dsh-recall-plugin 2.6.1 → 2.6.3

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 本文件格式遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)，版本号遵循语义化版本。
 
+## [2.6.3] - 2026-11-03
+
+### 修复
+
+- **Windows 回退解压不再逐条走 `Expand-Archive`（issue #34）**：整树与分批两个恢复分支改走共用的逐条 .NET `ExtractToFile(overwrite: true)`，目录创建按大小写不敏感集合缓存，显式 UTF-8 并 `finally` 释放归档句柄。保留覆盖、CJK 路径、恢复计数、archive 失败可见与 H1 救援语义；issue 报告者的 5000 文件实测为 17.2s → 4.0s，本机冷缓存受 Defender 影响较大，不承诺固定耗时。
+- **Windows 回退支持超过 260 字符的路径**：恢复与删除统一用 `\\?\`（UNC 为 `\\?\UNC\`）扩展绝对路径拼接，解压经 .NET 目录/文件 API 落盘；删除改用 `File.Delete` 并先清只读属性，普通路径与超长路径行为一致。解压失败或目录替换仍会终止并进入 H1 救援，不会假报 `ROLLBACK_OK`。
+- **回退恢复后的文件 mtime 显式刷新**：逐条解压保留的是快照提交时间，与旧 index 的 stat 记录可能碰撞，导致紧接着的快照漏掉恢复内容、后续回退取回错误版本。现在与 POSIX 的 `tar -m` 对齐，把恢复文件 touch 到当前时刻。
+- **大变更预览的分类计数改为全量口径**：此前摘要按截断后的前 500 条清单统计，与总数并列时读起来像清单丢了条目（实测 3054 条变更只报「修改 448 · 恢复 50 · 删除 2」）。现在 Windows 脚本在截断前输出 `COUNTS` 行、POSIX 由 Host 按全量清单统计，确认面板用全量计数渲染摘要；拿不到可信计数时面板隐去摘要，而不是显示一个对不上的数字。
+- **工作区路径过长时给出可行动提示**：新增 `pathTooLong` 环境错误分类，识别 git 的 `Filename too long` 与 PowerShell 拉起 native 命令失败的 `The directory name is invalid`，提示「把项目移到更短的路径」。这是 Windows `MAX_PATH` 的平台限制（工作区根 ≥260 字符时 git 拒绝索引，`\\?\` 只救工作区内部的深文件），已在 README「已知限制」写明。
+
+### 测试
+
+- **POSIX 回退补齐真执行回归**：新增 bash + git 冒烟，覆盖分批恢复、CJK/空格路径、`tar -m` 的 mtime 失配和超过 260 字符的路径。POSIX 模板原本已具备这些语义，本次只修正过时注释，不改实现。
+- **长路径用例改为按实际根长度构造**：原先写死目录段数，在 CI 的 `/tmp` 短根上目标路径刚好 260 字符、断言落空（本地 `%TEMP%` 更长才通过）。现在按根长度反推段数，跨 runner 稳定。
+
+## [2.6.2] - 2026-11-03
+
+### 修复
+
+- **Windows 保留设备名不再反复触发快照跳过提示（issue #32）**：`nul`、`aux`、`con`、`prn`、`com1`…、`lpt1`… 及其扩展名和上标数字变体在 `git add` 前默认排除，覆盖任意子目录；规则仅适用于 Windows，不进入构建产物 root 判定，POSIX 合法同名文件不受影响。这些路径保持「不恢复、不删除」的既有回退语义。
+- **0 字节 `nul` 等路径的失败提示不再静默丢失**：`SNAP_SKIP` 同时识别 Git 的 `unable to index file 'X'` 与 `unable to add 'X' to index`，PowerShell 与 bash 模板均已覆盖。
+
 ## [2.6.1] - 2026-10-31
 
 ### 新增

package/README.en.md

@@ -77,6 +77,8 @@ Boundaries accepted by design and edge cases not yet covered — worth checking
 - Recall cannot be initiated while an agent is running in the target workspace (by design — stop the agent first).
 - Supports Windows (PowerShell 5.1/7 + git CLI) and Linux/macOS (bash + git CLI). Windows is thoroughly verified on real machines; Linux has been fully tested on WSL2 (Ubuntu 26.04, bash 5.3 + git 2.53), including Chinese paths, home fallback, session cleanup, and gc; the macOS side is written to be bash 3.2 compatible but has not been tested on real hardware yet.
 - Nested git repositories inside the workspace (subdirectories with their own `.git`) cannot be indexed: the snapshot proceeds for everything else (fail-open, with a notice listing the skipped paths), but their contents do not participate in recalls.
+- Windows reserved device names (such as `nul`, `aux`, `con`, and `com1`, including extension forms) cannot be indexed by Git and are excluded from snapshots and recalls by default. These paths are left untouched and do not generate repeated skip notices. This exclusion applies only to Windows.
+- A **workspace whose root path itself exceeds 260 characters** is not supported: that is Windows' `MAX_PATH` hard limit — git refuses to index such a directory (`\\?\` extended paths only rescue deep files *inside* the workspace, not the root prefix itself; measured failure starting at 259 characters). Snapshots for such a workspace fail, and "Recent errors" tells you to move the project to a shorter path. Deep files inside a workspace (short root, file path over 260) are unaffected and snapshot / roll back normally.
 - **Directory reparse points** in the workspace (junctions / directory symlinks) are not snapshotted by default: the subtree they point at is not indexed, so its contents do not participate in recalls. This is required on Windows, where git for Windows treats a junction as an ordinary directory and a self-referencing one inflates the index up to Windows' 31-reparse-point path limit (a two-file workspace measured 64 index entries); on POSIX a symlink still enters the snapshot (git records it as a `120000` entry and never recurses). To deliberately snapshot a **benign** junction (pointing outside the workspace, non-self-referencing), append `!path/` (e.g. `!ext-link/`) in the exclusion settings — user rules take effect after machine-generated ones; **never do this for a self-referencing junction** (the explosion vector).
 - Extreme cases like filenames containing newlines/TAB are beyond the diff list's parsing capability (negligible probability).
 - **Interplay with dsh-routing-suite (progressive tool-disclosure router)**: if you also run its router-standard preset, a recall forks a new session via `sessions.fork`, which resets the router's stage to its default (the tool surface temporarily narrows). Symptoms, root cause and the fix are documented in [docs/routing-interplay.md](docs/routing-interplay.md) (Chinese).
@@ -201,7 +203,7 @@ The most common questions and their troubleshooting paths; for the full set of d
 
 **No "↶ Recall" button next to a message?** Check in order of likelihood: (1) the DSH process wasn't restarted after installing — restart it and hard-refresh (Ctrl+Shift+R); (2) git CLI isn't on PATH — a notice shows at the top of the page; (3) the message predates the plugin — snapshots are only created when a message is sent; (4) snapshots are disabled for that workspace — it sits under a directory-form exclusion (e.g. opened inside `dist/`), exceeded the `maxWorkspaceBytes` / `scanBudgetMs` guardrails, or the pre-snapshot size scan itself failed (`git ls-files` error; the reason is in "Recent errors" and it retries after 10 minutes) — recent messages carry a recovery notice (raise the limit or extend the exclusion list and it recovers automatically).
 
-**Some files weren't restored by a recall?** They weren't in the snapshot: larger than `maxFileBytes` (8MB by default), matched by the exclusion list, or inside a nested git repository / a win32 reparse point (see "Known Limitations"). The confirmation panel's file list before a recall is the exact rollback scope — trust it.
+**Some files weren't restored by a recall?** They weren't in the snapshot: larger than `maxFileBytes` (8MB by default), matched by the exclusion list (including Windows reserved device names), or inside a nested git repository / a win32 reparse point (see "Known Limitations"). The confirmation panel's file list before a recall is the exact rollback scope — trust it.
 
 **Snapshots eating too much disk?** Open "Settings → Plugin Config → Recall Plugin → Snapshot Manager" to see per-workspace usage, run "gc now", or delete by workspace / session / single snapshot; longer-term, lower `maxSnapshotsPerWorkspace`, set `retentionDays`, or add big directories to the exclusion list.
 
@@ -209,6 +211,8 @@ The most common questions and their troubleshooting paths; for the full set of d
 
 **Can the session's first message be recalled or edited?** Files yes, conversation no — fork needs an earlier turn boundary; "Edit and resend" on the first message is refused outright (the original message is still there, so resending would duplicate it).
 
+**A recall added a new session to the list — can that be avoided?** No, this is a platform boundary rather than a setting: the only channel DSH offers for "go back to before a message" is `sessions.fork`, and a fork necessarily creates a new session — the client session surface has only fork / open / list / binding, with no verb to delete or truncate a session in place. What the plugin controls is what happens to the **original** session (`archiveOriginal`, on by default: archived to "Archive", recoverable), not whether a new one exists. If by "branch" you meant a git branch: the plugin never creates one — snapshots are `snap-<message ID>` tags only, and your project's own git state is never touched.
+
 ## How It Works
 
 When each user message is sent (before the agent touches any files), the workspace is snapshotted into an independent shadow git repository; on recall, a "pre-rollback" safety snapshot is taken first, then files are restored via `git archive` and the conversation is rewound through DSH's official `sessions.fork` mechanism. Binary- and line-ending-safe, and your project's own git state is never touched.

package/README.md

@@ -74,6 +74,8 @@
 - 目标工作区的 agent 正在运行时无法发起撤回（防护设计，先停止 agent 再撤回）。
 - 支持 Windows（PowerShell 5.1/7 + git CLI）与 Linux/macOS（bash + git CLI）。Windows 真机验证充分；Linux 已在 WSL2（Ubuntu 26.04，bash 5.3 + git 2.53）实测全流程（含中文路径、home 降级、会话清理、gc）；macOS 侧脚本按 bash 3.2 兼容编写，尚未真机实测。
 - 工作区内嵌套的其他 git 仓库（子目录自带 `.git`）无法索引：其余部分快照照常（fail-open，页面会提示跳过了哪些路径），但其内容不参与回退。
+- Windows 保留设备名（如 `nul`、`aux`、`con`、`com1`，含扩展名形式）无法由 Git 索引，默认不参与快照与回退；这些路径保持原样，也不会反复产生跳过提示。此排除仅适用于 Windows。
+- **工作区根路径自身超过 260 字符**时不支持撤回：这是 Windows `MAX_PATH` 的硬限制——git 拒绝索引这类目录（`\\?\` 扩展路径只能救工作区**内部**的深文件，救不了根前缀本身；实测根长 259 字符起就失败）。这种工作区的快照会失败，「最近错误」里提示把项目移到更短的路径。工作区内的深文件（根短、文件路径超 260）不受影响，照常快照与回退。
 - 工作区内的**目录重解析点**（junction / 目录符号链接）默认不参与快照：它们指向的子树不会被索引，因此那部分内容不参与回退。win32 上这是必需的——git for Windows 把 junction 当普通目录递归，自引用 junction 会让索引膨胀到 Windows 的 31 层重解析点上限（实测 2 个文件的工作区产出 64 条索引）；POSIX 侧符号链接照常进快照（git 记成 `120000` 条目，不递归进目标）。确需把某个**良性** junction（指向工作区外、非自引用）纳入快照时，可在排除配置里追加 `!路径/`（如 `!ext-link/`）反选恢复——用户排除行在机器生成行之后生效；**切勿对自引用 junction 使用**（爆炸根因）。
 - 文件名含换行/TAB 的极端情形超出 diff 清单的解析能力（概率可忽略）。
 - **与 dsh-routing-suite（渐进式工具披露路由）的交互**：同时启用其 router-standard 预设时，撤回经 `sessions.fork` 出新会话会把路由阶段重置为默认（工具面临时收窄）。现象、成因与解决方案见 [docs/routing-interplay.md](docs/routing-interplay.md)。
@@ -199,7 +201,7 @@ peerDependencies 按 minor 版本线开窗，与 `dsh.compatibility.dshReleases`
 
 **消息旁没有「↶ 撤回」按钮？** 按概率排查：① 装完没重启 DSH 进程——重启后硬刷新页面（Ctrl+Shift+R）；② git CLI 不在 PATH——页面顶部会有安装提示；③ 该消息发送于插件启用之前——快照只在消息发送时创建，历史消息无快照；④ 该工作区被停用快照——工作区开在 `dist/`、`target/` 这类命中基础排除表目录形态的位置，或超出 `maxWorkspaceBytes` / `scanBudgetMs` 护栏，或快照前的范围统计本身失败（`git ls-files` 报错，原因见「最近错误」，10 分钟后自动重试）；最近消息上会给出恢复提示（调大上限或补充排除表后自动恢复）。
 
-**撤回后个别文件没有恢复？** 该文件不在快照里：超过 `maxFileBytes`（默认 8MB）、命中排除表，或位于嵌套 git 仓库 / win32 目录重解析点内（见「已知限制」）。撤回前确认面板的清单就是实际回退范围，以它为准。
+**撤回后个别文件没有恢复？** 该文件不在快照里：超过 `maxFileBytes`（默认 8MB）、命中排除表（含 Windows 保留设备名），或位于嵌套 git 仓库 / win32 目录重解析点内（见「已知限制」）。撤回前确认面板的清单就是实际回退范围，以它为准。
 
 **快照占用磁盘太多？** 打开「设置 → 插件配置 → 撤回插件 → 快照管理」查看各工作区占用，可「立即 gc」或按工作区 / 会话 / 单条分级删除；长期可压低 `maxSnapshotsPerWorkspace`、设置 `retentionDays`，或把大目录补进排除表。
 
@@ -207,6 +209,8 @@ peerDependencies 按 minor 版本线开窗，与 `dsh.compatibility.dshReleases`
 
 **会话第一条消息能撤回或编辑吗？** 文件可以回退，对话不能——fork 需要该消息之前的 turn 边界；「编辑并重发」对首条消息会被明确拒绝（原消息还在，补发即成重复消息）。
 
+**撤回后会话列表多出一个会话，能不能不新建？** 不能，这是平台能力边界而非配置项：DSH 提供的「回到某条消息之前」唯一通道是 `sessions.fork`，fork 必然产生新会话——客户端会话面只有 fork / open / list / binding，没有删除或就地截断会话的动词。插件能控制的是**原会话**的去留（`archiveOriginal`，默认归档到「已归档」、可恢复），不是「是否新建」。若你说的「分支」指的是 git 分支：插件从不创建分支，快照只打 `snap-<消息ID>` tag，不碰项目自身的 git 状态。
+
 ## 工作原理
 
 每条用户消息发送时（agent 动文件之前），工作区被快照进一个独立的影子 git 仓库；撤回时先打「回退前」安全快照、再用 `git archive` 恢复文件、通过 DSH 官方 `sessions.fork` 机制把会话切到该消息之前。二进制与换行符安全，全程不触碰项目自身的 git 状态。

package/lib/client.js

@@ -2029,9 +2029,12 @@
       if (recall.stage === "confirm") {
         const changes = recall.changes || [];
         const total = typeof recall.total === "number" ? recall.total : changes.length;
-        const counts = { modified: 0, restored: 0, added: 0 };
-        for (const c of changes) {
-          if (c && isChangeKind(c.kind)) counts[c.kind]++;
+        let counts = recall.counts || null;
+        if (!counts && !recall.truncated) {
+          counts = { modified: 0, restored: 0, added: 0 };
+          for (const c of changes) {
+            if (c && isChangeKind(c.kind)) counts[c.kind]++;
+          }
         }
         const rows = changes.map((c, i) => {
           const info = KIND_INFO[c.kind];
@@ -2053,7 +2056,7 @@
             t(sessionOnly ? "recall.truncated.chat" : "recall.truncated.files", { shown: changes.length, total })
           ));
         }
-        const summary = summaryText(counts, t);
+        const summary = counts ? summaryText(counts, t) : "";
         const rollbackLead = recall.time ? t("recall.confirm.rollbackAt", { time: clockText2(recall.time) }) : t("recall.confirm.rollbackNoTime");
         const filesLead = t("recall.confirm.files", {
           total,
@@ -2518,6 +2521,8 @@
             treeId: res.treeId || null,
             time: res.time || null,
             cutSeq: typeof res.cutSeq === "number" ? res.cutSeq : null,
+            // 全量分类计数（changes 是截断后的清单，不能拿来统计）
+            counts: res.counts || null,
             // issue #31：仅消息条目没有文件树（老 Host 无该字段 → 按 true）
             files: res.files !== false
           });
@@ -2571,6 +2576,7 @@
                   treeId: res2.treeId || null,
                   time: res2.time || null,
                   cutSeq: typeof res2.cutSeq === "number" ? res2.cutSeq : null,
+                  counts: res2.counts || null,
                   files: res2.files !== false
                 });
               }).catch((error) => {

package/lib/diagnostics.js

@@ -1,4 +1,8 @@
 const ENV_PATTERNS = [
+  // pathTooLong 排最前：它既不是 git 缺失也不是权限问题，是 Windows 的
+  // MAX_PATH 硬限制（工作区根 ≥260 字符时 git 直接拒绝索引，实测 259 已
+  // 报 "must be run in a work tree"）。混进其他分类只会把人引去装 git
+  ["pathTooLong", [/filename too long/i, /directory name is invalid/i, /path (?:is )?too long/i]],
   ["git", [/command not found/i, /not recognized/i, /git: not found/i, /is not a git command/i]],
   ["space", [/no space left on device/i, /disk quota exceeded/i, /enospc/i]],
   ["permission", [/permission denied/i, /operation not permitted/i, /not permitted/i, /access is denied/i]],
@@ -10,7 +14,10 @@ const ENV_HINTS = {
   space: "\u78C1\u76D8\u7A7A\u95F4\u5DF2\u6EE1\uFF0C\u5FEB\u7167\u5199\u5165\u5931\u8D25\uFF1A\u6E05\u7406\u78C1\u76D8\u7A7A\u95F4\u540E\u81EA\u52A8\u6062\u590D",
   permission: "\u5FEB\u7167\u76EE\u5F55\u65E0\u5199\u5165\u6743\u9650\uFF1A\u8BF7\u68C0\u67E5\u76EE\u5F55\u6743\u9650\u540E\u91CD\u8BD5",
   lock: "\u7591\u4F3C\u591A\u4E2A DSH \u5B9E\u4F8B\u5E76\u53D1\u4F7F\u7528\u540C\u4E00\u5FEB\u7167\u5E93\uFF1A\u8BF7\u786E\u8BA4\u53EA\u542F\u52A8\u4E86\u4E00\u4E2A\uFF1B\u786E\u8BA4\u540E\u4ECD\u5931\u8D25\u65F6\uFF0C\u6309\u300C\u8BBE\u7F6E \xB7 \u63D2\u4EF6\u914D\u7F6E \xB7 \u6700\u8FD1\u9519\u8BEF\u300D\u4E2D\u7684\u8DEF\u5F84\u5220\u9664\u9501\u6587\u4EF6",
-  mkdir: "\u5FEB\u7167\u5B58\u50A8\u76EE\u5F55\u88AB\u540C\u540D\u6587\u4EF6\u5360\u7528\uFF1A\u5904\u7406\u540E\u81EA\u52A8\u6062\u590D"
+  mkdir: "\u5FEB\u7167\u5B58\u50A8\u76EE\u5F55\u88AB\u540C\u540D\u6587\u4EF6\u5360\u7528\uFF1A\u5904\u7406\u540E\u81EA\u52A8\u6062\u590D",
+  // 实测边界：Windows 上工作区根 ≥260 字符时 git 拒绝索引（\\?\ 前缀只救
+  // 工作区内的深文件，救不了根前缀本身），插件无法绕过——只能请用户挪路径
+  pathTooLong: "\u5DE5\u4F5C\u533A\u8DEF\u5F84\u8D85\u8FC7 Windows 260 \u5B57\u7B26\u4E0A\u9650\uFF0Cgit \u65E0\u6CD5\u7D22\u5F15\uFF1A\u8BF7\u628A\u9879\u76EE\u79FB\u5230\u66F4\u77ED\u7684\u8DEF\u5F84\u540E\u91CD\u8BD5"
 };
 function classifyEnvError(text) {
   const s = String(text || "");

package/lib/routes-core.js

@@ -54,7 +54,7 @@ function createRoutesCore(deps) {
       if (result === null) return { ok: false, code: E.RECALL_NO_SNAPSHOT, message: "\u8BE5\u6D88\u606F\u6CA1\u6709\u53EF\u7528\u7684\u9879\u76EE\u5FEB\u7167" };
       const snap2 = state.snapshots.get(id);
       const cutSeq = await snaps.resolveCutSeq(sessionId, id);
-      return { ok: true, changes: result.changes, total: result.total, truncated: result.truncated, treeId: result.treeId || null, time: snap2 ? snap2.time : null, root: snap2 ? snap2.root : null, cutSeq, files: snap2 ? snap2.files !== false : void 0 };
+      return { ok: true, changes: result.changes, total: result.total, truncated: result.truncated, treeId: result.treeId || null, time: snap2 ? snap2.time : null, root: snap2 ? snap2.root : null, cutSeq, counts: result.counts, files: snap2 ? snap2.files !== false : void 0 };
     },
     "execute": async (args) => {
       const id = args && args.messageId ? String(args.messageId) : "";

package/lib/scripts.posix.js

@@ -246,7 +246,7 @@ function snapshotScript(root, store, gitExe, messageId, base) {
     "addrc=0",
     'add_log=$("$git" --git-dir="$g" --work-tree="$root" add -A --ignore-errors "${pa_args[@]}" 2>&1) || addrc=$?',
     `if [ "$addrc" -ge 2 ]; then printf '%s\\n' "$add_log" >&2; exit "$addrc"; fi`,
-    `printf '%s\\n' "$add_log" | sed -n "s/^error: unable to index file '\\(.*\\)'$/\\1/p" | sort -u | while IFS= read -r sk; do`,
+    `printf '%s\\n' "$add_log" | sed -n -e "s/^error: unable to index file '\\(.*\\)'$/\\1/p" -e "s/^error: unable to add '\\(.*\\)' to index$/\\1/p" | sort -u | while IFS= read -r sk; do`,
     // 循环体用 if/fi 而非 && 列表：&& 列表条件为假时整条管道退出码为 1，
     // set -e 会把脚本杀掉（if 语句天然豁免）
     `  if [ -n "$sk" ]; then printf 'SNAP_SKIP %s\\n' "$sk"; fi`,
@@ -333,8 +333,8 @@ function rollbackScript(root, store, gitExe, tag, base) {
     // mtime = 解包时刻）。必须如此：tar 默认保留归档内 mtime，而快照→篡改→
     // 回滚常在数秒内完成，恢复出的 mtime 可能与 index 里旧条目的 stat 记录
     // 碰撞，下一次 add -A 的 stat 缓存误判「未变更」跳过 re-hash——工作区
-    // 内容与快照从此脱钩（实测解包出篡改前内容的间歇性失败）。Windows 版的
-    // Expand-Archive 天然把 mtime 设为解包时刻，无此问题；-m 让 tar 对齐。
+    // 内容与快照从此脱钩（实测解包出篡改前内容的间歇性失败）。Windows 逐条
+    // 解压也会显式 touch，两侧语义由各自的回退冒烟测试锁定。
     '    "$git" --git-dir="$g" archive ' + psq(tag) + ' | tar -x -m -C "$root"',
     "  else",
     "    batch=()",

package/lib/scripts.pwsh.js

@@ -5,6 +5,32 @@ const UTF8_PRELUDE = "$OutputEncoding = [Text.UTF8Encoding]::new($false)\ntry {
 const MAX_FILE_BYTES = 8388608;
 const STALE_LOCK_MIN = 5;
 const HEARTBEAT_TTL_S = 900;
+const WIN_RESERVED_EXCLUDES = [
+  "nul",
+  "nul.*",
+  "aux",
+  "aux.*",
+  "con",
+  "con.*",
+  "prn",
+  "prn.*",
+  "com[1-9]",
+  "com[1-9].*",
+  "lpt[1-9]",
+  "lpt[1-9].*",
+  "com\xB9",
+  "com\xB9.*",
+  "com\xB2",
+  "com\xB2.*",
+  "com\xB3",
+  "com\xB3.*",
+  "lpt\xB9",
+  "lpt\xB9.*",
+  "lpt\xB2",
+  "lpt\xB2.*",
+  "lpt\xB3",
+  "lpt\xB3.*"
+];
 const FIDELITY_ATTRS = "* -text -filter -ident -export-ignore -export-subst -working-tree-encoding";
 function stripBom(text) {
   return text.replace(/^\uFEFF/, "");
@@ -180,7 +206,8 @@ function limitScanBlock(maxBytes, fileMaxBytes, budgetMs) {
   ].join("\n");
 }
 function excludeSyncBlock(excludeFile, base) {
-  const baseList = (Array.isArray(base) && base.length ? base : [".git", "node_modules/", ".dsh-recall-snapshots/", "dsh-recall-snapshots/"]).map(psq).join(",");
+  const configuredBase = Array.isArray(base) && base.length ? base : [".git", "node_modules/", ".dsh-recall-snapshots/", "dsh-recall-snapshots/"];
+  const baseList = [...configuredBase, ...WIN_RESERVED_EXCLUDES].map(psq).join(",");
   return [
     "$exFile = " + psq(excludeFile),
     "$userPats = @()",
@@ -317,14 +344,14 @@ function snapshotScript(root, store, gitExe, messageId, base) {
     // native stderr 包装成 ErrorRecord，EAP=Stop 下直接抛 NativeCommandError，
     // 而 PS 5.1 的 SilentlyContinue 会把合并流里的记录整个丢弃（实测 LOG
     // 为空）——Continue 是两个版本下唯一都能拿到 stderr 文本的取值。捕获
-    // 后按 "unable to index file 'X'" 提取被跳过的路径，以 SNAP_SKIP 行
-    // 回传 JS 侧做用户可见提示。
+    // 后按 "unable to index file 'X'" / "unable to add 'X' to index" 提取
+    // 被跳过的路径，以 SNAP_SKIP 行回传 JS 侧做用户可见提示。
     "$ErrorActionPreference = 'Continue'",
     '$addLog = (@(& $git --git-dir=$g --work-tree=$root add -A --ignore-errors @paArgs 2>&1) | ForEach-Object { [string]$_ }) -join "`n"',
     "$addRc = $LASTEXITCODE",
     "$ErrorActionPreference = 'Stop'",
     'if ($addRc -ge 2) { throw ("git add fatal (exit " + $addRc + "): " + $addLog) }',
