dsh-recall-plugin 2.4.11 → 2.4.12

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 本文件格式遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)，版本号遵循语义化版本。
 
+## [2.4.12] - 2026-10-16
+
+### 修复
+
+- **用户消息正文在 dsh 0.2.0-rc.x 上静默空白（issue #23）——判据重写为「旧面闭包在场即旧面」**：旧实现以 `renderFactorySlot` 是否存在判新面，而 0.2.0-rc.2 已下发该函数、`conversation.user.*` 槽位却尚未引入（0.2.1-alpha.3 才引入）——正文渲染成空、零报错（气泡只剩内边距，插件动作行照常）。`renderMessageImages` 只存在于 ≤0.2.1-alpha.2，与新槽位引入版本互斥，以其判定两面才可靠；0.2.0-rc.2 归旧面自绘、正文恢复。判据与投影单源在新增的 `src/client/user-content.ts`。
+- **新面内容渲染从「分片投影」收敛为「整条内容单入口」**：文本/图片/文件卡片/未知块/引用摘要一次交给官方 `conversation.chat.user.content` Factory（投影＝官方 `contentParts` 三分派的逐字复刻；该函数官方未导出），与官方 `UserMessageNodeView` 同款调用（含 `interactive: true` 对齐）——插件只保留动作行（时间/复制/撤回），气泡外壳/文件卡片/JSON 块/文本四类自绘在新面退场，官方规则链（密钥脱敏等）自动跟随。
+- **兜底不静默**：官方 Factory 返回空或抛错（槽位未注册的中间版本）时回落自绘（文本/文件卡片/JSON；新面兜底无图片入口，跳过）并打 warn——「探测通过但渲染为空」不再可能产出空白正文。旧面（≤0.2.1-alpha.2）行为不变。
+
+### 兼容
+
+- **dsh 0.2.1-alpha.4 兼容（零破坏核验，无代码改动）**（升级核查见 [docs/upgrade-assessments/dsh-0.2.1-alpha.4.md](docs/upgrade-assessments/dsh-0.2.1-alpha.4.md) 与 [docs/compat-audit.md](docs/compat-audit.md) 头部 0.2.1-alpha.4 段）：双 lockfile 包清单对比（第三方依赖零变化）+ 32 个关键包 `lib/` 逐字节 diff 确认插件消费/注册契约零漂移——`sessions.fork`（`dsh-session` 整包）、`dsh-shell`、`dsh-settings`、`dsh-session-query`、`dsh-session-persistence`、`dsh-cordis-host-runner`（host 插件加载器）、`dsh-client-ui-chat`（slot 定义方）等 22 包零变更。
+- **本版唯一机制变更（`engines.dsh` 优先判定）不作用于本插件**：`dsh-app-boot` 兼容性门禁改为「manifest 声明 `engines.dsh` 则只查它并**短路** peerDependencies；未声明沿用 peer 判定」——本插件未声明 `engines.dsh`（`engines` 仅 `{node:">=20"}`）→ 走 peer 路径，六条 `@deepseek-ai/dsh-*` peer 对 0.2.1-alpha.4 全满足；**维持不声明**（多段逐线窗口无法用单段等价表达，声明即短路 peer 判定且放宽未验证版本，见 I43）。输入链「命令芯片」重构（`ui-conversation` 等 3 包，编辑器内部）不改变 `setDraft` / `createDrafts` / `releaseDraftAttachments` / `addAttachments` 签名与行为；三个 client 基础包（store / primitives / slots）内联化退出运行时树，对插件透明（bundle 仅 require react）。门禁：`test:probe` **53/53**、单测 **499/499**、client **93/93**、`verify:host` 装配断言全过、`typecheck`、`check:dsh` 全绿；`dsh.compatibility.dshReleases` 补 `0.2.1-alpha.4: compatible`。
+
+### 文档
+
+- `docs/reference/` 镜像按 tag `dsh-v0.2.1-alpha.4` 重拉：13 源中 12 份逐字节相同、仅 `05-publish.md` 差异（新增 `engines.dsh` 版本声明段，+365 B）。
+- `docs/dsh-contract.md`（版本段与沿革 ⑨）/ `docs/compat-audit.md`（新增 I43）/ `AGENTS.md`（I43 索引行）/ README 双语兼容范围与徽章同步至 0.2.1-alpha.4。
+
 ## [2.4.11] - 2026-10-15
 
 ### 兼容

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--alpha.3-blue)](https://github.com/deepseek-ai/deepseek-harness/releases/tag/dsh-v0.2.1-alpha.3)
+[![DSH](https://img.shields.io/badge/DSH-0.2.1--alpha.4-blue)](https://github.com/deepseek-ai/deepseek-harness/releases/tag/dsh-v0.2.1-alpha.4)
 ![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**.
@@ -73,7 +73,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-alpha.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.1-alpha.4`; 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.
 

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--alpha.3-blue)](https://github.com/deepseek-ai/deepseek-harness/releases/tag/dsh-v0.2.1-alpha.3)
+[![DSH](https://img.shields.io/badge/DSH-0.2.1--alpha.4-blue)](https://github.com/deepseek-ai/deepseek-harness/releases/tag/dsh-v0.2.1-alpha.4)
 
 在任意一条你发过的消息下方点「↶ 撤回」——**工作区文件和对话历史一起回到那条消息发出之前的状态**。
 
@@ -70,7 +70,7 @@
 
 - git CLI：未安装时撤回按钮不出现（页面顶部会提示安装 git），不影响 DSH 运行。
 - shell：Windows 上 PowerShell 5.1 / 7 均可；Linux/macOS 需 bash。
-- DSH 版本：`0.1.2-alpha.1` 至 `0.2.1-alpha.3`；已核验 minor 线内的后续版本自动放行，未核验的新 minor 线会被启动期兼容门禁拦截（开窗机制见下方折叠块）。
+- DSH 版本：`0.1.2-alpha.1` 至 `0.2.1-alpha.4`；已核验 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 会静默不渲染。
 

package/lib/client.js

@@ -1023,6 +1023,56 @@
   var appLog = createLogger("app");
   var recallNodeLog = createLogger("recall-node");
 
+  // src/client/user-content.ts
+  var USER_CONTENT_FACTORY = "conversation.chat.user.content";
+  function projectUserContent(blocks) {
+    const texts = [];
+    const attachments = [];
+    const extraBlocks = [];
+    for (const block of blocks) {
+      const b = block;
+      if (b && b.type === "text" && typeof b.text === "string") texts.push(b.text);
+      else if (b && b.type === "image" && b.attachment !== void 0) attachments.push({ type: "image", image: { attachment: b.attachment } });
+      else if (b && b.type === "file" && b.attachment !== void 0) attachments.push({ type: "file", file: b.attachment });
+      else extraBlocks.push(block);
+    }
+    return { text: texts.join(""), attachments, extraBlocks };
+  }
+  function userContentFacts(referenceLabels, skillNames) {
+    const facts = {};
+    if (referenceLabels !== void 0) facts.sessionLabels = referenceLabels;
+    if (skillNames !== void 0) facts.skillNames = skillNames;
+    return facts;
+  }
+  function resolveUserContentFace(props) {
+    if (typeof props.renderMessageImages === "function") return "legacy";
+    if (typeof props.renderFactorySlot === "function" && typeof props.loadImage === "function") return "factory";
+    return "legacy";
+  }
+  function renderOfficialUserContent(renderFactorySlot, blocks, data, loadImage, interactive) {
+    if (typeof renderFactorySlot !== "function") return { ok: false };
+    const projected = projectUserContent(blocks);
+    const content = {
+      text: projected.text,
+      attachments: projected.attachments,
+      extraBlocks: projected.extraBlocks
+    };
+    if (data.referenceLabels !== void 0) content.referenceLabels = data.referenceLabels;
+    try {
+      const render = renderFactorySlot;
+      const node = render(USER_CONTENT_FACTORY, {
+        content,
+        loadImage,
+        facts: userContentFacts(data.referenceLabels, data.skillNames),
+        interactive
+      });
+      if (node === null || node === void 0 || node === false) return { ok: false };
+      return { ok: true, node };
+    } catch (error) {
+      return { ok: false, error };
+    }
+  }
+
   // src/client/recall-node.ts
   function attachmentRefsFromBlocks(blocks) {
     const refs = [];
@@ -1559,61 +1609,46 @@
         setRecall({ stage: "idle" });
       };
       const bubbleChildren = [];
-      if (imageBlocks.length) {
-        if (typeof renderMessageImages === "function") {
+      let officialFace = resolveUserContentFace({ renderMessageImages, renderFactorySlot, loadImage }) === "factory";
+      if (officialFace) {
+        const official = renderOfficialUserContent(renderFactorySlot, blocks, data, loadImage, true);
+        if (official.ok) {
+          bubbleChildren.push(React.createElement(React.Fragment, { key: "official" }, official.node));
+        } else {
+          officialFace = false;
+          recallNodeLog.warn("user.content factory unavailable; falling back to own rendering:", official.error);
+        }
+      }
+      if (!officialFace) {
+        if (imageBlocks.length && typeof renderMessageImages === "function") {
           const render = renderMessageImages;
           bubbleChildren.push(React.createElement(
             React.Fragment,
             { key: "images" },
             render({ images: imageBlocks, align: "end" })
           ));
-        } else if (typeof renderFactorySlot === "function" && typeof loadImage === "function") {
-          const render = renderFactorySlot;
-          bubbleChildren.push(React.createElement(
-            React.Fragment,
-            { key: "images" },
-            render("conversation.chat.user.content", {
-              content: {
-                text: "",
-                attachments: imageBlocks.map((b) => ({ type: "image", image: { attachment: b.attachment } })),
-                extraBlocks: []
-              },
-              loadImage,
-              interactive: false,
-              facts: {}
-            })
-          ));
         }
-      }
-      for (let i = 0; i < fileBlocks.length; i++) {
-        const info = fileCardInfo(fileBlocks[i], t);
-        if (!info) continue;
-        bubbleChildren.push(React.createElement(
-          "div",
-          { className: "dsh-recall-filecard", key: "file-" + i },
-          React.createElement("span", { className: "dsh-recall-filecard-icon" }, info.ext),
-          React.createElement(
-            "span",
-            { className: "dsh-recall-filecard-body" },
-            React.createElement("span", { className: "dsh-recall-filecard-name", title: info.name }, info.name),
-            React.createElement("span", { className: "dsh-recall-filecard-meta" }, info.size ? info.ext + " " + info.size : info.ext)
-          )
-        ));
-      }
-      if (text !== "") {
-        if (typeof renderFactorySlot === "function") {
-          const render = renderFactorySlot;
+        for (let i = 0; i < fileBlocks.length; i++) {
+          const info = fileCardInfo(fileBlocks[i], t);
+          if (!info) continue;
           bubbleChildren.push(React.createElement(
             "div",
-            { className: "dsh-recall-bubble", key: "text" },
-            render("conversation.user.text", { text, facts: {}, interactive: false, ellipsis: false })
+            { className: "dsh-recall-filecard", key: "file-" + i },
+            React.createElement("span", { className: "dsh-recall-filecard-icon" }, info.ext),
+            React.createElement(
+              "span",
+              { className: "dsh-recall-filecard-body" },
+              React.createElement("span", { className: "dsh-recall-filecard-name", title: info.name }, info.name),
+              React.createElement("span", { className: "dsh-recall-filecard-meta" }, info.size ? info.ext + " " + info.size : info.ext)
+            )
           ));
-        } else {
+        }
+        if (text !== "") {
           bubbleChildren.push(React.createElement("div", { className: "dsh-recall-bubble", key: "text" }, text));
         }
-      }
-      for (let i = 0; i < rest.length; i++) {
-        bubbleChildren.push(React.createElement("pre", { className: "dsh-recall-json", key: "rest-" + i }, JSON.stringify(rest[i], null, 2)));
+        for (let i = 0; i < rest.length; i++) {
+          bubbleChildren.push(React.createElement("pre", { className: "dsh-recall-json", key: "rest-" + i }, JSON.stringify(rest[i], null, 2)));
+        }
       }
       const actions = [];
       actions.push(React.createElement("span", { className: "dsh-recall-time", key: "time" }, clockText2(data.time)));

package/package.json

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