From 44893bc3c3d210e24dbb623599e81bbb4262339e Mon Sep 17 00:00:00 2001
From: Faisal Amir <urmauur@gmail.com>
Date: Mon, 15 Sep 2025 10:33:05 +0700
Subject: [PATCH 1/3] enhancement: copy MCP permission

---
 web-app/src/containers/dialogs/ToolApproval.tsx | 7 +++++--
 web-app/src/locales/de-DE/mcp-servers.json      | 2 +-
 web-app/src/locales/de-DE/tool-approval.json    | 2 +-
 web-app/src/locales/de-DE/tools.json            | 5 +++--
 web-app/src/locales/en/mcp-servers.json         | 2 +-
 web-app/src/locales/en/tool-approval.json       | 6 +++---
 web-app/src/locales/en/tools.json               | 5 +++--
 web-app/src/locales/id/mcp-servers.json         | 2 +-
 web-app/src/locales/id/tool-approval.json       | 2 +-
 web-app/src/locales/id/tools.json               | 5 +++--
 web-app/src/locales/pl/mcp-servers.json         | 2 +-
 web-app/src/locales/pl/tool-approval.json       | 2 +-
 web-app/src/locales/pl/tools.json               | 5 +++--
 web-app/src/locales/vn/tool-approval.json       | 2 +-
 web-app/src/locales/vn/tools.json               | 5 +++--
 web-app/src/locales/zh-CN/mcp-servers.json      | 2 +-
 web-app/src/locales/zh-CN/tool-approval.json    | 2 +-
 web-app/src/locales/zh-CN/tools.json            | 5 +++--
 web-app/src/locales/zh-TW/mcp-servers.json      | 2 +-
 web-app/src/locales/zh-TW/tool-approval.json    | 2 +-
 web-app/src/locales/zh-TW/tools.json            | 5 +++--
 21 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/web-app/src/containers/dialogs/ToolApproval.tsx b/web-app/src/containers/dialogs/ToolApproval.tsx
