dsh-disk-cleaner 1.6.8 → 1.6.9

package/README.md

@@ -5,7 +5,7 @@
 <!-- badges -->
 | | |
 | --- | --- |
-| **version** | `1.6.8` |
+| **version** | `1.6.9` |
 | **DSH** | `0.2.1-rc.5`（开发与实测版本；用到 `plugins.bundle.config`、`settings.section`） |
 | **license** | [MIT](LICENSE) |
 | **Node** | `>= 22`（仅运行冒烟测试需要） |
@@ -166,16 +166,16 @@ These are enforced in `lib/catalog.js` and must not be relaxed:
 
 Listed in the curated [awesome-dsh-plugin](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin) catalog, which powers **dshmarket → Discover** ([PR #12970](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin/pull/12970), merged): search **dsh-disk-cleaner** there and install it in one click. The direct installs below do the same thing by hand.
 
-Published on npm as [`dsh-disk-cleaner`](https://www.npmjs.com/package/dsh-disk-cleaner) — latest `1.6.8`:
+Published on npm as [`dsh-disk-cleaner`](https://www.npmjs.com/package/dsh-disk-cleaner) — latest `1.6.9`:
 
 ```bash
 npm i dsh-disk-cleaner
 ```
 
-A prebuilt tarball is attached to the [v1.6.8 Release](https://github.com/stallenlu/dsh-disk-cleaner/releases/tag/v1.6.8); installing from it skips DSH's build-approval step:
+A prebuilt tarball is attached to the [v1.6.9 Release](https://github.com/stallenlu/dsh-disk-cleaner/releases/tag/v1.6.9); installing from it skips DSH's build-approval step:
 
 ```bash
-dsh plugin --profile <profile> add https://github.com/stallenlu/dsh-disk-cleaner/releases/download/v1.6.8/dsh-disk-cleaner-1.6.8.tgz
+dsh plugin --profile <profile> add https://github.com/stallenlu/dsh-disk-cleaner/releases/download/v1.6.9/dsh-disk-cleaner-1.6.9.tgz
 ```
 
 Then enable it in the profile — in `$DSH_PROFILE_DIR/package.json`:
@@ -183,7 +183,7 @@ Then enable it in the profile — in `$DSH_PROFILE_DIR/package.json`:
 ```json
 {
   "dependencies": {
-    "dsh-disk-cleaner": "^1.6.8"
+    "dsh-disk-cleaner": "^1.6.9"
   },
   "dsh": {
     "profile": {
@@ -204,7 +204,7 @@ The bundle's own `cordis.patch.yml` inserts the plugin row; no profile patch edi
 ### Development
 
 ```bash
-node smoke.mjs                       # 110 assertions, zero dependencies
+node smoke.mjs                       # 114 assertions, zero dependencies
 node --check lib/client.js           # and lib/index.js, lib/catalog.js, lib/audit.js, lib/plan.js
 ```
 
@@ -233,6 +233,7 @@ What the smoke test deliberately does **not** cover: anything that walks a real
 | A dry run reports what a real run frees | The 30-day rewind window reports 263 KB not 283 MB, and scan matches the dry run |
 | Grouping and folding | The real `groupRows` runs out of the bundle against a mixed list: fixed order, per-section totals, an unknown group lands in "other", an empty section is the folded one. A click on a section head folds that section and only that one, and a folded section's rows drop out of bulk select |
 | Visual layout | Checked by hand in the running Web UI. No browser automation here, so this one is a human check, not a test. |
+| The confirmation follows the panel theme | `node smoke.mjs` regression assertion: both confirm sites render `ConfirmDialog`, `window.confirm` appears nowhere, and the dialog is styled with the baseline tokens |
 | Agent tool returns a string matching its output schema | `node smoke.mjs` regression assertion (the 1.6.1 fix) |
 | A real agent-tool delete invalidates the assessment cache | `node smoke.mjs` regression assertion (the 1.6.1 fix) |
 
@@ -258,23 +259,24 @@ What the smoke test deliberately does **not** cover: anything that walks a real
 ```
 ├─ package.json           dsh.bundle.patch + dsh.client { platform: "web" }
 ├─ cordis.patch.yml       - insert:  id: dsh-disk-cleaner
-├─ lib/index.js    (506)  Host: HTTP route + disk_cleaner tool, same run() for both; reveal
+├─ lib/index.js    (525)  Host: HTTP route + disk_cleaner tool, same run() for both; reveal
 ├─ lib/catalog.js  (1242)  The 32 targets, measurePath / purgePath / resolveTargets / drives
 ├─ lib/audit.js    (365)  Read-only assessment, 10-minute cache, areaPaths, exposes no deletion
 ├─ lib/plan.js     (150)  Pure: measurements → ordered steps
 ├─ lib/history.js   (71)  Append-only run log in $DSH_HOME/dsh-disk-cleaner; never throws
-├─ lib/client.js  (1808)  Client half: slots, panel, preferences, zh/en dictionaries, CSS
+├─ lib/client.js  (1939)  Client half: slots, panel, preferences, zh/en dictionaries, CSS
 ├─ locale/{en,zh}.json    Display metadata (meta.title / meta.description)
 ├─ icon.svg               Plugin icon
 ├─ README.md              This file
 ├─ LICENSE                MIT
-└─ smoke.mjs              110 assertions, zero dependencies
+└─ smoke.mjs              114 assertions, zero dependencies
 ```
 
 Client-half slots: `sidebar.panellist` (order 50, disposed in settings-only mode), `main` (keyed by the package name), `settings.section` (order 30, disposed in sidebar-only mode), `plugins.bundle.config` (keyed by the package name).
 
 ### What's new
 
+- **1.6.9** — The one white box left in a dark panel is gone. The confirmation was `window.confirm`, which the browser draws outside the document: it cannot see `color-scheme`, the baseline tokens or the host theme, so a dark panel got a light rectangle in the middle of it. It is now a dialog the panel draws itself — same information (how many, how much, every target with its size, anything irreversible), painted with `--dsb-*`, dismissible with Escape, the overlay or Cancel, and the destructive button deliberately holds no focus so a stray Enter cannot delete. The plan-step confirmation goes through the same component. No behaviour change beyond the painting.
 - **1.6.8** — Fixes the other half of the 1.6.7 story: the panel still answered "origin rejected" when the desktop window sent `Origin: http://localhost:<port>` while the request itself arrived at `127.0.0.1`, because the check compared those strings literally. The gate now decides on the **peer address** of the connection — something a remote page cannot influence — and only then looks at `Origin`: the app's own scheme, no `Origin` at all, or any loopback host name is accepted, everything else is still refused. An `https://evil.example` origin is rejected even from a loopback socket. The three assessment error paths (evaluate, reveal, run-a-plan-step) now go through the same translated-code path as the rest of the panel, so a Chinese user sees "请求来源不被接受" rather than the raw `origin rejected` string.
 - **1.6.7** — Fixes a regression 1.6.6 shipped: refusing every request without an `Origin` header locked the plugin's own panel out of its API ("请求来源不被接受"), because the desktop window posts from `dsh-app://app`, not from `http://127.0.0.1:<port>`. The check now accepts the desktop scheme and a header the desktop forwarder stripped, but only when the request already arrived on a loopback address; a plain web page still cannot reach a loopback port without sending an `Origin`, so the door stays shut. No other behaviour changed.
 - **1.6.6** — The results the plugin already computed are now shown. A **Dry run** button next to *Clean* asks the exact same question without `confirm`, so you see what a delete would free before anything goes; the result banner then survives the rescan that follows it (it used to be erased a line later). Plan steps name targets in words instead of printing `npm-cache, chrome-cache, pip-cache`, an empty plan says "nothing worth doing" instead of rendering a hole, and route errors arrive as a stable `code` the panel translates, so a Chinese user never reads `origin rejected` or `unknown target: x`. Every real clean now appends one line to `$DSH_HOME/dsh-disk-cleaner/history.jsonl`, and a **Clean history** panel reads it back with a *Copy as CSV* button. Under the hood: scan walks four targets at a time instead of all 32 at once, `SystemRoot` decides where the Windows targets live instead of a hardcoded `C:`, a request without an `Origin` header is refused unless it arrived on loopback (see 1.6.7), and a refused directory removal is counted separately from a legitimately full one.
@@ -441,16 +443,16 @@ Client-half slots: `sidebar.panellist` (order 50, disposed in settings-only mode
 
 已收录进精选目录 [awesome-dsh-plugin](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin)，它是 **dshmarket → 发现** 的数据源（[PR #12970](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin/pull/12970)，已合并）：在 dshmarket 里搜索 **dsh-disk-cleaner** 即可一键安装。下面的直接安装方式就是手动做同一件事。
 
-已发布到 npm：[`dsh-disk-cleaner`](https://www.npmjs.com/package/dsh-disk-cleaner)，最新版 `1.6.8`。
+已发布到 npm：[`dsh-disk-cleaner`](https://www.npmjs.com/package/dsh-disk-cleaner)，最新版 `1.6.9`。
 
 ```bash
 npm i dsh-disk-cleaner
 ```
 
-[v1.6.8 Release](https://github.com/stallenlu/dsh-disk-cleaner/releases/tag/v1.6.8) 还附带一个预构建 tarball，从它安装可跳过 DSH 的构建授权步骤：
+[v1.6.9 Release](https://github.com/stallenlu/dsh-disk-cleaner/releases/tag/v1.6.9) 还附带一个预构建 tarball，从它安装可跳过 DSH 的构建授权步骤：
 
 ```bash
-dsh plugin --profile <profile> add https://github.com/stallenlu/dsh-disk-cleaner/releases/download/v1.6.8/dsh-disk-cleaner-1.6.8.tgz
+dsh plugin --profile <profile> add https://github.com/stallenlu/dsh-disk-cleaner/releases/download/v1.6.9/dsh-disk-cleaner-1.6.9.tgz
 ```
 
 然后在 profile 里启用 —— 在 `$DSH_PROFILE_DIR/package.json`：
@@ -458,7 +460,7 @@ dsh plugin --profile <profile> add https://github.com/stallenlu/dsh-disk-cleaner
 ```json
 {
   "dependencies": {
-    "dsh-disk-cleaner": "^1.6.8"
+    "dsh-disk-cleaner": "^1.6.9"
   },
   "dsh": {
     "profile": {
@@ -479,7 +481,7 @@ bundle 自带的 `cordis.patch.yml` 会插入插件行，无需改 profile 的 p
 ### 开发
 
 ```bash
-node smoke.mjs                       # 110 条断言，零依赖
+node smoke.mjs                       # 114 条断言，零依赖
 node --check lib/client.js           # 以及 lib/index.js、lib/catalog.js、lib/audit.js、lib/plan.js
 ```
 
@@ -508,6 +510,7 @@ node --check lib/client.js           # 以及 lib/index.js、lib/catalog.js、li
 | 预演报告的字节数等于真删能释放的字节数 | 30 天的回滚窗口报 263 KB 而不是 283 MB，且扫描结果与预演一致 |
 | 分类与折叠 | 从 bundle 里取出真正的 `groupRows` 跑一组混合数据：顺序固定、按类合计、未知类别落到「其他」、空的类别是收起来的那个。点某一类的标题只折叠这一类，折叠里的行不参与批量选择 |
 | 视觉排版 | 在运行中的 Web UI 里手工确认过。本环境没有浏览器自动化，所以这条是人眼检查，不是测试。 |
+| 确认框跟随面板主题 | `node smoke.mjs` 回归断言：两处确认都渲染 `ConfirmDialog`、代码里不再出现 `window.confirm`、弹层只用基线令牌上色 |
 | agent 工具返回字符串且与 output.schema 一致 | `node smoke.mjs` 回归断言（1.6.1 修复） |
 | agent 工具真删后评估缓存失效 | `node smoke.mjs` 回归断言（1.6.1 修复） |
 
@@ -533,23 +536,24 @@ node --check lib/client.js           # 以及 lib/index.js、lib/catalog.js、li
 ```
 ├─ package.json           dsh.bundle.patch + dsh.client { platform: "web" }
 ├─ cordis.patch.yml       - insert:  id: dsh-disk-cleaner
-├─ lib/index.js    (506)  Host：HTTP 路由 + disk_cleaner 工具，共用同一个 run()，含 reveal
+├─ lib/index.js    (525)  Host：HTTP 路由 + disk_cleaner 工具，共用同一个 run()，含 reveal
 ├─ lib/catalog.js  (1242)  32 个目标，measurePath / purgePath / resolveTargets / drives
 ├─ lib/audit.js    (365)  只读评估，10 分钟缓存，带 areaPaths，不暴露任何删除
 ├─ lib/plan.js     (150)  纯函数：测量结果 → 有序步骤
 ├─ lib/history.js   (71)  只追加的运行日志，落在 $DSH_HOME/dsh-disk-cleaner；永不抛错
-├─ lib/client.js  (1808)  Client 半面：slot、面板、偏好、zh/en 字典、CSS
+├─ lib/client.js  (1939)  Client 半面：slot、面板、偏好、zh/en 字典、CSS
 ├─ locale/{en,zh}.json    展示元数据（meta.title / meta.description）
 ├─ icon.svg               插件图标
 ├─ README.md              本文件
 ├─ LICENSE                MIT
-└─ smoke.mjs              110 条断言，零依赖
+└─ smoke.mjs              114 条断言，零依赖
 ```
 
 Client 半面注册的 slot：`sidebar.panellist`（order 50，仅设置页模式下拆除）、`main`（以包名为 key）、`settings.section`（order 30，仅侧边栏模式下拆除）、`plugins.bundle.config`（以包名为 key）。
 
 ### 更新记录
 
+- **1.6.9** — 深色面板里最后一块白框没了。确认框原来是 `window.confirm`，它由浏览器画在文档之外：读不到 `color-scheme`、读不到基线令牌、也不跟宿主主题，于是深色面板中间出现一个浅色矩形。现在改成面板自己画的弹层：信息一条不少（几项、多少字节、每个目标的名称与大小、哪些不可恢复），用 `--dsb-*` 上色，Escape、点遮罩、点取消都能退出，危险按钮刻意不自动聚焦，免得顺手一个回车就删了。计划步骤的确认走同一个组件。除绘制方式外没有行为变化。
 - **1.6.8** — 补上 1.6.7 的另一半：桌面窗口如果发的是 `Origin: http://localhost:<端口>`、而请求实际到达 `127.0.0.1`，1.6.7 仍然会报「origin rejected」——因为它逐字比较这两个字符串。现在判定改为看**连接的来源地址**（远端网页无法影响这个值），再看 `Origin`：桌面自有协议、压根没有 `Origin`、或任何 loopback 主机名都放行，其余照旧拒绝；即便是 loopback 连接，`https://evil.example` 也进不来。空间评估的三条错误路径（评估、打开位置、跑计划步骤）统一走面板已有的「稳定 code → 中文文案」通道，不会再直接显示原始英文串。
 - **1.6.7** — 修掉 1.6.6 带进来的一个回归：把「没有 Origin 头的请求」一律拒绝，连插件自己的面板都进不了接口（界面报「请求来源不被接受」）——桌面窗口发请求时 Origin 是 `dsh-app://app`，不是 `http://127.0.0.1:<端口>`。现在的判定接受桌面协议，也接受被桌面转发层剥掉的头，但前提是请求本身已经到达 loopback 地址；普通网页不发 Origin 就到不了 loopback 端口，所以门仍然是关的。其余行为没变。
 - **1.6.6** — 把插件本来就算出来的结果真正显示出来。*清理* 旁边多了 **预演** 按钮：发同一个请求但不带 `confirm`，删之前就能看到会释放多少；清理结果横幅不再被紧随其后的重新扫描抹掉（以前下一行就被清空）。计划步骤改用目标名称，不再直出 `npm-cache, chrome-cache, pip-cache`；没有可做的事时说明「现在没有值得动手的地方」，而不是留一片空白；接口错误改带稳定 `code`，由面板翻成中文，不会再出现 `origin rejected` 或 `unknown target: x`。每次真正清理都会往 `$DSH_HOME/dsh-disk-cleaner/history.jsonl` 追加一行，新增的 **清理记录** 面板可读回并按 *复制为 CSV* 导出。底层：扫描从「32 个目标同时跑」改为每次 4 个，Windows 目标路径改由 `SystemRoot` 决定而不再硬编码 `C:`，缺少 `Origin` 头的请求会被拒绝（这项判定在 1.6.7 收紧到只放行 loopback，见下），目录删除被拒与非空目录被跳过分别计数。

package/lib/client.js

@@ -99,8 +99,11 @@ window.__ModuleLoader__.load({
       scanError: '扫描失败',
       cleanError: '清理失败',
       cleanConfirm: '删除选中缓存目录里的文件？正在使用的文件会被跳过。',
-      cleanConfirmList: '即将清理 {n} 项，合计 {bytes}：\n\n{list}\n\n回收站等不可恢复的项目会单独标出。',
-      cleanConfirmIrreversible: '\n\n注意：其中「回收站」清空后无法恢复。',
+      cleanConfirmList: '即将清理 {n} 项，合计 {bytes}：',
+      cleanConfirmIrreversible: '其中「回收站」清空后无法恢复。',
+      confirmOk: '确认清理',
+      confirmCancel: '取消',
+      confirmTitle: '清理前确认',
       truncatedHint: '这个目录太大，只统计/清理了前 {n} 条，实际释放可能少于这个数。',
       dryRunHint: '预演完成：没有删除任何文件。',
       wouldFree: '可释放',
@@ -301,8 +304,11 @@ window.__ModuleLoader__.load({
       scanError: 'Scan failed',
       cleanError: 'Clean failed',
       cleanConfirm: 'Delete the files in the selected cache directories? Files in use are skipped.',
-      cleanConfirmList: 'About to clean {n} target(s), {bytes} in total:\n\n{list}\n\nAnything irreversible is called out separately.',
-      cleanConfirmIrreversible: '\n\nNote: emptying the Recycle Bin cannot be undone.',
+      cleanConfirmList: 'About to clean {n} target(s), {bytes} in total:',
+      cleanConfirmIrreversible: 'Emptying the Recycle Bin cannot be undone.',
+      confirmOk: 'Clean these',
+      confirmCancel: 'Cancel',
+      confirmTitle: 'Confirm before cleaning',
       truncatedHint: 'This folder is too large: only the first {n} entries were measured or removed, so less may be freed.',
       dryRunHint: 'Dry run finished: nothing was deleted.',
       wouldFree: 'Could free',
@@ -547,6 +553,17 @@ window.__ModuleLoader__.load({
       .dsc-audit-label { font-weight: 600; }
       .dsc-audit-why { color: var(--dsb-text-secondary); font-size: 11px; line-height: 16px; }
       .dsc-audit-size { flex: none; min-width: 72px; text-align: right; font-variant-numeric: tabular-nums; font-weight: 600; }
+      .dsc-overlay { position: fixed; inset: 0; z-index: 60; display: flex; align-items: center; justify-content: center; padding: 24px; background: color-mix(in srgb, var(--dsb-text) 42%, transparent); }
+      .dsc-dialog { box-sizing: border-box; width: min(520px, 100%); max-height: min(78vh, 720px); display: flex; flex-direction: column; background: var(--dsb-surface); color: var(--dsb-text); border: 1px solid var(--dsb-line-strong); border-radius: var(--dsb-radius); box-shadow: 0 18px 48px color-mix(in srgb, var(--dsb-text) 28%, transparent); }
+      .dsc-dialog-head { display: flex; align-items: center; gap: 8px; padding: 14px 16px 10px; border-bottom: 1px solid var(--dsb-line-strong); }
+      .dsc-dialog-title { flex: 1; font-size: 14px; font-weight: 600; }
+      .dsc-dialog-x { width: 26px; height: 26px; display: inline-flex; align-items: center; justify-content: center; border: 0; border-radius: var(--dsb-radius-sm); background: transparent; color: var(--dsb-text-secondary); font-size: 18px; line-height: 1; cursor: pointer; }
+      .dsc-dialog-x:hover { background: var(--dsb-hover); color: var(--dsb-text); }
+      .dsc-dialog-body { padding: 12px 16px; overflow-y: auto; }
+      .dsc-dialog-lead { margin: 0 0 8px; font-size: 13px; line-height: 1.6; }
+      .dsc-dialog-list { margin: 0; padding: 0 0 0 2px; list-style: none; font-size: 12px; line-height: 1.9; color: var(--dsb-text-secondary); }
+      .dsc-dialog-warn { margin: 10px 0 0; font-size: 12px; line-height: 1.6; color: var(--dsb-accent-error); }
+      .dsc-dialog-actions { display: flex; justify-content: flex-end; gap: 8px; padding: 12px 16px 14px; border-top: 1px solid var(--dsb-line-strong); }
       .dsc-settings { display: flex; flex-direction: column; gap: 12px; }
       .dsc-settings .dsc-card { margin: 0; }
       .dsc-embedded { border-top: 1px solid var(--dsb-line-strong); padding-top: 12px; }
@@ -818,6 +835,74 @@ window.__ModuleLoader__.load({
       );
     }
 
+
+    /**
+     * A confirmation the page draws, not the platform.
+     *
+     * `window.confirm` renders outside the document: it cannot see `color-scheme`, the baseline
+     * tokens or the host's dark theme, so a dark panel got a white box in the middle of it. This
+     * is the same information — how many, how much, which targets, what cannot be undone — drawn
+     * with the panel's own tokens. Escape cancels; the confirm button holds no focus by default,
+     * so a stray Enter cannot delete anything.
+     */
+    function ConfirmDialog({ t, count, bytes, list, irreversible, onYes, onNo }) {
+      useEffect(() => {
+        const onKey = (event) => {
+          if (event.key === 'Escape') {
+            event.preventDefault();
+            onNo();
+          }
+        };
+        window.addEventListener('keydown', onKey);
+        return () => window.removeEventListener('keydown', onKey);
+      }, [onNo]);
+      return h(
+        'div',
+        { className: 'dsc-overlay', role: 'presentation', onClick: onNo },
+        h(
+          'div',
+          {
+            className: 'dsc-dialog',
+            role: 'dialog',
+            'aria-modal': 'true',
+            'aria-label': t('confirmTitle'),
+            onClick: (event) => event.stopPropagation(),
+          },
+          h(
+            'div',
+            { className: 'dsc-dialog-head' },
+            h('span', { className: 'dsc-dialog-title' }, t('confirmTitle')),
+            h(
+              'button',
+              { type: 'button', className: 'dsc-dialog-x', onClick: onNo, 'aria-label': t('confirmCancel') },
+              '\u00d7',
+            ),
+          ),
+          h(
+            'div',
+            { className: 'dsc-dialog-body' },
+            h(
+              'p',
+              { className: 'dsc-dialog-lead' },
+              t('cleanConfirmList').replace('{n}', String(count)).replace('{bytes}', formatBytes(bytes)),
+            ),
+            h(
+              'ul',
+              { className: 'dsc-dialog-list' },
+              list.map((line, index) => h('li', { key: `${index}/${line}` }, line)),
+            ),
+            irreversible ? h('p', { className: 'dsc-dialog-warn' }, t('cleanConfirmIrreversible')) : null,
+          ),
+          h(
+            'div',
+            { className: 'dsc-dialog-actions' },
+            h('button', { type: 'button', className: 'dsc-btn', onClick: onNo }, t('confirmCancel')),
+            h('button', { type: 'button', className: 'dsc-btn dsc-btn-danger', onClick: onYes }, t('confirmOk')),
+          ),
+        ),
+      );
+    }
+
     function Cleaner({ locale, embedded }) {
       const t = useTranslate(locale);
       // Settings live behind a header button, the way dsh-context does it: one obvious
@@ -829,6 +914,10 @@ window.__ModuleLoader__.load({
       const [rows, setRows] = usePersistent('rows', null);
       const [picked, setPicked] = usePersistent('picked', () => new Set());
       const [busy, setBusy] = useState('');
+      // A delete that is waiting for the user to say yes. Not window.confirm: that dialog is
+      // drawn by Chromium outside the page and ignores the theme, so it shows up white in a
+      // dark panel. `pending` holds the exact work that runs on confirm.
+      const [pending, setPending] = useState(null);
       const [notice, setNotice] = usePersistent('notice', null);
       const [error, setError] = usePersistent('error', '');
 
@@ -909,24 +998,8 @@ window.__ModuleLoader__.load({
        * is the number the delete would achieve. It never asks for confirmation: it deletes
        * nothing. A real run keeps asking.
        */
-      const runClean = async (dry) => {
-        const isDry = dry === true;
-        if (!rows || picked.size === 0) return;
-        const chosen = shown.filter((row) => picked.has(row.id));
-        if (!isDry && confirmFirst.get() === 'always') {
-          // A confirm box that does not say what it deletes is not a confirmation. Name the
-          // targets and the total, and call out anything that cannot be undone.
-          const bytes = chosen.reduce((sum, row) => sum + (row.bytes || 0), 0);
-          const list = chosen.map((row) => `· ${targetName(t, row.id)} — ${formatBytes(row.bytes)}`).join('\n');
-          const irreversible = chosen.some((row) => IRREVERSIBLE.has(row.id));
-          const text =
-            t('cleanConfirmList')
-              .replace('{n}', String(chosen.length))
-              .replace('{bytes}', formatBytes(bytes))
-              .replace('{list}', list) + (irreversible ? t('cleanConfirmIrreversible') : '');
-          if (!window.confirm(text)) return;
-        }
-        const ids = chosen.map((row) => row.id);
+      /** The delete itself, after any confirmation has been answered. */
+      const cleanNow = async (ids, isDry) => {
         setBusy('clean');
         setError('');
         setNotice(null);
@@ -960,6 +1033,29 @@ window.__ModuleLoader__.load({
         }
       };
 
+      /**
+       * A confirm box that does not say what it deletes is not a confirmation, so the dialog names
+       * every target with its size and calls out anything that cannot be undone. A dry run asks
+       * nothing: it deletes nothing.
+       */
+      const runClean = (dry) => {
+        const isDry = dry === true;
+        if (!rows || picked.size === 0) return;
+        const chosen = shown.filter((row) => picked.has(row.id));
+        const ids = chosen.map((row) => row.id);
+        if (isDry || confirmFirst.get() !== 'always') {
+          void cleanNow(ids, isDry);
+          return;
+        }
+        setPending({
+          count: chosen.length,
+          bytes: chosen.reduce((sum, row) => sum + (row.bytes || 0), 0),
+          list: chosen.map((row) => `${targetName(t, row.id)} — ${formatBytes(row.bytes)}`),
+          irreversible: chosen.some((row) => IRREVERSIBLE.has(row.id)),
+          run: () => void cleanNow(ids, false),
+        });
+      };
+
       const shown = rows && drive !== '' ? rows.filter((row) => row.pathCount > 0) : rows;
 
       // Only what the user toggled is stored; every other section falls back to "folded
@@ -1188,6 +1284,21 @@ window.__ModuleLoader__.load({
             ),
           ),
         ),
+        pending
+          ? h(ConfirmDialog, {
+              t,
+              count: pending.count,
+              bytes: pending.bytes,
+              list: pending.list,
+              irreversible: pending.irreversible,
+              onNo: () => setPending(null),
+              onYes: () => {
+                const action = pending;
+                setPending(null);
+                action.run();
+              },
+            })
+          : null,
         h(Audit, { t }),
         h(History, { t }),
             ],
@@ -1390,6 +1501,9 @@ window.__ModuleLoader__.load({
       // Where the last click opened: 24px of feedback beats a silent no-op on Windows,
       // which sometimes takes a second to raise the Explorer window.
       const [opened, setOpened] = useState('');
+      // A plan step waiting for a yes. Same dialog as the main button: a plan step is still a
+      // delete, and `reclaim-caution` can hold a target that cannot be undone.
+      const [pending, setPending] = useState(null);
 
       const run = useCallback(async (force) => {
         setBusy(true);
@@ -1451,20 +1565,7 @@ window.__ModuleLoader__.load({
       };
 
       /** Run a plan step the plugin is allowed to run, then re-measure so the plan is honest. */
-      const runStep = async (step) => {
-        if (confirmFirst.get() === 'always') {
-          // The same confirmation as the main button: a plan step is still a delete, and
-          // `reclaim-caution` can hold an irreversible target.
-          const ids = Array.isArray(step.ids) ? step.ids : [];
-          const list = ids.map((id) => `· ${targetName(t, id)}`).join('\n');
-          const irreversible = ids.some((id) => IRREVERSIBLE.has(id));
-          const text =
-            t('cleanConfirmList')
-              .replace('{n}', String(ids.length))
-              .replace('{bytes}', formatBytes(step.bytes || 0))
-              .replace('{list}', list) + (irreversible ? t('cleanConfirmIrreversible') : '');
-          if (!window.confirm(text)) return;
-        }
+      const cleanStep = async (step) => {
         setBusy(true);
         setError('');
         try {
@@ -1477,6 +1578,21 @@ window.__ModuleLoader__.load({
           setBusy(false);
         }
       };
+
+      const runStep = (step) => {
+        if (confirmFirst.get() !== 'always') {
+          void cleanStep(step);
+          return;
+        }
+        const ids = Array.isArray(step.ids) ? step.ids : [];
+        setPending({
+          count: ids.length,
+          bytes: step.bytes || 0,
+          list: ids.map((id) => targetName(t, id)),
+          irreversible: ids.some((id) => IRREVERSIBLE.has(id)),
+          run: () => void cleanStep(step),
+        });
+      };
       const GROUPS = [
         ['system', 'auditGroupSystem'],
         ['app', 'auditGroupApp'],
@@ -1556,6 +1672,21 @@ window.__ModuleLoader__.load({
                   )
                 : null,
               h(Plan, { plan: data.plan, t, busy, onRan: runStep }),
+              pending
+                ? h(ConfirmDialog, {
+                    t,
+                    count: pending.count,
+                    bytes: pending.bytes,
+                    list: pending.list,
+                    irreversible: pending.irreversible,
+                    onNo: () => setPending(null),
+                    onYes: () => {
+                      const action = pending;
+                      setPending(null);
+                      action.run();
+                    },
+                  })
+                : null,
             ]
           : null,
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-disk-cleaner",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "type": "module",
   "description": "Disk Cleaner for DSH: scan known-safe cache locations, see what they occupy, and reclaim the space from a panel or from the agent.",
   "keywords": [

package/smoke.mjs

@@ -211,7 +211,7 @@ check('preselect choice persisted', storage.get('dsc.pick') === 'none');
 check('confirm choice persisted', storage.get('dsc.confirm') === 'never');
 
 check('scan honours the preselect preference', source.includes('const want = defaultPick.get();'));
-check('clean honours the confirm preference', source.includes("confirmFirst.get() === 'always'"));
+check('clean honours the confirm preference', source.includes("confirmFirst.get() !== 'always'"));
 check('the settings page reuses the same rows', /function SettingsOptions\(\{ t \}\)[\s\S]{0,400}h\(ConfigRows, \{ t \}\)/.test(source));
 check('re-run asks the host to skip its cache', source.includes('onClick: () => run(true)') && source.includes("force === true ? { force: true } : {}"));
 check('an assessment row opens its folder', source.includes("call('reveal'") && source.includes('dsc-audit-row dsc-openable'));
@@ -377,11 +377,14 @@ check(
     (source.match(/!IRREVERSIBLE\.has\(row\.id\)/g) ?? []).length >= 2,
 );
 check(
-  'every confirm box names the targets and the total',
-  (source.match(/t\('cleanConfirmList'\)/g) ?? []).length === 2 &&
-    (source.match(/t\('cleanConfirmIrreversible'\)/g) ?? []).length === 2 &&
-    !/window\.confirm\(t\('cleanConfirm'\)\)/.test(source),
-  'a bare "delete these?" is not a confirmation, and the plan step is still a delete',
+  'every confirm box names the targets and the total, in a dialog the page draws',
+  source.includes("t('cleanConfirmList')") &&
+    source.includes("t('cleanConfirmIrreversible')") &&
+    source.includes('function ConfirmDialog(') &&
+    !/window\.confirm\(/.test(source) &&
+    (source.match(/h\(ConfirmDialog, \{/g) ?? []).length === 2,
+  'window.confirm is drawn by the browser outside the page, so it ignores the dark theme; ' +
+    'both the main button and a plan step must ask through the panel dialog',
 );
 check(
   'a clean that left files behind is not reported as a green success',
@@ -413,17 +416,51 @@ check(
     source.includes('QQ') ,
   'it only ever measures the QQGuild folder',
 );
-check('the version badge and package agree', pkg.version === '1.6.8');
+check('the version badge and package agree', pkg.version === '1.6.9');
 
 check(
   'a dry run is one click away and never sends confirm',
-  /const runClean = async \(dry\) => \{/.test(source) &&
+  /const runClean = \(dry\) => \{/.test(source) &&
     /const body = isDry \? \{ ids \} : \{ ids, confirm: true \};/.test(source) &&
     /onClick: \(\) => runClean\(true\)/.test(source) &&
     /onClick: \(\) => runClean\(false\)/.test(source),
   'the panel must be able to ask what a delete would free before doing it',
 );
 
+check(
+  'the dialog lists the targets itself, so the sentence holds no catalog ids or bullet text',
+  source.includes("className: 'dsc-dialog-list'") &&
+    source.includes("list.map((line, index) => h('li',") &&
+    !source.includes('{list}'),
+  'the template used to splice a newline-joined blob into one sentence; the list is markup now',
+);
+
+check(
+  'the confirmation is painted with the panel tokens, not by the platform',
+  source.includes('.dsc-overlay { position: fixed;') &&
+    source.includes('.dsc-dialog { box-sizing: border-box;') &&
+    /background: var\(--dsb-surface\)/.test(source) &&
+    /border: 1px solid var\(--dsb-line-strong\)/.test(source) &&
+    !/window\.confirm\(/.test(source),
+  'window.confirm ignores color-scheme and the baseline tokens, so a dark panel gets a white box',
+);
+
+check(
+  'the confirmation can be dismissed without deleting anything',
+  /if \(event\.key === 'Escape'\)/.test(source) &&
+    source.includes("className: 'dsc-overlay', role: 'presentation', onClick: onNo") &&
+    /className: 'dsc-btn dsc-btn-danger', onClick: onYes/.test(source),
+  'Escape, the overlay and the cancel button must all leave the files alone',
+);
+
+check(
+  'the destructive button does not take focus, so a stray Enter cannot delete',
+  source.includes('function ConfirmDialog(') &&
+    !/autoFocus/.test(source) &&
+    source.includes("role: 'dialog'") &&
+    source.includes("'aria-modal': 'true'"),
+);
+
 check(
   'a dry run never claims it freed anything',
   /if \(isDry\) \{[\s\S]{0,320}t\('dryRunHint'\)[\s\S]{0,320}return;/.test(source) &&