dsh-rewind-plugin 0.6.0 → 0.6.1

package/README.en.md

@@ -11,7 +11,7 @@ Conversation rewind for DeepSeek Harness: **rewind the conversation to any earli
 A deliberately focused plugin with one job: **rewind to any user message, no matter how far back, in place** — and conveniently **restore the files it changed** along the way.
 
 - **Rewinding is time-travel** — the target message and everything after it (agent replies, tool calls) are withdrawn from the model context *and* the rendered transcript at once, with no new session and no window switch; the target's text is offered back in the composer so you can edit and re-send it — **truly seamless and convenient by design**.
-- **Lightweight workspace backup** — Claude Code-aligned behavior: only file-writing tools are tracked, a lightweight before-backup is **persisted on disk**, and your git repository is never touched or relied on. One lightweight plugin gives you a **complete** agentic rewind capability.
+- **Lightweight workspace backup** — Claude Code-aligned behavior: tracks files edited by the write-class tools, and external changes to **already-tracked** files are restorable too. Selective tracking, before-write backup, store only on change. One lightweight plugin gives you a **complete** agentic rewind capability.
 - **Privacy-first** — the plugin never deletes or rewrites the session log (append-only) and never actually deletes any of your conversation; file restores stay inside the plugin's own backup directory. Full security model: [SECURITY.md](SECURITY.md).
 - **A complete test system** — unit, probe, and end-to-end host verification, covering compatibility probing, log replay, resume, cross-restart and other scenarios; maintained continuously as the harness evolves to ensure feature stability.
 

package/README.md

@@ -11,7 +11,7 @@ DeepSeek Harness 插件：**一键就地回退对话到任意更早的用户消
 刻意聚焦、保持极简，只做一件事：**就地回退到任意远的用户消息**，还能**顺手还原改过的文件**。
 
 - **回退 = 时间回溯**——目标消息及其之后的全部内容（agent 回复、工具调用）同时从**模型上下文**和**渲染对话**中撤回，不新建会话、不切换窗口；目标消息文本会回填输入框，改完可重发。**在原理上就真正无感、便捷**。
-- **轻量工作区备份**——行为对齐 Claude Code：只跟踪写文件的工具，写前做轻量备份并**落盘持久化**，不依赖、也不触碰 git 仓库。一个轻型插件，即拥有**完备的智能体回退能力**。
+- **轻量工作区备份**——对齐 Claude Code：追踪写类工具编辑过的文件，**已跟踪文件的外部变更也能还原**。局部追踪、写前备份、不变不存。一个轻型插件，即拥有**完备的智能体回退能力**。
 - **信息安全优先**——插件从不删改会话日志（append-only），从不真正删除你的任何对话；文件还原限定在插件自己的备份目录。完整安全模型：[SECURITY.md](SECURITY.md)。
 - **完备测试系统**——单元、探针、端到端主机验证，覆盖兼容性探测、日志重放、续接、跨重启等场景；随 harness 升级持续维护，确保功能稳定。
 

package/docs/compat/audit.md

@@ -17,6 +17,22 @@
 > `0.1.2-rc.x`, `0.2.x`) requires appending a union member; rc rolling within a
 > tuple (`0.1.1-rc.2 → rc.3`) is a no-op. Signal: `npm view @deepseek-ai/dsh version`;
 > flow: `scripts/check-dsh-version.mjs`.
+>
+> Client channel (harness `0.1.2-alpha.1`, a **bundled pre-release — NOT published
+> to npm**): the plugin also reads the session chat when a DSH Desktop build ships
+> that version (`latest` on the registry is still `0.1.1-rc.2`; the alpha is only
+> in the bundled `app.asar.unpacked/node_modules/@deepseek-ai/*`). There
+> `uiConversation` exposes the chat as a per-session named `"chat"` view
+> (contributed by `dsh-client-ui-chat` through the `uiSession` slot hook) instead
+> of the session-face `chat` field. `src/client/hidden.ts` (`chatSnapshotOf`) reads
+> the session-face snapshot first (rc.2 path), then the `uiConversation` `"chat"`
+> view (alpha.1 path); both missing degrades to `undefined` (no targets, never a
+> crash). Peers are intentionally **NOT** extended for `0.1.2-alpha.1` because it is
+> not a registry version (see above); the OR-union stays
+> `^0.1.0-rc.6 || ^0.1.1-rc.2` and will gain the `0.1.2` tuple when the harness
+> publishes it. Pinned by `tests/chat-channel.test.ts` (channel precedence + the
+> alpha.1 snapshot shape) and `tests/client-dom.test.ts` (the button-target
+> pairing that consumes the chat).
 
 ## Definition of "fully compatible" (invariants)
 