index 3aaa622f7..96bf0590a 100644
--- a/web-app/src/containers/dialogs/ToolApproval.tsx
+++ b/web-app/src/containers/dialogs/ToolApproval.tsx
@@ -52,7 +52,10 @@ export default function ToolApproval() {
               <DialogTitle>{t('tools:toolApproval.title')}</DialogTitle>
               <DialogDescription className="mt-1 text-main-view-fg/70">
                 {t('tools:toolApproval.description')}{' '}
-                <span className="font-semibold">{toolName}</span>
+                <span className="font-semibold">{toolName}</span>.&nbsp;
+                <span className="text-sm">
+                  {t('tools:toolApproval.permissionScope')}
+                </span>
               </DialogDescription>
             </div>
           </div>
@@ -85,7 +88,7 @@ export default function ToolApproval() {
           >
             {t('tools:toolApproval.deny')}
           </Button>
-          <div className="flex flex-col sm:flex-row sm:gap-2 sm:items-center">
+          <div className="flex flex-col sm:flex-row gap-2 items-center">
             <Button
               variant="link"
               onClick={handleAllowOnce}
diff --git a/web-app/src/locales/de-DE/mcp-servers.json b/web-app/src/locales/de-DE/mcp-servers.json
index 665c712a2..45feffac5 100644
--- a/web-app/src/locales/de-DE/mcp-servers.json
+++ b/web-app/src/locales/de-DE/mcp-servers.json
@@ -34,7 +34,7 @@
   "editAllJson": "JSON aller Server bearbeiten",
   "findMore": "Finde mehr MCP Server bei",
   "allowPermissions": "Erlaube allen MCP Werkzeugen den Zugriff",
-  "allowPermissionsDesc": "Wenn aktiviert, werden alle MCP-Werkzeug-Aufrufe automatisch genehmigt, ohne dass Berechtigungsdialoge angezeigt werden.",
+  "allowPermissionsDesc": "Wenn aktiviert, werden alle MCP-Werkzeug-Aufrufe automatisch genehmigt, ohne dass Berechtigungsdialoge angezeigt werden. Diese Einstellung gilt global für alle Gespräche, einschließlich neuer Chats.",
   "noServers": "Keine MCP Server gefunden",
   "args": "Argumente",
   "env": "Umgebung",
diff --git a/web-app/src/locales/de-DE/tool-approval.json b/web-app/src/locales/de-DE/tool-approval.json
index 3303abaad..8e214f95f 100644
--- a/web-app/src/locales/de-DE/tool-approval.json
+++ b/web-app/src/locales/de-DE/tool-approval.json
@@ -4,7 +4,7 @@
   "securityNotice": "<strong>Sicherheitshinweis:</strong> Schädliche Werkzeuge oder Konversationsinhalte könnten den Assistenten möglicherweise zu schädlichen Aktionen verleiten. Überprüfe jeden Werkzeug-Aufruf sorgfältig, bevor Du ihn genehmigst.",
   "deny": "Verweigern",
   "allowOnce": "Einmal erlauben",
-  "alwaysAllow": "Immer erlauben",
+  "alwaysAllow": "Im Thread erlauben",
   "permissions": "Berechtigungen",
   "approve": "Genehmigen",
   "reject": "Ablehnen",
diff --git a/web-app/src/locales/de-DE/tools.json b/web-app/src/locales/de-DE/tools.json
index 4e7ebe2a4..61beb3587 100644
--- a/web-app/src/locales/de-DE/tools.json
+++ b/web-app/src/locales/de-DE/tools.json
@@ -5,7 +5,8 @@
     "securityNotice": "Dieses Werkzeug möchte eine Aktion ausführen. Bitte überprüfen und genehmigen oder Ablehnen.",
     "deny": "Ablehnen",
     "allowOnce": "Einmal erlauben",
-    "alwaysAllow": "Immer erlauben",
-    "parameters": "Werkzeug-Parameter"
+    "alwaysAllow": "Im Thread erlauben",
+    "parameters": "Werkzeug-Parameter",
+    "permissionScope": "Erteilte Berechtigungen gelten nur für dieses Gespräch."
   }
 }
diff --git a/web-app/src/locales/en/mcp-servers.json b/web-app/src/locales/en/mcp-servers.json
index 5ba194850..4c76d6f0d 100644
--- a/web-app/src/locales/en/mcp-servers.json
+++ b/web-app/src/locales/en/mcp-servers.json
@@ -34,7 +34,7 @@
   "editAllJson": "Edit All Servers JSON",
   "findMore": "Find more MCP servers at",
   "allowPermissions": "Allow All MCP Tool Permissions",
-  "allowPermissionsDesc": "When enabled, all MCP tool calls will be automatically approved without showing permission dialogs.",
+  "allowPermissionsDesc": "When enabled, all MCP tool calls will be automatically approved without showing permission dialogs. This setting applies globally to all conversations, including new chats.",
   "noServers": "No MCP servers found",
   "args": "Args",
   "env": "Env",
diff --git a/web-app/src/locales/en/tool-approval.json b/web-app/src/locales/en/tool-approval.json
index f15e30c9b..bdbf08fbe 100644
--- a/web-app/src/locales/en/tool-approval.json
+++ b/web-app/src/locales/en/tool-approval.json
@@ -1,12 +1,12 @@
 {
   "title": "Tool Call Request",
-  "description": "The assistant wants to use the tool: <strong>{{toolName}}</strong>",
+  "description": "The assistant wants to use the tool: <strong>{{toolName}}</strong> hello",
   "securityNotice": "<strong>Security Notice:</strong> Malicious tools or conversation content could potentially trick the assistant into attempting harmful actions. Review each tool call carefully before approving.",
   "deny": "Deny",
   "allowOnce": "Allow Once",
-  "alwaysAllow": "Always Allow",
+  "alwaysAllow": "Allow in thread",
   "permissions": "Permissions",
   "approve": "Approve",
   "reject": "Reject",
   "parameters": "Tool Parameters"
-}
\ No newline at end of file
+}
diff --git a/web-app/src/locales/en/tools.json b/web-app/src/locales/en/tools.json
index 0a4691ea4..a0f236ff0 100644
--- a/web-app/src/locales/en/tools.json
+++ b/web-app/src/locales/en/tools.json
@@ -5,7 +5,8 @@
     "securityNotice": "Malicious tools or conversation content could potentially trick the assistant into attempting harmful actions. Review each tool call carefully before approving.",
     "deny": "Deny",
     "allowOnce": "Allow Once",