-    `foreach ($m in [regex]::Matches($addLog, "unable to index file '([^']+)'") ) { Write-Output ('SNAP_SKIP ' + $m.Groups[1].Value) }`,
+    `foreach ($m in [regex]::Matches($addLog, "unable to (?:index file|add) '([^']+)'") ) { Write-Output ('SNAP_SKIP ' + $m.Groups[1].Value) }`,
     dropGitlinksBlock(),
     // 兜底：旧 git 走裸 add 时大文件仍会被重新索引，这里按清单再清一次；
     // pathspec 生效时它是空操作（清单条目本就不在 index）
@@ -381,26 +408,56 @@ function diffScript(root, store, gitExe, tag, base, maxChanges) {
     "  $targetMap[$path] = $sha",
     "}",
     "$result = @()",
+    "$nMod = 0; $nRes = 0; $nAdd = 0",
     "foreach ($k in $curMap.Keys) {",
-    '  if (-not $targetMap.ContainsKey($k)) { $result += [pscustomobject]@{ rel = $k; kind = "added" } }',
-    '  elseif ($targetMap[$k] -ne $curMap[$k]) { $result += [pscustomobject]@{ rel = $k; kind = "modified" } }',
+    '  if (-not $targetMap.ContainsKey($k)) { $result += [pscustomobject]@{ rel = $k; kind = "added" }; $nAdd++ }',
+    '  elseif ($targetMap[$k] -ne $curMap[$k]) { $result += [pscustomobject]@{ rel = $k; kind = "modified" }; $nMod++ }',
     "}",
     "foreach ($k in $targetMap.Keys) {",
-    '  if (-not $curMap.ContainsKey($k)) { $result += [pscustomobject]@{ rel = $k; kind = "restored" } }',
+    '  if (-not $curMap.ContainsKey($k)) { $result += [pscustomobject]@{ rel = $k; kind = "restored" }; $nRes++ }',
     "}",
     "$sorted = @($result | Sort-Object rel)",
+    // 分类计数必须在截断前出：面板摘要若按前 N 条统计，大变更时「修改 448」
+    // 会与总数 3054 并列展示，读起来像清单丢了条目（实测事故形态）
+    "Write-Output ('COUNTS ' + $nMod + ' ' + $nRes + ' ' + $nAdd)",
     "Write-Output ('TOTAL ' + $sorted.Count)",
     "Write-Output (ConvertTo-Json -InputObject @($sorted | Select-Object -First " + take + ") -Depth 3 -Compress)",
     "$tree = (& $git --git-dir=$g --work-tree=$root write-tree).Trim()",
     "Write-Output ('TREE ' + $tree)"
   ].join("\n");
 }
