dsh-gitbash-shell 0.30.0 → 0.31.0

package/CHANGELOG.md

@@ -3,6 +3,144 @@
 > 倒序排列,新版本条目在最上面。条目格式:`## vX.Y.Z — YYYY-MM-DD` + 类型(feat / fix / docs / chore)+ 要点 + 相关链接。
 > 纪律见 AGENTS.md「变更记录纪律」:发版前先更新本文件并随版本提交;事故复盘、复现与真机验证记录也记在这里。
 
+## v0.31.0 — 2026-09-27
+
+**类型**:fix + feat(用户报告:点开对话里的文件链接,原生右侧栏显示「文件不存在,可能已被移动或删除」)
+
+> 用户原话:**"dsh原生的右侧边栏不支持这种/c/ 路径? 让我们的gitbash插件能不能修复一下这个bug?"**
+> 截图里 tab 标题是 `/c/Users/kanna/sandbox/dsh-remote-app/AGENTS.md`,内容区是那句 not-found。
+
+### 结论:不是 dsh 的 bug,是本插件引入的方言在 UI 侧没有闭环
+
+dsh **设计上只有两种路径拼写**(POSIX 与 Windows 盘符/UNC,见 `dsh-util-workspace-path` 的
+`isAbsoluteWorkspacePath`);MSYS 盘根是本插件教会模型与工具的东西,**官方核心不认识它**。
+修的责任因此在本插件这边 —— 而且这是本插件第一次把方言边界延伸到**浏览器 UI**。
+
+### 根因链(逐层定位,每一层都有代码位置)
+
+1. 右侧栏是官方包 `ui-sidebar-documentpreview`,它的失败文案按错误码 `workspace-file/not-found`
+   映射(locales.ts:27,与截图逐字一致)。
+2. 读文件的宿主实现在 `packages/api/workspace-files/src/index.ts`:所有路径都经
+   `this.ctx.fs.resolve(path, { cwd: workspaceRoot })` / `fs.lstat(path, { cwd })`。
+3. `packages/fs/fs-local/src/fsio.ts:148-150` 在 win32 上就是 **`node:path.resolve(cwd, path)`**。
+4. `/c/Users/...` **不是** node 眼中的绝对路径(`isAbsolute` 只认 `C:\`、`\\server`、posix 根),
+   于是它被解析成 **`<当前盘符>:\c\Users\...`** —— 一个不存在的路径 ⇒ not-found。
+5. 那个 `/c/...` 是从哪来的:对话里的文件链接文本来自 **shell 输出**,而本插件让 shell 说 MSYS 方言。
+   链接打开走 `ui-chat` 的 `openFile` → `fileAddressFor(sessionId, cwd, path)`
+   (`packages/util/workspace-path`):它用 `cwd` 前缀判断"工作区内→转相对路径"。本机实测 session 目录名是
+   `--C-Users-kanna-sandbox--`,即 **cwd 是 Windows 拼写**(`C:/Users/kanna/sandbox`),而链接文本是
+   `/c/Users/kanna/sandbox/...` —— 前缀不匹配 ⇒ 原样保留绝对 MSYS 拼写 ⇒ 第 4 步必然失败。
+
+### 改动
+
+**宿主半(`src/index.js`)**:新增只读路由 `GET /dsh-gitbash-shell/api/pathmap`,返回
+`{ platform, home, tmpDir, gitRoot, mounts }` —— 就是既有翻译层 `buildTranslateEnv()` 的同一份事实
+(挂载表直接从 `GIT_MOUNTS` 生成,不另抄一份),加 `process.platform` 供客户端判断。与工具链路由同款
+loopback + same-origin fence(`fenceToolRequest`;GET 只需 loopback),因为 web 服务器可能绑在 `0.0.0.0`,
+而这个路由会报出账号自己的目录。
+
+**客户端半(`src/client.js`)**:包装 `ctx.sidebarRight` 的 `openResource` 与 `openResourceIn` ——
+官方文档写明**"每一种进入右侧栏的方式都是这两者之一的调用"**(对话文件链接、工具行行号引用、
+文件树的每一行),所以一个包装点覆盖全部入口,**不碰任何 dsh 源码**。
+
+- 地址语法按官方 `file-address.ts` 实现:解析 `dsh-resource://file/{session/<id>|<absolute>}/<path>`
+  (逐段 `encodeURIComponent`、`:` 保留、UNC 空首段),改写后按同一编码规则重建,`?`/`#` 后缀原样保留。
+- **未改变即原样转发原字符串**(不是"重建后看起来一样"),所以没有翻译过的地址绝不会被 URL 往返改动。
+- 转换语义与宿主 `translateMsysPath` 逐例对齐(盘根 → `X:/`、`~` → home、`/tmp` → 用户 TEMP、
+  `/dev/null` → `\\.\NUL`、`/usr` 系 → Git 根);**不实现宿主的 `$VAR` 展开** —— 对话里的路径是文本不是 shell 词。
+- **门是宿主的事实,不是猜测**:`pathRescueActive()` 要求 `/api/pathmap` 已应答且 `platform === 'win32'`。
+  macOS/Linux 宿主**永不**翻译(客户端的 user agent 说明不了路径属于谁的文件系统);fact 未到时也不翻译
+  (退化为打补丁前的行为,而不是赌一把)。
+- **可选注入**:`ctx.inject(["sidebarRight"], …)` 而非写进 `exports.inject` —— 硬注入一个本插件不拥有的服务
+  会让 fiber 在缺该服务的宿主上永久 PENDING(v0.24.0 的 settingsScope 教训)。
+- 包装挂在服务实例上,经 `sctx.effect` 随插件 fiber 卸载并还原原方法。
+
+### 验证
+
+- `npm test` **118/118 全绿**(新增 6 项):
+  - 驱动**真实 bundle**(fake cordis ctx + fake `sidebarRight` 记录收到的地址)覆盖地址语法:
+    盘根 / `~` / `/tmp` / `/usr` / `/etc`、absolute scope、`?line=12` 后缀、UNC 原样、非 file 地址原样、
+    非法转义原样、边界不误伤(`/tmpfoo`、`/usrx`、`/Tmp`、`/ab/c`)、已是 Windows 拼写原样、相对路径原样。
+  - **宿主事实门**:`platform: 'linux'` 与"fetch 未应答"两种情况下地址逐字节原样。
+  - **可逆性**:disposer 还原原方法;`exports.inject` 不得含 `sidebarRight`(静态断言)。
+  - **浏览器镜像与宿主翻译器逐例比对**:23 个输入跑 `_internal.translateMsysPath` 与客户端实现,结果必须相同
+    —— 锁死两边语义漂移。
+  - **真实文件系统实测(win32)**:用本仓库 `package.json` 造 `/c/...` 形式,断言
+    `path.resolve(cwd, msys)` 指向**不存在**的路径(这就是用户看到的 not-found),而救回后的
+    `C:/...` **existsSync 为真** —— bug 与修复都在真文件上量了一遍。
+  - **路由实测**:驱动真实 `apply()`,断言路由注册为 `prefix`、loopback GET 返回 200 且
+    `platform` 等于 `process.platform`、mounts 键序与客户端遍历序一致、非 loopback 返回 403 `not-loopback`。
+- **真机验证(隔离实例,未碰用户正在运行的实例)**:把用户 web profile 复制到一个独立 `DSH_HOME`
+  (Windows 上 `cp -rL` 解引用 pnpm 链接,97M → 366M,5 秒),把插件目录换成**本仓源码**,独立端口起
+  `dsh web`,然后:
+  - 宿主侧:`GET /dsh-gitbash-shell/api/pathmap` 实测 **HTTP 200**,返回
+    `{"platform":"win32","home":"C:/Users/kanna","tmpDir":"C:/Users/kanna/AppData/Local/Temp",
+    "gitRoot":"c:/program files/git","mounts":{…7 项,键序与客户端遍历序一致}}`
+    —— 启动日志出现 `MSYS path map route active at /dsh-gitbash-shell/api/pathmap`。
+  - 客户端侧:首页 `window.__DSH_BOOT__` 里 `dsh-gitbash-shell` 出现 5 次(启动图含本插件);
+    `curl` 它实际会取的 combo URL(`/plugins/??dsh-gitbash-shell/client.js&rev=…`)返回 **200**,
+    内容含完整新代码段且**语法有效**。
+  - **真实浏览器(CDP 驱动 driver 自己的隔离 Chromium,不动用户的浏览器)控制台实测出现**
+    `[gitbash-shell/client] right-sidebar path rescue armed (host spelling restored on open)`
+    —— 这一行在 `ctx.inject(["sidebarRight"], …)` 的回调内部,所以它同时证明:client 半在真实浏览器
+    里 apply、**`sidebarRight` 客户端服务可见、inject 回调被调用、`openResource` 是函数且已被包装**。
+  - 宿主日志随后出现 `path map read by <loopback>` —— **浏览器真的拉到了那份宿主事实**,
+    即 `pathRescueActive()` 在生产链路里会返回 true。
+  - 路由新增一行访问日志(`path map read by <addr>`),既是诊断手段,也是上面这条验证的观测点。
+- **仍未覆盖**:真实 UI 里"点击 `/c/...` 链接 → tab 显示出文件内容"这最后一跳(需要先构造一个带
+  MSYS 路径的会话)。这一跳的两端都被验证过 —— 地址重写(单元矩阵)与宿主可读性(真实文件
+  `existsSync`);用户在重启客户端后即可实测确认。
+
+### 已知边界(如实记录)
+
+- 只有"整体就是一条路径"的链接能被救:`/c/Users/x` 成立;而 shell 输出里**被文本截断/拼接**的路径、
+  以及 `/c` 之外的 MSYS 虚拟根(若宿主探测不到 Git 根,tmpDir/gitRoot 为 null)保持原样 ——
+  退化行为与修复前一致,**不会**产生错误路径。
+- `/dev/null` 这类设备路径即使被点开也没有可读内容(与文件工具一致,EINVAL 如实报错)。
+
+## v0.30.1 — 2026-09-26
+
+**类型**:fix(用户实测反馈 v0.30.0 的工具列表:点了按钮看不到进度、看不到在装哪一个、看不到报错、还能连点)
+
+> 用户原话:**"我这点击升级了都不知道进度,有没有在升级,也看不到报错,你优化一下,可能看到目前按安装还是更新那个,进度条什么的放在那个列表里。然后不让我连点,开始了就不用再点。"**
+
+### 根因(两个都是真缺陷,不是用法问题)
+
+1. **busy 的生命周期错了**:`runTools()` 在 POST 收到 202 时就 `setToolBusy(false)`,而任务在**宿主侧继续跑**
+   —— 于是按钮在批次刚开始时就恢复可点。这正是"能连点"的来源:后端的单任务闸门确实会返回 409,
+   但用户看到的是一个**亮着的按钮**,自然会再点。
+2. **进度放在了一个没人看的地方**:进度只渲染在按钮下方的一块区域,**不在工具列表行内**;
+   每行也不显示自己的状态,失败原因混在一个游离的结果列表里,既不显眼也不对应行。
+
+### 改动(`src/client.js`)
+
+- **busy 从「请求在飞」改为「任务在跑」**:新增派生状态 `jobRunning = toolJob && toolJob.finished !== true`
+  与 `busyNow = toolBusy || jobRunning`;安装 / 刷新 / 全选三个按钮与**所有复选框**在整个批次期间禁用,
+  主按钮文案变为「处理中」。开始之后不必也**不能**再点。
+- **进度搬进列表行**:正在处理的那一行高亮,行内依次显示 spinner + **「安装中…」/「更新中…」**
+  (按该行 `state` 判断是装还是升,不靠猜)+ 一条扫动进度条;已完成的行保留 ✓/✗ 判定。
+- **错误就地可见**:失败的行**正下方**用红字打印「安装中 — 失败: <winget 原文>」,不用再去别处找日志。
+- **整体进度**:任务运行时显示 spinner + `当前工具 · 处理中: n / m` + 按完成数计算的进度条(宽度随 done/total 增长)。
+- 移除原先那个游离的结果列表 —— 信息已全部进入对应行。
+- 新增样式:行高亮、运行态徽章、行内扫动条、整体进度条、失败行、spinner,以及 `gb-spin` / `gb-slide` 两条 keyframes。
+- 词典 **21 语言各补 2 键**(`tools.installing` / `tools.updating`),现共 **65 键**,键对齐由冒烟强制。
+
+### 验证
+
+- `npm test` **112/112 全绿**(词典键对齐断言覆盖新键)。
+- 静态校验:65 个词典键**全部**被代码引用,零悬空引用。
+- ⚠️ 仍未做:浏览器端真机点击验证(需重启客户端后自测)。
+- 版本号 `0.30.0` → **`0.30.1`**。
+
+### 附:一次误操作与回滚(如实记录)
+
+本次最初**误把第三方插件 `dshmarket` 当成了目标**,对
+`~/.dsh/profiles/desktop/node_modules/dshmarket/client/client.js` 打了一处本地补丁(让自我更新时
+dshmarket 自己出现在「已安装」列表里,以显示行内进度)。用户澄清后**已完整回滚**:
+与 npm 上的 `dshmarket@1.66.2` 逐字节 `cmp` 一致,零残留。
+(该补丁对应的确实是一个真实缺陷 —— 自我更新按钮 `onClick` 会 `setTab("installed")` 想看进度,
+但列表又 `filter` 掉了 `selfName` —— 留作后续,未在本仓库处理。)
+
 ## v0.30.0 — 2026-09-26
 
 **类型**:feat(新能力 —— 设置卡里一键安装/升级一份**固定的终端工具清单**,全部经 winget 官方源)

package/README.md

@@ -316,7 +316,14 @@ PTC/创造及用户自建模式一律覆盖。
   用户 TEMP 下的路径回显为 `/tmp/...`(与 bash 的 `$TMP` 一致);文件内容与错误结果不动;
   `grep` 的 `matches[].path`)改写回 MSYS 形式;文件内容与错误结果不动;
 - **运行时事实**:向官方 `dsh-shell-env` 注册表贡献 `DSH_PATH_DIALECT=msys`,模型可在执行时