-    "alwaysAllow": "Always Allow",
-    "parameters": "Tool Parameters"
+    "alwaysAllow": "Allow in thread",
+    "parameters": "Tool Parameters",
+    "permissionScope": "Permissions granted apply only to this conversation."
   }
 }
diff --git a/web-app/src/locales/id/mcp-servers.json b/web-app/src/locales/id/mcp-servers.json
index 667345680..54fb87ba9 100644
--- a/web-app/src/locales/id/mcp-servers.json
+++ b/web-app/src/locales/id/mcp-servers.json
@@ -34,7 +34,7 @@
   "editAllJson": "Edit Semua JSON Server",
   "findMore": "Temukan lebih banyak server MCP di",
   "allowPermissions": "Izinkan Semua Izin Alat MCP",
-  "allowPermissionsDesc": "Jika diaktifkan, semua panggilan alat MCP akan disetujui secara otomatis tanpa menampilkan dialog izin.",
+  "allowPermissionsDesc": "Jika diaktifkan, semua panggilan alat MCP akan disetujui secara otomatis tanpa menampilkan dialog izin. Pengaturan ini berlaku secara global untuk semua percakapan, termasuk chat baru.",
   "noServers": "Tidak ada server MCP yang ditemukan",
   "args": "Argumen",
   "env": "Lingkungan",
diff --git a/web-app/src/locales/id/tool-approval.json b/web-app/src/locales/id/tool-approval.json
index 3353b7626..6193d97e3 100644
--- a/web-app/src/locales/id/tool-approval.json
+++ b/web-app/src/locales/id/tool-approval.json
@@ -4,7 +4,7 @@
   "securityNotice": "<strong>Pemberitahuan Keamanan:</strong> Alat berbahaya atau konten percakapan dapat menipu asisten untuk mencoba melakukan tindakan yang merugikan. Tinjau setiap permintaan penggunaan alat dengan cermat sebelum menyetujui.",
   "deny": "Tolak",
   "allowOnce": "Izinkan Sekali",
-  "alwaysAllow": "Selalu Izinkan",
+  "alwaysAllow": "Izinkan di thread",
   "permissions": "Izin",
   "approve": "Setujui",
   "reject": "Tolak",
diff --git a/web-app/src/locales/id/tools.json b/web-app/src/locales/id/tools.json
index 1e001afc6..7392c44c6 100644
--- a/web-app/src/locales/id/tools.json
+++ b/web-app/src/locales/id/tools.json
@@ -4,8 +4,9 @@
     "securityNotice": "Alat ini ingin melakukan suatu tindakan. Harap tinjau dan setujui.",
     "deny": "Tolak",
     "allowOnce": "Izinkan Sekali",
-    "alwaysAllow": "Selalu Izinkan",
+    "alwaysAllow": "Izinkan di thread",
     "description": "Asisten ingin menggunakan <strong>{{toolName}}</strong>",
-    "parameters": "Parameter Alat"
+    "parameters": "Parameter Alat",
+    "permissionScope": "Izin yang diberikan hanya berlaku untuk percakapan ini."
   }
 }
diff --git a/web-app/src/locales/pl/mcp-servers.json b/web-app/src/locales/pl/mcp-servers.json
index a9e689343..34588fa3a 100644
--- a/web-app/src/locales/pl/mcp-servers.json
+++ b/web-app/src/locales/pl/mcp-servers.json
@@ -34,7 +34,7 @@
   "editAllJson": "Edytuj JSON Wszystkich Serwerów",
   "findMore": "Znajdź więcej serwerów MCP na",
   "allowPermissions": "Pozwalaj na Wszystkie Użycia Narzędzi MCP",