+function expandZipBlock() {
+  return [
+    "Add-Type -AssemblyName System.IO.Compression.FileSystem",
+    "function Expand-ZipTo {",
+    "  $now = [DateTime]::UtcNow",
+    "  $made = [System.Collections.Generic.HashSet[string]]::new([System.StringComparer]::OrdinalIgnoreCase)",
+    "  $za = [System.IO.Compression.ZipFile]::Open($zip, 'Read', [System.Text.Encoding]::UTF8)",
+    "  try {",
+    "    foreach ($e in $za.Entries) {",
+    "      $t = $lpRoot + '\\' + ($e.FullName -replace '/','\\')",
+    "      if ($e.Name) {",
+    "        $d = $t.Substring(0, $t.LastIndexOf('\\'))",
+    "        if ($d -and $made.Add($d)) { [System.IO.Directory]::CreateDirectory($d) | Out-Null }",
+    "        [System.IO.Compression.ZipFileExtensions]::ExtractToFile($e, $t, $true)",
+    "        [System.IO.File]::SetLastWriteTimeUtc($t, $now)",
+    "      }",
+    "    }",
+    "  } finally { $za.Dispose() }",
+    "}"
+  ].join("\n");
+}
 function rollbackScript(root, store, gitExe, tag, base) {
   return [
     "$ErrorActionPreference = 'Stop'",
     "$git = " + psq(gitExe),
     "$g = " + psq(store.git),
     "$root = " + psq(root),
+    // PS5.1 的 .NET Framework 不认清单级长路径；\\?\ 前缀绕过 MAX_PATH 且不再
+    // 规范化路径，必须先把 / 归一为 \，UNC 再改写为 \\?\UNC\。解压与删除共用。
+    "$lpRoot = $root.Replace('/','\\')",
+    String.raw`$lpRoot = if ($lpRoot.StartsWith('\\?\')) { $lpRoot } elseif ($lpRoot.StartsWith('\\')) { '\\?\UNC\' + $lpRoot.Substring(2) } else { '\\?\' + $lpRoot }`,
+    "$lpRoot = $lpRoot.TrimEnd('\\')",
     dropGitlinksBlock(),
     excludeSyncBlock(store.excludeFile, base),
     // issue #29：同 snapshotScript（回退前的当前清单同样不该为大文件写对象）
@@ -437,23 +494,24 @@ function rollbackScript(root, store, gitExe, tag, base) {
     "$restored = $restoreRel.Count",
     "if ($restored -gt 0) {",
     "  $zip = " + psq(store.dir + "\\restore-tmp.zip"),
+    expandZipBlock(),
     "  if ($restoreRel.Count * 2 -ge $targetMap.Count) {",
     "    & $git --git-dir=$g archive --format=zip --output=$zip " + psq(tag),
     "    if ($LASTEXITCODE -ne 0) { throw ('git archive failed (exit ' + $LASTEXITCODE + ')') }",
-    "    Expand-Archive -LiteralPath $zip -DestinationPath $root -Force",
+    "    Expand-ZipTo",
     "    Remove-Item -LiteralPath $zip -Force",
     "  } else {",
     "    for ($i = 0; $i -lt $restoreRel.Count; $i += 100) {",
     "      $batch = $restoreRel.GetRange($i, [Math]::Min(100, $restoreRel.Count - $i))",
     "      & $git --literal-pathspecs --git-dir=$g archive --format=zip --output=$zip " + psq(tag) + " -- $batch",
     "      if ($LASTEXITCODE -ne 0) { throw ('git archive failed (exit ' + $LASTEXITCODE + ')') }",
-    "      Expand-Archive -LiteralPath $zip -DestinationPath $root -Force",
+    "      Expand-ZipTo",
     "      Remove-Item -LiteralPath $zip -Force",
     "    }",
     "  }",
     "}",
-    // 删除失败语义与 POSIX 版对齐（F-G2）：本侧 EAP=Stop 下 Remove-Item
-    // 失败直接抛终止错误、pwsh 以非零码退出；POSIX 侧 rm 在 set -e 的 if
+    // 删除失败语义与 POSIX 版对齐（F-G2）：本侧 EAP=Stop 下 File.Delete 失败
+    // 直接抛终止错误、pwsh 以非零码退出；POSIX 侧 rm 在 set -e 的 if
     // 条件里失败不会自动终止，须显式 exit 1（见 scripts.posix.js rollbackScript）。
     // 任何一侧半回退都不许报 ROLLBACK_OK——假成功会让救援永不触发（H1）。
     "$deleted = 0",
@@ -461,8 +519,12 @@ function rollbackScript(root, store, gitExe, tag, base) {
     "  if (-not $r) { continue }",
     '  $tab = $r.IndexOf("`t"); $path = $r.Substring($tab + 1)',
     "  if (-not $targetMap.ContainsKey($path)) {",
-    "    $full = Join-Path $root ($path.Replace('/','\\'))",
-    "    if (Test-Path -LiteralPath $full) { Remove-Item -LiteralPath $full -Force; $deleted++ }",
+    "    $full = $lpRoot + '\\' + ($path.Replace('/','\\'))",
+    "    if ([System.IO.File]::Exists($full)) {",
+    "      $attrs = [System.IO.File]::GetAttributes($full)",
+    "      if (($attrs -band [System.IO.FileAttributes]::ReadOnly) -ne 0) { [System.IO.File]::SetAttributes($full, [System.IO.FileAttributes]::Normal) }",
+    "      [System.IO.File]::Delete($full); $deleted++",
+    '    } elseif ([System.IO.Directory]::Exists($full)) { throw ("cannot remove directory at tracked file path: " + $path) }',
     "  }",
     "}",
     "Write-Output ('ROLLBACK_OK ' + $deleted + ' ' + $restored)"

package/lib/snapshots.js

@@ -69,16 +69,38 @@ function parseTreeId(out) {
   }
   return null;
 }
+function countChanges(list) {
+  const counts = { modified: 0, restored: 0, added: 0 };
+  for (const c of list) {
+    if (c && Object.prototype.hasOwnProperty.call(counts, String(c.kind))) counts[c.kind]++;
+  }
+  return counts;
+}
+function parseCounts(line) {
+  const parts = line.trim().split(/\s+/);
+  if (parts.length !== 3) return null;
+  const m = parseInt(parts[0] ?? "", 10);
+  const r = parseInt(parts[1] ?? "", 10);
+  const a = parseInt(parts[2] ?? "", 10);
+  if (!Number.isFinite(m) || !Number.isFinite(r) || !Number.isFinite(a)) return null;
+  if (m < 0 || r < 0 || a < 0) return null;
+  return { modified: m, restored: r, added: a };
+}
 function parseDiffOutput(text, isWin, maxChanges) {
   const lines = String(text || "").split(/\r?\n/);
   let total = null;
   let treeId = null;
+  let counts = null;
   const body = [];
   for (const line of lines) {
     if (line.indexOf("TREE ") === 0) {
       treeId = line.slice(5).trim() || null;
       continue;
     }
+    if (line.indexOf("COUNTS ") === 0) {
+      counts = parseCounts(line.slice(7));
+      continue;
+    }
     if (line.indexOf("TOTAL ") === 0) {
       const n = parseInt(line.slice(6), 10);
       if (Number.isFinite(n) && n >= 0) total = n;
@@ -90,7 +112,9 @@ function parseDiffOutput(text, isWin, maxChanges) {
   const all = raw ? parseChanges(raw, isWin) : [];
   const finalTotal = total !== null ? total : all.length;
   const changes = all.slice(0, maxChanges);
-  return { changes, total: finalTotal, truncated: finalTotal > changes.length, treeId };
+  const truncated = finalTotal > changes.length;
+  const complete = all.length >= finalTotal;
+  return { changes, total: finalTotal, truncated, treeId, counts: counts || (complete ? countChanges(all) : null) };
 }
 function scanCutSeqDetail(events, messageId) {
   let anchor = -1;
@@ -540,12 +564,12 @@ function createSnapshots(ctx, rt, config) {
   async function diffFor(messageId) {
     const snap = state.snapshots.get(String(messageId));
     if (!snap) return null;
-    if (snap.files === false) return { changes: [], total: 0, truncated: false, treeId: null };
+    if (snap.files === false) return { changes: [], total: 0, truncated: false, treeId: null, counts: { modified: 0, restored: 0, added: 0 } };
     const store = state.stores.get(snap.root);
     if (!store) return null;
     const text = S.stripBom(await rt.runShell(S.diffScript(snap.root, store, state.gitExe || "", "snap-" + messageId, BASE(), MAX_CHANGES), { timeoutMs: 6e5, stdoutMaxBytes: 8388608 }));
     const trimmed = text.trim();
-    if (!trimmed) return { changes: [], total: 0, truncated: false, treeId: null };
+    if (!trimmed) return { changes: [], total: 0, truncated: false, treeId: null, counts: { modified: 0, restored: 0, added: 0 } };
     return parseDiffOutput(trimmed, rt.isWin, MAX_CHANGES);
   }
   async function rollbackFor(messageId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-recall-plugin",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "在 DSH 中撤回自己发过的消息：工作区文件与对话历史一起回到那条消息发出之前，消息的文本与附件自动放回输入框，改完即可重发。文件走独立影子 git 快照（不碰项目自身的 git），对话走官方 sessions.fork，原会话归档可找回。",
   "icon": "assets/icon.svg",
   "type": "module",