-  核验(随开关实时生效)。
+  核验(随开关实时生效);
+- **右侧栏文件链接(v0.31.0)**:对话里的文件链接带着 `/c/...` 拼写进入 dsh **原生右侧栏**
+  (`ui-sidebar-documentpreview`),而宿主文件系统只认 Windows 盘符/UNC 拼写 —— `/c/...` 会被
+  解析成 `<当前盘符>:\c\...`,于是显示「文件不存在,可能已被移动或删除」。插件在右侧栏的**唯一
+  入口**(`ctx.sidebarRight.openResource`)上把地址还原成宿主拼写,`~` / `/tmp` / `/dev/null` /
+  `/usr` 等挂载点按与工具参数翻译**同一张表**处理;宿主事实经只读路由
+  `GET /dsh-gitbash-shell/api/pathmap` 提供,**只有宿主自报 `win32` 时才改写**
+  (macOS/Linux 宿主永不翻译,事实未到时也不翻译)。**没有改动任何 dsh 源码**,包装随插件卸载还原。
 
 关闭后回到 dsh 原生行为:指示文本为空(组装期直接丢弃,零提示噪声),路径参数与结果元数据
 都不再改写,文件工具收 Windows 路径。**bash 始终是 Git Bash,不受此开关影响**——它只决定

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-gitbash-shell",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "main": "./src/index.js",
   "description": "Windows 全模式 Git Bash:用 Git for Windows bash 替换 PowerShell 执行器,并物化 standard/minimal/code/cordis 的 Git Bash 变体 preset。双 era 适配 dsh <= 0.1.1(内置 id 'code')与 >= 0.1.2(改名 'ptc'),启动探测自动选择,preset id 永不变。联动:dsh-ptc-cordis-preset(两者同装时 PTC 创造模式自动物化为 Git Bash 版)+ dsh-better-sidebar(终端 UI 标签与模型 terminal_* 工具自动切到 Git Bash)。",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-gitbash-shell",