-  "allowPermissionsDesc": "Po włączeniu będzie automatycznie zezwalać na wszystkie użycia narzędzi MCP bez wyświetlania próśb o zgodę.",
+  "allowPermissionsDesc": "Po włączeniu będzie automatycznie zezwalać na wszystkie użycia narzędzi MCP bez wyświetlania próśb o zgodę. To ustawienie obowiązuje globalnie dla wszystkich rozmów, w tym nowych czatów.",
   "noServers": "Nie znaleziono serwerów MCP",
   "args": "Argumenty",
   "env": "Zmienne Środowiskowe",
diff --git a/web-app/src/locales/pl/tool-approval.json b/web-app/src/locales/pl/tool-approval.json
index c0e917b68..71263cf42 100644
--- a/web-app/src/locales/pl/tool-approval.json
+++ b/web-app/src/locales/pl/tool-approval.json
@@ -4,7 +4,7 @@
   "securityNotice": "<strong>Ostrzeżenie Bezpieczeństwa:</strong> Złośliwe narzędzia lub treści rozmowy mają potencjał nakłonić agenta do szkodliwych działań. Dokładnie przejrzyj każdą prośbę o użycie narzędzia przed wyrażeniem zgody.",
   "deny": "Odmów",
   "allowOnce": "Pozwól Raz",
-  "alwaysAllow": "Zawsze Pozwalaj",
+  "alwaysAllow": "Pozwól w wątku",
   "permissions": "Pozwolenia",
   "approve": "Zaakceptuj",
   "reject": "Odrzuć",
diff --git a/web-app/src/locales/pl/tools.json b/web-app/src/locales/pl/tools.json
index fcb7c0ee3..acea29481 100644
--- a/web-app/src/locales/pl/tools.json
+++ b/web-app/src/locales/pl/tools.json
@@ -5,7 +5,8 @@
     "securityNotice": "Złośliwe narzędzia lub treści rozmowy mają potencjał nakłonić agenta do szkodliwych działań. Dokładnie przejrzyj każdą prośbę o użycie narzędzia przed wyrażeniem zgody.",
     "deny": "Odmów",
     "allowOnce": "Pozwól Raz",
-    "alwaysAllow": "Zawsze Pozwalaj",
-    "parameters": "Parametry Narzędzia"
+    "alwaysAllow": "Pozwól w wątku",
+    "parameters": "Parametry Narzędzia",
+    "permissionScope": "Udzielone pozwolenia dotyczą tylko tej rozmowy."
   }
 }
diff --git a/web-app/src/locales/vn/tool-approval.json b/web-app/src/locales/vn/tool-approval.json
index bbe388d7e..808a5d72f 100644
--- a/web-app/src/locales/vn/tool-approval.json
+++ b/web-app/src/locales/vn/tool-approval.json
@@ -4,7 +4,7 @@
   "securityNotice": "<strong>Thông báo bảo mật:</strong> Các công cụ độc hại hoặc nội dung cuộc trò chuyện có khả năng lừa trợ lý thực hiện các hành động có hại. Hãy xem xét kỹ từng lệnh gọi công cụ trước khi phê duyệt.",
   "deny": "Từ chối",
   "allowOnce": "Cho phép một lần",
-  "alwaysAllow": "Luôn cho phép",
+  "alwaysAllow": "Cho phép trong chuỗi",
   "permissions": "Quyền",
   "approve": "Phê duyệt",
   "reject": "Từ chối",
diff --git a/web-app/src/locales/vn/tools.json b/web-app/src/locales/vn/tools.json
index 63306479f..7b39def99 100644
--- a/web-app/src/locales/vn/tools.json
+++ b/web-app/src/locales/vn/tools.json
@@ -4,8 +4,9 @@
     "securityNotice": "Công cụ này muốn thực hiện một hành động. Vui lòng xem xét và phê duyệt.",
     "deny": "Từ chối",
     "allowOnce": "Cho phép một lần",
