dsh-recall-plugin 2.5.1 → 2.5.3

package/CHANGELOG.md

@@ -4,6 +4,39 @@
 
 ## [Unreleased]
 
+## [2.5.3] - 2026-10-30
+
+### 修复
+
+- **大工作区护栏静默失效（issue #29）**：快照前的预算扫描以 `git ls-files` 为准，此前它非零退出会被当作「没超限」——`$HOME` 级工作区（523 GB / 233 万条目）上实测每条消息先写约 10 GB 对象、600 秒后被杀，prune 回收后下一条消息再重复一遍。现在统计失败一律 **fail-closed**：脚本在 `add` 之前输出 `SNAP_SCAN_FAIL` / `SNAP_SCAN_ERR` 并跳过本次快照，原因（git 的 stderr 首行）进「最近错误」，该工作区暂停快照 10 分钟（改配置或 TTL 到期自动重试），不再重付一次全量扫描。
+- **超过 `maxFileBytes` 的文件不再先写对象再移出索引（issue #29）**：此前 `add -A` 会先为超大文件写入 blob，之后才由剔除逻辑移出 index——「小文件少 + 大文件多」的工作区能在预算通过后仍写满磁盘。改为先扫出大文件清单，`add` 带 `--pathspec-from-file` 的 exclude 清单执行（大文件既不进索引也不写对象），add 后仍按清单兜底剔除一次；不支持该选项的旧 git 自动退回裸 `add`（行为同旧版）。
+- **分钟级失败不再免费重试两次（issue #29）**：失败耗时 ≥60 秒视为「昂贵失败」，直接进入退避（5 分钟起、指数递增），不再按「连续 3 次失败」让用户先付三轮分钟级 + GB 级写入。
+
+### 变更
+
+- **快照 / 预览 / 回退三处 `add` 前统一切 cwd 到工作区根**：`--pathspec-from-file` 的隐含全集会被 cwd 前缀裁切（`:(top)` 救不回来，实测），脚本原先的 cwd 是宿主工作目录，可能正在工作区子目录里。
+
+## [2.5.2] - 2026-10-28
+
+### 修复
+
+- **编辑重发带图片时「草稿填了却不发」（活体回归发现，仅 0.2.2-alpha.2 触发）**：`createDrafts` 第三参传 `true` 会让图片进输入态即后台上传，而官方 `sendSession` 会**等上传回执**才发 prompt——刚 fork 的子会话上传迟迟不结算时，草稿留在输入框、消息不发、控制台无错（真机复现两次；同场景纯文本编辑重发一次成功）。改为按场景分流：撤回回填（只填不发）仍传 `true` 保留即时上传；编辑重发（自动发送）传 `false`，图片字节随 prompt 内联，发送一步到位。
+
+### 兼容
+
+- **dsh 0.2.2-alpha.2（一处破坏，已修）**：官方把 `readAttachment` 的入参从 `attachmentId` 字符串换成完整 `ImageAttachmentRef`，宿主不再回会话日志反查授权，裸 id 直接 `INVALID_ATTACHMENT_REF`。插件原先传裸 id → **撤回回填与编辑重发的图片会被逐项 `try/catch` 静默丢弃**。现按「完整引用 → 裸 id」探测回退并把命中代缓存在闭包，两代同时可用（0.1.x / 0.2.0 / 0.2.1 行为不变）。另补 `createDrafts` 第三参 `uploadImages=true`（旧版忽略），恢复「图片进输入态即上传」的官方语义；三参形态抛错时自动退回两参（图片改随 prompt 内联），不让整批附件丢失。
+- **`sessions.fork` 停写 `parentSession`**：普通分支改由 header `origin` 判定，插件只读 `origin` 且血缘自存 `lineage.json`，无需改码；fork 子会话不再有被当作子代理的残余风险。
+- **cordis 配置访问统一**：loader 的 ref 来源 `fiber.config` → `fiber.effectiveConfig`，volatile 提交与 `loader/volatile-update` 派发链未变，设置面热更不受影响。
+
+### 变更
+
+- **`test:probe` 58 条**：新增「附件回读链（B1）」钉住 `readAttachment` 单参形状与 `{ attachment, data }` 返回；`createDrafts` 探针并入第三参（新旧两形态都放行）；loader 探针按 `fiber.effectiveConfig` 同步改名并注明两种拼写。
+- **client 单测 121 → 129**：新增 `tests/client/draft-fill.test.ts`（对象口径 / 字符串口径 / 命中代缓存 / 双失败降级 / 仅裸 id 的旧调用方形状 / 回填第三参 true / 自动发送第三参 false / 三参抛错退回两参）；`attachmentRefsFromBlocks` 的形状断言并入既有 unit 用例（原始引用随行）。
+
+### 文档
+
+- 台账同步 dsh 0.2.2-alpha.2：`dshReleases` 补 `0.2.2-alpha.2`、六条 `@deepseek-ai/dsh-*` peer 追加 `>=0.2.2-alpha.1 <0.3.0`（cordis `>=4.0.6-alpha.1 <4.0.7`、schemastery `>=3.18.6-alpha.1 <3.18.7`）、`docs/reference/` 第十一次重拉（13 源中 3 份有差异，均不落插件消费面）、`docs/dsh-contract.md` 对应版本与新增 §1.2「输入区写入链与附件回读」+ 沿革⑫、`docs/compat-audit.md` 新核验段、新增 [upgrade-assessments/dsh-0.2.2-alpha.2.md](docs/upgrade-assessments/dsh-0.2.2-alpha.2.md)、README 双语徽章与版本范围。
+
 ## [2.5.1] - 2026-10-27
 
 ### 兼容

package/README.en.md

