dsh-gitbash-shell 0.42.3 → 0.43.1

package/CHANGELOG.md

@@ -3,6 +3,61 @@
 > 倒序排列,新版本条目在最上面。条目格式:`## vX.Y.Z — YYYY-MM-DD` + 类型(feat / fix / docs / chore)+ 要点 + 相关链接。
 > 纪律见 AGENTS.md「变更记录纪律」:发版前先更新本文件并随版本提交;事故复盘、复现与真机验证记录也记在这里。
 
+## [0.43.1] — 2026-10-23
+
+### fix:测试装置的 Windows 路径 bug(v0.43.0 的 CI 修复,无功能变化)
+
+- **0.43.0 的 CI(windows-latest × Node 22/24)红了**:新 `tests/terminal-cancel.mjs` 用
+  `new URL('.', import.meta.url).pathname` 拼源码路径——Windows 上 pathname 带前导 `/`,拼出
+  `D:\D:\a\...` 双盘符 → ENOENT。macOS 的 `/Users/...` 永远暴露不了这个。**生产代码零变化**
+  (发布的 0.43.0 包不受影响:tests 不在发布面,失败仅是仓库 CI),修法是回归仓库惯例
+  `readFileSync(new URL('../src/x.js', import.meta.url), 'utf8')`(直接接受 URL,跨平台正确)。
+- **教训入库**:同一仓库里 `align-official.mjs` / `client-regressions.mjs` /
+  `compatibility-regressions.mjs` 早就是惯例写法——新测试文件开写前应先看同目录既有文件的
+  装置惯例,而不是自造。win32 门控路径在 macOS 上不可见,这是本仓库第二次被同一类问题咬
+  (第一次:v0.39.4 smoke stub 的 ns 字面量)。
+- 全量 334 项本机 0 fail;以 CI(ubuntu+windows × Node 22/24)全绿为发版门。
+
+## [0.43.0] — 2026-10-23
+
+### feat:终端工具任务的取消能力与可观测性(#35,@youyv 报告)
+
+- **背景**:#35(高质量报告,代码事实逐行核验全部准确):winget 安装/升级任务「只进不出」——
+  下载卡住时卡片停在「处理中」,没有取消按钮、看不到已用时与 winget 的重试输出、单条目最长干等
+  15 分钟(`INSTALL_TIMEOUT_MS`,为 UAC 等待保留,不动),唯一出路是重启 DSH;`clear` 只丢
+  `activeJob` 锁不杀进程,第二个任务能与仍在跑的 winget 并发(半装状态风险)。
+- **取消(主诉求)**:新路由 `POST ?action=cancel`(`index.js`,与 `run`/`clear` 同一 fence);
+  `cancelToolJob()` 标记 job 并经 `io.cancelActive()` **杀整个进程树**——win32 用
+  `taskkill /PID <pid> /T /F`(winget 会派发 forwarder/msiexec/DeliveryOptimization 子进程,
+  只杀父进程留孤儿),POSIX 用 SIGKILL。进行中的条目 verdict 归 `cancelled`,剩余条目归
+  `skipped`(用户要求的是停止,不是失败);任务留在「已取消」终态直到卡片关闭。取消落在
+  inventory 读取期间时全部条目 skipped(什么都没尝试,什么都不报失败);落在 winget 已正常
+  退出之后时不改写已完成条目的 verdict(只信 run 自己的 `cancelled` 标志,不信 job 级兜底)。
+- **clear 语义修正(堵并发洞)**:任务未完成时 `clearToolJob()` 现在**等价于取消**(杀树 + 标记),
+  不再丢锁放行第二个任务;已完成任务照旧忘记。
+- **runner 流式改造**:`defaultRunnerIo` 的 `execFile` 换 `spawn`(stdio pipe,16MiB 输出上限
+  语义保留):`hooks.onOutput` 逐行送出最新一行(300 字符截断),job 快照新增
+  `startedAt` / `currentSince` / `lastOutput` / `cancelled`(`index.js` snapshot 显式挑字段,
+  io 引用不上线路)。超时、取消、看门狗三种终止都走进程树击杀,并以
+  `timedOut` / `cancelled` / `networkRetry` 标志区分——`execFile` 时代 ETIMEDOUT 被压成
+  `code=-1` 归「一般失败」的问题一并修正。
+- **卡死下载看门狗**:`NETWORK_RETRY_PATTERN`(`/failed to download, waiting a bit and
+  retry|0x80072ee2|0x80072efd/i`,#35 实测的 DO→WinINet 重试循环信号)首次命中起计时,一个
+  窗口(默认 120s,`defaultRunnerIo({networkRetryWindowMs})` 可注入)后进程仍在即杀树,verdict
+  归 `network` 并附最后一行——不再静默烧完 15 分钟。健康下载永远不会碰到它(窗口只从首个
+  retry 行起算,且只触发一次)。
+- **UI**:进行中行新增**已用时**(`currentSince` 起算,`2m13s` 数字形,随 1.2s 轮询刷新)、
+  **取消按钮**与最新 winget 行(单行灰色 `gb-toolTail`);badge 按 verdict 归类——已取消 /
+  已跳过(中性 `–` + `gb-st-skip`)/ 超时 / 网络失败 与 成功/失败 区分;skipped 条目不打失败
+  明细行;任务被取消后在卡片上显示总况行。21 门词典各新增 6 键
+  (`tools.cancel` / `tools.cancelledNote` / `tools.kind.cancelled|skipped|timeout|network`)。
+- **测试**:新 `tests/terminal-cancel.mjs` 11 项(取消状态机三条路径 / clear 等价 / timeout 与
+  networkRetry 归类 / watchdog / onOutput / spawn 失败兼容 / 路由与卡片源码断言);全量 334 项
+  333 pass + 1 平台 skip + 0 fail。win32 的进程树击杀(taskkill 路径)本机(macOS)只能验证
+  SIGKILL 分支,**Windows 真机复验待做**(卡死下载场景:装一个 GitHub 源包,断网点「取消」,
+  看树是否全灭、卡片是否显示已取消)。
+- UAC 提示:杀树后系统 consent.exe 弹窗一般随之撤下;若残留,手动关掉即可,不影响已取消的判定。
+
 ## [0.42.3] — 2026-10-23
 
 ### fix:全仓严格 review 的十项修复(PR #34,@KouzakiUmi 贡献;16 文件 +1229/−123)

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-gitbash-shell",
-  "version": "0.42.3",
+  "version": "0.43.1",
   "main": "./src/index.js",
   "description": "Windows 全模式 Git Bash:自带 bash 工具(私有 Git Bash 执行器实例,官方 PowerShell 执行器原样保留),官方四个模式经行内工具补位直接获得 Git Bash(v0.35.0 起;v0.39.0 起不再替换宿主执行器),四个 *·Git Bash 变体 preset 可开关;官方 pwsh 工具默认隐藏、开关可见(真 PowerShell);附带 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.42.3",
+  "version": "0.43.1",
   "description": "Windows 上给 agent 一个真正的 Git Bash 命令工具:私有 Git Bash 执行器实例(官方 PowerShell 执行器原样保留),统一 MSYS 盘根路径方言,官方 pwsh 工具默认隐藏可开关,物化四个内置预设的 Git Bash 变体,侧栏终端接管可开关。· Give agents a real Git Bash tool on Windows: a private Git Bash executor instance (the official PowerShell executor stays untouched), a unified MSYS drive-root path dialect, an opt-in official pwsh tool, and four Git Bash preset variants.",
   "type": "module",
   "repository": {
@@ -57,7 +57,7 @@
     "icon.svg"
   ],
   "scripts": {
-    "test": "node --test tests/smoke.mjs tests/private-executor.mjs tests/client-regressions.mjs tests/bridge-regressions.mjs tests/runtime-regressions.mjs tests/host-regressions.mjs tests/compatibility-regressions.mjs tests/path-tool.mjs tests/native-output.mjs tests/native-executor.mjs tests/ops-adopt.mjs tests/review-core-regressions.mjs tests/review-native-regressions.mjs",
+    "test": "node --test tests/smoke.mjs tests/private-executor.mjs tests/client-regressions.mjs tests/bridge-regressions.mjs tests/runtime-regressions.mjs tests/host-regressions.mjs tests/compatibility-regressions.mjs tests/path-tool.mjs tests/native-output.mjs tests/native-executor.mjs tests/ops-adopt.mjs tests/terminal-cancel.mjs tests/review-core-regressions.mjs tests/review-native-regressions.mjs",
     "test:preview": "node --import ./tests/host-loader.mjs --import ./tests/preview-env.mjs --test tests/preview.mjs tests/bridge-preview.mjs tests/runtime-preview.mjs tests/host-preview.mjs tests/path-preview.mjs tests/native-output-preview.mjs tests/native-preview.mjs tests/native-integration-preview.mjs tests/review-native-preview.mjs",
     "version": "node -e \"const fs=require('fs');const m=JSON.parse(fs.readFileSync('dsh.plugin.json','utf8'));const v=JSON.parse(fs.readFileSync('package.json','utf8')).version;m.version=v;fs.writeFileSync('dsh.plugin.json',JSON.stringify(m,null,2)+'\\n')\" && git add dsh.plugin.json"
   },

package/src/client.js

@@ -132,6 +132,12 @@ window.__ModuleLoader__.load({
 			"tools.state.current": "已是最新",
 			"tools.adminHint": "需要管理员权限:会弹出 UAC 窗口,请在电脑上确认",
 			"tools.working": "处理中",
+			"tools.cancel": "取消",
+			"tools.cancelledNote": "已取消:完成的条目保留结果,其余已跳过。",
+			"tools.kind.cancelled": "已取消",
+			"tools.kind.skipped": "已跳过",
+			"tools.kind.timeout": "超时",
+			"tools.kind.network": "网络失败",
 			"tools.resultOk": "成功",
 			"tools.resultFail": "失败",
 			"tools.installing": "安装中…",
@@ -212,6 +218,12 @@ window.__ModuleLoader__.load({
 			"tools.state.current": "Up to date",
 			"tools.adminHint": "Needs administrator: a UAC prompt will appear — accept it on this machine",
 			"tools.working": "Working",
+			"tools.cancel": "取消",
+			"tools.cancelledNote": "已取消:完成的条目保留结果,其余已跳过。",
+			"tools.kind.cancelled": "已取消",
+			"tools.kind.skipped": "已跳过",
+			"tools.kind.timeout": "超时",
+			"tools.kind.network": "网络失败",
 			"tools.resultOk": "succeeded",
 			"tools.resultFail": "failed",
 			"tools.installing": "Installing…",
@@ -302,6 +314,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "محدَّث",
 				"tools.adminHint": "يتطلب صلاحيات المسؤول: ستظهر نافذة UAC — أكّدها على هذا الجهاز",
 				"tools.working": "جارٍ العمل",
+				"tools.cancel": "إلغاء",
+				"tools.cancelledNote": "تم الإلغاء: تحتفظ الإدخالات المكتملة بنتائجها، وتخطّي الباقي.",
+				"tools.kind.cancelled": "أُلغي",
+				"tools.kind.skipped": "تم التخطي",
+				"tools.kind.timeout": "انتهت المهلة",
+				"tools.kind.network": "فشل الشبكة",
 				"tools.resultOk": "نجح",
 				"tools.resultFail": "فشل",
 				"tools.installing": "جارٍ التثبيت…",
@@ -382,6 +400,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "Aktuell",
 				"tools.adminHint": "Erfordert Administratorrechte: Ein UAC-Fenster erscheint — bitte an diesem Rechner bestätigen",
 				"tools.working": "Läuft",
+				"tools.cancel": "Abbrechen",
+				"tools.cancelledNote": "Abgebrochen: abgeschlossene Einträge behalten ihr Ergebnis, der Rest wurde übersprungen.",
+				"tools.kind.cancelled": "Abgebrochen",
+				"tools.kind.skipped": "Übersprungen",
+				"tools.kind.timeout": "Timeout",
+				"tools.kind.network": "Netzwerkfehler",
 				"tools.resultOk": "erfolgreich",
 				"tools.resultFail": "fehlgeschlagen",
 				"tools.installing": "Wird installiert…",
@@ -462,6 +486,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "À jour",
 				"tools.adminHint": "Nécessite les droits administrateur : une fenêtre UAC va s'afficher — validez-la sur cette machine",
 				"tools.working": "En cours",
+				"tools.cancel": "Annuler",
+				"tools.cancelledNote": "Annulé : les entrées terminées conservent leur résultat, les autres ont été ignorées.",
+				"tools.kind.cancelled": "Annulé",
+				"tools.kind.skipped": "Ignoré",
+				"tools.kind.timeout": "Expiré",
+				"tools.kind.network": "Échec réseau",
 				"tools.resultOk": "réussi",
 				"tools.resultFail": "échec",
 				"tools.installing": "Installation…",
@@ -542,6 +572,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "अद्यतन",
 				"tools.adminHint": "व्यवस्थापक अनुमति चाहिए: एक UAC विंडो दिखेगी — इस मशीन पर पुष्टि करें",
 				"tools.working": "चल रहा है",
+				"tools.cancel": "रद्द करें",
+				"tools.cancelledNote": "रद्द: पूर्ण प्रविष्टियाँ अपना परिणाम रखती हैं; शेष छोड़ दिए गए।",
+				"tools.kind.cancelled": "रद्द",
+				"tools.kind.skipped": "छोड़ा गया",
+				"tools.kind.timeout": "समय समाप्त",
+				"tools.kind.network": "नेटवर्क विफल",
 				"tools.resultOk": "सफल",
 				"tools.resultFail": "विफल",
 				"tools.installing": "इंस्टॉल हो रहा है…",
@@ -622,6 +658,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "Terbaru",
 				"tools.adminHint": "Perlu administrator: jendela UAC akan muncul — setujui di komputer ini",
 				"tools.working": "Memproses",
+				"tools.cancel": "Batalkan",
+				"tools.cancelledNote": "Dibatalkan: entri yang selesai tetap berhasil; sisanya dilewati.",
+				"tools.kind.cancelled": "Dibatalkan",
+				"tools.kind.skipped": "Dilewati",
+				"tools.kind.timeout": "Habis waktu",
+				"tools.kind.network": "Kegagalan jaringan",
 				"tools.resultOk": "berhasil",
 				"tools.resultFail": "gagal",
 				"tools.installing": "Memasang…",
@@ -702,6 +744,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "Aggiornato",
 				"tools.adminHint": "Richiede privilegi di amministratore: apparirà una finestra UAC — confermala su questo computer",
 				"tools.working": "In corso",
+				"tools.cancel": "Annulla",
+				"tools.cancelledNote": "Annullato: le voci completate conservano l'esito; le altre sono state saltate.",
+				"tools.kind.cancelled": "Annullato",
+				"tools.kind.skipped": "Saltato",
+				"tools.kind.timeout": "Timeout",
+				"tools.kind.network": "Errore di rete",
 				"tools.resultOk": "riuscito",
 				"tools.resultFail": "non riuscito",
 				"tools.installing": "Installazione…",
@@ -782,6 +830,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "最新",
 				"tools.adminHint": "管理者権限が必要です。UAC の画面が表示されるので、この PC で承認してください",
 				"tools.working": "処理中",
+				"tools.cancel": "キャンセル",
+				"tools.cancelledNote": "中止しました:完了した項目の結果は保持され、残りはスキップされました。",
+				"tools.kind.cancelled": "中止",
+				"tools.kind.skipped": "スキップ",
+				"tools.kind.timeout": "タイムアウト",
+				"tools.kind.network": "ネットワーク失敗",
 				"tools.resultOk": "成功",
 				"tools.resultFail": "失敗",
 				"tools.installing": "インストール中…",
@@ -862,6 +916,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "최신",
 				"tools.adminHint": "관리자 권한이 필요합니다. UAC 창이 뜨면 이 PC에서 승인하세요",
 				"tools.working": "처리 중",
+				"tools.cancel": "취소",
+				"tools.cancelledNote": "취소됨: 완료된 항목의 결과는 유지되고 나머지는 건너뛰었습니다.",
+				"tools.kind.cancelled": "취소됨",
+				"tools.kind.skipped": "건너뜀",
+				"tools.kind.timeout": "시간 초과",
+				"tools.kind.network": "네트워크 실패",
 				"tools.resultOk": "성공",
 				"tools.resultFail": "실패",
 				"tools.installing": "설치 중…",
@@ -942,6 +1002,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "Bijgewerkt",
 				"tools.adminHint": "Vereist beheerdersrechten: er verschijnt een UAC-venster — bevestig dat op deze computer",
 				"tools.working": "Bezig",
+				"tools.cancel": "Annuleren",
+				"tools.cancelledNote": "Geannuleerd: voltooide items behouden hun resultaat; de rest is overgeslagen.",
+				"tools.kind.cancelled": "Geannuleerd",
+				"tools.kind.skipped": "Overgeslagen",
+				"tools.kind.timeout": "Time-out",
+				"tools.kind.network": "Netwerkfout",
 				"tools.resultOk": "geslaagd",
 				"tools.resultFail": "mislukt",
 				"tools.installing": "Installeren…",
@@ -1022,6 +1088,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "Aktualne",
 				"tools.adminHint": "Wymaga uprawnień administratora: pojawi się okno UAC — potwierdź je na tym komputerze",
 				"tools.working": "Przetwarzanie",
+				"tools.cancel": "Anuluj",
+				"tools.cancelledNote": "Anulowano: ukończone pozycje zachowują wynik, pozostałe pominięto.",
+				"tools.kind.cancelled": "Anulowano",
+				"tools.kind.skipped": "Pominięto",
+				"tools.kind.timeout": "Przekroczono czas",
+				"tools.kind.network": "Błąd sieci",
 				"tools.resultOk": "sukces",
 				"tools.resultFail": "niepowodzenie",
 				"tools.installing": "Instalowanie…",
@@ -1102,6 +1174,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "Atualizado",
 				"tools.adminHint": "Requer administrador: aparecerá uma janela UAC — confirme-a neste computador",
 				"tools.working": "A processar",
+				"tools.cancel": "Cancelar",
+				"tools.cancelledNote": "Cancelado: as entradas concluídas mantêm o resultado; as restantes foram ignoradas.",
+				"tools.kind.cancelled": "Cancelado",
+				"tools.kind.skipped": "Ignorado",
+				"tools.kind.timeout": "Tempo esgotado",
+				"tools.kind.network": "Falha de rede",
 				"tools.resultOk": "com êxito",
 				"tools.resultFail": "falhou",
 				"tools.installing": "A instalar…",
@@ -1182,6 +1260,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "Актуально",
 				"tools.adminHint": "Нужны права администратора: появится окно UAC — подтвердите его на этом компьютере",
 				"tools.working": "Выполняется",
+				"tools.cancel": "Отмена",
+				"tools.cancelledNote": "Отменено: завершённые пункты сохраняют результат, остальные пропущены.",
+				"tools.kind.cancelled": "Отменено",
+				"tools.kind.skipped": "Пропущено",
+				"tools.kind.timeout": "Превышено время",
+				"tools.kind.network": "Сбой сети",
 				"tools.resultOk": "успешно",
 				"tools.resultFail": "ошибка",
 				"tools.installing": "Установка…",
@@ -1262,6 +1346,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "Senaste",
 				"tools.adminHint": "Kräver administratör: ett UAC-fönster visas — bekräfta det på den här datorn",
 				"tools.working": "Arbetar",
+				"tools.cancel": "Avbryt",
+				"tools.cancelledNote": "Avbruten: färdiga poster behåller sitt resultat; resten hoppades över.",
+				"tools.kind.cancelled": "Avbruten",
+				"tools.kind.skipped": "Hoppade över",
+				"tools.kind.timeout": "Tidsgräns",
+				"tools.kind.network": "Nätverksfel",
 				"tools.resultOk": "lyckades",
 				"tools.resultFail": "misslyckades",
 				"tools.installing": "Installerar…",
@@ -1342,6 +1432,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "ล่าสุดแล้ว",
 				"tools.adminHint": "ต้องใช้สิทธิ์ผู้ดูแลระบบ จะมีหน้าต่าง UAC ขึ้นมา กรุณายืนยันบนเครื่องนี้",
 				"tools.working": "กำลังดำเนินการ",
+				"tools.cancel": "ยกเลิก",
+				"tools.cancelledNote": "ยกเลิกแล้ว: รายการที่เสร็จแล้วคงผลลัพธ์ไว้ ส่วนที่เหลือถูกข้าม",
+				"tools.kind.cancelled": "ยกเลิกแล้ว",
+				"tools.kind.skipped": "ข้ามไว้",
+				"tools.kind.timeout": "หมดเวลา",
+				"tools.kind.network": "เครือข่ายล้มเหลว",
 				"tools.resultOk": "สำเร็จ",
 				"tools.resultFail": "ล้มเหลว",
 				"tools.installing": "กำลังติดตั้ง…",
@@ -1422,6 +1518,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "Güncel",
 				"tools.adminHint": "Yönetici izni gerekir: bir UAC penceresi açılır — bu bilgisayarda onaylayın",
 				"tools.working": "İşleniyor",
+				"tools.cancel": "İptal",
+				"tools.cancelledNote": "İptal edildi: tamamlanan girdiler sonuçlarını korur; kalanlar atlandı.",
+				"tools.kind.cancelled": "İptal edildi",
+				"tools.kind.skipped": "Atlandı",
+				"tools.kind.timeout": "Zaman aşımı",
+				"tools.kind.network": "Ağ hatası",
 				"tools.resultOk": "başarılı",
 				"tools.resultFail": "başarısız",
 				"tools.installing": "Kuruluyor…",
@@ -1502,6 +1604,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "Mới nhất",
 				"tools.adminHint": "Cần quyền quản trị: cửa sổ UAC sẽ hiện ra — hãy xác nhận trên máy này",
 				"tools.working": "Đang xử lý",
+				"tools.cancel": "Hủy bỏ",
+				"tools.cancelledNote": "Đã hủy: các mục đã xong giữ nguyên kết quả; phần còn lại đã bỏ qua.",
+				"tools.kind.cancelled": "Đã hủy",
+				"tools.kind.skipped": "Đã bỏ qua",
+				"tools.kind.timeout": "Hết thời gian",
+				"tools.kind.network": "Lỗi mạng",
 				"tools.resultOk": "thành công",
 				"tools.resultFail": "thất bại",
 				"tools.installing": "Đang cài…",
@@ -1582,6 +1690,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "已經最新",
 				"tools.adminHint": "需要管理員權限:會彈出 UAC 視窗,請喺電腦度確認",
 				"tools.working": "處理緊",
+				"tools.cancel": "取消",
+				"tools.cancelledNote": "已取消:完成的項目保留結果,其餘已跳過。",
+				"tools.kind.cancelled": "已取消",
+				"tools.kind.skipped": "已跳過",
+				"tools.kind.timeout": "逾時",
+				"tools.kind.network": "網絡失敗",
 				"tools.resultOk": "成功",
 				"tools.resultFail": "失敗",
 				"tools.installing": "安裝緊…",
@@ -1662,6 +1776,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "已經最新",
 				"tools.adminHint": "需要管理員權限:會彈出 UAC 視窗,請喺電腦度確認",
 				"tools.working": "處理緊",
+				"tools.cancel": "取消",
+				"tools.cancelledNote": "已取消:完成的項目保留結果,其餘已跳過。",
+				"tools.kind.cancelled": "已取消",
+				"tools.kind.skipped": "已跳過",
+				"tools.kind.timeout": "逾時",
+				"tools.kind.network": "網絡失敗",
 				"tools.resultOk": "成功",
 				"tools.resultFail": "失敗",
 				"tools.installing": "安裝緊…",
@@ -1742,6 +1862,12 @@ window.__ModuleLoader__.load({
 				"tools.state.current": "已是最新",
 				"tools.adminHint": "需要管理員權限:會彈出 UAC 視窗,請在這台電腦上確認",
 				"tools.working": "處理中",
+				"tools.cancel": "取消",
+				"tools.cancelledNote": "已取消:完成的項目保留結果,其餘已跳過。",
+				"tools.kind.cancelled": "已取消",
+				"tools.kind.skipped": "已跳過",
+				"tools.kind.timeout": "逾時",
+				"tools.kind.network": "網路失敗",
 				"tools.resultOk": "成功",
 				"tools.resultFail": "失敗",
 				"tools.installing": "安裝中…",
@@ -1763,6 +1889,15 @@ window.__ModuleLoader__.load({
 			return Object.prototype.hasOwnProperty.call(bag, key);
 		}
 
+		/* Issue #35: how long the entry in flight has been running, in the
+		   locale-neutral "2m13s" / "47s" form — a duration needs no words. */
+		function formatElapsed(ms) {
+			var total = Math.max(0, Math.round(ms / 1000));
+			var m = Math.floor(total / 60);
+			var s = total % 60;
+			return m > 0 ? m + "m" + (s < 10 ? "0" + s : "" + s) + "s" : s + "s";
+		}
+
 		/* Resolve one locale tag against what this plugin ships: the exact tag,
 		   then the primary subtag, then English. Chinese is special-cased because
 		   the traditional variants are shipped while a bare zh-Hant-* is not
@@ -1890,6 +2025,10 @@ window.__ModuleLoader__.load({
 			".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-st-skip{color:var(--dsw-alias-label-tertiary)}",
+			".gb-toolElapsed{flex:none;font-size:calc(11px + var(--dsh-content-font-delta-secondary, 0px));color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums}",
+			".gb-toolCancel{flex:none;padding:1px 10px}",
+			".gb-toolTail{margin:0 0 4px;font-size:calc(11px + var(--dsh-content-font-delta-secondary, 0px));line-height:1.4;color:var(--dsw-alias-label-tertiary);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}",
 			".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}",
@@ -2570,6 +2709,19 @@ window.__ModuleLoader__.load({
 					.then(function () { setToolBusy(false); });
 			}
 
+			function cancelTools() {
+				// Issue #35: the host kills the whole winget process tree; the job
+				// stays current (finished, cancelled) so the card can show what
+				// happened, and `clear` forgets it when the view closes.
+				return fetch(TOOLS_URL + "?action=cancel", { method: "POST", headers: { "content-type": "application/json" } })
+					.then(function (res) {
+						if (!res.ok) throw new Error("HTTP " + res.status);
+						return res.json();
+					})
+					.then(function (data) { setToolJob(data !== null && typeof data === "object" && data.job ? data.job : null); })
+					.catch(function (err) { setToolErr(String((err && err.message) || err)); });
+			}
+
 			var toolsSection = fold("sec.tools",
 					toolsData === null && toolErr === "" ? E("p", { className: "gb-hint" }, t("tools.loading")) : null,
 					toolErr !== "" ? E("p", { className: "gb-error" }, toolErr) : null,
@@ -2590,8 +2742,19 @@ window.__ModuleLoader__.load({
 									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"));
+								/* Issue #35: the ending matters — cancelled/skipped are not
+								   failures, a timeout and a wedged download are not the
+								   same as winget saying no. Skipped entries are neutral. */
+								var okBadge = entry.ok === true;
+								var kindKey = okBadge ? "tools.resultOk"
+									: entry.kind === "cancelled" ? "tools.kind.cancelled"
+									: entry.kind === "skipped" ? "tools.kind.skipped"
+									: entry.kind === "timeout" ? "tools.kind.timeout"
+									: entry.kind === "network" ? "tools.kind.network"
+									: "tools.resultFail";
+								var mark = okBadge ? "✓ " : (entry.kind === "skipped" ? "– " : "✗ ");
+								var stateClass = okBadge ? "gb-st-ok" : (entry.kind === "skipped" ? "gb-st-skip" : "gb-st-fail");
+								badge = E("span", { className: "gb-toolState " + stateClass }, mark + t(kindKey));
 							} else {
 								badge = E("span", { className: "gb-toolState gb-st-" + row.state }, t("tools.state." + row.state));
 							}
@@ -2611,7 +2774,9 @@ window.__ModuleLoader__.load({
 								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) {
+							/* Skipped entries have nothing to explain ("cancelled before
+							   this entry started") — only real verdicts print a line. */
+							if (entry !== undefined && entry.ok !== true && entry.kind !== "skipped") {
 								acc.push(E("p", { key: row.id + ":fail", className: "gb-toolFail" },
 									t(entry.action === "upgrade" ? "tools.updating" : "tools.installing") + " — " + t("tools.resultFail") + ": " + (entry.detail || "")));
 							}
@@ -2636,11 +2801,26 @@ window.__ModuleLoader__.load({
 							E("span", { className: "gb-spin" }),
 							E("span", { className: "gb-rowLabel" }, (activeCmd !== "" ? activeCmd + " · " : "") + t("tools.working") + ":"),
 							E("span", { className: "gb-rowValue" }, toolJob.done + " / " + toolJob.total),
+							/* Issue #35: how long the entry in flight has been running —
+							   the difference between "slow UAC wait" and "wedged download"
+							   is exactly this number. Locale-neutral 2m13s form; refreshed
+							   by the 1.2s poll, so no timer of its own. */
+							E("span", { className: "gb-toolElapsed" }, formatElapsed(Date.now() - (toolJob.currentSince || toolJob.startedAt || Date.now()))),
+							E("button", {
+								type: "button",
+								className: "gb-segBtn gb-toolCancel",
+								onClick: cancelTools,
+							}, t("tools.cancel")),
 						),
+						/* The freshest winget line ("Failed to download, waiting a bit
+						   and retry"): the one signal that distinguishes a wedged
+						   download from a quiet UAC wait. One grey line, not a log. */
+						typeof toolJob.lastOutput === "string" && toolJob.lastOutput !== "" ? E("p", { className: "gb-toolTail" }, toolJob.lastOutput) : null,
 						E("div", { className: "gb-jobBar" },
 							E("div", { className: "gb-jobBarFill", style: { width: jobPct + "%" } }),
 						),
 					) : null,
+					toolJob !== null && toolJob.finished === true && toolJob.cancelled === true ? E("p", { className: "gb-hint" }, t("tools.cancelledNote")) : null,
 					E("p", { className: "gb-hint" }, t("tools.hint")),
 			);
 

package/src/index.js

@@ -308,7 +308,7 @@ import {
   restoreOpsBash,
 } from './ops-adopt.js'
 import {
-  clearToolJob, currentToolJob, defaultRunnerIo, fenceToolRequest,
+  cancelToolJob, clearToolJob, currentToolJob, defaultRunnerIo, fenceToolRequest,
   probeToolchain, readJsonBody, startToolJob,
 } from './tool-runner.js'
 
@@ -2660,6 +2660,10 @@ export async function apply(ctx, config = {}) {
             return {
               id: job.id, action: job.action, total: job.total, done: job.done,
               current: job.current, finished: job.finished, results: job.results.slice(),
+              // v0.43.0 (issue #35): elapsed time, the freshest winget line,
+              // and the cancelled state, so the card can show them.
+              startedAt: job.startedAt, currentSince: job.currentSince,
+              lastOutput: job.lastOutput, cancelled: job.cancelled === true,
             }
           }
           const handler = async (req, res) => {
@@ -2675,6 +2679,14 @@ export async function apply(ctx, config = {}) {
             try {
               if (method === 'POST') {
                 const action = query.get('action') || ''
+                if (action === 'cancel') {
+                  // v0.43.0 (issue #35): kill the in-flight tree, mark the rest
+                  // skipped. The cancelled job stays current until finished so
+                  // the card can show what happened; `clear` then forgets it.
+                  cancelToolJob('')
+                  send(res, 200, { ok: true, job: snapshot() })
+                  return
+                }
                 if (action === 'clear') {
                   clearToolJob('')
                   send(res, 200, { ok: true, job: null })

package/src/tool-runner.js

@@ -25,7 +25,7 @@
  * module is testable without winget, Windows, or a network.
  */
 
-import { execFile } from 'node:child_process'
+import { spawn } from 'node:child_process'
 import { readdirSync, readFileSync, rmSync, statSync } from 'node:fs'
 import { randomUUID } from 'node:crypto'
 import { tmpdir } from 'node:os'
@@ -42,6 +42,46 @@ import {
 const PROBE_TIMEOUT_MS = 60_000
 const INSTALL_TIMEOUT_MS = 15 * 60_000
 
+/** winget's own download-retry chatter (issue #35): when this shows up and the
+ *  process is STILL running one window later, the download is wedged — DO
+ *  falls back to WinINet, retries, and would otherwise burn the whole 15-minute
+ *  ceiling in silence. */
+export const NETWORK_RETRY_PATTERN = /failed to download, waiting a bit and retry|0x80072ee2|0x80072efd/i
+const NETWORK_RETRY_WINDOW_MS = 120_000
+/** Hard cap on the collected output of one run (mirrors the old maxBuffer). */
+const OUTPUT_CAP_BYTES = 16 * 1024 * 1024
+
+/** Kill a whole process tree. */
+function killTree(child) {
+  try {
+    if (!child || child.pid === undefined) return
+    if (process.platform === 'win32') {
+      spawn('taskkill', ['/PID', String(child.pid), '/T', '/F'], { windowsHide: true, stdio: 'ignore' })
+    } else {
+      child.kill('SIGKILL')
+    }
+  } catch { /* best effort — the verdict does not depend on the kill landing */ }
+}
+
+/** Sort a run result that ended through cancel / hard timeout / wedged
+ *  download from an ordinary winget failure (issue #35).
+ *  Only the run's OWN `cancelled` flag counts here: a cancel that lands AFTER
+ *  winget already exited must not rewrite a finished install into a cancelled
+ *  one — the loop skips the remaining entries instead. */
+function verdictFrom(result) {
+  if (result && result.cancelled === true) return { ok: false, kind: 'cancelled', detail: 'cancelled by the user' }
+  if (result && result.timedOut === true) return { ok: false, kind: 'timeout', detail: tailLine(result.output) || 'hard timeout' }
+  if (result && result.networkRetry === true) return { ok: false, kind: 'network', detail: tailLine(result.output) || 'download retried without progress' }
+  return classifyWingetResult(result.code, result.output)
+}
+
+/** The freshest full line of a run's output, capped — the one signal a stuck
+ *  download actually prints ("Failed to download, waiting a bit and retry"). */
+function tailLine(text) {
+  const lines = String(text || '').trimEnd().split(/\r?\n/)
+  return (lines[lines.length - 1] || '').slice(0, 300)
+}
+
 /** Only one job at a time: winget serializes on its own state anyway, and two
  *  concurrent installs is how a half-applied catalog happens. */
 let activeJob = null
@@ -49,22 +89,101 @@ let activeJob = null
 /**
  * The real IO. `run` never rejects: a non-zero exit is data, and a spawn
  * failure becomes a synthetic exit code so callers have one shape to handle.
+ *
+ * v0.43.0 (issue #35): the old `execFile` buffered the child's whole output,
+ * so a wedged winget download looked like "processing" for 15 minutes with
+ * nothing to watch and no way out. `spawn` streams instead: `hooks.onOutput`
+ * receives each line as it arrives, a hard timeout, an external
+ * `cancelActive()` and the download-retry watchdog below all end the run by
+ * killing the WHOLE process tree (winget dispatches forwarders / msiexec /
+ * DeliveryOptimization children — killing only the parent leaves them), and
+ * the result carries `cancelled` / `timedOut` / `networkRetry` so callers can
+ * sort those endings from ordinary failures.
+ * @param {{ networkRetryWindowMs?: number }} [options]
  * @returns {object}
  */
-export function defaultRunnerIo() {
+export function defaultRunnerIo(options = {}) {
+  const networkRetryWindowMs = Number(options.networkRetryWindowMs) > 0
+    ? Number(options.networkRetryWindowMs)
+    : NETWORK_RETRY_WINDOW_MS
+  /** The in-flight run: `{ child, flags }`, or null between runs. */
+  let current = null
   return {
-    run(file, args, timeoutMs) {
+    run(file, args, timeoutMs, hooks) {
+      const onOutput = hooks && typeof hooks.onOutput === 'function' ? hooks.onOutput : null
       return new Promise((resolve) => {
-        execFile(file, args, { windowsHide: true, timeout: timeoutMs || PROBE_TIMEOUT_MS, maxBuffer: 16 * 1024 * 1024 }, (error, stdout, stderr) => {
-          const output = String(stdout || '') + String(stderr || '')
-          if (error) {
-            const code = typeof error.code === 'number' ? error.code : -1
-            return resolve({ code, output: output || String(error.message || '') })
+        let settled = false
+        const flags = {}
+        const child = spawn(file, args, { windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] })
+        current = { child, flags }
+        let output = ''
+        let bytes = 0
+        const swallow = (chunk) => {
+          bytes += chunk.length
+          if (bytes <= OUTPUT_CAP_BYTES) output += chunk.toString('utf8')
+          if (onOutput !== null) {
+            // Keep only the freshest line (a 300-char tail): the card shows one
+            // grey line under the progress, not a log.
+            const line = String(chunk).split(/\r?\n/).filter(Boolean).pop()
+            if (line) onOutput(line.slice(0, 300))
           }
-          resolve({ code: 0, output })
+        }
+        child.stdout.on('data', swallow)
+        child.stderr.on('data', swallow)
+        // The wedged-download watchdog: from the FIRST retry line, a process
+        // still alive one window later is not making progress (winget cycles
+        // DO → WinINet → "waiting a bit and retry" for minutes). One window,
+        // once — a slow but working download never sees it.
+        let retryTimer = null
+        child.stderr.on('data', (chunk) => {
+          if (settled || flags.networkRetry || flags.timedOut || flags.cancelled || retryTimer !== null) return
+          if (NETWORK_RETRY_PATTERN.test(String(chunk))) {
+            retryTimer = setTimeout(() => {
+              retryTimer = null
+              if (settled || flags.timedOut || flags.cancelled) return
+              flags.networkRetry = true
+              killTree(child)
+            }, networkRetryWindowMs)
+          }
+        })
+        const timer = setTimeout(() => {
+          if (settled || flags.networkRetry || flags.cancelled) return
+          flags.timedOut = true
+          killTree(child)
+        }, timeoutMs || PROBE_TIMEOUT_MS)
+        child.on('error', (error) => {
+          if (settled) return
+          settled = true
+          clearTimeout(timer)
+          if (retryTimer !== null) { clearTimeout(retryTimer); retryTimer = null }
+          if (current !== null && current.child === child) current = null
+          resolve({ code: -1, output: output || String((error && error.message) || error) })
+        })
+        child.on('close', (code) => {
+          if (settled) return
+          settled = true
+          clearTimeout(timer)
+          if (retryTimer !== null) { clearTimeout(retryTimer); retryTimer = null }
+          if (current !== null && current.child === child) current = null
+          resolve({
+            code: typeof code === 'number' ? code : -1,
+            output,
+            ...(flags.cancelled === true ? { cancelled: true } : {}),
+            ...(flags.timedOut === true ? { timedOut: true } : {}),
+            ...(flags.networkRetry === true ? { networkRetry: true } : {}),
+          })
         })
       })
     },
+    /** Abort the in-flight run (issue #35). A no-op between runs; the run
+     *  resolves with `cancelled: true` once the tree is down. */
+    cancelActive() {
+      const entry = current
+      if (!entry || entry.child.exitCode !== null || entry.child.signalCode !== null) return false
+      entry.flags.cancelled = true
+      killTree(entry.child)
+      return true
+    },
     pathDirs() {
       return String(process.env.PATH || '').split(';').filter(Boolean)
     },
@@ -204,8 +323,18 @@ export async function runToolJob(io, request, onChange) {
     total: entries.length,
     done: 0,
     current: '',
+    // v0.43.0 (issue #35): observability + cancellation. `currentSince` times
+    // the entry in flight, `lastOutput` mirrors the freshest winget line,
+    // `cancelled` is set by cancelToolJob(), and `io` is kept so the cancel
+    // path can reach the process tree. The route's snapshot picks fields
+    // explicitly, so the io reference never reaches the wire.
+    startedAt: Date.now(),
+    currentSince: 0,
+    lastOutput: '',
+    cancelled: false,
     finished: false,
     results: [],
+    io,
   }
   activeJob = job
 
@@ -216,6 +345,20 @@ export async function runToolJob(io, request, onChange) {
     try {
       owned = await readWingetInventory(io)
     } catch (error) {
+      if (job.cancelled) {
+        // The cancel landed while the inventory was being read: nothing was
+        // attempted, so nothing may be reported as a failure.
+        job.results = entries.map((tool) => ({
+          id: tool.id, cmd: tool.cmd, action: mode === 'upgrade' ? 'upgrade' : 'install',
+          wingetId: tool.ids[0], admin: tool.admin === true, ok: false, kind: 'skipped',
+          detail: 'cancelled before this entry started',
+        }))
+        job.done = entries.length
+        job.current = ''
+        job.finished = true
+        if (onChange) onChange(job)
+        return job
+      }
       // Do not choose a preferred build or start an installer from an unknown inventory.
       job.results = entries.map(tool => ({
         id: tool.id, cmd: tool.cmd, action: mode === 'upgrade' ? 'upgrade' : 'install',
@@ -230,34 +373,42 @@ export async function runToolJob(io, request, onChange) {
   }
 
   for (const tool of entries) {
-    job.current = tool.cmd
-    if (onChange) onChange(job)
     const installed = owned.get(tool.id)
     const useUpgrade = mode === 'upgrade' || (mode === 'auto' && !!installed)
+    const base = {
+      id: tool.id,
+      cmd: tool.cmd,
+      action: useUpgrade ? 'upgrade' : 'install',
+      wingetId: installed ? installed.pkgId : tool.ids[0],
+      admin: tool.admin === true,
+    }
+    // A cancel lands between entries too: the remaining ones are skipped, not
+    // failed (issue #35) — the user asked to stop, not to be told it broke.
+    if (job.cancelled) {
+      job.results.push({ ...base, ok: false, kind: 'skipped', detail: 'cancelled before this entry started' })
+      job.done += 1
+      if (onChange) onChange(job)
+      continue
+    }
+    job.current = tool.cmd
+    job.currentSince = Date.now()
+    if (onChange) onChange(job)
     const argv = useUpgrade ? upgradeArgv(tool, installed && installed.pkgId) : installArgv(tool)
+    const hooks = { onOutput: (line) => { job.lastOutput = line } }
     let verdict
     try {
-      const result = await io.run('winget', argv, INSTALL_TIMEOUT_MS)
-      verdict = classifyWingetResult(result.code, result.output)
+      const result = await io.run('winget', argv, INSTALL_TIMEOUT_MS, hooks)
+      verdict = verdictFrom(result)
       // An explicit "install" on something winget already owns is really an
       // upgrade request; retry as one so the user's click does the obvious thing.
-      if (!verdict.ok && !useUpgrade && verdict.kind === 'not-found' && installed) {
-        const retry = await io.run('winget', upgradeArgv(tool, installed.pkgId), INSTALL_TIMEOUT_MS)
-        verdict = classifyWingetResult(retry.code, retry.output)
+      if (!verdict.ok && !useUpgrade && verdict.kind === 'not-found' && installed && !job.cancelled) {
+        const retry = await io.run('winget', upgradeArgv(tool, installed.pkgId), INSTALL_TIMEOUT_MS, hooks)
+        verdict = verdictFrom(retry)
       }
     } catch (error) {
       verdict = { ok: false, kind: 'failed', detail: String((error && error.message) || error) }
     }
-    job.results.push({
-      id: tool.id,
-      cmd: tool.cmd,
-      action: useUpgrade ? 'upgrade' : 'install',
-      wingetId: installed ? installed.pkgId : tool.ids[0],
-      admin: tool.admin === true,
-      ok: verdict.ok,
-      kind: verdict.kind,
-      detail: verdict.detail,
-    })
+    job.results.push({ ...base, ok: verdict.ok, kind: verdict.kind, detail: verdict.detail })
     job.done += 1
     if (onChange) onChange(job)
   }
@@ -282,9 +433,34 @@ export function currentToolJob() {
   return activeJob
 }
 
-/** Forget a finished job (called when the card closes the progress view). */
+/**
+ * Cancel the active job: mark it, then kill the whole winget process tree so
+ * the in-flight entry ends immediately and the loop marks the rest skipped
+ * (issue #35). A no-op on a finished or missing job, or on an id mismatch.
+ * @param {string} [id] - when given, only that job is cancelled.
+ * @returns {object} the (possibly unchanged) current job.
+ */
+export function cancelToolJob(id) {
+  const job = activeJob
+  if (!job || job.finished) return currentToolJob()
+  if (id && job.id !== id) return job
+  job.cancelled = true
+  try { if (job.io && typeof job.io.cancelActive === 'function') job.io.cancelActive() } catch { /* best effort */ }
+  return job
+}
+
+/** Forget a finished job (called when the card closes the progress view).
+ *  Closing it MID-RUN now cancels instead: the old clear just dropped the
+ *  activeJob lock and let a second job race the still-running winget — a
+ *  half-applied catalog was one click away (issue #35). */
 export function clearToolJob(id) {
-  if (activeJob && (!id || activeJob.id === id)) activeJob = null
+  const job = activeJob
+  if (!job) return
+  if (!job.finished) {
+    cancelToolJob(id)
+    return
+  }
+  if (!id || job.id === id) activeJob = null
 }
 
 // ── request fencing ─────────────────────────────────────────────────────────