-    "alwaysAllow": "Luôn cho phép",
+    "alwaysAllow": "Cho phép trong chuỗi",
     "description": "Trợ lý muốn sử dụng <strong>{{toolName}}</strong>",
-    "parameters": "Tham số công cụ"
+    "parameters": "Tham số công cụ",
+    "permissionScope": "Quyền được cấp chỉ áp dụng cho cuộc trò chuyện này."
   }
 }
diff --git a/web-app/src/locales/zh-CN/mcp-servers.json b/web-app/src/locales/zh-CN/mcp-servers.json
index 130759c56..17d64af77 100644
--- a/web-app/src/locales/zh-CN/mcp-servers.json
+++ b/web-app/src/locales/zh-CN/mcp-servers.json
@@ -34,7 +34,7 @@
   "editAllJson": "编辑所有服务器的 JSON",
   "findMore": "在以下位置查找更多 MCP 服务器",
   "allowPermissions": "允许所有 MCP 工具权限",
-  "allowPermissionsDesc": "启用后，所有 MCP 工具调用都将自动批准，而不会显示权限对话框。",
+  "allowPermissionsDesc": "启用后，所有 MCP 工具调用都将自动批准，而不会显示权限对话框。此设置全局适用于所有对话，包括新聊天。",
   "noServers": "未找到 MCP 服务器",
   "args": "参数",
   "env": "环境",
diff --git a/web-app/src/locales/zh-CN/tool-approval.json b/web-app/src/locales/zh-CN/tool-approval.json
index d1f60d5b1..3bbc6a745 100644
--- a/web-app/src/locales/zh-CN/tool-approval.json
+++ b/web-app/src/locales/zh-CN/tool-approval.json
@@ -4,7 +4,7 @@
   "securityNotice": "<strong>安全警告：</strong>恶意的工具或对话内容可能会诱使助手尝试有害操作。在批准之前，请仔细审查每个工具调用。",
   "deny": "拒绝",
   "allowOnce": "允许一次",
-  "alwaysAllow": "始终允许",
+  "alwaysAllow": "在线程中允许",
   "permissions": "权限",
   "approve": "批准",
   "reject": "拒绝",
diff --git a/web-app/src/locales/zh-CN/tools.json b/web-app/src/locales/zh-CN/tools.json
index 332ffc6ec..e4c471fdb 100644
--- a/web-app/src/locales/zh-CN/tools.json
+++ b/web-app/src/locales/zh-CN/tools.json
@@ -4,8 +4,9 @@
     "securityNotice": "此工具想要执行一个操作。请审查并批准。",
     "deny": "拒绝",
     "allowOnce": "允许一次",
-    "alwaysAllow": "始终允许",
+    "alwaysAllow": "在线程中允许",
     "description": "助手想要使用 <strong>{{toolName}}</strong>",
-    "parameters": "工具参数"
+    "parameters": "工具参数",
+    "permissionScope": "授予的权限仅适用于此对话。"
   }
 }
diff --git a/web-app/src/locales/zh-TW/mcp-servers.json b/web-app/src/locales/zh-TW/mcp-servers.json
index cbcf46490..0eb781497 100644
--- a/web-app/src/locales/zh-TW/mcp-servers.json
+++ b/web-app/src/locales/zh-TW/mcp-servers.json
@@ -34,7 +34,7 @@
   "editAllJson": "編輯所有伺服器的 JSON",
   "findMore": "在以下位置尋找更多 MCP 伺服器",
   "allowPermissions": "允許所有 MCP 工具權限",
-  "allowPermissionsDesc": "啟用後，所有 MCP 工具呼叫將自動核准，而不會顯示權限對話方塊。",
+  "allowPermissionsDesc": "啟用後，所有 MCP 工具呼叫將自動核准，而不會顯示權限對話方塊。此設定全域適用於所有對話，包括新聊天。",
   "noServers": "找不到 MCP 伺服器",
   "args": "參數",
   "env": "環境",
