dsh-recall-plugin 2.3.13 → 2.3.15

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 本文件格式遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)，版本号遵循语义化版本。
 
+## [2.3.15] - 2026-09-11
+
+### 新增
+
+- **撤回回填扩展为「文本 + 附件」**：此前撤回只把被撤回消息的文本回填到输入框，消息里的附件（图片/文件）不会回来；现在两者一起回填，改完可直接重发。实现沿用官方 composer 自己的附件链路（`dsh-client-ui-conversation` 的 `addFiles` 实证）：**早读**——撤回执行一开始（源会话仍在册、附件引用可解析时）经 `sessions.binding(sessionId).session.readAttachment(attachmentId)` 取回原始字节与 mediaType，重建为浏览器 `File`（缺文件名按 mediaType 派生 `attachment-N.<subtype>`）；**后写**——fork + open 完成后在子会话里 `conversation.createDrafts(sessionId, files)` 注册草稿附件、`shell.actions.addAttachments(ids)` 进入输入态（未接纳时 `releaseDraftAttachments` 释放，与官方 `addFiles` 的失败回滚一致）。附件读取授权绑定「消息所在会话」，故必须用源会话早读——被撤回消息不在 fork 出的子会话日志中，直读子会话拿不到授权。附件读取与草稿注册均逐项 try/catch、服务面全部 typeof 探测：任一步缺失只降级附件，文本回填与撤回主流程不受影响（旧版 dsh 无 `conversation`/`createDrafts`/`readAttachment` 时恒降级）。`refillDraft` 开关语义同步为「文本与附件」（设置描述与 README 双语同步）；新增 `attachmentRefsFromBlocks` / `defaultAttachmentName` 纯函数与 3 例单测，compat-audit 新增 I34。客户端 bundle 结构与既有行为零变化。
+
+## [2.3.14] - 2026-09-11
+
+### 修复
+
+- **撤回 fork 出的子会话内，撤回预览对任何消息都误报「该消息是本会话中第一条用户消息」**：`resolveCutSeq` 冷读取走 `sessionQuery.readSession`，官方实现内部却用 `Session.create(events, header, inheritedEventCount)` 做回放校验——快照模式要求 seeded 头的 `inheritedEventCount` 恰等于 `log.length`（「seeded session constructor seed must equal its inherited prefix」），而读取面交给它的是全量逻辑日志（`snapshotEvents()` 无参＝继承前缀＋自身事件；冷读返回完整存储日志），两者必然不等，`readSession` 对任何 seeded 会话（本插件每次撤回 fork 出的子会话即此类）直接抛错；此前的 `catch` 把异常静默折成 null，与「真首条」不可分——于是子会话里点**任何**消息，面板都显示「该消息是本会话中第一条用户消息，无法回退对话；确认后仅回退项目文件」。修复：`resolveCutSeq` 增加降级链——`readSession` 抛错、或消息根本没出现在它给的事件里（读取面缺继承前缀的版本差异）时，改用 `sessionQuery.observeSession`（经 `Session.fromRestore` 恢复，restore 模式无该约束）读取全量逻辑日志；租约以 `Symbol.dispose` 显式释放（prepared 缓存项靠它减引用，漏释放会卡淘汰）；只有「消息在、其前无 turn/end」才是可信的“首条”，两跳都失败才落到 null。`scanCutSeq` 拆出 `scanCutSeqDetail`（cut + found）供降级判断；契约补 `observeSession` 与 `SessionObservationLease`（可选——旧版 dsh 无此 API 时维持原行为）。**真机复验**（dsh web 0.1.5-rc.2 + POST `/api/recall/preview`）：修前子会话 6 条消息 cutSeq 全 null、父会话正常；修后子会话 156/43/62/88/197、真首条（你好）仍 null、父会话不变。新增 `tests/unit/snapshots-cutseq.test.js`（6 例），compat-audit 新增 I33。插件功能、客户端与其余行为零变化。
+
 ## [2.3.13] - 2026-09-11
 
 ### 修复

package/README.en.md

@@ -107,7 +107,7 @@ All options can be edited visually in the "**Settings → Plugin Config → Reca
 | `maxSnapshotsPerWorkspace` | 500 | Maximum snapshots kept per workspace; oldest pruned beyond the cap. 0 = unlimited |
 | `retentionDays` | 0 | Keep snapshots for this many days; older ones are deleted. 0 = disabled (works independently of the cap) |
 | `baseExcludes` | `.git`, `node_modules/`, `.dsh-recall-snapshots/`, `dsh-recall-snapshots/` | Base exclusion list (gitignore syntax, lower priority than exclude.txt) |