-  "version": "0.30.0",
+  "version": "0.31.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

@@ -131,6 +131,8 @@ window.__ModuleLoader__.load({
 			"tools.working": "处理中",
 			"tools.resultOk": "成功",
 			"tools.resultFail": "失败",
+			"tools.installing": "安装中…",
+			"tools.updating": "更新中…",
 		};
 
 		var en = {
@@ -197,6 +199,8 @@ window.__ModuleLoader__.load({
 			"tools.working": "Working",
 			"tools.resultOk": "succeeded",
 			"tools.resultFail": "failed",
+			"tools.installing": "Installing…",
+			"tools.updating": "Updating…",
 		};
 
 		/* Third-language dictionaries: one entry per language, each preceded
@@ -273,6 +277,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "جارٍ العمل",
 				"tools.resultOk": "نجح",
 				"tools.resultFail": "فشل",
+				"tools.installing": "جارٍ التثبيت…",
+				"tools.updating": "جارٍ الترقية…",
 			},
 			/* locale: de */
 			"de": {
@@ -339,6 +345,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "Läuft",
 				"tools.resultOk": "erfolgreich",
 				"tools.resultFail": "fehlgeschlagen",
+				"tools.installing": "Wird installiert…",
+				"tools.updating": "Wird aktualisiert…",
 			},
 			/* locale: fr */
 			"fr": {
@@ -405,6 +413,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "En cours",
 				"tools.resultOk": "réussi",
 				"tools.resultFail": "échec",
+				"tools.installing": "Installation…",
+				"tools.updating": "Mise à jour…",
 			},
 			/* locale: hi */
 			"hi": {
@@ -471,6 +481,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "चल रहा है",
 				"tools.resultOk": "सफल",
 				"tools.resultFail": "विफल",
+				"tools.installing": "इंस्टॉल हो रहा है…",
+				"tools.updating": "अपडेट हो रहा है…",
 			},
 			/* locale: id */
 			"id": {
@@ -537,6 +549,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "Memproses",
 				"tools.resultOk": "berhasil",
 				"tools.resultFail": "gagal",
+				"tools.installing": "Memasang…",
+				"tools.updating": "Memperbarui…",
 			},
 			/* locale: it */
 			"it": {
@@ -603,6 +617,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "In corso",
 				"tools.resultOk": "riuscito",
 				"tools.resultFail": "non riuscito",
+				"tools.installing": "Installazione…",
+				"tools.updating": "Aggiornamento…",
 			},
 			/* locale: ja */
 			"ja": {
@@ -669,6 +685,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "処理中",
 				"tools.resultOk": "成功",
 				"tools.resultFail": "失敗",
+				"tools.installing": "インストール中…",
+				"tools.updating": "更新中…",
 			},
 			/* locale: ko */
 			"ko": {
@@ -735,6 +753,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "처리 중",
 				"tools.resultOk": "성공",
 				"tools.resultFail": "실패",
+				"tools.installing": "설치 중…",
+				"tools.updating": "업데이트 중…",
 			},
 			/* locale: nl */
 			"nl": {
@@ -801,6 +821,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "Bezig",
 				"tools.resultOk": "geslaagd",
 				"tools.resultFail": "mislukt",
+				"tools.installing": "Installeren…",
+				"tools.updating": "Bijwerken…",
 			},
 			/* locale: pl */
 			"pl": {
@@ -867,6 +889,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "Przetwarzanie",
 				"tools.resultOk": "sukces",
 				"tools.resultFail": "niepowodzenie",
+				"tools.installing": "Instalowanie…",
+				"tools.updating": "Aktualizowanie…",
 			},
 			/* locale: pt */
 			"pt": {
@@ -933,6 +957,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "A processar",
 				"tools.resultOk": "com êxito",
 				"tools.resultFail": "falhou",
+				"tools.installing": "A instalar…",
+				"tools.updating": "A atualizar…",
 			},
 			/* locale: ru */
 			"ru": {
@@ -999,6 +1025,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "Выполняется",
 				"tools.resultOk": "успешно",
 				"tools.resultFail": "ошибка",
+				"tools.installing": "Установка…",
+				"tools.updating": "Обновление…",
 			},
 			/* locale: sv */
 			"sv": {
@@ -1065,6 +1093,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "Arbetar",
 				"tools.resultOk": "lyckades",
 				"tools.resultFail": "misslyckades",
+				"tools.installing": "Installerar…",
+				"tools.updating": "Uppdaterar…",
 			},
 			/* locale: th */
 			"th": {
@@ -1131,6 +1161,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "กำลังดำเนินการ",
 				"tools.resultOk": "สำเร็จ",
 				"tools.resultFail": "ล้มเหลว",
+				"tools.installing": "กำลังติดตั้ง…",
+				"tools.updating": "กำลังอัปเกรด…",
 			},
 			/* locale: tr */
 			"tr": {
@@ -1197,6 +1229,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "İşleniyor",
 				"tools.resultOk": "başarılı",
 				"tools.resultFail": "başarısız",
+				"tools.installing": "Kuruluyor…",
+				"tools.updating": "Güncelleniyor…",
 			},
 			/* locale: vi */
 			"vi": {
@@ -1263,6 +1297,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "Đang xử lý",
 				"tools.resultOk": "thành công",
 				"tools.resultFail": "thất bại",
+				"tools.installing": "Đang cài…",
+				"tools.updating": "Đang nâng cấp…",
 			},
 			/* locale: zh-hk */
 			"zh-hk": {
@@ -1329,6 +1365,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "處理緊",
 				"tools.resultOk": "成功",
 				"tools.resultFail": "失敗",
+				"tools.installing": "安裝緊…",
+				"tools.updating": "升級緊…",
 			},
 			/* locale: zh-mo */
 			"zh-mo": {
@@ -1395,6 +1433,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "處理緊",
 				"tools.resultOk": "成功",
 				"tools.resultFail": "失敗",
+				"tools.installing": "安裝緊…",
+				"tools.updating": "升級緊…",
 			},
 			/* locale: zh-tw */
 			"zh-tw": {
@@ -1461,6 +1501,8 @@ window.__ModuleLoader__.load({
 				"tools.working": "處理中",
 				"tools.resultOk": "成功",
 				"tools.resultFail": "失敗",
+				"tools.installing": "安裝中…",
+				"tools.updating": "更新中…",
 			},
 		};
 
@@ -1581,6 +1623,21 @@ window.__ModuleLoader__.load({
 			".gb-ok{flex:none;color:var(--dsw-alias-state-success-primary,#3fb950)}",
 			".gb-bad{flex:none;color:var(--dsw-alias-status-danger,#e5484d)}",
 			".gb-segBtn:disabled{opacity:.45;cursor:default}",
+			/* in-list progress (v0.30.1): the row being installed/upgraded shows a
+			   spinner, its action, and a sweeping bar; finished rows keep their
+			   verdict, and a failure prints its reason under the row. */
+			".gb-toolRow.gb-rowActive{border-radius:6px;background:var(--dsw-alias-bg-layer-2,transparent)}",
+			".gb-toolState.gb-st-running{border-color:var(--dsw-alias-brand-primary);color:var(--dsw-alias-brand-primary);display:inline-flex;align-items:center;gap:5px}",
+			".gb-st-ok{border-color:var(--dsw-alias-state-success-primary,#3fb950);color:var(--dsw-alias-state-success-primary,#3fb950)}",
+			".gb-st-fail{border-color:var(--dsw-alias-status-danger,#e5484d);color:var(--dsw-alias-status-danger,#e5484d)}",
+			".gb-spin{flex:none;display:inline-block;width:10px;height:10px;border:2px solid var(--dsw-alias-border-l2);border-top-color:var(--dsw-alias-brand-primary);border-radius:50%;animation:gb-spin .8s linear infinite}",
+			".gb-toolBar{flex:1 1 auto;min-width:32px;height:4px;border-radius:2px;background:var(--dsw-alias-border-l2);overflow:hidden}",
+			".gb-toolBarFill{display:block;height:100%;width:38%;border-radius:2px;background:var(--dsw-alias-brand-primary);animation:gb-slide 1.15s ease-in-out infinite}",
+			".gb-jobBar{height:6px;border-radius:3px;background:var(--dsw-alias-border-l2);overflow:hidden}",
+			".gb-jobBarFill{display:block;height:100%;border-radius:3px;background:var(--dsw-alias-brand-primary);transition:width .3s ease}",
+			".gb-toolFail{margin:0 0 4px 26px;font-size:11.5px;line-height:1.5;color:var(--dsw-alias-status-danger,#e5484d);overflow-wrap:anywhere}",
+			"@keyframes gb-spin{to{transform:rotate(360deg)}}",
+			"@keyframes gb-slide{0%{margin-left:-38%}100%{margin-left:100%}}",
 		].join("\n");
 
 		function ensureStyles() {
@@ -2027,8 +2084,23 @@ window.__ModuleLoader__.load({
 			   even be ticked, so an upgrade can never touch it. */
 			var toolRows = toolsData !== null && Array.isArray(toolsData.tools) ? toolsData.tools : [];
 			var wingetOk = !!(toolsData !== null && toolsData.winget && toolsData.winget.ok);
+			/* The job lives on the HOST and keeps running long after the POST has
+			   returned, so "busy" must be derived from the JOB, not from the request.
+			   Keying the buttons off the POST alone re-enabled them the instant the
+			   host answered 202 — which is precisely how a second click could land on
+			   an already-running batch. */
+			var jobRunning = toolJob !== null && toolJob.finished !== true;
+			var busyNow = toolBusy || jobRunning;
+			var jobById = {};
+			if (toolJob !== null && Array.isArray(toolJob.results)) {
+				toolJob.results.forEach(function (entry) {
+					if (entry !== null && typeof entry === "object" && typeof entry.id === "string") jobById[entry.id] = entry;
+				});
+			}
+			var activeCmd = jobRunning && typeof toolJob.current === "string" ? toolJob.current : "";
+			var jobPct = jobRunning && toolJob.total > 0 ? Math.round(toolJob.done / toolJob.total * 100) : 0;
 			function toolSelectable(row) {
-				return wingetOk && !toolBusy && (row.state === "missing" || row.state === "managed");
+				return wingetOk && !busyNow && (row.state === "missing" || row.state === "managed");
 			}
 			var toolSelCount = toolRows.filter(function (row) { return toolSel[row.id] === true; }).length;
 
@@ -2126,8 +2198,31 @@ window.__ModuleLoader__.load({
 					toolErr !== "" ? E("p", { className: "gb-error" }, toolErr) : null,
 					toolsData !== null && !wingetOk ? E("p", { className: "gb-error" }, t("tools.nowinget")) : null,
 					toolRows.length > 0 ? E("div", { className: "gb-tools" },
-						toolRows.map(function (row) {
-							return E("label", { key: row.id, className: "gb-toolRow", title: row.publisher + " · " + row.source },
+						/* ONE row per tool, and the row itself carries the progress: the
+						   tool being worked on shows a spinner, whether it is being
+						   installed or upgraded, and a sweeping bar; a finished tool keeps
+						   its verdict; a failure prints its reason directly underneath, so
+						   nothing has to be hunted for in a separate log area. */
+						toolRows.reduce(function (acc, row) {
+							var entry = jobById[row.id];
+							var active = activeCmd !== "" && activeCmd === row.cmd;
+							var isUpgrade = row.state === "managed";
+							var badge;
+							if (active) {
+								badge = E("span", { className: "gb-toolState gb-st-running" },
+									E("span", { className: "gb-spin" }),
+									t(isUpgrade ? "tools.updating" : "tools.installing"));
+							} else if (entry !== undefined) {
+								badge = E("span", { className: "gb-toolState " + (entry.ok ? "gb-st-ok" : "gb-st-fail") },
+									(entry.ok ? "✓ " : "✗ ") + t(entry.ok ? "tools.resultOk" : "tools.resultFail"));
+							} else {
+								badge = E("span", { className: "gb-toolState gb-st-" + row.state }, t("tools.state." + row.state));
+							}
+							acc.push(E("label", {
+								key: row.id,
+								className: "gb-toolRow" + (active ? " gb-rowActive" : ""),
+								title: row.publisher + " · " + row.source,
+							},
 								E("input", {
 									type: "checkbox",
 									checked: toolSel[row.id] === true,
@@ -2135,27 +2230,39 @@ window.__ModuleLoader__.load({
 									onChange: function () { toggleTool(row.id); },
 								}),
 								E("span", { className: "gb-toolCmd" }, row.cmd),
-								E("span", { className: "gb-toolState gb-st-" + row.state }, t("tools.state." + row.state)),
+								badge,
+								active ? E("span", { className: "gb-toolBar" }, E("span", { className: "gb-toolBarFill" })) : null,
 								E("span", { className: "gb-toolSrc" }, (row.version !== "" ? row.version + " · " : "") + (row.provider !== "" ? row.provider : row.source) + (row.admin ? " · " + t("tools.adminHint") : "")),
-							);
-						}),
+							));
+							if (entry !== undefined && entry.ok !== true) {
+								acc.push(E("p", { key: row.id + ":fail", className: "gb-toolFail" },
+									t(entry.action === "upgrade" ? "tools.updating" : "tools.installing") + " — " + t("tools.resultFail") + ": " + (entry.detail || "")));
+							}
+							return acc;
+						}, []),
 					) : null,
 					toolsData !== null && wingetOk ? E("div", { className: "gb-seg" },
-						E("button", { type: "button", className: "gb-segBtn", disabled: toolBusy, onClick: function () { loadTools(); } }, t("tools.refresh")),
-						E("button", { type: "button", className: "gb-segBtn", disabled: toolBusy, onClick: selectInstallable }, t("tools.selectMissing")),
-						E("button", { type: "button", className: "gb-segBtn" + (toolSelCount > 0 ? " gb-segActive" : ""), disabled: toolBusy || toolSelCount === 0, onClick: runTools }, t("tools.run")),
+						E("button", { type: "button", className: "gb-segBtn", disabled: busyNow, onClick: function () { loadTools(); } }, t("tools.refresh")),
+						E("button", { type: "button", className: "gb-segBtn", disabled: busyNow, onClick: selectInstallable }, t("tools.selectMissing")),
+						/* A running job DISABLES this button and says so — the host keeps
+						   working after the POST returns, so re-enabling on the response
+						   would invite a second click onto a batch already in flight. */
+						E("button", {
+							type: "button",
+							className: "gb-segBtn" + (toolSelCount > 0 && !busyNow ? " gb-segActive" : ""),
+							disabled: busyNow || toolSelCount === 0,
+							onClick: runTools,
+						}, busyNow ? t("tools.working") : t("tools.run")),
 					) : null,
-					toolJob !== null ? E("div", { className: "gb-stack" },
+					jobRunning ? E("div", { className: "gb-stack" },
 						E("div", { className: "gb-row" },
-							E("span", { className: "gb-rowLabel" }, t("tools.working") + ":"),
-							E("span", { className: "gb-rowValue" }, (toolJob.current ? toolJob.current + " " : "") + toolJob.done + " / " + toolJob.total),
+							E("span", { className: "gb-spin" }),
+							E("span", { className: "gb-rowLabel" }, (activeCmd !== "" ? activeCmd + " · " : "") + t("tools.working") + ":"),
+							E("span", { className: "gb-rowValue" }, toolJob.done + " / " + toolJob.total),
+						),
+						E("div", { className: "gb-jobBar" },
+							E("div", { className: "gb-jobBarFill", style: { width: jobPct + "%" } }),
 						),
-						(toolJob.results || []).map(function (item) {
-							return E("div", { key: item.id, className: "gb-toolResult" },
-								E("span", { className: item.ok ? "gb-ok" : "gb-bad" }, item.cmd + " " + t(item.ok ? "tools.resultOk" : "tools.resultFail")),
-								E("span", null, item.detail || ""),
-							);
-						}),
 					) : null,
 					E("p", { className: "gb-hint" }, t("tools.hint")),
 				),
@@ -2345,6 +2452,185 @@ window.__ModuleLoader__.load({
 			);
 		}
 
+		// ── native right-sidebar path rescue (v0.31.0) ───────────────────────
+		//
+		// WHY: while the POSIX dialect is on, the conversation shows MSYS drive
+		// roots (/c/Users/...), and dsh's OWN file links carry that spelling into
+		// the right Sidebar. The Host resolves the path with node:path against
+		// the session cwd, so '/c/Users/x' becomes '<current drive>:\c\Users\x'
+		// and the preview answers "file not found". The plugin introduced that
+		// spelling, so the plugin restores its meaning — at the ONE point every
+		// way into the column passes through: `ctx.sidebarRight.openResource`
+		// (conversation file links, tool-row line references, the file tree).
+		//
+		// SAFETY: the rewrite is driven by the HOST's own platform fact, never by
+		// a guess: nothing is rewritten until `/api/pathmap` reports win32, so a
+		// macOS/Linux Host can never see its paths translated. A path already in
+		// the Host's spelling is returned unchanged, so with the dialect off the
+		// wrapper is a pure pass-through. The wrapper lives on the service
+		// instance and is removed with this plugin's own fiber.
+		var FILE_ADDRESS_PREFIX = "dsh-resource://file/";
+		var PATHMAP_URL = "dsh-gitbash-shell/api/pathmap";
+		/** The Host's MSYS facts, or null until /api/pathmap has answered. */
+		var pathMap = null;
+		var pathMapRequested = false;
+
+		/** Read the Host's platform + mount facts once; never blocks a click. */
+		function loadPathMap() {
+			if (pathMapRequested) return;
+			pathMapRequested = true;
+			try {
+				Promise.resolve(fetch(PATHMAP_URL, { headers: { accept: "application/json" } }))
+					.then(function (response) { return response && response.ok ? response.json() : null; })
+					.then(function (body) {
+						if (body && typeof body === "object" && typeof body.platform === "string") pathMap = body;
+						else console.warn(TAG + " path map unavailable: no rewrite until the host answers");
+					})
+					.catch(function (error) {
+						console.warn(TAG + " path map fetch failed:", error && error.message ? error.message : error);
+					});
+			} catch (error) {
+				console.warn(TAG + " path map fetch threw:", error && error.message ? error.message : error);
+			}
+		}
+
+		/** Whether the Host is a Windows one whose filesystem needs the rewrite. */
+		function pathRescueActive() {
+			return pathMap !== null && pathMap.platform === "win32";
+		}
+
+		/**
+		 * '/c/Users/x' -> 'C:/Users/x', plus the Git Bash mounts the Host's own
+		 * translation layer resolves (~, /tmp, /dev/null, /usr & friends). Mirrors
+		 * src/index.js translateMsysPath WITHOUT its `$VAR` expansion: a path
+		 * rendered in the transcript is text, not a shell word.
+		 */
+		function msysToHostPath(value, env) {
+			if (typeof value !== "string" || value === "") return value;
+			var facts = env || {};
+			if (facts.home && (value === "~" || value.slice(0, 2) === "~/")) {
+				return value === "~" ? facts.home : facts.home + "/" + value.slice(2);
+			}
+			var drive = /^\/([a-z])\/(.*)$/i.exec(value);
+			if (drive) return drive[1].toUpperCase() + ":/" + drive[2];
+			var bare = /^\/([a-z])$/i.exec(value);
+			if (bare) return bare[1].toUpperCase() + ":/";
+			if (value === "/dev/null") return "\\\\.\\NUL";
+			if (facts.tmpDir && (value === "/tmp" || value.slice(0, 5) === "/tmp/")) {
+				return value === "/tmp" ? facts.tmpDir : facts.tmpDir + value.slice(4);
+			}
+			if (facts.gitRoot && facts.mounts) {
+				var mounts = facts.mounts;
+				for (var mount in mounts) {
+					if (!Object.prototype.hasOwnProperty.call(mounts, mount)) continue;
+					if (value === mount || value.slice(0, mount.length + 1) === mount + "/") {
+						return facts.gitRoot + "/" + mounts[mount] + (value === mount ? "" : value.slice(mount.length));
+					}
+				}
+			}
+			return value;
+		}
+
+		/** Component-encode one path segment, keeping ':' literal for drive letters. */
+		function encodeAddressSegment(segment) {
+			return encodeURIComponent(segment).replace(/%3A/gi, ":");
+		}
+
+		/** Encode a '/'-separated path the way dsh's own address builder does. */
+		function encodeAddressPath(path) {
+			return path.split("/").map(encodeAddressSegment).join("/");
+		}
+
+		/**
+		 * Rewrite one `dsh-resource://file/...` address so its path uses the
+		 * Host's spelling. Anything that is not a file address, does not decode,
+		 * or does not change comes back untouched — the caller then forwards the
+		 * ORIGINAL string, so no URL round trip can alter a path we never
+		 * translated.
+		 * @param address - the resource address the Sidebar is about to open.
+		 * @param env - the Host's mount facts, or null.
+		 * @returns the address to open.
+		 */
+		function rescueFileAddress(address, env) {
+			if (typeof address !== "string" || address.slice(0, FILE_ADDRESS_PREFIX.length) !== FILE_ADDRESS_PREFIX) return address;
+			var tail = address.slice(FILE_ADDRESS_PREFIX.length);
+			var cut = tail.search(/[?#]/);
+			var suffix = cut === -1 ? "" : tail.slice(cut);
+			var parts = (cut === -1 ? tail : tail.slice(0, cut)).split("/");
+			var scope = parts.shift();
+			if (scope !== "session" && scope !== "absolute") return address;
+			var sessionId = null;
+			if (scope === "session") {
+				sessionId = parts.shift();
+				if (sessionId === undefined || sessionId === "" || parts.length === 0) return address;
+			}
+			var segments;
+			try {
+				segments = parts.map(decodeURIComponent);
+			} catch (error) {
+				return address;   // a malformed escape is not ours to repair
+			}
+			// '//server/share' keeps an empty first segment; a UNC path is never an
+			// MSYS drive root, so it is left exactly as the Host spelled it.
+			if (scope === "absolute" && segments[0] === "" && segments.length > 1) return address;
+			var path = scope === "absolute" ? "/" + segments.join("/") : segments.join("/");
+			var translated = msysToHostPath(path, env);
+			if (translated === path) return address;
+			var rebuilt = scope === "session"
+				? FILE_ADDRESS_PREFIX + "session/" + encodeAddressSegment(sessionId) + "/" + encodeAddressPath(translated)
+				: FILE_ADDRESS_PREFIX + "absolute/" + encodeAddressPath(translated.replace(/^\/+/, ""));
+			return rebuilt + suffix;
+		}
+
+		/**
+		 * Wrap the navigation controller's ONE address-taking entry point. Every
+		 * way into the right column calls `openResource` (or its per-session twin),
+		 * so one wrapper covers the conversation links, the tool rows and the file
+		 * tree at once — no dsh source is touched, and the wrapper is removed when
+		 * this plugin's fiber is.
+		 */
+		function installPathRescue(ctx) {
+			loadPathMap();
+			try {
+				ctx.inject(["sidebarRight"], function (sctx) {
+					try {
+						var controller = sctx && sctx.sidebarRight;
+						if (!controller || controller.gbPathRescue === true) return;
+						var openResource = controller.openResource;
+						if (typeof openResource !== "function") return;
+						var openResourceIn = controller.openResourceIn;
+						var rescue = function (address) {
+							return pathRescueActive() ? rescueFileAddress(address, pathMap) : address;
+						};
+						controller.openResource = function (address, options) {
+							return openResource.call(this, rescue(address), options);
+						};
+						if (typeof openResourceIn === "function") {
+							controller.openResourceIn = function (sessionId, address, options) {
+								return openResourceIn.call(this, sessionId, rescue(address), options);
+							};
+						}
+						controller.gbPathRescue = true;
+						var restore = function () {
+							try {
+								controller.openResource = openResource;
+								if (typeof openResourceIn === "function") controller.openResourceIn = openResourceIn;
+								delete controller.gbPathRescue;
+							} catch (error) { /* a frozen instance keeps the wrapper; harmless */ }
+						};
+						if (typeof sctx.effect === "function") {
+							sctx.effect(function () { return restore; }, "dsh-gitbash-shell: sidebar path rescue");
+						}
+						console.log(TAG + " right-sidebar path rescue armed (host spelling restored on open)");
+					} catch (error) {
+						console.warn(TAG + " right-sidebar path rescue failed:", error && error.message ? error.message : error);
+					}
+				});
+			} catch (error) {
+				console.warn(TAG + " right-sidebar path rescue wiring failed:", error && error.message ? error.message : error);
+			}
+		}
+
 		// ── plugin ────────────────────────────────────────────────────────────
 
 		exports.name = "dsh-gitbash-shell/client";
@@ -2472,6 +2758,11 @@ window.__ModuleLoader__.load({
 			} catch (error) {
 				console.warn(TAG + " settings card registration failed:", error && error.message ? error.message : error);
 			}
+
+			// The native right Sidebar consumes the very dialect this card gates,
+			// so the rescue is armed on the same mount — and independently of the
+			// card, which must never be taken down by it.
+			installPathRescue(ctx);
 		};
 
 		return module.exports;

package/src/index.js

@@ -2776,6 +2776,62 @@ export async function apply(ctx, config = {}) {
     }
   }
 
+  // ── MSYS path facts for the browser half (v0.31.0) ───────────────────────
+  // The native right Sidebar receives the path spelling the CONVERSATION
+  // shows. While this plugin's POSIX dialect is on, that spelling is an MSYS
+  // drive root (/c/Users/...), and the Host filesystem resolves it against the
+  // current drive instead — '<drive>:\c\Users\...' — so every file link in the
+  // transcript opens onto "file not found". The browser half rewrites the
+  // resource address before opening it; this route is the fact bag that
+  // rewrite needs. It reports the SAME env the tool-argument translation
+  // already resolves against, plus the platform, so a non-Windows client never
+  // rewrites anything. Read-only and loopback-fenced (a GET needs no Origin),
+  // because the web server may be bound to 0.0.0.0.
+  try {
+    ctx.inject(['webServer'], (wctx) => {
+      try {
+        const route = '/dsh-gitbash-shell/api/pathmap'
+        const mounts = {}
+        for (const [mount, target] of GIT_MOUNTS) mounts[mount] = target
+        const send = (res, code, payload) => {
+          const text = JSON.stringify(payload)
+          res.writeHead(code, {
+            'content-type': 'application/json; charset=utf-8',
+            'cache-control': 'no-store',
+            'content-length': Buffer.byteLength(text),
+          })
+          res.end(text)
+        }
+        const handler = (req, res) => {
+          const fence = fenceToolRequest(req)
+          if (!fence.ok) {
+            console.log(TAG + ' path map request refused (' + fence.reason + ')')
+            send(res, 403, { error: 'forbidden', reason: fence.reason })
+            return
+          }
+          const env = buildTranslateEnv(configuredBashPath)
+          // One line per read: the browser half fetches this once per page load,
+          // so its presence in the log is how a user can tell the rescue is live.
+          console.log(TAG + ' path map read by ' + (req.socket && req.socket.remoteAddress ? req.socket.remoteAddress : '?'))
+          send(res, 200, {
+            platform: process.platform,
+            home: env.home ?? null,
+            tmpDir: env.tmpDir ?? null,
+            gitRoot: env.gitRoot ?? null,
+            mounts,
+          })
+        }
+        const dispose = wctx.webServer.register({ kind: 'prefix', path: route, handler })
+        wctx.effect(() => dispose, 'dsh-gitbash-shell: path map route')
+        console.log(TAG + ' MSYS path map route active at ' + route + ' (read by the browser half)')
+      } catch (error) {
+        console.log(TAG + ' path map route failed: ' + (error?.message ?? error))
+      }
+    })
+  } catch (error) {
+    console.log(TAG + ' path map route wiring failed: ' + (error?.message ?? error))
+  }
+
   // ── winget toolchain route (v0.30.0) ─────────────────────────────────────
   // The settings card's "install / upgrade" buttons. Installing software is a
   // real side effect, so src/tool-runner.js fences the route: only a loopback