diff --git a/web-app/src/locales/zh-TW/tool-approval.json b/web-app/src/locales/zh-TW/tool-approval.json
index 1d1dcd19b..120a8af15 100644
--- a/web-app/src/locales/zh-TW/tool-approval.json
+++ b/web-app/src/locales/zh-TW/tool-approval.json
@@ -4,7 +4,7 @@
   "securityNotice": "<strong>安全性通知：</strong>惡意的工具或對話內容可能會誘騙助理嘗試有害的操作。在核准之前，請仔細檢閱每個工具呼叫。",
   "deny": "拒絕",
   "allowOnce": "允許一次",
-  "alwaysAllow": "一律允許",
+  "alwaysAllow": "在討論串中允許",
   "permissions": "權限",
   "approve": "核准",
   "reject": "拒絕",
diff --git a/web-app/src/locales/zh-TW/tools.json b/web-app/src/locales/zh-TW/tools.json
index 64ed15e8d..f87d1257f 100644
--- a/web-app/src/locales/zh-TW/tools.json
+++ b/web-app/src/locales/zh-TW/tools.json
@@ -4,8 +4,9 @@
     "securityNotice": "此工具想要執行一個動作。請檢閱並核准。",
     "deny": "拒絕",
     "allowOnce": "允許一次",
-    "alwaysAllow": "一律允許",
+    "alwaysAllow": "在討論串中允許",
     "description": "助理想要使用 <strong>{{toolName}}</strong>",
-    "parameters": "工具參數"
+    "parameters": "工具參數",
+    "permissionScope": "授予的權限僅適用於此對話。"
   }
 }

From a26445e5579007434a905e8f5afd6dd7c5131c6f Mon Sep 17 00:00:00 2001
From: Faisal Amir <urmauur@gmail.com>
Date: Mon, 15 Sep 2025 10:34:27 +0700
Subject: [PATCH 2/3] chore: make action mutton capitalize

---
 web-app/src/containers/dialogs/ToolApproval.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/web-app/src/containers/dialogs/ToolApproval.tsx b/web-app/src/containers/dialogs/ToolApproval.tsx
index 96bf0590a..7dbd4bd96 100644
--- a/web-app/src/containers/dialogs/ToolApproval.tsx
+++ b/web-app/src/containers/dialogs/ToolApproval.tsx
@@ -96,7 +96,12 @@ export default function ToolApproval() {
             >
               {t('tools:toolApproval.allowOnce')}
             </Button>
-            <Button variant="default" onClick={handleAllow} autoFocus>
+            <Button
+              variant="default"
+              onClick={handleAllow}
+              autoFocus
+              className="capitalize"
+            >
               {t('tools:toolApproval.alwaysAllow')}
             </Button>
           </div>

From a4483b7eb72eac58c360a47e79facfa947394c8d Mon Sep 17 00:00:00 2001
From: Faisal Amir <urmauur@gmail.com>
Date: Mon, 15 Sep 2025 10:38:36 +0700
Subject: [PATCH 3/3] Update web-app/src/locales/en/tool-approval.json

Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
---
 web-app/src/locales/en/tool-approval.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-app/src/locales/en/tool-approval.json b/web-app/src/locales/en/tool-approval.json
index bdbf08fbe..2d0c8b549 100644
--- a/web-app/src/locales/en/tool-approval.json
+++ b/web-app/src/locales/en/tool-approval.json
@@ -1,6 +1,6 @@
 {
   "title": "Tool Call Request",
-  "description": "The assistant wants to use the tool: <strong>{{toolName}}</strong> hello",
+  "description": "The assistant wants to use the tool: <strong>{{toolName}}</strong>",
   "securityNotice": "<strong>Security Notice:</strong> Malicious tools or conversation content could potentially trick the assistant into attempting harmful actions. Review each tool call carefully before approving.",
   "deny": "Deny",
   "allowOnce": "Allow Once",