package/docs/release/release.md

@@ -38,6 +38,9 @@ npm version patch
 git push origin main --tags   # triggers .github/workflows/publish.yml
 ```
 
+- **Before bumping, manually confirm there is no newer DSH version the plugin
+  has not been verified against** (a pre-release can ship in DSH Desktop
+  without being on npm, e.g. `0.1.2-alpha.1`; see docs/compat/audit.md).
 - The workflow verifies the tag matches `package.json`, runs typecheck + tests +
   a full build + artifact verification, publishes with `--provenance`
   (Sigstore), and creates a GitHub Release. It is **idempotent** — an already
@@ -58,9 +61,11 @@ uses an OR-union covering every published rc tuple series
   (`0.1.1 → 0.1.2 → 0.2.x`); rc rolling within a tuple (`0.1.1-rc.2 → rc.3`)
   needs nothing. All `@deepseek-ai/*` packages release together;
   `npm view @deepseek-ai/dsh version` is the authoritative signal.
-- **Automatic detection**: `node scripts/check-dsh-version.mjs` compares the
-  latest npm version against the tuples the peers cover and reports whether an
-  extension is needed (exit 0 = nothing to do, exit 1 = update).
+- **Published-tuple check (optional)**: `node scripts/check-dsh-version.mjs`
+  compares the latest npm version against the tuples the peers cover (exit 0 =
+  nothing to do, exit 1 = update). It reads npm published versions only; a
+  newer-but-unpublished pre-release is a manual pre-release check — see the
+  "Before bumping" step above.
 - **Update steps**: append `|| ^<new-tuple>-rc.<n>` to every
   `@deepseek-ai/dsh-*` peer → bump devDependencies to the latest → `npm
   install` → `npm run check` → release.

package/docs/release/release.zh.md

@@ -37,6 +37,7 @@ npm version patch
 git push origin main --tags   # 触发 .github/workflows/publish.yml
 ```
 
+- **升版前手动确认**：确认无插件未针对其验证过的更新 DSH 版本（pre-release 可能只随 Desktop 捆绑、而不发到 npm，如 `0.1.2-alpha.1`；见 docs/compat/audit.md）。
 - workflow 校验 tag 与 `package.json` 版本一致，跑 typecheck + 测试 + 完整
   构建 + 产物验证，以 `--provenance`（Sigstore）发布并创建 GitHub Release。
   **幂等**——已发布的版本会跳过。
@@ -54,8 +55,9 @@ OR 并集覆盖 DSH 已发布的每个 rc 元组系列（如 `^0.1.0-rc.6 || ^0.
 - **何时需要更新**：仅当 DSH 发布新元组（`0.1.1 → 0.1.2 → 0.2.x`）时；
   同元组内 rc 滚动（`0.1.1-rc.2 → rc.3`）无需动作。DSH 所有包同版本发布，
   `npm view @deepseek-ai/dsh version` 即权威信号。
-- **自动检测**：`node scripts/check-dsh-version.mjs` 对比 npm 最新版本与
-  peer 覆盖的元组，输出是否需追加（exit 0 无需动作，exit 1 需要）。
+- **已发布元组检查（可选）**：`node scripts/check-dsh-version.mjs` 用 npm 最新版本
+  对比 peer 覆盖的元组（exit 0 无需动作，exit 1 需要）。它**只读 npm 已发布版本**；
+  更新的未发布 pre-release 走**手动发布前检查**——见上文"升版前手动确认"。
 - **更新步骤**：给每个 `@deepseek-ai/dsh-*` peer 追加 `|| ^<新元组>-rc.<n>`
   → devDependencies 同步升到最新 → `npm install` → `npm run check` → 发版。
 - **正式版后收敛**：DSH 发布 final 版本后，正式版不受 prerelease 元组规则

package/lib/client.js

@@ -35,6 +35,11 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/client/hidden.ts
+function chatSnapshotOf(face, chatView) {
+  const legacy = face?.getSnapshot().chat;
+  if (legacy !== void 0) return legacy;
+  return chatView?.getSnapshot() ?? void 0;
+}
 function targetSeqOfArgs(args) {
   if (args === void 0 || args === null) return void 0;
   const match = args.match(/@(\d+)/);
@@ -333,10 +338,11 @@ function parseImpactList(text) {
   }
   return { restores, deletes };
 }
-function findCommand(snapshot, match) {
+function findCommand(chat, match) {
+  if (chat === void 0) return void 0;
   let found;
-  for (const key of snapshot.chat.order) {
-    const node = snapshot.chat.nodes.get(key);
+  for (const key of chat.order) {
+    const node = chat.nodes.get(key);
     if (node !== void 0 && node.kind === "command") {
       const command = node.data;
       if (match(command)) found = command;
@@ -344,11 +350,12 @@ function findCommand(snapshot, match) {
   }
   return found;
 }
-function knownCommandSeqs(session, match) {
+function knownCommandSeqs(session, chatOf, match) {
   const known = /* @__PURE__ */ new Set();
