dsh-recall-plugin 2.6.1 → 2.6.2

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 本文件格式遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)，版本号遵循语义化版本。
 
+## [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,7 @@ 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.
 - **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 +202,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.
 

package/README.md

@@ -74,6 +74,7 @@
 - 目标工作区的 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。
 - 工作区内的**目录重解析点**（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 +200,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`，或把大目录补进排除表。
 

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`,

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）

package/package.json

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