diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index aaa9f93e78..05005e46a1 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -963,10 +963,16 @@ export const ChatRowContent = ({
 								<div>
 									<strong>{message.text}</strong>
 									<br />
+									<div>
+										&bull; {t("chat:shellIntegration.checkSettings")}
+										<br />
+										&bull; {t("chat:shellIntegration.updateVSCode")} (
+										<code>CMD/CTRL + Shift + P</code> → "Update")
+										<br />
+										&bull; {t("chat:shellIntegration.supportedShell")} (
+										<code>CMD/CTRL + Shift + P</code> → "Terminal: Select Default Profile")
+									</div>
 									<br />
-									Please update VSCode (<code>CMD/CTRL + Shift + P</code> → "Update") and make sure
-									you're using a supported shell: zsh, bash, fish, or PowerShell (
-									<code>CMD/CTRL + Shift + P</code> → "Terminal: Select Default Profile").{" "}
 									<a
 										href="http://docs.roocode.com/troubleshooting/shell-integration/"
 										style={{ color: "inherit", textDecoration: "underline" }}>
diff --git a/webview-ui/src/i18n/locales/ca/chat.json b/webview-ui/src/i18n/locales/ca/chat.json
index 6c913965d6..76f195f637 100644
--- a/webview-ui/src/i18n/locales/ca/chat.json
+++ b/webview-ui/src/i18n/locales/ca/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "Tasca completada",
 	"shellIntegration": {
 		"unavailable": "Integració de shell no disponible",
-		"troubleshooting": "Encara tens problemes?"
+		"troubleshooting": "Encara tens problemes? Fes clic aquí per a la documentació d'integració de shell.",
+		"checkSettings": "Comprova les solucions alternatives del terminal a la pàgina de configuració",
+		"updateVSCode": "Actualitza VSCode",
+		"supportedShell": "Assegura't d'utilitzar un shell compatible: zsh, bash, fish o PowerShell"
 	},
 	"powershell": {
 		"issues": "Sembla que estàs tenint problemes amb Windows PowerShell, si us plau consulta aquesta documentació per a més informació."
diff --git a/webview-ui/src/i18n/locales/de/chat.json b/webview-ui/src/i18n/locales/de/chat.json
index cb97b0bc84..302cccfe9c 100644
--- a/webview-ui/src/i18n/locales/de/chat.json
+++ b/webview-ui/src/i18n/locales/de/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "Aufgabe abgeschlossen",
 	"shellIntegration": {
 		"unavailable": "Shell-Integration nicht verfügbar",
-		"troubleshooting": "Immer noch Probleme?"
+		"troubleshooting": "Immer noch Probleme? Klicke hier für die Shell-Integrationsdokumentation.",
+		"checkSettings": "Überprüfe die Terminal-Workarounds in den Einstellungen",
+		"updateVSCode": "VSCode aktualisieren",
+		"supportedShell": "Stelle sicher, dass du eine unterstützte Shell verwendest: zsh, bash, fish oder PowerShell"
 	},
 	"powershell": {
 		"issues": "Es scheint, dass du Probleme mit Windows PowerShell hast, bitte sieh dir dies an"
diff --git a/webview-ui/src/i18n/locales/en/chat.json b/webview-ui/src/i18n/locales/en/chat.json
index f9f838356d..efc492b7a6 100644
--- a/webview-ui/src/i18n/locales/en/chat.json
+++ b/webview-ui/src/i18n/locales/en/chat.json
@@ -160,7 +160,10 @@
 	"troubleMessage": "Roo is having trouble...",
 	"shellIntegration": {
 		"unavailable": "Shell Integration Unavailable",
-		"troubleshooting": "Still having trouble?"
+		"troubleshooting": "Still having trouble? Click here for shell integration documentation.",
+		"checkSettings": "Check terminal workarounds in the settings page",
+		"updateVSCode": "Update VSCode",
+		"supportedShell": "Make sure you're using a supported shell: zsh, bash, fish, or PowerShell"
 	},
 	"powershell": {
 		"issues": "It seems like you're having Windows PowerShell issues, please see this"
diff --git a/webview-ui/src/i18n/locales/es/chat.json b/webview-ui/src/i18n/locales/es/chat.json
index caa1b6048c..5e86247416 100644
--- a/webview-ui/src/i18n/locales/es/chat.json
+++ b/webview-ui/src/i18n/locales/es/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "Tarea completada",
 	"shellIntegration": {
 		"unavailable": "Integración de shell no disponible",
-		"troubleshooting": "¿Sigues teniendo problemas?"
+		"troubleshooting": "¿Sigues teniendo problemas? Haz clic aquí para ver la documentación de integración de shell.",
+		"checkSettings": "Revisa los ajustes alternativos de terminal en la página de configuración",
+		"updateVSCode": "Actualiza VSCode",
+		"supportedShell": "Asegúrate de usar un shell compatible: zsh, bash, fish o PowerShell"
 	},
 	"powershell": {
 		"issues": "Parece que estás teniendo problemas con Windows PowerShell, por favor consulta esta"
diff --git a/webview-ui/src/i18n/locales/fr/chat.json b/webview-ui/src/i18n/locales/fr/chat.json
index 28254ab1c8..36f8cbe2d4 100644
--- a/webview-ui/src/i18n/locales/fr/chat.json
+++ b/webview-ui/src/i18n/locales/fr/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "Tâche terminée",
 	"shellIntegration": {
 		"unavailable": "Intégration du shell indisponible",
-		"troubleshooting": "Toujours des problèmes ?"
+		"troubleshooting": "Toujours des problèmes ? Cliquez ici pour la documentation d'intégration du shell.",
+		"checkSettings": "Vérifie les solutions de contournement du terminal dans les paramètres",
+		"updateVSCode": "Mets à jour VSCode",
+		"supportedShell": "Assure-toi d'utiliser un shell supporté : zsh, bash, fish ou PowerShell"
 	},
 	"powershell": {
 		"issues": "Il semble que vous rencontriez des problèmes avec Windows PowerShell, veuillez consulter ce"
diff --git a/webview-ui/src/i18n/locales/hi/chat.json b/webview-ui/src/i18n/locales/hi/chat.json
index 78904af006..9b68943eae 100644
--- a/webview-ui/src/i18n/locales/hi/chat.json
+++ b/webview-ui/src/i18n/locales/hi/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "कार्य पूरा हुआ",
 	"shellIntegration": {
 		"unavailable": "शेल एकीकरण अनुपलब्ध",
-		"troubleshooting": "अभी भी समस्या है?"
+		"troubleshooting": "अभी भी समस्या है? शेल एकीकरण दस्तावेज़ के लिए यहाँ क्लिक करें।",
+		"checkSettings": "सेटिंग्स पेज में टर्मिनल वर्कअराउंड जांचें",
+		"updateVSCode": "VSCode अपडेट करें",
+		"supportedShell": "सुनिश्चित करें कि आप समर्थित शेल का उपयोग कर रहे हैं: zsh, bash, fish या PowerShell"
 	},
 	"powershell": {
 		"issues": "ऐसा लगता है कि आपको Windows PowerShell के साथ समस्याएँ हो रही हैं, कृपया इसे देखें"
diff --git a/webview-ui/src/i18n/locales/it/chat.json b/webview-ui/src/i18n/locales/it/chat.json
index cb1d5f6dc1..b055c36b86 100644
--- a/webview-ui/src/i18n/locales/it/chat.json
+++ b/webview-ui/src/i18n/locales/it/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "Attività completata",
 	"shellIntegration": {
 		"unavailable": "Integrazione shell non disponibile",
-		"troubleshooting": "Ancora problemi?"
+		"troubleshooting": "Ancora problemi? Clicca qui per la documentazione sull'integrazione della shell.",
+		"checkSettings": "Controlla le soluzioni alternative del terminale nella pagina delle impostazioni",
+		"updateVSCode": "Aggiorna VSCode",
+		"supportedShell": "Assicurati di utilizzare una shell supportata: zsh, bash, fish o PowerShell"
 	},
 	"powershell": {
 		"issues": "Sembra che tu stia avendo problemi con Windows PowerShell, consulta questa"
diff --git a/webview-ui/src/i18n/locales/ja/chat.json b/webview-ui/src/i18n/locales/ja/chat.json
index 4eb1aa52fe..74250b70b9 100644
--- a/webview-ui/src/i18n/locales/ja/chat.json
+++ b/webview-ui/src/i18n/locales/ja/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "タスク完了",
 	"shellIntegration": {
 		"unavailable": "シェル統合が利用できません",
-		"troubleshooting": "まだ問題がありますか？"
+		"troubleshooting": "まだ問題がありますか？シェル統合のドキュメントはこちらをクリックしてください。",
+		"checkSettings": "設定ページでターミナルの回避策を確認してください",
+		"updateVSCode": "VSCodeを更新してください",
+		"supportedShell": "サポートされているシェルを使用していることを確認してください：zsh、bash、fish、またはPowerShell"
 	},
 	"powershell": {
 		"issues": "Windows PowerShellに問題があるようです。こちらを参照してください"
diff --git a/webview-ui/src/i18n/locales/ko/chat.json b/webview-ui/src/i18n/locales/ko/chat.json
index 2f4bff5cd3..037066f489 100644
--- a/webview-ui/src/i18n/locales/ko/chat.json
+++ b/webview-ui/src/i18n/locales/ko/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "작업 완료",
 	"shellIntegration": {
 		"unavailable": "쉘 통합 사용 불가",
-		"troubleshooting": "여전히 문제가 있나요?"
+		"troubleshooting": "여전히 문제가 있나요? 쉘 통합 문서를 보려면 여기를 클릭하세요.",
+		"checkSettings": "설정 페이지에서 터미널 해결 방법을 확인하세요",
+		"updateVSCode": "VSCode를 업데이트하세요",
+		"supportedShell": "지원되는 쉘을 사용하고 있는지 확인하세요: zsh, bash, fish 또는 PowerShell"
 	},
 	"powershell": {
 		"issues": "Windows PowerShell에 문제가 있는 것 같습니다. 다음을 참조하세요"
diff --git a/webview-ui/src/i18n/locales/pl/chat.json b/webview-ui/src/i18n/locales/pl/chat.json
index 372b347943..8e6d74669e 100644
--- a/webview-ui/src/i18n/locales/pl/chat.json
+++ b/webview-ui/src/i18n/locales/pl/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "Zadanie zakończone",
 	"shellIntegration": {
 		"unavailable": "Integracja powłoki niedostępna",
-		"troubleshooting": "Nadal masz problemy?"
+		"troubleshooting": "Nadal masz problemy? Kliknij tutaj, aby zobaczyć dokumentację integracji powłoki.",
+		"checkSettings": "Sprawdź obejścia terminala na stronie ustawień",
+		"updateVSCode": "Zaktualizuj VSCode",
+		"supportedShell": "Upewnij się, że używasz obsługiwanej powłoki: zsh, bash, fish lub PowerShell"
 	},
 	"powershell": {
 		"issues": "Wygląda na to, że masz problemy z Windows PowerShell, proszę zapoznaj się z tym"
diff --git a/webview-ui/src/i18n/locales/pt-BR/chat.json b/webview-ui/src/i18n/locales/pt-BR/chat.json
index d5d7aefc56..bd50af503b 100644
--- a/webview-ui/src/i18n/locales/pt-BR/chat.json
+++ b/webview-ui/src/i18n/locales/pt-BR/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "Tarefa concluída",
 	"shellIntegration": {
 		"unavailable": "Integração de shell indisponível",
-		"troubleshooting": "Ainda com problemas?"
+		"troubleshooting": "Ainda com problemas? Clique aqui para ver a documentação de integração do shell.",
+		"checkSettings": "Verifique as soluções alternativas do terminal na página de configurações",
+		"updateVSCode": "Atualize o VSCode",
+		"supportedShell": "Certifique-se de estar usando um shell suportado: zsh, bash, fish ou PowerShell"
 	},
 	"powershell": {
 		"issues": "Parece que você está tendo problemas com o Windows PowerShell, por favor veja este"
diff --git a/webview-ui/src/i18n/locales/tr/chat.json b/webview-ui/src/i18n/locales/tr/chat.json
index 3e4d68d618..baacb7e1d2 100644
--- a/webview-ui/src/i18n/locales/tr/chat.json
+++ b/webview-ui/src/i18n/locales/tr/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "Görev Tamamlandı",
 	"shellIntegration": {
 		"unavailable": "Kabuk Entegrasyonu Kullanılamıyor",
-		"troubleshooting": "Hala sorun mu yaşıyorsunuz?"
+		"troubleshooting": "Hala sorun mu yaşıyorsunuz? Kabuk entegrasyonu belgelerine göz atmak için buraya tıklayın.",
+		"checkSettings": "Ayarlar sayfasındaki terminal geçici çözümlerini kontrol et",
+		"updateVSCode": "VSCode'u güncelle",
+		"supportedShell": "Desteklenen bir kabuk kullandığından emin ol: zsh, bash, fish veya PowerShell"
 	},
 	"powershell": {
 		"issues": "Windows PowerShell ile ilgili sorunlar yaşıyor gibi görünüyorsunuz, lütfen şu konuya bakın"
diff --git a/webview-ui/src/i18n/locales/vi/chat.json b/webview-ui/src/i18n/locales/vi/chat.json
index 7c417d54ef..021c4cd730 100644
--- a/webview-ui/src/i18n/locales/vi/chat.json
+++ b/webview-ui/src/i18n/locales/vi/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "Nhiệm vụ hoàn thành",
 	"shellIntegration": {
 		"unavailable": "Tích hợp shell không khả dụng",
-		"troubleshooting": "Vẫn gặp vấn đề?"
+		"troubleshooting": "Vẫn gặp vấn đề? Nhấp vào đây để xem tài liệu tích hợp shell.",
+		"checkSettings": "Kiểm tra các giải pháp thay thế cho terminal trong trang cài đặt",
+		"updateVSCode": "Cập nhật VSCode",
+		"supportedShell": "Đảm bảo bạn đang sử dụng shell được hỗ trợ: zsh, bash, fish hoặc PowerShell"
 	},
 	"powershell": {
 		"issues": "Có vẻ như bạn đang gặp vấn đề với Windows PowerShell, vui lòng xem"
diff --git a/webview-ui/src/i18n/locales/zh-CN/chat.json b/webview-ui/src/i18n/locales/zh-CN/chat.json
index a8c261642c..52c15265dd 100644
--- a/webview-ui/src/i18n/locales/zh-CN/chat.json
+++ b/webview-ui/src/i18n/locales/zh-CN/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "任务完成",
 	"shellIntegration": {
 		"unavailable": "Shell集成不可用",
-		"troubleshooting": "仍有问题吗？"
+		"troubleshooting": "仍有问题吗？点击此处查看Shell集成文档。",
+		"checkSettings": "检查设置页面中的终端解决方案",
+		"updateVSCode": "更新VSCode",
+		"supportedShell": "确保使用受支持的shell：zsh、bash、fish或PowerShell"
 	},
 	"powershell": {
 		"issues": "看起来您遇到了Windows PowerShell问题，请参阅此"
diff --git a/webview-ui/src/i18n/locales/zh-TW/chat.json b/webview-ui/src/i18n/locales/zh-TW/chat.json
index b232eea889..b28ce9e4ee 100644
--- a/webview-ui/src/i18n/locales/zh-TW/chat.json
+++ b/webview-ui/src/i18n/locales/zh-TW/chat.json
@@ -160,7 +160,10 @@
 	"taskCompleted": "工作完成",
 	"shellIntegration": {
 		"unavailable": "Shell 整合功能無法使用",
-		"troubleshooting": "仍有問題嗎？"
+		"troubleshooting": "仍有問題嗎？點擊此處查看 Shell 整合文件。",
+		"checkSettings": "檢查設定頁面中的終端解決方案",
+		"updateVSCode": "更新 VSCode",
+		"supportedShell": "確保使用支援的 shell：zsh、bash、fish 或 PowerShell"
 	},
 	"powershell": {
 		"issues": "看起來您遇到了 Windows PowerShell 的問題，請參考此處"