@@ -7,7 +7,7 @@
 ![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS-blue)
 ![Build](https://img.shields.io/badge/pure%20JS-green)
 
-[![DSH](https://img.shields.io/badge/DSH-0.2.1--rc.3-blue)](https://github.com/deepseek-ai/deepseek-harness/releases/tag/dsh-v0.2.1-rc.3)
+[![DSH](https://img.shields.io/badge/DSH-0.2.2--alpha.2-blue)](https://github.com/deepseek-ai/deepseek-harness/releases/tag/dsh-v0.2.2-alpha.2)
 ![DSH](https://img.shields.io/badge/DSH-Desktop-blue)
 
 Under any message you've sent, click "↶ Recall" — **your workspace files and the conversation history roll back to just before that message was sent**.
@@ -87,7 +87,7 @@ Prerequisites:
 
 - git CLI: without it the recall button won't appear (a notice shows at the top of the page); DSH itself keeps running.
 - Shell: PowerShell 5.1 / 7 on Windows; bash on Linux/macOS.
-- DSH version: `0.1.2-alpha.1` through `0.2.1-rc.3`; later versions within a verified minor line are admitted automatically, while unverified new minor lines are blocked by the startup compatibility gate (window mechanics in the fold below).
+- DSH version: `0.1.2-alpha.1` through `0.2.2-alpha.2`; later versions within a verified minor line are admitted automatically, while unverified new minor lines are blocked by the startup compatibility gate (window mechanics in the fold below).
 - **0.1.7-alpha.1 is a breaking release** (the shell execution and settings interfaces changed); the plugin ships both seams side by side — the same release works on every 0.1.2–0.1.6 line and on 0.1.7+, with unchanged behaviour on older DSH versions.
 - `0.1.1-rc.2` and earlier are not supported: their client runtime lacks the `sessions`/`workspaces`/`uiWorkspace` services, so the plugin UI silently fails to render.
 
@@ -97,10 +97,10 @@ Prerequisites:
 peerDependencies open a window per minor line, consistent with the `dsh.compatibility.dshReleases` declaration:
 
 ```
->=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0
+>=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0 || >=0.2.2-alpha.1 <0.3.0
 ```
 
-Each line is anchored at its first verified version with an upper bound at the next minor (the 0.2.1 window's upper bound is widened to `<0.3.0`, admitting every 0.2 release), so later prereleases/releases within a verified line are admitted without touching the peer declaration. Both the 0.2.0 and 0.2.1 lines need their own tuple: npm's prerelease gate only admits a prerelease from a comparator with the same tuple, so the existing `<0.1.8` segment cannot admit `0.2.0-rc.1`, nor `<0.2.1` admit `0.2.1-alpha.1` (prereleases of later tuples such as 0.2.2 obey the same gate and need their own segment once verified).
+Each line is anchored at its first verified version with an upper bound at the next minor (the 0.2.1 and 0.2.2 windows widen their upper bound to `<0.3.0`, admitting every 0.2 release), so later prereleases/releases within a verified line are admitted without touching the peer declaration. The 0.2.0, 0.2.1 and 0.2.2 lines each need their own tuple: npm's prerelease gate only admits a prerelease from a comparator with the same tuple, so the existing `<0.1.8` segment cannot admit `0.2.0-rc.1`, `<0.2.1` cannot admit `0.2.1-alpha.1`, and `>=0.2.1-alpha.1 <0.3.0` cannot admit `0.2.2-alpha.2` (first verified 0.2.2 release, 2026-10-28).
 
 </details>
 
@@ -155,7 +155,7 @@ All options can be edited visually in the "**Settings → Plugin Config → Reca
 | --- | --- | --- |
 | `gcSnaps` | 50 | Run `git gc` after this many snapshots accumulate (env `DSH_RECALL_GC_SNAPS` force-overrides) |
 | `gcHours` | 24 | Run gc when this many hours have passed since the last one (whichever trigger fires first; env `DSH_RECALL_GC_HOURS`) |
-| `maxFileBytes` | 8388608 (8MB) | Files larger than this are neither snapshotted nor touched by recalls |
+| `maxFileBytes` | 8388608 (8MB) | Files larger than this are neither snapshotted nor touched by recalls; they are filtered out *before* `git add` from a path list, so no objects are written (older git falls back to add-then-remove) |
 | `maxWorkspaceBytes` | 268435456 (256MB) | Total snapshot-eligible file size per workspace, measured exactly as `git add` sees it (`.gitignore`, `.git/info/exclude` and the global excludesFile all apply). Exceeding it **disables snapshots for that workspace** (no truncation — a truncated snapshot would make rollback delete the skipped files) and shows a notice on recent messages; raise the limit or add exclusions to recover automatically. 0 = unlimited |
 | `scanBudgetMs` | 10000 (10s) | Time budget for measuring the snapshot-eligible total. Exceeding it skips the snapshot with a notice (guards against pathological directories stalling startup). 0 = unlimited |
 | `maxSnapshotsPerWorkspace` | 500 | Maximum snapshots kept per workspace; oldest pruned beyond the cap. 0 = unlimited |
@@ -198,7 +198,7 @@ The plugin manages disk usage automatically — no manual housekeeping needed:
 
 The most common questions and their troubleshooting paths; for the full set of design boundaries see "Known Limitations" above, and environment-class failures (git missing / disk full / permission denied / …) are explained in the settings card's "Recent errors".
 
-**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/`) or exceeded the `maxWorkspaceBytes` / `scanBudgetMs` guardrails, in which case recent messages carry a recovery notice (raise the limit or extend the exclusion list and it recovers automatically).
+**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.
 

package/README.md

@@ -5,7 +5,7 @@
 [![npm version](https://img.shields.io/npm/v/dsh-recall-plugin?style=flat-square&label=npm&color=3178C6)](https://www.npmjs.com/package/dsh-recall-plugin)
 [![npm downloads](https://img.shields.io/npm/dm/dsh-recall-plugin?style=flat-square&label=downloads&color=1F883D)](https://www.npmjs.com/package/dsh-recall-plugin)
 ![License](https://img.shields.io/badge/license-MIT-blue)
-[![DSH](https://img.shields.io/badge/DSH-0.2.1--rc.3-blue)](https://github.com/deepseek-ai/deepseek-harness/releases/tag/dsh-v0.2.1-rc.3)
+[![DSH](https://img.shields.io/badge/DSH-0.2.2--alpha.2-blue)](https://github.com/deepseek-ai/deepseek-harness/releases/tag/dsh-v0.2.2-alpha.2)
 
 在任意一条你发过的消息下方点「↶ 撤回」——**工作区文件和对话历史一起回到那条消息发出之前的状态**。
 
@@ -84,7 +84,7 @@
 
 - git CLI：未安装时撤回按钮不出现（页面顶部会提示安装 git），不影响 DSH 运行。
 - shell：Windows 上 PowerShell 5.1 / 7 均可；Linux/macOS 需 bash。
-- DSH 版本：`0.1.2-alpha.1` 至 `0.2.1-rc.3`；已核验 minor 线内的后续版本自动放行，未核验的新 minor 线会被启动期兼容门禁拦截（开窗机制见下方折叠块）。
+- DSH 版本：`0.1.2-alpha.1` 至 `0.2.2-alpha.2`；已核验 minor 线内的后续版本自动放行，未核验的新 minor 线会被启动期兼容门禁拦截（开窗机制见下方折叠块）。
 - **0.1.7-alpha.1 是破坏性版本**（shell 执行与 settings 面接口更换），插件内置双分支共存适配：同一发布同时兼容 0.1.2–0.1.6 各线与 0.1.7+，老版本 DSH 上行为不变。
 - `0.1.1-rc.2` 及更早不支持：那条线的客户端运行时没有 `sessions`/`workspaces`/`uiWorkspace` 服务，插件 UI 会静默不渲染。
 
@@ -94,10 +94,10 @@
 peerDependencies 按 minor 版本线开窗，与 `dsh.compatibility.dshReleases` 声明一致：
 
 ```
->=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0
+>=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0 || >=0.2.2-alpha.1 <0.3.0
 ```
 
-每条线以首个核验版本为下限、上界开到下一 minor（0.2.1 段上限放宽到 `<0.3.0`，0.2 全线正式版自动放行），同线内后续 prerelease/正式版自动放行、无需改 peer 声明。0.2.0 与 0.2.1 两线都必须显式开窗：npm 的 prerelease 门槛要求同 tuple 且带 prerelease 的比较器，既有 `<0.1.8` 段放行不了 `0.2.0-rc.1`、`<0.2.1` 段放行不了 `0.2.1-alpha.1`（0.2.2 及以后 tuple 的 prerelease 同样受此门槛约束，待核验后另加段）。
+每条线以首个核验版本为下限、上界开到下一 minor（0.2.1 与 0.2.2 段上限均放宽到 `<0.3.0`，0.2 全线正式版自动放行），同线内后续 prerelease/正式版自动放行、无需改 peer 声明。0.2.0 / 0.2.1 / 0.2.2 每条线都必须显式开窗：npm 的 prerelease 门槛要求同 tuple 且带 prerelease 的比较器，既有 `<0.1.8` 段放行不了 `0.2.0-rc.1`、`<0.2.1` 段放行不了 `0.2.1-alpha.1`，`>=0.2.1-alpha.1 <0.3.0` 同样放行不了 `0.2.2-alpha.2`（首个 0.2.2 核验版本，2026-10-28）。
 
 </details>
 
@@ -152,7 +152,7 @@ peerDependencies 按 minor 版本线开窗，与 `dsh.compatibility.dshReleases`
 | --- | --- | --- |
 | `gcSnaps` | 50 | 每积累多少条快照触发一次 `git gc`（env `DSH_RECALL_GC_SNAPS` 可强制覆盖） |
 | `gcHours` | 24 | 距上次 gc 超过多少小时触发（与条数先到先触发；env `DSH_RECALL_GC_HOURS`） |
-| `maxFileBytes` | 8388608（8MB） | 超过该大小的文件不进快照、不被回退触碰 |
+| `maxFileBytes` | 8388608（8MB） | 超过该大小的文件不进快照、不被回退触碰；在 `git add` 之前就按清单剔除，不写对象（旧 git 退回「先加后剔」） |
 | `maxWorkspaceBytes` | 268435456（256MB） | 单工作区可纳入快照的文件总量上限，口径与 `git add` 一致（`.gitignore`、`.git/info/exclude`、全局 excludesFile 都算数）。超过时**停用该工作区快照**（不截断——截断快照回退时会误删未纳入的文件），并在最近消息上提示；调大该值或补充排除表后自动恢复；0 = 不限制 |
 | `scanBudgetMs` | 10000（10 秒） | 快照前统计纳入总量的时间预算。超过时停用本次快照并提示（防病态大目录拖死启动）；0 = 不限制 |
 | `maxSnapshotsPerWorkspace` | 500 | 每个工作区保留的最大快照数，超限自动删除最旧的；0 = 不限制 |
@@ -195,7 +195,7 @@ peerDependencies 按 minor 版本线开窗，与 `dsh.compatibility.dshReleases`
 
 使用中最常遇到的几类问题与排查路径；更完整的设计边界见上文「已知限制」，环境类失败（git 缺失 / 磁盘满 / 无权限等）的原因在设置卡片「最近错误」里可查。
 
-**消息旁没有「↶ 撤回」按钮？** 按概率排查：① 装完没重启 DSH 进程——重启后硬刷新页面（Ctrl+Shift+R）；② git CLI 不在 PATH——页面顶部会有安装提示；③ 该消息发送于插件启用之前——快照只在消息发送时创建，历史消息无快照；④ 该工作区被停用快照——工作区开在 `dist/`、`target/` 这类命中基础排除表目录形态的位置，或超出 `maxWorkspaceBytes` / `scanBudgetMs` 护栏，最近消息上会给出恢复提示（调大上限或补充排除表后自动恢复）。
+**消息旁没有「↶ 撤回」按钮？** 按概率排查：① 装完没重启 DSH 进程——重启后硬刷新页面（Ctrl+Shift+R）；② git CLI 不在 PATH——页面顶部会有安装提示；③ 该消息发送于插件启用之前——快照只在消息发送时创建，历史消息无快照；④ 该工作区被停用快照——工作区开在 `dist/`、`target/` 这类命中基础排除表目录形态的位置，或超出 `maxWorkspaceBytes` / `scanBudgetMs` 护栏，或快照前的范围统计本身失败（`git ls-files` 报错，原因见「最近错误」，10 分钟后自动重试）；最近消息上会给出恢复提示（调大上限或补充排除表后自动恢复）。
 
 **撤回后个别文件没有恢复？** 该文件不在快照里：超过 `maxFileBytes`（默认 8MB）、命中排除表，或位于嵌套 git 仓库 / win32 目录重解析点内（见「已知限制」）。撤回前确认面板的清单就是实际回退范围，以它为准。
 

package/lib/client.js

@@ -1695,7 +1695,7 @@
                 attachStarted = startAttachDrafts(conversation, shell, targetSessionId, attachmentFiles, () => {
                   attachDone = true;
                   submitIfReady();
-                });
+                }, opts === void 0 || opts.submit !== true);
               }
             }
           }
@@ -1732,7 +1732,7 @@
       };
       setTimeout(tick, 0);
     }
-    function startAttachDrafts(conversation, shell, sessionId, files, onDone) {
+    function startAttachDrafts(conversation, shell, sessionId, files, onDone, eagerUpload = true) {
       if (typeof conversation.createDrafts !== "function") return false;
       const actions = shell.actions;
       let add = null;
@@ -1749,7 +1749,12 @@
           }
           if (!Array.isArray(list) || list.length === 0) return;
           try {
-            const drafts = conversation.createDrafts ? conversation.createDrafts(sessionId, list) : [];
+            let drafts;
+            try {
+              drafts = conversation.createDrafts ? conversation.createDrafts(sessionId, list, eagerUpload) : [];
+            } catch (e) {
+              drafts = conversation.createDrafts ? conversation.createDrafts(sessionId, list) : [];
+            }
             const descriptors = Array.isArray(drafts) ? drafts : [];
             const ids = descriptors.map((draft) => draft && draft.id).filter((id) => typeof id === "string" && id !== "");
             if (ids.length === 0) return;
@@ -1763,20 +1768,45 @@
       })();
       return true;
     }
+    let attachmentShape = null;
+    async function readAttachmentBytes(read, ref) {
+      const refArg = ref.attachment && typeof ref.attachment === "object" ? ref.attachment : null;
+      const idArg = typeof ref.attachmentId === "string" && ref.attachmentId !== "" ? ref.attachmentId : null;
+      const attempts = [];
+      if (attachmentShape === "id") {
+        if (idArg !== null) attempts.push({ shape: "id", arg: idArg });
+        if (refArg !== null) attempts.push({ shape: "ref", arg: refArg });
+      } else {
+        if (refArg !== null) attempts.push({ shape: "ref", arg: refArg });
+        if (idArg !== null) attempts.push({ shape: "id", arg: idArg });
+      }
+      for (const attempt of attempts) {
+        try {
+          const result = await read(attempt.arg);
+          if (result && result.ok === true && result.value && result.value.data !== void 0 && result.value.data !== null) {
+            attachmentShape = attempt.shape;
+            return { attachment: result.value.attachment, data: result.value.data };
+          }
+        } catch (e) {
+        }
+      }
+      return null;
+    }
     function preloadAttachmentFiles(sourceSessionId, refs) {
       return (async () => {
         const sessions = ctx.sessions;
         const binding = sessions && typeof sessions.binding === "function" ? sessions.binding(sourceSessionId) : void 0;
         const session = binding && binding.session;
         if (!session || typeof session.readAttachment !== "function") return [];
+        const read = session.readAttachment.bind(session);
         const out = [];
         for (const ref of refs) {
           try {
-            const result = await session.readAttachment(ref.attachmentId);
-            if (!result || result.ok !== true || !result.value || result.value.data === void 0 || result.value.data === null) continue;
-            const raw = result.value.data;
+            const value = await readAttachmentBytes(read, ref);
+            if (!value) continue;
+            const raw = value.data;
             const bytes = raw instanceof Uint8Array ? raw : Uint8Array.from(raw);
-            const meta = result.value.attachment;
+            const meta = value.attachment;
             const mediaType = meta && typeof meta.mediaType === "string" && meta.mediaType !== "" ? meta.mediaType : "application/octet-stream";
             const name = ref.name || (meta && typeof meta.name === "string" && meta.name !== "" ? meta.name : defaultAttachmentName(mediaType, out.length));
             const buffer = bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
@@ -1859,7 +1889,7 @@
       if (!block || block.type !== "image" && block.type !== "file") continue;
       const ref = block.attachment;
       if (!ref || typeof ref.attachmentId !== "string" || ref.attachmentId === "") continue;
-      const entry = { attachmentId: ref.attachmentId, kind: block.type };
+      const entry = { attachmentId: ref.attachmentId, kind: block.type, attachment: block.attachment };
       if (typeof ref.name === "string" && ref.name !== "") entry.name = ref.name;
       refs.push(entry);
     }

package/lib/scripts.posix.js

@@ -36,14 +36,34 @@ function dirPruneArgsBlock() {
     "if [ ${#oversize_args[@]} -gt 0 ]; then oversize_prune=('(' -type d '(' \"${oversize_args[@]}\" ')' ')' -prune -o); fi"
   ].join("\n");
 }
-function oversizeBlock(maxBytes) {
+function oversizeRemoveBlock() {
+  return 'xargs -0 "$git" --literal-pathspecs --git-dir="$g" --work-tree="$root" update-index --force-remove -- < "$oversize_r" 2>/dev/null || true';
+}
+function oversizeListBlock(maxBytes) {
   return [
     dirPruneArgsBlock(),
+    'oversize_p="$g/oversize-pathspec.$$"',
+    'oversize_r="$g/oversize-rel.$$"',
+    ': > "$oversize_p"',
+    ': > "$oversize_r"',
     'find "$root" "${oversize_prune[@]}" -type f -size +' + String(maxBytes || MAX_FILE_BYTES) + "c -print0 2>/dev/null | while IFS= read -r -d '' f; do",
-    `  printf '%s\\0' "\${f#"$root"/}"`,
-    // --work-tree 不可省：bare 影子仓库下裸 update-index fatal（被 || true 吞掉
-    // 后大文件会静默留在 index 里），maxFileBytes 的承诺会形同虚设
-    'done | xargs -0 "$git" --literal-pathspecs --git-dir="$g" --work-tree="$root" update-index --force-remove -- 2>/dev/null || true'
+    '  oversize_rel="${f#"$root"/}"',
+    `  printf '%s\\0' ":(top,exclude,literal)$oversize_rel" >> "$oversize_p"`,
+    `  printf '%s\\0' "$oversize_rel" >> "$oversize_r"`,
+    "done",
+    oversizeRemoveBlock()
+  ].join("\n");
+}
+function oversizeAddPrepBlock() {
+  return [
+    "pa_args=()",
+    'if [ -s "$oversize_p" ]; then',
+    `  if [ -f "$g/pathspec-from-file.ok" ] || "$git" add -h 2>&1 | grep -q -- '--pathspec-from-file'; then`,
+    `    printf '1\\n' > "$g/pathspec-from-file.ok" 2>/dev/null || true`,
+    '    pa_args=(--pathspec-from-file="$oversize_p" --pathspec-file-nul)',
+    "  fi",
+    "fi",
+    'cd "$root"'
   ].join("\n");
 }
 function limitScanBlock(maxBytes, fileMaxBytes, budgetMs) {
@@ -53,13 +73,22 @@ function limitScanBlock(maxBytes, fileMaxBytes, budgetMs) {
   return [
     "limit_start=$(date +%s)",
     'limit_tmp="$g/limit-scan.$$"',
-    "limit_scan_ok=0",
-    // set -e：条件位置豁免，ls-files 失败不终止脚本——fail-open 只放行不判定
-    'if "$git" -c core.quotePath=false --git-dir="$g" --work-tree="$root" ls-files -z -co --exclude-standard > "$limit_tmp" 2>/dev/null; then',
-    "  limit_scan_ok=1",
+    'limit_err="$g/limit-scan-err.$$"',
+    // set -e：条件位置豁免，失败由 else 分支显式处理（不许穿透到 add）
+    'if "$git" -c core.quotePath=false --git-dir="$g" --work-tree="$root" ls-files -z -co --exclude-standard > "$limit_tmp" 2> "$limit_err"; then',
+    "  :",
+    "else",
+    "  limit_rc=$?",
+    // 压平成单行才能随哨兵回传；截 300 字符防一条巨长 stderr 撑爆错误环
+    '  limit_msg=$(head -c 300 "$limit_err" 2>/dev/null | tr "\\n\\r" "  ")',
+    '  rm -f "$limit_tmp" "$limit_err"',
+    `  printf 'SNAP_SCAN_FAIL %s\\n' "$limit_rc"`,
+    `  printf 'SNAP_SCAN_ERR %s\\n' "$limit_msg"`,
+    "  exit 0",
     "fi",
+    'rm -f "$limit_err"',
     'limit_sizes=""',
-    'if [ "$limit_scan_ok" = 1 ] && [ -s "$limit_tmp" ]; then',
+    'if [ -s "$limit_tmp" ]; then',
     // ls-files 输出相对 root 的路径，而脚本 cwd 是宿主工作目录：必须 cd 进去再 stat
     `  if find "$root" -maxdepth 0 -printf '' >/dev/null 2>&1; then`,
     `    limit_sizes=$(cd "$root" && xargs -0 stat -c '%s %F' -- < "$limit_tmp" 2>/dev/null || true)`,
@@ -70,7 +99,7 @@ function limitScanBlock(maxBytes, fileMaxBytes, budgetMs) {
     'rm -f "$limit_tmp"',
     // 目录条目（嵌套仓库在 ls-files 里输出 `dir/`）不计入：add 侧同样不纳入它
     // 的内容（gitlink 被剔除 / 无提交时 unable to index）；越过单文件上限的也
-    // 不计入——oversizeBlock 随后会把它移出 index
+    // 不计入——oversizeListBlock 随后会把它移出 index
     `limit_total=$(printf '%s\\n' "$limit_sizes" | awk -v lim=` + limit + " -v flim=" + fileLimit + ` '{ if (tolower($0) ~ /directory/) next; if ($1 <= flim) { s += $1; if (lim > 0 && s > lim) { print "OVER " s; exit } } } END { if (lim <= 0 || s <= lim) print s }')`,
     "limit_elapsed=$(( $(date +%s) - limit_start ))",
     'case "$limit_total" in',
@@ -205,14 +234,17 @@ function snapshotScript(root, store, gitExe, messageId, base) {
     excludeSyncBlock(store.excludeFile, base),
     // issue #24：总量/预算护栏先于 add——超限时连 add 都不跑
     limitScanBlock(store.maxWorkspaceBytes, store.maxFileBytes, store.scanBudgetMs),
+    // issue #29：大文件清单先于 add——add 带 exclude 后不再为它们写对象
+    oversizeListBlock(store.maxFileBytes),
     attrsMigrateBlock(),
+    oversizeAddPrepBlock(),
     // fail-open add（issue #7 加固，语义见 pwsh 版同款注释）：--ignore-errors
     // 下「无法索引的路径」以退出码 1 结束但索引已落盘；≥2 才是真 fatal，
     // 显式退出让 runShell 抛错（set -e 对 add 非零本会终止，但 || rc=$?
     // 捕获后必须自检，否则 tolerated/fatal 无法区分）。stderr 合并进变量
     // 供 fatal 时带回诊断与 SNAP_SKIP 提取。
     "addrc=0",
-    'add_log=$("$git" --git-dir="$g" --work-tree="$root" add -A --ignore-errors 2>&1) || addrc=$?',
+    '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`,
     // 循环体用 if/fi 而非 && 列表：&& 列表条件为假时整条管道退出码为 1，
@@ -220,7 +252,9 @@ function snapshotScript(root, store, gitExe, messageId, base) {
     `  if [ -n "$sk" ]; then printf 'SNAP_SKIP %s\\n' "$sk"; fi`,
     "done",
     dropGitlinksBlock(),
-    oversizeBlock(store.maxFileBytes),
+    // 兜底：旧 git 走裸 add 时大文件仍会被重新索引，这里按清单再清一次
+    oversizeRemoveBlock(),
+    'rm -f "$oversize_p" "$oversize_r"',
     'tree=$("$git" --git-dir="$g" --work-tree="$root" write-tree)',
     'commit=$("$git" --git-dir="$g" -c user.name=dsh-recall -c user.email=recall@dsh.local commit-tree "$tree" -m ' + psq("snapshot " + messageId) + ")",
     '"$git" --git-dir="$g" tag -f ' + psq("snap-" + messageId) + ' "$commit" >/dev/null',
@@ -237,14 +271,18 @@ function collectListsBlock(store, gitExe, root, tag, base) {
     "root=" + psq(root),
     dropGitlinksBlock(),
     excludeSyncBlock(store.excludeFile, base),
+    // issue #29：与 snapshotScript 同形——大文件不进 add（否则 preview 一次
+    // 也要为它们写对象），清单随 add 后的兜底剔除一起收口
+    oversizeListBlock(store.maxFileBytes),
+    oversizeAddPrepBlock(),
     // fail-open add（语义见 snapshotScript 同款注释）：diff/rollback 的当前
     // 清单来自这次 add 后的索引——被跳过的路径不进清单，diff 不显示、
     // rollback 删除清单也不会误删它们；≥2 显式退出防「旧索引假成功」
     "addrc=0",
-    '"$git" --git-dir="$g" --work-tree="$root" add -A --ignore-errors || addrc=$?',
+    '"$git" --git-dir="$g" --work-tree="$root" add -A --ignore-errors "${pa_args[@]}" || addrc=$?',
     '[ "$addrc" -le 1 ] || exit "$addrc"',
     dropGitlinksBlock(),
-    oversizeBlock(store.maxFileBytes),
+    oversizeRemoveBlock(),
     "tmpc=" + psq(store.dir + "/diff-cur.$$"),
     "tmpt=" + psq(store.dir + "/diff-tgt.$$"),
     `"$git" -c core.quotePath=false --git-dir="$g" --work-tree="$root" ls-files --stage | grep -v '^160000 ' > "$tmpc" || true`,
@@ -255,7 +293,7 @@ function diffScript(root, store, gitExe, tag, base) {
   return [
     "set -e -o pipefail",
     collectListsBlock(store, gitExe, root, tag, base),
-    `trap 'rm -f "$tmpc" "$tmpt"' EXIT`,
+    `trap 'rm -f "$tmpc" "$tmpt" "$oversize_p" "$oversize_r"' EXIT`,
     "awk -F'\\t' -v OFS='\\t' '",
     "  FNR==1 { fidx++ }",
     '  fidx==1 { split($1, a, " "); cur[$2]=a[2]; next }',
@@ -278,7 +316,7 @@ function rollbackScript(root, store, gitExe, tag, base) {
     "set -e -o pipefail",
     collectListsBlock(store, gitExe, root, tag, base),
     "tmpr=" + psq(store.dir + "/diff-restore.$$"),
-    `trap 'rm -f "$tmpc" "$tmpt" "$tmpr"' EXIT`,
+    `trap 'rm -f "$tmpc" "$tmpt" "$tmpr" "$oversize_p" "$oversize_r"' EXIT`,
     // 恢复集 = 目标有、当前无或 sha 不同（awk 结构与 diffScript 同款：
     // cur 侧 "mode sha stage<TAB>path" 取 a[2]，target 侧 "mode type sha<TAB>path" 取 a[3]）
     "awk -F'\\t' '",
@@ -314,7 +352,7 @@ function rollbackScript(root, store, gitExe, tag, base) {
     "  fi",
     "fi",
     "tmpd=" + psq(store.dir + "/diff-del.$$"),
-    `trap 'rm -f "$tmpc" "$tmpt" "$tmpr" "$tmpd"' EXIT`,
+    `trap 'rm -f "$tmpc" "$tmpt" "$tmpr" "$tmpd" "$oversize_p" "$oversize_r"' EXIT`,
     "awk -F'\\t' '",
     "  FNR==1 { fidx++ }",
     "  fidx==1 { cur[$2]=1; next }",

package/lib/scripts.pwsh.js

@@ -56,9 +56,20 @@ function reparseDirsBlock() {
     "$reparseRel.Sort()"
   ].join("\n");
 }
-function oversizeBlock(maxBytes) {
+function oversizeRemoveBlock() {
+  return [
+    "for ($i = 0; $i -lt $oversizeRel.Count; $i += 100) {",
+    "  $batch = $oversizeRel.GetRange($i, [Math]::Min(100, $oversizeRel.Count - $i))",
+    // --work-tree 不可省：bare 影子仓库下裸 update-index 会 fatal，pwsh 不抛
+    // → 大文件静默留在 index 里，maxFileBytes 的承诺形同虚设
+    "  & $git --literal-pathspecs --git-dir=$g --work-tree=$root update-index --force-remove -- $batch",
+    "}"
+  ].join("\n");
+}
+function oversizeListBlock(maxBytes) {
   return [
     dirSkipSetBlock("oversizeSkip"),
+    '$oversizeP = Join-Path $g ("oversize-pathspec." + $PID)',
     "$oversizeStack = [System.Collections.Generic.Stack[string]]::new()",
     "$oversizeStack.Push($root)",
     "$oversizeRel = [System.Collections.Generic.List[string]]::new()",
@@ -78,14 +89,44 @@ function oversizeBlock(maxBytes) {
     "    }",
     "  } catch {}",
     "}",
-    "for ($i = 0; $i -lt $oversizeRel.Count; $i += 100) {",
-    "  $batch = $oversizeRel.GetRange($i, [Math]::Min(100, $oversizeRel.Count - $i))",
-    // --work-tree 不可省：bare 影子仓库下裸 update-index 会 fatal，pwsh 不抛
-    // → 大文件静默留在 index 里，maxFileBytes 的承诺形同虚设
-    "  & $git --literal-pathspecs --git-dir=$g --work-tree=$root update-index --force-remove -- $batch",
-    "}"
+    // 清单必须存在（--pathspec-from-file 指错会让 add fatal）：无大文件时写空文件，
+    // 后续按长度 0 判定「不传该参数」
+    "if ($oversizeRel.Count -gt 0) {",
+    "  $oversizeSb = [System.Text.StringBuilder]::new()",
+    '  foreach ($r in $oversizeRel) { [void]$oversizeSb.Append(":(top,exclude,literal)").Append($r).Append([char]0) }',
+    "  [System.IO.File]::WriteAllText($oversizeP, $oversizeSb.ToString(), (New-Object System.Text.UTF8Encoding($false)))",
+    "} else {",
+    '  Set-Content -LiteralPath $oversizeP -Value "" -NoNewline -Encoding ascii -ErrorAction SilentlyContinue',
+    "}",
+    oversizeRemoveBlock()
+  ].join("\n");
+}
+function oversizeAddPrepBlock() {
+  return [
+    "$paArgs = @()",
+    "if ((Test-Path -LiteralPath $oversizeP) -and ((Get-Item -LiteralPath $oversizeP).Length -gt 0)) {",
+    "  $paOk = Join-Path $g 'pathspec-from-file.ok'",
+    "  $paDetect = Test-Path -LiteralPath $paOk",
+    "  if (-not $paDetect) {",
+    "    $paHit = @()",
+    "    $paEap = $ErrorActionPreference",
+    "    $ErrorActionPreference = 'Continue'",
+    "    try {",
+    "      $paHit = @(& $git add -h 2>&1 | Select-String -SimpleMatch '--pathspec-from-file')",
+    "    } finally { $ErrorActionPreference = $paEap }",
+    "    if ($paHit.Count -gt 0) {",
+    "      Set-Content -LiteralPath $paOk -Value 1 -Encoding ascii -ErrorAction SilentlyContinue",
+    "      $paDetect = $true",
+    "    }",
+    "  }",
+    '  if ($paDetect) { $paArgs = @(("--pathspec-from-file=" + $oversizeP), "--pathspec-file-nul") }',
+    "}",
+    "Set-Location -LiteralPath $root"
   ].join("\n");
 }
+function oversizeCleanupBlock() {
+  return "Remove-Item -LiteralPath $oversizeP -ErrorAction SilentlyContinue";
+}
 function limitScanBlock(maxBytes, fileMaxBytes, budgetMs) {
   const limit = maxBytes > 0 ? String(maxBytes) : "0";
   const fileLimit = String(fileMaxBytes || MAX_FILE_BYTES);
@@ -96,27 +137,43 @@ function limitScanBlock(maxBytes, fileMaxBytes, budgetMs) {
     "$limitHit = ''",
     "$limitRc = 0",
     "$limitFiles = @()",
+    // 临时文件名带 $PID：脚本每次都是新进程，避免同一 store 上的残留互相覆盖
+    '$limitErrFile = Join-Path $g ("limit-scan-err." + $PID)',
     // PS 5.1：native stderr 在 EAP=Stop 下会被包成 ErrorRecord 直接抛（pwsh 7
     // 不抛），一条 warning 就能让整条快照挂掉——与下方 add 段同款临时降级
     "$limitEap = $ErrorActionPreference",
     "$ErrorActionPreference = 'Continue'",
     "try {",
-    // -z：路径含换行也不分裂（实测 PS 5.1/7 的 @() 都保留 NUL）
-    "  $limitFiles = @(((& $git -c core.quotePath=false --git-dir=$g --work-tree=$root ls-files -z -co --exclude-standard 2>$null) -join '').Split([char]0))",
+    // -z：路径含换行也不分裂（实测 PS 5.1/7 的 @() 都保留 NUL）；stderr 落文件
+    // 而不是 $null——失败原因是 issue #29 的第一诉求，不能再吞掉
+    "  $limitFiles = @(((& $git -c core.quotePath=false --git-dir=$g --work-tree=$root ls-files -z -co --exclude-standard 2>$limitErrFile) -join '').Split([char]0))",
     "  $limitRc = $LASTEXITCODE",
     "} finally { $ErrorActionPreference = $limitEap }",
-    "if ($limitRc -eq 0) {",
-    "  foreach ($limitRel in $limitFiles) {",
+    "if ($limitRc -ne 0) {",
+    "  $limitMsg = ''",
+    // 只取首个非空行：PS 5.1 把 native stderr 写成 ErrorRecord（后续行是
+    // 调用点/脚本路径上下文），整段压平会把噪声塞进「最近错误」
+    "  try {",
+    "    $limitLines = @(Get-Content -LiteralPath $limitErrFile -Encoding UTF8 -ErrorAction SilentlyContinue | Where-Object { $_.Trim() })",
+    "    if ($limitLines.Count -gt 0) { $limitMsg = ($limitLines[0] -replace '\\s+', ' ').Trim() }",
+    "  } catch {}",
+    "  Remove-Item -LiteralPath $limitErrFile -ErrorAction SilentlyContinue",
+    "  if ($limitMsg.Length -gt 300) { $limitMsg = $limitMsg.Substring(0, 300) }",
+    "  Write-Output ('SNAP_SCAN_FAIL ' + $limitRc)",
+    "  Write-Output ('SNAP_SCAN_ERR ' + $limitMsg)",
+    "  exit 0",
+    "}",
+    "Remove-Item -LiteralPath $limitErrFile -ErrorAction SilentlyContinue",
+    "foreach ($limitRel in $limitFiles) {",
     // 两道守卫吸收两类异常条目：5.1 的 Split 会留尾部空串；目录条目（嵌套仓库
     // 输出 `dir/`）的 Length 为空或抛——两者都不该计入（add 侧同样不纳入）
-    "    if (-not $limitRel) { continue }",
-    "    if (" + budget + " -gt 0 -and $limitSw.ElapsedMilliseconds -gt " + budget + ") { $limitHit = 'time'; break }",
-    "    try { $limitLen = [System.IO.FileInfo]::new($root + '/' + $limitRel).Length } catch { $limitLen = [long]0 }",
-    // 口径 = 实际会进快照的字节：超过单文件上限的文件随后被 oversizeBlock
+    "  if (-not $limitRel) { continue }",
+    "  if (" + budget + " -gt 0 -and $limitSw.ElapsedMilliseconds -gt " + budget + ") { $limitHit = 'time'; break }",
+    "  try { $limitLen = [System.IO.FileInfo]::new($root + '/' + $limitRel).Length } catch { $limitLen = [long]0 }",
+    // 口径 = 实际会进快照的字节：超过单文件上限的文件随后被 oversizeListBlock
     // 移出 index，不该计入总量（否则一个 300MB 视频就能把干净项目误判超限）
-    "    if ($limitLen -gt 0 -and $limitLen -le " + fileLimit + ") { $limitBytes += $limitLen }",
-    "    if (" + limit + " -gt 0 -and $limitBytes -gt " + limit + ") { $limitHit = 'bytes'; break }",
-    "  }",
+    "  if ($limitLen -gt 0 -and $limitLen -le " + fileLimit + ") { $limitBytes += $limitLen }",
+    "  if (" + limit + " -gt 0 -and $limitBytes -gt " + limit + ") { $limitHit = 'bytes'; break }",
     "}",
     "if ($limitHit -eq 'bytes') { Write-Output ('SNAP_LIMIT bytes ' + $limitBytes + ' ' + " + limit + "); exit 0 }",
     "if ($limitHit -eq 'time') { Write-Output ('SNAP_LIMIT time ' + $limitSw.ElapsedMilliseconds + ' ' + " + budget + "); exit 0 }"
@@ -246,7 +303,10 @@ function snapshotScript(root, store, gitExe, messageId, base) {
     excludeSyncBlock(store.excludeFile, base),
     // issue #24：总量/预算护栏先于 add——超限时连 add 都不跑
     limitScanBlock(store.maxWorkspaceBytes, store.maxFileBytes, store.scanBudgetMs),
+    // issue #29：大文件清单先于 add——add 带 exclude 后不再为它们写对象
+    oversizeListBlock(store.maxFileBytes),
     attrsMigrateBlock(),
+    oversizeAddPrepBlock(),
     // fail-open add（issue #7 加固）：--ignore-errors 让「个别路径无法索引」
     // （无提交的嵌入式仓库、不可读文件等）以退出码 1 结束但索引照常落盘，
     // 快照缺个别路径可接受，好过整条快照 fatal。退出码 ≥2 才是真 fatal
@@ -260,13 +320,16 @@ function snapshotScript(root, store, gitExe, messageId, base) {
     // 后按 "unable to index file 'X'" 提取被跳过的路径，以 SNAP_SKIP 行
     // 回传 JS 侧做用户可见提示。
     "$ErrorActionPreference = 'Continue'",
-    '$addLog = (@(& $git --git-dir=$g --work-tree=$root add -A --ignore-errors 2>&1) | ForEach-Object { [string]$_ }) -join "`n"',
+    '$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) }`,
     dropGitlinksBlock(),
-    oversizeBlock(store.maxFileBytes),
+    // 兜底：旧 git 走裸 add 时大文件仍会被重新索引，这里按清单再清一次；
+    // pathspec 生效时它是空操作（清单条目本就不在 index）
+    oversizeRemoveBlock(),
+    oversizeCleanupBlock(),
     "$tree = (& $git --git-dir=$g --work-tree=$root write-tree).Trim()",
     "$commit = (& $git --git-dir=$g -c user.name=dsh-recall -c user.email=recall@dsh.local commit-tree $tree -m ('snapshot ' + " + psq(messageId) + ")).Trim()",
     "& $git --git-dir=$g tag -f " + psq("snap-" + messageId) + " $commit | Out-Null",
@@ -286,14 +349,19 @@ function diffScript(root, store, gitExe, tag, base, maxChanges) {
     "$root = " + psq(root),
     dropGitlinksBlock(),
     excludeSyncBlock(store.excludeFile, base),
+    // issue #29：与 snapshotScript 同形——大文件不进 add（否则 preview 一次
+    // 也要为它们写对象），清单随 add 后的兜底剔除一起收口
+    oversizeListBlock(store.maxFileBytes),
+    oversizeAddPrepBlock(),
     // fail-open add：语义同 snapshotScript（--ignore-errors 跳过无法索引的
     // 路径、≥2 显式 throw 防「旧索引假成功」）；此处不提取 SNAP_SKIP——
     // 被跳过的路径不进索引，diff 天然不显示、rollback 的删除清单来自当前
     // 索引也天然不会误删它们
-    "& $git --git-dir=$g --work-tree=$root add -A --ignore-errors",
+    "& $git --git-dir=$g --work-tree=$root add -A --ignore-errors @paArgs",
     'if ($LASTEXITCODE -ge 2) { throw ("git add fatal (exit " + $LASTEXITCODE + ")") }',
     dropGitlinksBlock(),
-    oversizeBlock(store.maxFileBytes),
+    oversizeRemoveBlock(),
+    oversizeCleanupBlock(),
     "$curOut = & $git -c core.quotePath=false --git-dir=$g --work-tree=$root ls-files --stage",
     // 旧 tag 的树里可能仍有 gitlink（修复前留下的），从目标侧一并剔除，
     // 否则 diff 会报出“恢复 dsh-recall-plugin”这类幻影条目
@@ -335,11 +403,15 @@ function rollbackScript(root, store, gitExe, tag, base) {
     "$root = " + psq(root),
     dropGitlinksBlock(),
     excludeSyncBlock(store.excludeFile, base),
+    // issue #29：同 snapshotScript（回退前的当前清单同样不该为大文件写对象）
+    oversizeListBlock(store.maxFileBytes),
+    oversizeAddPrepBlock(),
     // fail-open add：语义同 snapshotScript 同款注释（diff/rollback 复用）
-    "& $git --git-dir=$g --work-tree=$root add -A --ignore-errors",
+    "& $git --git-dir=$g --work-tree=$root add -A --ignore-errors @paArgs",
     'if ($LASTEXITCODE -ge 2) { throw ("git add fatal (exit " + $LASTEXITCODE + ")") }',
     dropGitlinksBlock(),
-    oversizeBlock(store.maxFileBytes),
+    oversizeRemoveBlock(),
+    oversizeCleanupBlock(),
     // 同 diffScript：-z 的 NUL 输出会被 PowerShell 捕获丢弃，改为逐行 + quotePath=false
     "$curOut = & $git -c core.quotePath=false --git-dir=$g --work-tree=$root ls-files --stage",
     "$targetOut = @(& $git -c core.quotePath=false --git-dir=$g ls-tree -r " + psq(tag) + " | Where-Object { -not $_.StartsWith('160000') })",

package/lib/snapshots.js

@@ -21,11 +21,27 @@ function parseSnapshotLimit(out) {
   }
   return null;
 }
+function parseScanFail(out) {
+  let rc = null;
+  let message = "";
+  for (const line of String(out || "").split(/\r?\n/)) {
+    if (line.indexOf("SNAP_SCAN_FAIL ") === 0) {
+      const n = parseInt(line.slice(15).trim(), 10);
+      if (Number.isFinite(n)) rc = n;
+    } else if (line.indexOf("SNAP_SCAN_ERR ") === 0) {
+      message = line.slice(14).trim();
+    }
+  }
+  return rc === null ? null : { rc, message };
+}
 function bytesText(bytes) {
   if (bytes >= 1048576) return Math.round(bytes / 1048576) + " MB";
   return Math.max(1, Math.round(bytes / 1024)) + " KB";
 }
 function buildSnapshotLimitNotice(limit) {
+  if (limit.kind === "scan") {
+    return "\u65E0\u6CD5\u7EDF\u8BA1\u8BE5\u5DE5\u4F5C\u533A\u7684\u5FEB\u7167\u8303\u56F4\uFF08git \u9000\u51FA\u7801 " + limit.value + "\uFF09\uFF0C\u672C\u6B21\u5FEB\u7167\u5DF2\u8DF3\u8FC7\uFF1B\u8BE5\u5DE5\u4F5C\u533A\u6682\u505C\u5FEB\u7167\u7EA6 10 \u5206\u949F\uFF0C\u4FEE\u590D\u540E\u81EA\u52A8\u6062\u590D\uFF0C\u8BE6\u60C5\u89C1\u300C\u6700\u8FD1\u9519\u8BEF\u300D";
+  }
   if (limit.kind === "bytes") {
     return "\u8BE5\u5DE5\u4F5C\u533A\u53EF\u7EB3\u5165\u5FEB\u7167\u7684\u6587\u4EF6\u603B\u91CF\u8D85\u8FC7\u4E0A\u9650\uFF08\u7EA6 " + bytesText(limit.value) + " / " + bytesText(limit.limit) + "\uFF0C\u5DF2\u6309 .gitignore \u4E0E\u6392\u9664\u8868\u8FC7\u6EE4\uFF09\uFF0C\u5DF2\u505C\u7528\u5FEB\u7167\uFF1B\u53EF\u8C03\u5927\u300C\u5DE5\u4F5C\u533A\u603B\u91CF\u4E0A\u9650\u300D\u6216\u8865\u5145\u6392\u9664\u8868\u540E\u81EA\u52A8\u6062\u590D";
   }
@@ -185,10 +201,20 @@ function createSnapshots(ctx, rt, config) {
   const FUSE_AFTER = 3;
   const FUSE_BACKOFF_BASE_MS = 5 * 60 * 1e3;
   const FUSE_BACKOFF_CAP_MS = 60 * 60 * 1e3;
+  const EXPENSIVE_FAIL_MS = 60 * 1e3;
   const snapFailures = /* @__PURE__ */ new Map();
   const SNAP_LIMIT_RETRY_MS = 10 * 60 * 1e3;
   const snapLimits = /* @__PURE__ */ new Map();
   const limitBlockedAt = /* @__PURE__ */ new Map();
+  function markSnapshotLimited(root, limit) {
+    snapLimits.set(root, { ...limit, at: Date.now(), maxWorkspaceBytes: config.maxWorkspaceBytes, scanBudgetMs: config.scanBudgetMs });
+  }
+  function noteSnapshotBlocked(root, detail) {
+    const last = limitBlockedAt.get(root) || 0;
+    if (Date.now() - last < 5 * 60 * 1e3) return;
+    limitBlockedAt.set(root, Date.now());
+    rt.recordError(detail);
+  }
   const SUPPORTED_FORMAT = 1;
   const FORMAT_OK_TTL_MS = 3e4;
   const formatOkAt = /* @__PURE__ */ new Map();
@@ -413,20 +439,26 @@ function createSnapshots(ctx, rt, config) {
       return;
     }
     await loadIndex(root, sessionId);
+    const captureStartedAt = Date.now();
     try {
       const out = await rt.runShell(S.snapshotScript(root, store, state.gitExe || "", messageId, BASE()), { timeoutMs: 6e5, stdoutMaxBytes: 65536 });
       const limit = parseSnapshotLimit(out);
       if (limit) {
-        snapLimits.set(root, { ...limit, at: Date.now(), maxWorkspaceBytes: config.maxWorkspaceBytes, scanBudgetMs: config.scanBudgetMs });
+        markSnapshotLimited(root, limit);
         const notice = buildSnapshotLimitNotice(limit);
-        const last = limitBlockedAt.get(root) || 0;
-        if (Date.now() - last >= 5 * 60 * 1e3) {
-          limitBlockedAt.set(root, Date.now());
-          rt.recordError("recall snapshot disabled for " + root + ": " + notice);
-        }
+        noteSnapshotBlocked(root, "recall snapshot disabled for " + root + ": " + notice);
         setFeedback(messageId, { failed: true, kind: "workspaceLimit", error: notice });
         return;
       }
+      const scanFail = parseScanFail(out);
+      if (scanFail) {
+        const pseudo = { kind: "scan", value: scanFail.rc, limit: 0 };
+        markSnapshotLimited(root, pseudo);
+        const notice = buildSnapshotLimitNotice(pseudo);
+        noteSnapshotBlocked(root, "recall snapshot scan failed for " + root + ": rc=" + scanFail.rc + " " + scanFail.message);
+        setFeedback(messageId, { failed: true, kind: "scanFail", error: notice });
+        return;
+      }
       snapFailures.delete(root);
       state.snapshots.set(String(messageId), { root, time: time || Date.now(), sessionId });
       await saveIndex(root, sessionId);
@@ -434,7 +466,7 @@ function createSnapshots(ctx, rt, config) {
     } catch (error) {
       rt.recordError("recall snapshot failed: " + String(error));
       setFeedback(messageId, { failed: true, ...buildFeedbackError(String(error)) });
-      await handleSnapshotFailure(root, store);
+      await handleSnapshotFailure(root, store, Date.now() - captureStartedAt);
     }
   }
   function setFeedback(messageId, rec) {
@@ -460,7 +492,7 @@ function createSnapshots(ctx, rt, config) {
     }
     return {};
   }
-  async function handleSnapshotFailure(root, store) {
+  async function handleSnapshotFailure(root, store, elapsedMs = 0) {
     if (store && state.gitExe) {
       try {
         await rt.runShell(S.pruneScript(store, state.gitExe), { timeoutMs: 6e5, stdoutMaxBytes: 4096 });
@@ -470,11 +502,15 @@ function createSnapshots(ctx, rt, config) {
     }
     const f = snapFailures.get(root) || { count: 0, skipUntil: 0 };
     f.count++;
+    const expensive = elapsedMs >= EXPENSIVE_FAIL_MS;
+    if (expensive && f.count < FUSE_AFTER) f.count = FUSE_AFTER;
     if (f.count >= FUSE_AFTER) {
       const backoff = Math.min(FUSE_BACKOFF_BASE_MS * 2 ** (f.count - FUSE_AFTER), FUSE_BACKOFF_CAP_MS);
       const wasFused = Date.now() < f.skipUntil;
       f.skipUntil = Date.now() + backoff;
-      if (!wasFused) rt.recordError("recall snapshot fused after " + f.count + " consecutive failures, backoff " + Math.round(backoff / 6e4) + "min for: " + root);
+      if (!wasFused) {
+        rt.recordError("recall snapshot fused after " + f.count + " consecutive failures, backoff " + Math.round(backoff / 6e4) + "min for: " + root + (expensive ? " (last failure took " + Math.round(elapsedMs / 1e3) + "s)" : ""));
+      }
     }
     snapFailures.set(root, f);
   }
@@ -579,6 +615,7 @@ export {
   judgeStoreFormat,
   parseChanges,
   parseDiffOutput,
+  parseScanFail,
   parseSkipped,
   parseSnapshotLimit,
   parseTagsWithTime,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-recall-plugin",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "description": "在 DSH 中撤回自己发过的消息：工作区文件与对话历史一起回到那条消息发出之前，消息的文本与附件自动放回输入框，改完即可重发。文件走独立影子 git 快照（不碰项目自身的 git），对话走官方 sessions.fork，原会话归档可找回。",
   "icon": "assets/icon.svg",
   "type": "module",
@@ -75,19 +75,20 @@
         "0.2.1-alpha.5": "compatible",
         "0.2.1-rc.1": "compatible",
         "0.2.1-rc.2": "compatible",
-        "0.2.1-rc.3": "compatible"
+        "0.2.1-rc.3": "compatible",
+        "0.2.2-alpha.2": "compatible"
       }
     }
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1 || >=4.0.5-alpha.1 <4.0.6",
-    "@deepseek-ai/dsh-host-webserver": ">=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0",
-    "@deepseek-ai/dsh-sandbox-policy": ">=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0",
-    "@deepseek-ai/dsh-session": ">=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0",
-    "@deepseek-ai/dsh-session-query": ">=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0",
-    "@deepseek-ai/dsh-settings": ">=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0",
-    "@deepseek-ai/dsh-shell": ">=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0",
-    "@deepseek-ai/schemastery": "^3.18.1 || >=3.18.5-alpha.1 <3.18.6",
+    "@deepseek-ai/cordis": "^4.0.1 || >=4.0.5-alpha.1 <4.0.6 || >=4.0.6-alpha.1 <4.0.7",
+    "@deepseek-ai/dsh-host-webserver": ">=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0 || >=0.2.2-alpha.1 <0.3.0",
+    "@deepseek-ai/dsh-sandbox-policy": ">=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0 || >=0.2.2-alpha.1 <0.3.0",
+    "@deepseek-ai/dsh-session": ">=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0 || >=0.2.2-alpha.1 <0.3.0",
+    "@deepseek-ai/dsh-session-query": ">=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0 || >=0.2.2-alpha.1 <0.3.0",
+    "@deepseek-ai/dsh-settings": ">=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0 || >=0.2.2-alpha.1 <0.3.0",
+    "@deepseek-ai/dsh-shell": ">=0.1.2-alpha.1 <0.1.3 || >=0.1.3-alpha.1 <0.1.4 || >=0.1.5-alpha.1 <0.1.6 || >=0.1.6-alpha.1 <0.1.7 || >=0.1.7-alpha.1 <0.1.8 || >=0.2.0-rc.1 <0.2.1 || >=0.2.1-alpha.1 <0.3.0 || >=0.2.2-alpha.1 <0.3.0",
+    "@deepseek-ai/schemastery": "^3.18.1 || >=3.18.5-alpha.1 <3.18.6 || >=3.18.6-alpha.1 <3.18.7",
     "react": "^18.2.0"
   },
   "peerDependenciesMeta": {