-| `refillDraft` | true | Refill the recalled message text into the input box after a recall |
+| `refillDraft` | true | Refill the recalled message (text and attachments) into the input box after a recall |
 | `snapshotEnabled` | true | Master snapshot switch (off = no new snapshots; existing snapshots remain recallable) |
 | `archiveOriginal` | true | Archive the original session after a recall (off = the original session stays in the session list) |
 

package/README.md

@@ -109,7 +109,7 @@ dsh plugin --profile web remove dsh-recall-plugin
 | `maxSnapshotsPerWorkspace` | 500 | 每个工作区保留的最大快照数，超限自动删除最旧的；0 = 不限制 |
 | `retentionDays` | 0 | 按天数保留快照，超期自动删除；0 = 不启用（与条数上限各自独立生效） |
 | `baseExcludes` | `.git`、`node_modules/`、`.dsh-recall-snapshots/`、`dsh-recall-snapshots/` | 基础排除表（gitignore 语法，优先级低于 exclude.txt） |
-| `refillDraft` | true | 撤回后把被撤回的消息文本回填到输入框 |
+| `refillDraft` | true | 撤回后把被撤回的消息（文本与附件）回填到输入框 |
 | `snapshotEnabled` | true | 快照总开关（关闭只冻结新建，已有快照仍可撤回） |
 | `archiveOriginal` | true | 撤回后归档原会话（关闭后原会话保留在会话列表中） |
 

package/lib/client.js

@@ -380,6 +380,24 @@ function buildUtil() {
 }
 
 // src/client/recall-node.ts
+function attachmentRefsFromBlocks(blocks) {
+  const refs = [];
+  for (const block of blocks) {
+    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 };
+    if (typeof ref.name === "string" && ref.name !== "") entry.name = ref.name;
+    refs.push(entry);
+  }
+  return refs;
+}
+function defaultAttachmentName(mediaType, index) {
+  const text = String(mediaType || "");
+  const slash = text.indexOf("/");
+  const sub = (slash >= 0 ? text.slice(slash + 1) : text).replace(/[^a-z0-9.+-]/gi, "");
+  return "attachment-" + String(index + 1) + "." + (sub || "bin");
+}
 var KIND_INFO = {
   modified: { label: "\u4FEE\u6539", cls: "modified" },
   restored: { label: "\u6062\u590D", cls: "restored" },
@@ -507,31 +525,89 @@ function buildRecallNode(React, util, ctx, sessionsSvc, workspacesSvc) {
     }
     return null;
   }
