dsh-gitbash-shell 0.35.3 → 0.36.0

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 > 倒序排列,新版本条目在最上面。条目格式:`## vX.Y.Z — YYYY-MM-DD` + 类型(feat / fix / docs / chore)+ 要点 + 相关链接。
 > 纪律见 AGENTS.md「变更记录纪律」:发版前先更新本文件并随版本提交;事故复盘、复现与真机验证记录也记在这里。
 
+## v0.36.0 — 2026-10-13
+
+**类型**:feat(设置卡分组重排;用户反馈「一排按钮不知道分类」)。
+
+- **七分区语义分组**:此前 9 个开关一锅炖在「路径方言」分区里(方言、终端接管、Git 行尾、bash 路径混排),行内工具区连标题都没有。重排为按功能域的七个分区,显示顺序即用户决策顺序:**模式**(变体开关)→ **行内工具**(gitbash_pwsh、gb_*——补上标题)→ **路径方言**(瘦身,纯翻译层 6 开关)→ **执行器**(新分区:Git 行尾 + Git Bash 路径——找「为什么 diff 飘红」或填 bash 路径不用再滚过六个翻译开关)→ **终端**(新建终端接管 + 侧栏接管)→ **终端工具**(win32 工具链,原样)→ **插件联动**(新合并分区:去重开关 + python 后端两个席位一个标题)。
+- **词典**:新增 `sec.inline`/`sec.executor`/`sec.peer` × 21 语言;`sec.terminal` 文案从「侧栏终端」改为「终端」(该分区现在装的是两个终端接管开关)。合计 21 门逐键对齐(冒烟键集断言全过)。
+- **冒烟**:117 项(116 过 + 1 跳)。新增「client card: the body groups switches into seven labelled sections」——锁七分区定义齐全、body 挂载顺序、方言区不再吞执行器/终端行、行内工具区有标题。
+- 功能面零变化:所有开关的字段名、写入通道(configForms)、默认值全部原样,纯布局重组。
+
 ## v0.35.3 — 2026-10-12
 
 **类型**:fix(issue [#18](https://github.com/KannaKuron/dsh-gitbash-shell/issues/18) 三个独立根因;Windows 真机 v0.35.0 四面全灭)。

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-gitbash-shell",
-  "version": "0.35.3",
+  "version": "0.36.0",
   "main": "./src/index.js",
   "description": "Windows 全模式 Git Bash:用 Git for Windows bash 替换 PowerShell 执行器;官方四个模式经行内工具补位直接获得 Git Bash(v0.35.0,默认),四个 *·Git Bash 变体 preset 可开关;附带 gitbash_pwsh(系统 PowerShell 7)与 gb_* FastCtx 文件工具,检测到 dsh-ops 自动让位。联动:dsh-ptc-cordis-preset(PTC 创造模式带 Git Bash 行且可去重)+ dsh-better-sidebar(终端标签自动切 Git Bash)。",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-gitbash-shell",
-  "version": "0.35.3",
+  "version": "0.36.0",
   "description": "Windows 上让 agent 的每条 shell 命令改经 Git for Windows bash 执行;物化四个内置预设的 Git Bash 变体,统一 MSYS 盘根路径方言,侧栏终端接管可开关。· Run every agent shell command through Git for Windows bash on Windows; materialize Git Bash variants of the built-in presets, unify the MSYS drive-root path dialect, and adopt the sidebar terminal behind a switch.",
   "type": "module",
   "repository": {

package/src/client.js

@@ -76,8 +76,11 @@ window.__ModuleLoader__.load({
 			"switch.off": "停用",
 			"error": "写入失败",
 			"hint": "启用后:所有工具(bash 命令与 workdir、read/write/edit/read_image/glob/grep 与 present 的路径参数)统一使用 MSYS 盘根 POSIX 路径(/c/Users/...);bash 的原生习惯——~ 家目录、/tmp 临时目录、/dev/null、/usr 等——在所有工具中同样有效(与 Git Bash 挂载表一致),路径参数由宿主自动翻译,模型无感。停用后恢复 dsh 原生行为(文件工具用 Windows 路径)。bash 始终是 Git Bash,不受此开关影响。",
+			"sec.inline": "行内工具",
+			"sec.executor": "执行器",
+			"sec.peer": "插件联动",
 			"sec.dialect": "路径方言",
-			"sec.terminal": "侧栏终端",
+			"sec.terminal": "终端",
 			"mnts.label": "虚拟路径挂载",
 			"mnts.hint": "bash 的原生路径习惯——~ 家目录、/tmp、/usr 等——按 Git Bash 挂载表在所有工具解析;关闭则仅 /c/ 盘根形式。",
 			"errs.label": "报错路径翻译",
@@ -150,8 +153,11 @@ window.__ModuleLoader__.load({
 			"switch.off": "Disable",
 			"error": "write failed",
 			"hint": "Enabled: every tool (bash commands and workdir, read/write/edit/read_image/glob/grep and present path arguments) uses MSYS drive-root POSIX paths (/c/Users/...); bash-native habits — the ~ home shorthand, /tmp, /dev/null, /usr — resolve in every tool exactly as bash itself resolves them, and the host translates the path fields automatically. Disabled restores dsh-native behavior (Windows paths for file tools). Bash is always Git Bash while the plugin is installed; this switch only governs the cross-tool path dialect.",
+			"sec.inline": "Inline tools",
+			"sec.executor": "Executor",
+			"sec.peer": "Plugin integrations",
 			"sec.dialect": "Path dialect",
-			"sec.terminal": "Sidebar terminal",
+			"sec.terminal": "Terminal",
 			"mnts.label": "Virtual path mounts",
 			"mnts.hint": "Bash-native habits — ~ home, /tmp, /usr — resolve through the Git Bash mount table in every tool; off = /c/ drive roots only.",
 			"errs.label": "Error-path translation",
@@ -234,8 +240,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "تعطيل",
 				"error": "فشل الكتابة",
 				"hint": "عند التفعيل: تستخدم كل الأدوات (أوامر bash و workdir، ومعاملات المسار في read/write/edit/read_image/glob/grep و present) مسارات POSIX من جذر قرص MSYS (/c/Users/...)؛ وعادات bash الأصلية — ~ للمجلد الرئيسي و /tmp و /dev/null و /usr — تعمل في كل أداة تمامًا كما تحلّها bash نفسها، ويتولّى المضيف ترجمة حقول المسار تلقائيًا. عند التعطيل يعود السلوك الأصلي لـ dsh (مسارات Windows لأدوات الملفات). يبقى bash دائمًا Git Bash ما دامت الإضافة مثبَّتة؛ هذا المفتاح لا يحكم سوى لهجة المسارات بين الأدوات.",
+				"sec.inline": "الأدوات المضمنة",
+				"sec.executor": "المنفّذ",
+				"sec.peer": "تكامل الإضافات",
 				"sec.dialect": "لهجة المسارات",
-				"sec.terminal": "طرفية الشريط الجانبي",
+				"sec.terminal": "الطرفية",
 				"mnts.label": "التركيبات الافتراضية للمسارات",
 				"mnts.hint": "عادات bash الأصلية — ~ و /tmp و /usr — تُحل عبر جدول تحميلات Git Bash في كل أداة؛ الإيقاف يعني جذور الأقراص /c/ فقط.",
 				"errs.label": "ترجمة مسارات الأخطاء",
@@ -308,8 +317,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "Deaktivieren",
 				"error": "Schreiben fehlgeschlagen",
 				"hint": "Aktiviert: Alle Tools (bash-Befehle und workdir sowie Pfadargumente von read/write/edit/read_image/glob/grep und present) verwenden POSIX-Pfade ab der MSYS-Laufwerkswurzel (/c/Users/...); bash-eigene Gewohnheiten — ~ für das Home-Verzeichnis, /tmp, /dev/null, /usr — funktionieren in jedem Tool genau so, wie bash sie selbst auflöst, und der Host übersetzt die Pfadfelder automatisch. Deaktiviert stellt das dsh-native Verhalten wieder her (Windows-Pfade für Dateitools). Bash ist bei installiertem Plugin immer Git Bash; dieser Schalter steuert nur den Pfaddialekt zwischen den Tools.",
+				"sec.inline": "Inline-Werkzeuge",
+				"sec.executor": "Executor",
+				"sec.peer": "Plugin-Integrationen",
 				"sec.dialect": "Pfaddialekt",
-				"sec.terminal": "Seitenleisten-Terminal",
+				"sec.terminal": "Terminal",
 				"mnts.label": "Virtuelle Pfad-Mounts",
 				"mnts.hint": "Bash-eigene Gewohnheiten — ~ Home, /tmp, /usr — werden über die Git-Bash-Mount-Tabelle in jedem Tool aufgelöst; aus = nur /c/-Laufwerkswurzeln.",
 				"errs.label": "Fehlerpfad-Übersetzung",
@@ -382,8 +394,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "Désactiver",
 				"error": "échec de l'écriture",
 				"hint": "Activé : tous les outils (commandes bash et workdir, arguments de chemin de read/write/edit/read_image/glob/grep et de present) utilisent des chemins POSIX à racine de lecteur MSYS (/c/Users/...) ; les habitudes natives de bash — ~ pour le dossier personnel, /tmp, /dev/null, /usr — fonctionnent dans chaque outil exactement comme bash les résout lui-même, et l'hôte traduit les champs de chemin automatiquement. Désactivé rétablit le comportement natif de dsh (chemins Windows pour les outils de fichiers). Bash reste toujours Git Bash tant que le plugin est installé ; ce commutateur ne régit que le dialecte de chemins entre outils.",
+				"sec.inline": "Outils en ligne",
+				"sec.executor": "Exécuteur",
+				"sec.peer": "Intégrations de plugins",
 				"sec.dialect": "Dialecte de chemins",
-				"sec.terminal": "Terminal latéral",
+				"sec.terminal": "Terminal",
 				"mnts.label": "Montages de chemins virtuels",
 				"mnts.hint": "Les habitudes natives de bash — ~ home, /tmp, /usr — se résolvent via la table de montages de Git Bash dans chaque outil ; désactivé = racines /c/ uniquement.",
 				"errs.label": "Traduction des chemins d'erreur",
@@ -456,8 +471,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "अक्षम करें",
 				"error": "लिखना विफल रहा",
 				"hint": "सक्षम होने पर: सभी टूल (bash कमांड और workdir, तथा read/write/edit/read_image/glob/grep और present के पथ तर्क) MSYS ड्राइव-रूट POSIX पथ (/c/Users/...) का उपयोग करते हैं; bash की मूल आदतें — होम के लिए ~, /tmp, /dev/null, /usr — हर टूल में ठीक वैसे काम करती हैं जैसे bash स्वयं उन्हें हल करता है, और होस्ट पथ फ़ील्ड स्वतः अनुवादित करता है। अक्षम करने पर dsh का मूल व्यवहार बहाल होता है (फ़ाइल टूल के लिए Windows पथ)। जब तक प्लगइन इंस्टॉल है bash हमेशा Git Bash रहता है; यह स्विच केवल टूल के बीच पथ शैली नियंत्रित करता है।",
+				"sec.inline": "इनलाइन टूल्स",
+				"sec.executor": "एक्ज़ीक्यूटर",
+				"sec.peer": "प्लगइन एकीकरण",
 				"sec.dialect": "पथ बोली",
-				"sec.terminal": "साइडबार टर्मिनल",
+				"sec.terminal": "टर्मिनल",
 				"mnts.label": "वर्चुअल पथ माउंट",
 				"mnts.hint": "bash की मूल आदतें — ~ होम, /tmp, /usr — हर टूल में Git Bash माउंट तालिका से हल होती हैं; बंद = केवल /c/ ड्राइव-रूट।",
 				"errs.label": "त्रुटि-पथ अनुवाद",
@@ -530,8 +548,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "Nonaktifkan",
 				"error": "gagal menulis",
 				"hint": "Saat aktif: semua alat (perintah bash dan workdir, serta argumen path read/write/edit/read_image/glob/grep dan present) memakai path POSIX berakar drive MSYS (/c/Users/...); kebiasaan asli bash — ~ untuk direktori home, /tmp, /dev/null, /usr — bekerja di setiap alat persis seperti bash sendiri menyelesaikannya, dan host menerjemahkan bidang path secara otomatis. Saat nonaktif, perilaku asli dsh dipulihkan (path Windows untuk alat berkas). Bash selalu Git Bash selama plugin terpasang; sakelar ini hanya mengatur dialek path antaralat.",
+				"sec.inline": "Alat inline",
+				"sec.executor": "Eksekutor",
+				"sec.peer": "Integrasi plugin",
 				"sec.dialect": "Dialek path",
-				"sec.terminal": "Terminal sidebar",
+				"sec.terminal": "Terminal",
 				"mnts.label": "Mount path virtual",
 				"mnts.hint": "Kebiasaan asli bash — ~ home, /tmp, /usr — diselesaikan lewat tabel mount Git Bash di setiap alat; nonaktif = hanya akar drive /c/.",
 				"errs.label": "Terjemahan path error",
@@ -604,8 +625,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "Disattiva",
 				"error": "scrittura non riuscita",
 				"hint": "Attivato: tutti gli strumenti (comandi bash e workdir, argomenti di percorso di read/write/edit/read_image/glob/grep e di present) usano percorsi POSIX con radice di unità MSYS (/c/Users/...); le abitudini native di bash — ~ per la home, /tmp, /dev/null, /usr — funzionano in ogni strumento esattamente come le risolve bash stesso, e l'host traduce automaticamente i campi di percorso. Disattivato ripristina il comportamento nativo di dsh (percorsi Windows per gli strumenti per i file). Bash resta sempre Git Bash finché il plugin è installato; questo interruttore governa solo il dialetto dei percorsi tra gli strumenti.",
+				"sec.inline": "Strumenti inline",
+				"sec.executor": "Esecutore",
+				"sec.peer": "Integrazioni plugin",
 				"sec.dialect": "Dialetto dei percorsi",
-				"sec.terminal": "Terminale laterale",
+				"sec.terminal": "Terminale",
 				"mnts.label": "Mount di percorsi virtuali",
 				"mnts.hint": "Le abitudini native di bash — ~ home, /tmp, /usr — si risolvono tramite la tabella di mount di Git Bash in ogni strumento; off = solo radici /c/.",
 				"errs.label": "Traduzione dei percorsi d'errore",
@@ -678,8 +702,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "無効にする",
 				"error": "書き込みに失敗しました",
 				"hint": "有効にすると、すべてのツール(bash コマンドと workdir、read/write/edit/read_image/glob/grep と present のパス引数)が MSYS ドライブルートの POSIX パス(/c/Users/...)を使います。bash のネイティブな習慣——ホームの ~、/tmp、/dev/null、/usr——も、bash 自身が解決するのとまったく同じようにすべてのツールで動作し、パスフィールドはホストが自動的に変換します。無効にすると dsh 本来の動作(ファイルツールは Windows パス)に戻ります。bash はプラグインがインストールされている限り常に Git Bash で、このスイッチの影響を受けません。",
+				"sec.inline": "インラインツール",
+				"sec.executor": "実行エンジン",
+				"sec.peer": "プラグイン連携",
 				"sec.dialect": "パス方言",
-				"sec.terminal": "サイドバーターミナル",
+				"sec.terminal": "端末",
 				"mnts.label": "仮想パスマウント",
 				"mnts.hint": "bash 固有の習慣——~ ホーム、/tmp、/usr——は Git Bash のマウントテーブルで全ツールに解決;オフなら /c/ ドライブルートのみ。",
 				"errs.label": "エラーパス翻訳",
@@ -752,8 +779,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "사용 안 함",
 				"error": "쓰기 실패",
 				"hint": "켜면 모든 도구(bash 명령과 workdir, read/write/edit/read_image/glob/grep 및 present의 경로 인수)가 MSYS 드라이브 루트 POSIX 경로(/c/Users/...)를 사용합니다. bash 고유 습관——홈의 ~, /tmp, /dev/null, /usr——도 bash 자신이 해석하는 그대로 모든 도구에서 작동하며 호스트가 경로 필드를 자동 변환합니다. 끄면 dsh 기본 동작(파일 도구에 Windows 경로 사용)으로 돌아갑니다. 플러그인이 설치되어 있는 동안 bash는 항상 Git Bash이며 이 스위치의 영향을 받지 않습니다.",
+				"sec.inline": "인라인 도구",
+				"sec.executor": "실행기",
+				"sec.peer": "플러그인 연동",
 				"sec.dialect": "경로 방언",
-				"sec.terminal": "사이드바 터미널",
+				"sec.terminal": "터미널",
 				"mnts.label": "가상 경로 마운트",
 				"mnts.hint": "bash 고유 습관——~ 홈, /tmp, /usr——은 Git Bash 마운트 테이블로 모든 도구에서 해석; 끄면 /c/ 드라이브 루트만.",
 				"errs.label": "오류 경로 번역",
@@ -826,8 +856,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "Uitschakelen",
 				"error": "schrijven mislukt",
 				"hint": "Ingeschakeld: alle tools (bash-opdrachten en workdir, padargumenten van read/write/edit/read_image/glob/grep en present) gebruiken POSIX-paden vanaf de MSYS-schijfwortel (/c/Users/...); bash-eigen gewoonten — ~ voor de home-map, /tmp, /dev/null, /usr — werken in elke tool precies zoals bash ze zelf oplost, en de host vertaalt de padvelden automatisch. Uitgeschakeld herstelt het oorspronkelijke dsh-gedrag (Windows-paden voor bestandstools). Bash is altijd Git Bash zolang de plugin is geïnstalleerd; deze schakelaar bepaalt alleen het paddialect tussen de tools.",
+				"sec.inline": "Inline tools",
+				"sec.executor": "Executor",
+				"sec.peer": "Plug-in-integraties",
 				"sec.dialect": "Paddialect",
-				"sec.terminal": "Zijbalkterminal",
+				"sec.terminal": "Terminal",
 				"mnts.label": "Virtuele pad-mounts",
 				"mnts.hint": "Bash-eigen gewoonten — ~ home, /tmp, /usr — lossen op via de Git Bash-mount tabel in elke tool; uit = alleen /c/-schijfwortels.",
 				"errs.label": "Foutpad-vertaling",
@@ -900,8 +933,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "Wyłącz",
 				"error": "zapis nie powiódł się",
 				"hint": "Po włączeniu: wszystkie narzędzia (polecenia bash i workdir, argumenty ścieżek w read/write/edit/read_image/glob/grep i w present) używają ścieżek POSIX od korzenia dysku MSYS (/c/Users/...); natywne nawyki basha — ~ dla katalogu domowego, /tmp, /dev/null, /usr — działają w każdym narzędziu dokładnie tak, jak rozwiązuje je sam bash, a host automatycznie tłumaczy pola ścieżek. Wyłączenie przywraca natywne zachowanie dsh (ścieżki Windows dla narzędzi plikowych). Bash jest zawsze Git Bash, dopóki wtyczka jest zainstalowana; ten przełącznik reguluje wyłącznie dialekt ścieżek między narzędziami.",
+				"sec.inline": "Narzędzia wbudowane",
+				"sec.executor": "Egzekutor",
+				"sec.peer": "Integracje wtyczek",
 				"sec.dialect": "Dialekt ścieżek",
-				"sec.terminal": "Terminal boczny",
+				"sec.terminal": "Terminal",
 				"mnts.label": "Wirtualne montowanie ścieżek",
 				"mnts.hint": "Natywne nawyki basha — ~ home, /tmp, /usr — rozwiązują się przez tablicę montowań Git Bash w każdym narzędziu; wył. = tylko korzenie /c/.",
 				"errs.label": "Tłumaczenie ścieżek błędów",
@@ -974,8 +1010,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "Desativar",
 				"error": "falha ao gravar",
 				"hint": "Ativada: todas as ferramentas (comandos bash e workdir, argumentos de caminho de read/write/edit/read_image/glob/grep e de present) usam caminhos POSIX a partir da raiz da unidade MSYS (/c/Users/...); os hábitos nativos do bash — ~ para a pasta pessoal, /tmp, /dev/null, /usr — funcionam em cada ferramenta exatamente como o próprio bash os resolve, e o host traduz os campos de caminho automaticamente. Desativada restaura o comportamento nativo do dsh (caminhos Windows para as ferramentas de arquivo). O bash é sempre Git Bash enquanto o plugin estiver instalado; este interruptor rege apenas o dialeto de caminhos entre ferramentas.",
+				"sec.inline": "Ferramentas inline",
+				"sec.executor": "Executor",
+				"sec.peer": "Integrações de plugins",
 				"sec.dialect": "Dialeto de caminhos",
-				"sec.terminal": "Terminal lateral",
+				"sec.terminal": "Terminal",
 				"mnts.label": "Montagens de caminhos virtuais",
 				"mnts.hint": "Hábitos nativos do bash — ~ home, /tmp, /usr — resolvem pela tabela de montagens do Git Bash em cada ferramenta; desligado = só raízes /c/.",
 				"errs.label": "Tradução de caminhos de erro",
@@ -1048,8 +1087,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "Выключить",
 				"error": "не удалось записать",
 				"hint": "Включено: все инструменты (команды bash и workdir, аргументы путей read/write/edit/read_image/glob/grep и present) используют POSIX-пути от корня диска MSYS (/c/Users/...); собственные привычки bash — ~ для домашнего каталога, /tmp, /dev/null, /usr — работают в каждом инструменте ровно так, как их разрешает сам bash, а хост автоматически преобразует поля путей. Выключение возвращает исходное поведение dsh (пути Windows для файловых инструментов). Пока плагин установлен, bash всегда остаётся Git Bash; этот переключатель управляет только диалектом путей между инструментами.",
+				"sec.inline": "Встроенные инструменты",
+				"sec.executor": "Исполнитель",
+				"sec.peer": "Интеграции плагинов",
 				"sec.dialect": "Диалект путей",
-				"sec.terminal": "Терминал боковой панели",
+				"sec.terminal": "Терминал",
 				"mnts.label": "Виртуальные монтирования путей",
 				"mnts.hint": "Собственные привычки bash — ~ домашний, /tmp, /usr — разрешаются через таблицу монтирований Git Bash в каждом инструменте; выкл = только корни /c/.",
 				"errs.label": "Перевод путей в ошибках",
@@ -1122,8 +1164,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "Inaktivera",
 				"error": "skrivning misslyckades",
 				"hint": "Aktiverad: alla verktyg (bash-kommandon och workdir, sökvägsargument för read/write/edit/read_image/glob/grep och present) använder POSIX-sökvägar från MSYS-enhetsroten (/c/Users/...); bash egna vanor — ~ för hemkatalogen, /tmp, /dev/null, /usr — fungerar i varje verktyg exakt som bash själv löser dem, och värden översätter sökvägsfälten automatiskt. Inaktiverad återställer dsh:s ursprungliga beteende (Windows-sökvägar för filverktygen). Bash är alltid Git Bash så länge insticksprogrammet är installerat; den här växeln styr bara sökvägsdialekten mellan verktygen.",
+				"sec.inline": "Inline-verktyg",
+				"sec.executor": "Exekutor",
+				"sec.peer": "Plugin-integrationer",
 				"sec.dialect": "Sökvägsdialekt",
-				"sec.terminal": "Sidopanelsterminal",
+				"sec.terminal": "Terminal",
 				"mnts.label": "Virtuella sökvägsmonteringar",
 				"mnts.hint": "Bash egna vanor — ~ hem, /tmp, /usr — löses via Git Bash monteringstabell i varje verktyg; av = endast /c/-enhetsrötter.",
 				"errs.label": "Felsökvägsöversättning",
@@ -1196,8 +1241,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "ปิดใช้งาน",
 				"error": "เขียนไม่สำเร็จ",
 				"hint": "เมื่อเปิดใช้งาน: เครื่องมือทั้งหมด (คำสั่ง bash และ workdir รวมถึงอาร์กิวเมนต์พาธของ read/write/edit/read_image/glob/grep และ present) ใช้พาธ POSIX จากรากไดรฟ์ของ MSYS (/c/Users/...); พฤติกรรมดั้งเดิมของ bash — ~ สำหรับโฮม, /tmp, /dev/null, /usr — ทำงานในทุกเครื่องมือเหมือนที่ bash แก้เองพอดี และโฮสต์แปลฟิลด์พาธให้อัตโนมัติ เมื่อปิดใช้งานจะกลับสู่พฤติกรรมดั้งเดิมของ dsh (เครื่องมือจัดการไฟล์ใช้พาธ Windows) bash เป็น Git Bash เสมอเมื่อติดตั้งปลั๊กอินนี้ สวิตช์นี้ควบคุมเฉพาะรูปแบบพาธระหว่างเครื่องมือเท่านั้น",
+				"sec.inline": "เครื่องมือแบบ inline",
+				"sec.executor": "ตัวรัน",
+				"sec.peer": "การเชื่อมต่อปลั๊กอิน",
 				"sec.dialect": "ภาษาถิ่นเส้นทาง",
-				"sec.terminal": "เทอร์มินัลแถบข้าง",
+				"sec.terminal": "เทอร์มินัล",
 				"mnts.label": "จุดเมานต์เส้นทางเสมือน",
 				"mnts.hint": "พฤติกรรมดั้งเดิมของ bash — ~ โฮม, /tmp, /usr — แก้ผ่านตารางเมานต์ของ Git Bash ในทุกเครื่องมือ; ปิด = เฉพาะรากไดรฟ์ /c/",
 				"errs.label": "การแปลเส้นทางในข้อผิดพลาด",
@@ -1270,8 +1318,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "Devre dışı bırak",
 				"error": "yazma başarısız",
 				"hint": "Etkinleştirildiğinde: tüm araçlar (bash komutları ve workdir ile read/write/edit/read_image/glob/grep ve present yol bağımsız değişkenleri) MSYS sürücü kökünden POSIX yolları (/c/Users/...) kullanır; bash'e özgü alışkanlıklar — ev için ~, /tmp, /dev/null, /usr — her araçta tam bash'in kendisinin çözdüğü gibi çalışır ve ana süreç yol alanlarını otomatik olarak çevirir. Devre dışı bırakıldığında dsh yerel davranışına döner (dosya araçları için Windows yolları). Eklenti kurulu olduğu sürece bash her zaman Git Bash olarak kalır; bu anahtar yalnızca araçlar arası yol lehçesini yönetir.",
+				"sec.inline": "Satır içi araçlar",
+				"sec.executor": "Yürütücü",
+				"sec.peer": "Eklenti entegrasyonları",
 				"sec.dialect": "Yol lehçesi",
-				"sec.terminal": "Kenar çubuğu terminali",
+				"sec.terminal": "Terminal",
 				"mnts.label": "Sanal yol bağlamaları",
 				"mnts.hint": "Bash'e özgü alışkanlıklar — ~ ev, /tmp, /usr — her araçta Git Bash bağlama tablosuyla çözülür; kapalı = yalnızca /c/ sürücü kökleri.",
 				"errs.label": "Hata yolu çevirisi",
@@ -1344,8 +1395,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "Tắt",
 				"error": "ghi thất bại",
 				"hint": "Khi bật: mọi công cụ (lệnh bash và workdir, tham số đường dẫn của read/write/edit/read_image/glob/grep và present) dùng đường dẫn POSIX từ gốc ổ đĩa MSYS (/c/Users/...); thói quen gốc của bash — ~ cho thư mục home, /tmp, /dev/null, /usr — hoạt động trong mọi công cụ đúng như chính bash giải quyết chúng, và máy chủ tự động chuyển đổi trường đường dẫn. Khi tắt, hành vi gốc của dsh được khôi phục (công cụ tệp dùng đường dẫn Windows). bash luôn là Git Bash khi plugin được cài đặt; công tắc này chỉ điều khiển phương ngữ đường dẫn giữa các công cụ.",
+				"sec.inline": "Công cụ nội tuyến",
+				"sec.executor": "Trình thực thi",
+				"sec.peer": "Tích hợp plugin",
 				"sec.dialect": "Phương ngữ đường dẫn",
-				"sec.terminal": "Terminal thanh bên",
+				"sec.terminal": "Terminal",
 				"mnts.label": "Gán đường dẫn ảo",
 				"mnts.hint": "Thói quen gốc của bash — ~ home, /tmp, /usr — được giải qua bảng gán của Git Bash trong mọi công cụ; tắt = chỉ gốc ổ /c/.",
 				"errs.label": "Dịch đường dẫn lỗi",
@@ -1418,8 +1472,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "停用",
 				"error": "寫入失敗",
 				"hint": "啟用後:所有工具(bash 指令同 workdir、read/write/edit/read_image/glob/grep 同 present 嘅路徑參數)統一使用 MSYS 磁碟根 POSIX 路徑(/c/Users/...);bash 原生習慣——~ 家目錄、/tmp、/dev/null、/usr——喺所有工具一樣有效(同 Git Bash 掛載表一致),路徑參數由宿主自動翻譯,模型無感。停用後回復 dsh 原生行為(檔案工具用 Windows 路徑)。bash 永遠係 Git Bash,唔受呢個開關影響。",
+				"sec.inline": "行內工具",
+				"sec.executor": "執行器",
+				"sec.peer": "外掛聯動",
 				"sec.dialect": "路徑方言",
-				"sec.terminal": "側欄終端",
+				"sec.terminal": "終端機",
 				"mnts.label": "虛擬路徑掛載",
 				"mnts.hint": "bash 原生習慣——~ 家目錄、/tmp、/usr——按 Git Bash 掛載表喺所有工具解析;關閉就只剩 /c/ 磁碟根。",
 				"errs.label": "報錯路徑翻譯",
@@ -1492,8 +1549,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "停用",
 				"error": "寫入失敗",
 				"hint": "啟用後:所有工具(bash 指令同 workdir、read/write/edit/read_image/glob/grep 同 present 嘅路徑參數)統一使用 MSYS 磁碟根 POSIX 路徑(/c/Users/...);bash 原生習慣——~ 家目錄、/tmp、/dev/null、/usr——喺所有工具一樣有效(同 Git Bash 掛載表一致),路徑參數由宿主自動翻譯,模型無感。停用後回復 dsh 原生行為(檔案工具用 Windows 路徑)。bash 永遠係 Git Bash,唔受呢個開關影響。",
+				"sec.inline": "行內工具",
+				"sec.executor": "執行器",
+				"sec.peer": "外掛聯動",
 				"sec.dialect": "路徑方言",
-				"sec.terminal": "側欄終端",
+				"sec.terminal": "終端機",
 				"mnts.label": "虛擬路徑掛載",
 				"mnts.hint": "bash 原生習慣——~ 家目錄、/tmp、/usr——按 Git Bash 掛載表喺所有工具解析;關閉就只剩 /c/ 磁碟根。",
 				"errs.label": "報錯路徑翻譯",
@@ -1566,8 +1626,11 @@ window.__ModuleLoader__.load({
 				"switch.off": "停用",
 				"error": "寫入失敗",
 				"hint": "啟用後:所有工具(bash 指令與 workdir,以及 read/write/edit/read_image/glob/grep 與 present 的路徑參數)統一使用 MSYS 磁碟根 POSIX 路徑(/c/Users/...);bash 原生習慣——~ 家目錄、/tmp、/dev/null、/usr——在所有工具同樣有效(與 Git Bash 掛載表一致),路徑參數由宿主自動轉譯,模型無感。停用後恢復 dsh 原生行為(檔案工具使用 Windows 路徑)。bash 一律是 Git Bash,不受此開關影響。",
+				"sec.inline": "行內工具",
+				"sec.executor": "執行器",
+				"sec.peer": "外掛聯動",
 				"sec.dialect": "路徑方言",
-				"sec.terminal": "側欄終端機",
+				"sec.terminal": "終端機",
 				"mnts.label": "虛擬路徑掛載",
 				"mnts.hint": "bash 原生習慣——~ 家目錄、/tmp、/usr——按 Git Bash 掛載表在所有工具解析;關閉則僅 /c/ 磁碟根。",
 				"errs.label": "報錯路徑翻譯",
@@ -2068,15 +2131,17 @@ window.__ModuleLoader__.load({
 					E("button", { type: "button", className: "gb-segBtn" + (!subagents ? " gb-segActive" : ""), onClick: function () { if (subagents) writeField("subagentDialect", false); } }, t("switch.off")),
 				),
 				E("p", { className: "gb-hint" }, t("sub.hint")),
-				E("div", { className: "gb-row" },
-					E("span", { className: "gb-rowLabel" }, t("term.label") + ":"),
-					E("span", { className: "gb-rowValue" }, winshell ? t("state.on") : t("state.off")),
-				),
-				E("div", { className: "gb-seg" },
-					E("button", { type: "button", className: "gb-segBtn" + (winshell ? " gb-segActive" : ""), onClick: function () { if (!winshell) writeField("autoTerminalShell", true); } }, t("switch.on")),
-					E("button", { type: "button", className: "gb-segBtn" + (!winshell ? " gb-segActive" : ""), onClick: function () { if (winshell) writeField("autoTerminalShell", false); } }, t("switch.off")),
 				),
-				E("p", { className: "gb-hint" }, t("term.hint")),
+			);
+
+			/* ── executor section (v0.36.0 regroup) ───────────────────────────
+			   The binary layer: WHICH bash runs and the git line-ending policy
+			   the executor injects. Split out of the dialect section — users
+			   hunting "why is my diff all red" or pasting a bash path should
+			   not scroll through six translation switches to find it. */
+			var executorSection = E("div", { className: "gb-section" },
+				E("div", { className: "gb-sectionTitle" }, t("sec.executor")),
+				E("div", { className: "gb-stack" },
 				E("div", { className: "gb-row" },
 					E("span", { className: "gb-rowLabel" }, t("eol.label") + ":"),
 					E("span", { className: "gb-rowValue" }, eolOn ? t("state.on") : t("state.off")),
@@ -2086,20 +2151,20 @@ window.__ModuleLoader__.load({
 					E("button", { type: "button", className: "gb-segBtn" + (!eolOn ? " gb-segActive" : ""), onClick: function () { if (eolOn) writeField("gitAutocrlf", false); } }, t("switch.off")),
 				),
 				E("p", { className: "gb-hint" }, t("eol.hint")),
-					E("div", { className: "gb-row" },
-						E("span", { className: "gb-rowLabel" }, t("bash.label") + ":"),
-					),
-					E("div", { className: "gb-seg" },
-						E("input", { className: "gb-input", type: "text", spellCheck: false, placeholder: "C:/Program Files/Git/bin/bash.exe", value: bashDraft, onChange: function (e) { setBashDraft(e.target.value); setBashSaved(false); } }),
-						E("button", {
-							type: "button",
-							className: "gb-saveBtn" + (bashSaved ? " gb-saved" : ""),
-							onClick: function () {
-								setBashSaved(false);
-								writeField("bashPath", bashDraft.trim()).then(function (accepted) { setBashSaved(accepted === true); });
-							},
-						}, bashSaved ? t("bash.saved") : t("bash.save")),
-					),
+				E("div", { className: "gb-row" },
+					E("span", { className: "gb-rowLabel" }, t("bash.label") + ":"),
+				),
+				E("div", { className: "gb-seg" },
+					E("input", { className: "gb-input", type: "text", spellCheck: false, placeholder: "C:/Program Files/Git/bin/bash.exe", value: bashDraft, onChange: function (e) { setBashDraft(e.target.value); setBashSaved(false); } }),
+					E("button", {
+						type: "button",
+						className: "gb-saveBtn" + (bashSaved ? " gb-saved" : ""),
+						onClick: function () {
+							setBashSaved(false);
+							writeField("bashPath", bashDraft.trim()).then(function (accepted) { setBashSaved(accepted === true); });
+						},
+					}, bashSaved ? t("bash.saved") : t("bash.save")),
+				),
 				E("p", { className: "gb-hint" }, t("bash.hint")),
 				),
 			);
@@ -2107,6 +2172,15 @@ window.__ModuleLoader__.load({
 			var terminalSection = E("div", { className: "gb-section" },
 				E("div", { className: "gb-sectionTitle" }, t("sec.terminal")),
 				E("div", { className: "gb-stack" },
+				E("div", { className: "gb-row" },
+					E("span", { className: "gb-rowLabel" }, t("term.label") + ":"),
+					E("span", { className: "gb-rowValue" }, winshell ? t("state.on") : t("state.off")),
+				),
+				E("div", { className: "gb-seg" },
+					E("button", { type: "button", className: "gb-segBtn" + (winshell ? " gb-segActive" : ""), onClick: function () { if (!winshell) writeField("autoTerminalShell", true); } }, t("switch.on")),
+					E("button", { type: "button", className: "gb-segBtn" + (!winshell ? " gb-segActive" : ""), onClick: function () { if (winshell) writeField("autoTerminalShell", false); } }, t("switch.off")),
+				),
+				E("p", { className: "gb-hint" }, t("term.hint")),
 				E("div", { className: "gb-row" },
 					E("span", { className: "gb-rowLabel" }, t("adopt.label") + ":"),
 					E("span", { className: "gb-rowValue" }, adopt ? t("state.on") : t("state.off")),
@@ -2143,6 +2217,7 @@ window.__ModuleLoader__.load({
 			);
 
 			var inlineSection = E("div", { className: "gb-section" },
+				E("div", { className: "gb-sectionTitle" }, t("sec.inline")),
 				E("div", { className: "gb-stack" },
 				E("div", { className: "gb-row" },
 					E("span", { className: "gb-rowLabel" }, t("pwsh.label") + ":"),
@@ -2170,20 +2245,13 @@ window.__ModuleLoader__.load({
 				if (peer && typeof peer.getSnapshot === "function") peerSnap = peer.getSnapshot();
 			} catch (error_) { /* keep unavailable */ }
 
-			var dedupeSection = peerSnap.status === "ready" ? E("div", { className: "gb-section" },
-				E("div", { className: "gb-sectionTitle" }, t("sec.dedupe")),
-				E("div", { className: "gb-stack" },
-				E("div", { className: "gb-row" },
-					E("span", { className: "gb-rowLabel" }, t("dedupe.label") + ":"),
-					E("span", { className: "gb-rowValue" }, dedupe ? t("state.on") : t("state.off")),
-				),
-				E("div", { className: "gb-seg" },
-					E("button", { type: "button", className: "gb-segBtn" + (dedupe ? " gb-segActive" : ""), onClick: function () { if (!dedupe) writeField("suppressPeerCordis", true); } }, t("switch.on")),
-					E("button", { type: "button", className: "gb-segBtn" + (!dedupe ? " gb-segActive" : ""), onClick: function () { if (dedupe) writeField("suppressPeerCordis", false); } }, t("switch.off")),
-				),
-				E("p", { className: "gb-hint" }, t("dedupe.hint")),
-				),
-			) : null;
+			/* ── plugin integrations (v0.36.0 regroup) ────────────────────────
+			   Both peer rows now share ONE section: they are the same
+			   relationship (dsh-ptc-cordis-preset) seen from two seats. The
+			   section itself is assembled after the python computations
+			   below; the dedupe VALUE lives on OUR row (the peer card binds
+			   the same field through configForms) while the python VALUE
+			   lives on the PEER's row. */
 
 			/* Python row (v0.26.0): the SECOND seat of the PEER's switch. Unlike
 			   the dedupe row above, the value does NOT live on our row — the
@@ -2223,21 +2291,32 @@ window.__ModuleLoader__.load({
 				}
 			}
 
-			var pythonSection = pythonOffered ? E("div", { className: "gb-section" },
-				E("div", { className: "gb-sectionTitle" }, t("sec.python")),
+			/* The merged integrations section: dedupe row + python row under one
+			   heading (v0.36.0). Exists only while the peer serves its row. */
+			var peerSection = peerSnap.status === "ready" ? E("div", { className: "gb-section" },
+				E("div", { className: "gb-sectionTitle" }, t("sec.peer")),
 				E("div", { className: "gb-stack" },
 				E("div", { className: "gb-row" },
+					E("span", { className: "gb-rowLabel" }, t("dedupe.label") + ":"),
+					E("span", { className: "gb-rowValue" }, dedupe ? t("state.on") : t("state.off")),
+				),
+				E("div", { className: "gb-seg" },
+					E("button", { type: "button", className: "gb-segBtn" + (dedupe ? " gb-segActive" : ""), onClick: function () { if (!dedupe) writeField("suppressPeerCordis", true); } }, t("switch.on")),
+					E("button", { type: "button", className: "gb-segBtn" + (!dedupe ? " gb-segActive" : ""), onClick: function () { if (dedupe) writeField("suppressPeerCordis", false); } }, t("switch.off")),
+				),
+				E("p", { className: "gb-hint" }, t("dedupe.hint")),
+				pythonOffered ? E("div", { className: "gb-row" },
 					E("span", { className: "gb-rowLabel" }, t("python.label") + ":"),
 					E("span", { className: "gb-rowValue" }, pythonOn
 						? (pythonDegraded ? t("python.on") + " · " + t("python.degraded") : t("python.on"))
 						: t("python.off")),
-				),
-				winHost ? null : E("div", { className: "gb-seg" },
+				) : null,
+				pythonOffered && !winHost ? E("div", { className: "gb-seg" },
 					E("button", { type: "button", className: "gb-segBtn" + (pythonOn ? " gb-segActive" : ""), onClick: function () { if (!pythonOn) writePython(true); } }, t("switch.on")),
 					E("button", { type: "button", className: "gb-segBtn" + (!pythonOn ? " gb-segActive" : ""), onClick: function () { if (pythonOn) writePython(false); } }, t("switch.off")),
-				),
-				E("p", { className: "gb-hint" }, t("python.hint")),
-				winHost ? E("p", { className: "gb-error" }, t("python.blocked")) : null,
+				) : null,
+				pythonOffered ? E("p", { className: "gb-hint" }, t("python.hint")) : null,
+				pythonOffered && winHost ? E("p", { className: "gb-error" }, t("python.blocked")) : null,
 				pythonDegraded ? E("p", { className: "gb-error" }, t("python.degraded")) : null,
 				),
 			) : null;
@@ -2436,13 +2515,13 @@ window.__ModuleLoader__.load({
 			);
 
 			var bodyContent = E("div", { className: "gb-body" },
-				dialectSection,
 				modeSection,
 				inlineSection,
+				dialectSection,
+				executorSection,
 				terminalSection,
 				toolsSection,
-				dedupeSection,
-				pythonSection,
+				peerSection,
 				error ? E("p", { className: "gb-error" }, error) : null,
 			);