-  const snapshot = session.getSnapshot();
-  for (const key of snapshot.chat.order) {
-    const node = snapshot.chat.nodes.get(key);
+  const chat = chatOf(session);
+  if (chat === void 0) return known;
+  for (const key of chat.order) {
+    const node = chat.nodes.get(key);
     if (node !== void 0 && node.kind === "command") {
       const command = node.data;
       if (match(command)) known.add(command.seq);
@@ -356,7 +363,7 @@ function knownCommandSeqs(session, match) {
   }
   return known;
 }
-function waitForCommand(session, match, timeoutMs = 8e3) {
+function waitForCommand(session, chatOf, match, timeoutMs = 8e3) {
   return new Promise((resolve) => {
     let settled = false;
     const settle = (value) => {
@@ -367,7 +374,7 @@ function waitForCommand(session, match, timeoutMs = 8e3) {
       resolve(value);
     };
     const check = () => {
-      const node = findCommand(session.getSnapshot(), match);
+      const node = findCommand(chatOf(session), match);
       if (node?.outcome !== null && node?.outcome !== void 0) {
         settle({ kind: node.outcome.kind, text: node.outcome.text });
       }
@@ -381,11 +388,11 @@ function isPreviewFor(node, seq) {
   const args = node.args ?? "";
   return node.name === "rewind" && args.includes("preview") && new RegExp(`(?:^|\\s)@${seq}(?=\\s|$)`).test(args);
 }
-async function previewImpact(session, seq) {
-  const known = knownCommandSeqs(session, (node) => isPreviewFor(node, seq));
+async function previewImpact(session, chatOf, seq) {
+  const known = knownCommandSeqs(session, chatOf, (node) => isPreviewFor(node, seq));
   const result = await session.command(`/rewind preview @${seq} both`);
   if (!result.ok || result.value?.matched !== true) return null;
-  return waitForCommand(session, (node) => isPreviewFor(node, seq) && !known.has(node.seq));
+  return waitForCommand(session, chatOf, (node) => isPreviewFor(node, seq) && !known.has(node.seq));
 }
 function el(tag, className, text) {
   const node = document.createElement(tag);
@@ -436,7 +443,7 @@ function renderImpactStep(root, opts, back, cached) {
   root.replaceChildren(impact, actions);
   focusFirst(root);
   void (async () => {
-    const outcome = cached ?? await previewImpact(session, seq);
+    const outcome = cached ?? await previewImpact(session, opts.chatOf, seq);
     if (outcome === null) {
       impact.textContent = t("popover.impact.failed", { message: "preview command failed or timed out" });
       return;
@@ -555,10 +562,10 @@ function openPopover(opts) {
     openRetractPopover(opts);
     return;
   }
-  const { session, seq, time, preview, anchor, t } = opts;
+  const { session, seq, time, preview, anchor, t, chatOf } = opts;
   const onRewind = opts.onRewind;
   if (seq === void 0 || time === void 0 || onRewind === void 0) return;
-  const durableOpts = { session, seq, time, preview, anchor, t, onRewind };
+  const durableOpts = { session, seq, time, preview, anchor, t, chatOf, onRewind };
   const root = el("div", CLASS.popover);
   root.setAttribute("role", "dialog");
   root.setAttribute("aria-label", t("popover.title"));
@@ -628,7 +635,7 @@ function openPopover(opts) {
   popoverEl = root;
   disposeOutside = shell.dispose;
   void (async () => {
-    const outcome = await previewImpact(session, seq);
+    const outcome = await previewImpact(session, chatOf, seq);
     impactOutcome = outcome;
     if (outcome !== null && outcome.kind === "success") {
       bothState = { state: hasFileImpact(outcome.text) ? "hasChanges" : "noChanges" };
@@ -670,10 +677,10 @@ function retractSpan(steering, targetId) {
 
 // src/client/portals.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
-function userTextAt(session, seq) {
-  const snap = session.getSnapshot();
-  for (const key of snap.chat.order) {
-    const node = snap.chat.nodes.get(key);
+function userTextAt(chat, seq) {
+  if (chat === void 0) return void 0;
+  for (const key of chat.order) {
+    const node = chat.nodes.get(key);
     if (node === void 0 || node.kind !== "user") continue;
     const user = node.data;
     if (user.seq === seq) {
@@ -691,23 +698,23 @@ function fillComposer(text) {
   textarea.focus();
   return true;
 }
-function userNodeOf(session, key) {
-  const node = session.getSnapshot().chat.nodes.get(key);
+function userNodeOf(chat, key) {
+  const node = chat?.nodes.get(key);
   if (node === void 0 || node.kind !== "user" && node.kind !== "steering") return void 0;
   return node.data;
 }
-async function runRewindAndFill(session, seq, mode, currentSessionId) {
-  const known = knownCommandSeqs(session, (node) => isExecutedRewindCommand(node, seq));
+async function runRewindAndFill(session, seq, mode, currentSessionId, chatOf) {
+  const known = knownCommandSeqs(session, chatOf, (node) => isExecutedRewindCommand(node, seq));
   const result = await session.command(`/rewind @${seq} ${mode}`);
   if (!result.ok || result.value?.matched !== true) return;
-  const outcome = await waitForCommand(session, (node) => isExecutedRewindCommand(node, seq) && !known.has(node.seq), 2e4);
+  const outcome = await waitForCommand(session, chatOf, (node) => isExecutedRewindCommand(node, seq) && !known.has(node.seq), 2e4);
   if (outcome === null) return;
   if (outcome.kind !== "success") {
     showHint(outcome.text ?? "rewind failed");
     return;
   }
   if (currentSessionId() !== session.sessionId) return;
-  const text = userTextAt(session, seq);
+  const text = userTextAt(chatOf(session), seq);
   if (text === void 0 || text === "") return;
   fillComposer(text);
 }
@@ -794,7 +801,7 @@ function sameTargets(left, right) {
     return other.kind === "pending" && target.itemId === other.itemId;
   });
 }
-function RewindPortals({ sessionId, sessionOf, currentSessionId, t, subscribeLocale }) {
+function RewindPortals({ sessionId, sessionOf, chatOf, currentSessionId, t, subscribeLocale }) {
   const [targets, setTargets] = (0, import_react.useState)([]);
   const hidden = (0, import_react.useRef)(/* @__PURE__ */ new WeakSet());
   const [, forceRender] = (0, import_react.useReducer)((count) => count + 1, 0);
@@ -812,12 +819,12 @@ function RewindPortals({ sessionId, sessionOf, currentSessionId, t, subscribeLoc
         return;
       }
       const snapshot = session.getSnapshot();
-      const chat = snapshot.chat;
-      const hiddenSeqs = hiddenSeqsOf(chat);
+      const chat = chatOf(session);
+      const hiddenSeqs = chat === void 0 ? /* @__PURE__ */ new Set() : hiddenSeqsOf(chat);
       let hiddenCount = 0;
-      for (const seat of document.querySelectorAll(CHAT_SEAT_SELECTOR)) {
+      for (const seat of chat === void 0 ? [] : document.querySelectorAll(CHAT_SEAT_SELECTOR)) {
         const key = seat.dataset.chatAnchorKey;
-        const anchor = key !== void 0 ? chat.nodes.get(key)?.anchorSeq : void 0;
+        const anchor = key !== void 0 ? chat?.nodes.get(key)?.anchorSeq : void 0;
         if (anchor !== void 0 && hiddenSeqs.has(anchor)) {
           seat.style.display = "none";
           seat.dataset.dshRewindHidden = "true";
@@ -834,7 +841,8 @@ function RewindPortals({ sessionId, sessionOf, currentSessionId, t, subscribeLoc
           `[dsh-rewind] hiding: ${hiddenCount} rows, seqs [${[...hiddenSeqs].slice(0, 20).join(", ")}${hiddenSeqs.size > 20 ? "\u2026" : ""}]`
         );
       }
-      const next = [...collectTargets(chat, hiddenSeqs), ...collectPendingTargets(snapshot)];
+      const durable = chat === void 0 ? [] : collectTargets(chat, hiddenSeqs);
+      const next = [...durable, ...collectPendingTargets(snapshot)];
       setTargets((current) => sameTargets(current, next) ? current : next);
     };
     const queueRefresh = () => {
@@ -860,6 +868,7 @@ function RewindPortals({ sessionId, sessionOf, currentSessionId, t, subscribeLoc
         target,
         sessionId,
         sessionOf,
+        chatOf,
         t
       },
       target.key
@@ -869,6 +878,7 @@ function RewindPortals({ sessionId, sessionOf, currentSessionId, t, subscribeLoc
         target,
         sessionId,
         sessionOf,
+        chatOf,
         currentSessionId,
         t
       },
@@ -878,7 +888,7 @@ function RewindPortals({ sessionId, sessionOf, currentSessionId, t, subscribeLoc
     target.key
   ));
 }
-function RewindButton({ target, sessionId, sessionOf, currentSessionId, t }) {
+function RewindButton({ target, sessionId, sessionOf, chatOf, currentSessionId, t }) {
   const onClick = (event) => {
     event.stopPropagation();
     const session = sessionOf(sessionId);
@@ -886,17 +896,18 @@ function RewindButton({ target, sessionId, sessionOf, currentSessionId, t }) {
       console.warn("[dsh-rewind] rewind button clicked with no session binding");
       return;
     }
-    const node = userNodeOf(session, target.key);
+    const node = userNodeOf(chatOf(session), target.key);
     if (node === void 0) return;
     openPopover({
       session,
+      chatOf,
       seq: node.seq,
       time: node.time,
       preview: messagePreviewOf(node),
       anchor: event.currentTarget,
       t,
       onRewind: (mode) => {
-        void runRewindAndFill(session, node.seq, mode, currentSessionId);
+        void runRewindAndFill(session, node.seq, mode, currentSessionId, chatOf);
       }
     });
   };
@@ -927,13 +938,14 @@ async function retractPending(session, itemId, text) {
     fillComposer(text);
   }
 }
-function RetractButton({ target, sessionId, sessionOf, t }) {
+function RetractButton({ target, sessionId, sessionOf, chatOf, t }) {
   const onClick = (event) => {
     event.stopPropagation();
     const session = sessionOf(sessionId);
     if (session === void 0) return;
     openPopover({
       session,
+      chatOf,
       preview: target.preview,
       anchor: event.currentTarget,
       t,
@@ -1032,6 +1044,17 @@ function apply(ctx) {
     const sessionOf = (sessionId) => ctx.sessions.binding(sessionId)?.session;
     const currentSessionId = () => ctx.sessions.list.getSnapshot().current;
     const subscribeLocale = (cb) => ctx.locale.subscribe(cb);
+    const uiConversation = () => ctx.get("uiConversation");
+    const CHAT_VIEW = "chat";
+    const chatOf = (session) => {
+      if (session === void 0) return void 0;
+      try {
+        const view = uiConversation()?.binding(session.sessionId).target(CHAT_VIEW);
+        return chatSnapshotOf(session, view);
+      } catch {
+        return void 0;
+      }
+    };
     const slots = ctx.slots;
     yield slots.inject(HEADER_ACTIONS_SLOT, () => slots.register(
       {
@@ -1041,23 +1064,19 @@ function apply(ctx) {
         id: "dsh-rewind-portals",
         order: 1e3
       },
-      createRewindBridge({ sessionOf, currentSessionId, t, subscribeLocale })
+      createRewindBridge({ sessionOf, chatOf, currentSessionId, t, subscribeLocale })
     ));
     const commandUi = ctx.get("commandUi");
-    const chatOf = (sessionId) => {
-      if (sessionId === void 0) return void 0;
-      const face = sessionOf(sessionId);
-      return face === void 0 ? void 0 : face.getSnapshot().chat;
-    };
     const hasCandidates = (sessionId) => {
-      const chat = chatOf(sessionId);
+      const face = sessionId === void 0 ? void 0 : sessionOf(sessionId);
+      const chat = chatOf(face);
       return chat !== void 0 && rewindCandidatesOfChat(chat).length > 0;
     };
-    const fetchHostCandidates = async (face) => {
-      const known = knownCommandSeqs(face, (node) => isCandidateCommand(node));
+    const fetchHostCandidates = async (face, chatOf2) => {
+      const known = knownCommandSeqs(face, chatOf2, (node) => isCandidateCommand(node));
       const result = await face.command("/rewind __candidates");
       if (!result.ok || result.value?.matched !== true) return void 0;
-      const outcome = await waitForCommand(face, (node) => isCandidateCommand(node) && !known.has(node.seq));
+      const outcome = await waitForCommand(face, chatOf2, (node) => isCandidateCommand(node) && !known.has(node.seq));
       if (outcome === null || outcome.kind !== "success" || outcome.text === void 0) return void 0;
       return rewindCandidatesFromHostText(outcome.text);
     };
@@ -1078,7 +1097,7 @@ function apply(ctx) {
         options: async (session) => {
           const face = sessionOf(session.sessionId);
           if (face === void 0) return [];
-          const candidates = await fetchHostCandidates(face);
+          const candidates = await fetchHostCandidates(face, chatOf);
           if (candidates !== void 0) hostCandidatesCache.set(session.sessionId, candidates);
           return candidates === void 0 ? [] : rewindOptionsFromCandidates(candidates, t);
         },
@@ -1091,13 +1110,14 @@ function apply(ctx) {
           if (candidate === void 0) return;
           openPopover({
             session: face,
+            chatOf,
             seq: candidate.seq,
             time: candidate.time,
             preview: candidate.preview,
             anchor: composerAnchor(),
             t,
             onRewind: (mode) => {
-              void runRewindAndFill(face, candidate.seq, mode, currentSessionId);
+              void runRewindAndFill(face, candidate.seq, mode, currentSessionId, chatOf);
             }
           });
         }

package/lib/index.js

@@ -772,6 +772,13 @@ var SnapshotStore = class _SnapshotStore {
    * already absent, i.e. the target state is reached), a restore is a plain
    * writeFile with a recursive mkdir of the parent. Returns how the outcome
    * should record it.
+   *
+   * This is the only place the store writes restored content to the real FS,
+   * and it is deliberately a raw `writeFile`/`unlink` rather than the fs
+   * service: the caller only ever hands it a path from `planRestore` — one the
+   * session's own write-class tool call recorded and resolved (never a
+   * symlink/hard link) and only when it differs from the live disk. So no
+   * arbitrary path, no model input, never automatic.
    */
   async applyActionToDisk(kind, path, content, deleteFile) {
     if (kind === "delete") {

package/lib/types/client/hidden.d.ts

@@ -13,6 +13,34 @@ export interface HiddenChat {
         get(key: string): ChatConversationViewNode | undefined;
     };
 }
+/**
+ * Reader for one session's live chat snapshot. The dual channel hides the
+ * harness split behind SiriLee/dsh-rewind#7: rc.2 serves the chat from the
+ * session face snapshot, while 0.1.2-alpha.1+ serves it from the
+ * `uiConversation` service's named "chat" view (contributed by
+ * dsh-client-ui-chat through the uiSession slot hook).
+ */
+export type ChatOf = (session: {
+    readonly sessionId: string;
+    getSnapshot(): {
+        chat?: unknown;
+    };
+} | undefined) => HiddenChat | undefined;
+/**
+ * Resolve the chat snapshot across the two harness channels: the session-face
+ * snapshot first (rc.2 — on alpha.1+ the face no longer carries `chat`, so the
+ * field reads `undefined`), then the `uiConversation` "chat" view. The view's
+ * `getSnapshot()` returns undefined until the named view is registered, so
+ * both channels missing degrades to `undefined` (no targets, no hiding —
+ * never a crash).
+ */
+export declare function chatSnapshotOf(face: {
+    getSnapshot(): {
+        chat?: unknown;
+    };
+} | undefined, chatView: {
+    getSnapshot(): unknown;
+} | undefined): HiddenChat | undefined;
 /**
  * Extract the rewind target seq from a `/rewind` command's structured `args`
  * (e.g. `@5 chat`, `preview @5 both`). Locale-independent — never parses the

package/lib/types/client/popover.d.ts

@@ -15,6 +15,7 @@
  */
 import type { SessionFace } from '@deepseek-ai/dsh-client-runtime/client';
 import type { CommandNode } from '@deepseek-ai/dsh-client-runtime/client';
+import { type ChatOf } from './hidden.ts';
 import type { RewindKey } from './locales.ts';
 type Translate = (key: RewindKey, params?: Record<string, unknown>) => string;
 export interface PopoverOptions {
@@ -31,6 +32,12 @@ export interface PopoverOptions {
     /** Pending variant: executed after the retract confirm closes the popover. */
     readonly onRetract?: () => void;
     readonly preview: string;
+    /**
+     * Dual-channel chat reader (rc.2 session face / alpha.1+ uiConversation
+     * view): the durable variant's command probes scan the chat through it.
+     * Unused by the pending-retract variant.
+     */
+    readonly chatOf: ChatOf;
     /** The button that opened the popover (outside-click ignore target). */
     readonly anchor: HTMLElement;
     readonly t: Translate;
@@ -50,13 +57,13 @@ export declare function closePopover(): void;
  * command's stale outcome (e.g. an older preview that found file changes,
  * after those changes were already restored).
  */
-export declare function knownCommandSeqs(session: SessionFace, match: (node: CommandNode) => boolean): Set<number>;
+export declare function knownCommandSeqs(session: SessionFace, chatOf: ChatOf, match: (node: CommandNode) => boolean): Set<number>;
 /**
  * Resolve the outcome of the newest matching rewind command by watching the
  * session snapshot (command/run + command/done land as one CommandNode).
  * @returns the outcome text-bearing node, or null on timeout.
  */
-export declare function waitForCommand(session: SessionFace, match: (node: CommandNode) => boolean, timeoutMs?: number): Promise<{
+export declare function waitForCommand(session: SessionFace, chatOf: ChatOf, match: (node: CommandNode) => boolean, timeoutMs?: number): Promise<{
     kind: 'success' | 'error';
     text?: string;
 } | null>;

package/lib/types/client/portals.d.ts

@@ -24,6 +24,7 @@
  */
 import { type ReactNode } from 'react';
 import type { SessionFace } from '@deepseek-ai/dsh-client-runtime/client';
+import { type ChatOf, type HiddenChat } from './hidden.ts';
 import type { RewindKey } from './locales.ts';
 type Translate = (key: RewindKey, params?: Record<string, unknown>) => string;
 /** One portal target: the actions row of a user/steering seat + its durable node. */
@@ -51,6 +52,12 @@ export type PortalTarget = {
 /** Capabilities the session-scoped bridge receives from the plugin apply(). */
 export interface RewindBridgeDeps {
     readonly sessionOf: (sessionId: string) => SessionFace | undefined;
+    /**
+     * Dual-channel chat reader (rc.2 session face / alpha.1+ uiConversation
+     * "chat" view): every chat snapshot read goes through it. See
+     * `chatSnapshotOf` in hidden.ts for the channel precedence.
+     */
+    readonly chatOf: ChatOf;
     readonly currentSessionId: () => string | undefined;
     readonly t: Translate;
     readonly subscribeLocale: (cb: () => void) => () => void;
@@ -87,7 +94,13 @@ export declare function fillComposer(text: string): boolean;
  * the old baseline heuristic refilled withdrawn text into the composer
  * after switching sessions or restarting dsh.
  */
-export declare function runRewindAndFill(session: SessionFace, seq: number, mode: 'chat' | 'both', currentSessionId: () => string | undefined): Promise<void>;
+export declare function runRewindAndFill(session: SessionFace, seq: number, mode: 'chat' | 'both', currentSessionId: () => string | undefined, chatOf: ChatOf): Promise<void>;
+/**
+ * Collect the portal targets of one session: user rows × snapshot nodes.
+ * Exported as a test seam — the DOM→targets pairing that drives the ↶ button
+ * is otherwise only reachable through a full React portal render.
+ */
+export declare function collectTargets(chat: HiddenChat, hiddenSeqs: ReadonlySet<number>): readonly PortalTarget[];
 interface RewindPortalsProps extends RewindBridgeDeps {
     readonly sessionId: string;
 }
@@ -98,7 +111,7 @@ interface RewindPortalsProps extends RewindBridgeDeps {
  * skipped when the target set is unchanged), so the plugin never runs a
  * synchronous full-transcript scan inside a commit microtask.
  */
-export declare function RewindPortals({ sessionId, sessionOf, currentSessionId, t, subscribeLocale }: RewindPortalsProps): ReactNode;
+export declare function RewindPortals({ sessionId, sessionOf, chatOf, currentSessionId, t, subscribeLocale }: RewindPortalsProps): ReactNode;
 /**
  * Build the slot-entry component for the plugin apply(): a tiny bridge that
  * injects the apply-time capabilities (session resolution, locale, rewind

package/lib/types/snapshot.d.ts

@@ -456,6 +456,13 @@ export declare class SnapshotStore {
      * already absent, i.e. the target state is reached), a restore is a plain
      * writeFile with a recursive mkdir of the parent. Returns how the outcome
      * should record it.
+     *
+     * This is the only place the store writes restored content to the real FS,
+     * and it is deliberately a raw `writeFile`/`unlink` rather than the fs
+     * service: the caller only ever hands it a path from `planRestore` — one the
+     * session's own write-class tool call recorded and resolved (never a
+     * symlink/hard link) and only when it differs from the live disk. So no
+     * arbitrary path, no model input, never automatic.
      */
     private applyActionToDisk;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "DSH 插件：真正便捷无感的同窗口内对话回退，从不新建分支；自带轻量工作区备份，可一并还原文件（完整 Claude Code /rewind 语义）。 · DSH plugin: genuinely effortless in-window conversation rewind — never forking a new session; ships a lightweight workspace backup that restores files together with the rewind (full Claude Code /rewind semantics).",
   "keywords": [
     "deepseek-harness",
@@ -154,6 +154,7 @@
     "@types/react": "^18.3.31",
     "@types/react-dom": "^18.3.7",
     "esbuild": "^0.28.2",
+    "jsdom": "^30.0.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^7.0.2",