-  function fillDraft(targetSessionId, draftText) {
-    if (!draftText || !targetSessionId) return;
+  function fillDraft(targetSessionId, draftText, attachmentFiles) {
+    if (!targetSessionId || !draftText && attachmentFiles === null) return;
     let attempts = 0;
+    let attachStarted = false;
     const attempt = () => {
+      let textDone = draftText === "";
       try {
         const conversation = ctx.get("conversation");
         if (conversation && conversation.input && typeof conversation.input.shell === "function") {
           const shell = conversation.input.shell(targetSessionId);
           if (shell) {
-            if (shell.actions && typeof shell.actions.setDraft === "function") {
-              shell.actions.setDraft(draftText);
-              return;
+            if (!textDone) {
+              if (shell.actions && typeof shell.actions.setDraft === "function") {
+                shell.actions.setDraft(draftText);
+                textDone = true;
+              } else if (typeof shell.setDraft === "function") {
+                shell.setDraft(draftText);
+                textDone = true;
+              }
             }
-            if (typeof shell.setDraft === "function") {
-              shell.setDraft(draftText);
-              return;
+            if (!attachStarted && attachmentFiles !== null) {
+              attachStarted = startAttachDrafts(conversation, shell, targetSessionId, attachmentFiles);
             }
           }
         }
       } catch (e) {
       }
-      if (attempts++ < 8) setTimeout(attempt, 150);
+      const attachDone = attachmentFiles === null || attachStarted;
+      if ((!textDone || !attachDone) && attempts++ < 8) setTimeout(attempt, 150);
     };
     attempt();
   }
+  function startAttachDrafts(conversation, shell, sessionId, files) {
+    if (typeof conversation.createDrafts !== "function") return false;
+    const actions = shell.actions;
+    let add = null;
+    if (actions && typeof actions.addAttachments === "function") add = (ids) => actions.addAttachments ? actions.addAttachments(ids) : false;
+    else if (typeof shell.addAttachments === "function") add = (ids) => shell.addAttachments ? shell.addAttachments(ids) : false;
+    if (add === null) return false;
+    (async () => {
+      let list = [];
+      try {
+        list = await files;
+      } catch (e) {
+        return;
+      }
+      if (!Array.isArray(list) || list.length === 0) return;
+      try {
+        const 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;
+        const accepted = add(ids);
+        if (accepted === false && typeof conversation.releaseDraftAttachments === "function") conversation.releaseDraftAttachments(descriptors);
+      } catch (e) {
+      }
+    })();
+    return true;
+  }
+  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 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 bytes = raw instanceof Uint8Array ? raw : Uint8Array.from(raw);
+          const meta = result.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);
+          out.push(new File([buffer], name, { type: mediaType }));
+        } catch (e) {
+        }
+      }
+      return out;
+    })();
+  }
   function UserRecallNode(props) {
     const node = props && props.node;
     const renderMessageImages = props && props.renderMessageImages;
@@ -542,6 +618,7 @@ function buildRecallNode(React, util, ctx, sessionsSvc, workspacesSvc) {
     const text = blocks.filter((b) => b && b.type === "text" && typeof b.text === "string").map((b) => b.text).join("");
     const imageBlocks = blocks.filter((b) => b && b.type === "image" && b.attachment).map((b) => ({ attachment: b.attachment }));
     const rest = blocks.filter((b) => !b || !(b.type === "text" && typeof b.text === "string") && !(b.type === "image" && b.attachment));
+    const attachmentRefs = attachmentRefsFromBlocks(blocks);
     const [copied, setCopied] = React.useState(false);
     const [hasSnapshot, setHasSnapshot] = React.useState(false);
     const [recall, setRecall] = React.useState({ stage: "idle" });
@@ -625,6 +702,7 @@ function buildRecallNode(React, util, ctx, sessionsSvc, workspacesSvc) {
       const changes = recall.changes || [];
       const previewCut = typeof recall.cutSeq === "number" ? recall.cutSeq : null;
       const previewTotal = typeof recall.total === "number" ? recall.total : changes.length;
+      const attachmentFiles = pluginConfig.refillDraft && attachmentRefs.length > 0 && sessionId ? preloadAttachmentFiles(sessionId, attachmentRefs) : null;
       setRecall({ stage: "executing", changes });
       api("execute", { messageId, sessionId, previewTotal, previewTreeId: recall.treeId || void 0, previewAt: Date.now() }).then(async (res) => {
         if (!res || !res.ok) {
@@ -676,7 +754,7 @@ function buildRecallNode(React, util, ctx, sessionsSvc, workspacesSvc) {
             chatError = String(error);
           }
         }
-        if (pluginConfig.refillDraft) fillDraft(fillTarget, text);
+        if (pluginConfig.refillDraft) fillDraft(fillTarget, text, attachmentFiles);
         setHasSnapshot(false);
         setRecall({ stage: "done", count: typeof res.count === "number" ? res.count : changes.length, chatReverted, chatError });
       }).catch((error) => {

package/lib/config.js

@@ -9,7 +9,7 @@ const Config = Schema.object({
   // HOME 时（容器 root=/root 等）它落在工作区内，漏排除会让 git add -A
   // 把影子仓库自己吞进去、快照全部失败（issue #6）
   baseExcludes: Schema.array(Schema.string()).default([".git", "node_modules/", ".dsh-recall-snapshots/", "dsh-recall-snapshots/"]).description("\u57FA\u7840\u6392\u9664\u8868\uFF08gitignore \u8BED\u6CD5\uFF0C\u4F18\u5148\u7EA7\u4F4E\u4E8E exclude.txt\uFF09"),
-  refillDraft: Schema.boolean().default(true).description("\u64A4\u56DE\u540E\u628A\u88AB\u64A4\u56DE\u7684\u6D88\u606F\u6587\u672C\u56DE\u586B\u5230\u8F93\u5165\u6846"),
+  refillDraft: Schema.boolean().default(true).description("\u64A4\u56DE\u540E\u628A\u88AB\u64A4\u56DE\u7684\u6D88\u606F\uFF08\u6587\u672C\u4E0E\u9644\u4EF6\uFF09\u56DE\u586B\u5230\u8F93\u5165\u6846"),
   snapshotEnabled: Schema.boolean().default(true).description("\u542F\u7528\u6D88\u606F\u5FEB\u7167\uFF08\u5173\u95ED\u540E\u4E0D\u518D\u65B0\u5EFA\uFF0C\u5DF2\u6709\u5FEB\u7167\u4ECD\u53EF\u64A4\u56DE\uFF09"),
   archiveOriginal: Schema.boolean().default(true).description("\u64A4\u56DE\u540E\u5F52\u6863\u539F\u4F1A\u8BDD\uFF08\u5173\u95ED\u540E\u539F\u4F1A\u8BDD\u4FDD\u7559\u5728\u5217\u8868\u4E2D\uFF09"),
   retentionDays: Schema.number().default(0).description("\u6309\u5929\u6570\u4FDD\u7559\u5FEB\u7167\uFF0C\u8D85\u671F\u81EA\u52A8\u5220\u9664\uFF1B0 \u8868\u793A\u4E0D\u542F\u7528")

package/lib/snapshots.js

@@ -52,7 +52,7 @@ function parseDiffOutput(text, isWin, maxChanges) {
   const changes = all.slice(0, maxChanges);
   return { changes, total: finalTotal, truncated: finalTotal > changes.length, treeId };
 }
-function scanCutSeq(events, messageId) {
+function scanCutSeqDetail(events, messageId) {
   let anchor = -1;
   for (let i = 0; i < events.length; i++) {
     const e = events[i];
@@ -61,12 +61,21 @@ function scanCutSeq(events, messageId) {
       break;
     }
   }
-  if (anchor < 0) return null;
+  if (anchor < 0) return { cut: null, found: false };
   for (let i = anchor - 1; i >= 0; i--) {
     const e = events[i];
-    if (e && e.type === "turn/end" && typeof e.seq === "number") return e.seq;
+    if (e && e.type === "turn/end" && typeof e.seq === "number") return { cut: e.seq, found: true };
   }
-  return null;
+  return { cut: null, found: true };
+}
+function scanCutSeq(events, messageId) {
+  return scanCutSeqDetail(events, messageId).cut;
+}
+function disposeLease(lease) {
+  const disposeSymbol = Symbol.dispose;
+  if (!disposeSymbol || lease === null || typeof lease !== "object") return;
+  const dispose = lease[disposeSymbol];
+  if (typeof dispose === "function") dispose.call(lease);
 }
 async function rescueRollback(deps, opts) {
   const { root, store, safetyId, safetyOk, rollbackError } = opts;
@@ -374,11 +383,26 @@ function createSnapshots(ctx, rt, config) {
     } else {
       const query = ctx.get("sessionQuery");
       if (query) {
+        let fallback = false;
         try {
           const log = await query.readSession(sessionId);
-          result = scanCutSeq(Array.isArray(log && log.events) ? log.events : [], messageId);
+          const detail = scanCutSeqDetail(Array.isArray(log && log.events) ? log.events : [], messageId);
+          result = detail.cut;
+          fallback = !detail.found;
         } catch (error) {
-          result = null;
+          fallback = true;
+        }
+        if (fallback && typeof query.observeSession === "function") {
+          try {
+            const lease = await query.observeSession(sessionId);
+            try {
+              result = scanCutSeq(lease && Array.isArray(lease.events) ? lease.events : [], messageId);
+            } finally {
+              disposeLease(lease);
+            }
+          } catch (error) {
+            result = null;
+          }
         }
       }
     }
@@ -396,5 +420,6 @@ export {
   parseTagsWithTime,
   parseTreeId,
   rescueRollback,
-  scanCutSeq
+  scanCutSeq,
+  scanCutSeqDetail
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-recall-plugin",
-  "version": "2.3.13",
+  "version": "2.3.15",
   "description": "DSH 消息撤回插件：在用户消息气泡旁加「撤回」按钮，把项目文件（独立影子 git 仓库快照）与对话历史（官方 fork）一并回退到该消息发送之前。",
   "type": "module",
   "repository": {