dsh-rewind-plugin 0.18.0 → 0.18.1

package/README.en.md

@@ -11,12 +11,12 @@ 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.
 
 - **In-place rewind, no new session** — the target message and everything after it (replies, tool calls) are withdrawn from the model context *and* the rendered transcript, and the target's text is filled back into the composer for editing and re-sending. It all happens inside the original session: no new branch, no leftover copy.
-- **Conversation and code rewind together** — Claude Code-aligned behavior: files edited by the write tools are tracked and restored by the same rewind, and external changes to already-tracked files are restorable too. **Partial tracking, before-write backup, store only on change**, with no git dependency.
+- **Conversation and files rewind together** — Claude Code-aligned behavior: files edited by the write tools are tracked and restored by the same rewind, and external changes to already-tracked files are restorable too. **Partial tracking, before-write backup, store only on change**, with no git dependency.
 - **Safety guarantees** — the session log only ever appends rewind markers and is never deleted or rewritten; file backup and restore are hardened; tests are comprehensive, and maintenance continues across DSH upgrades. Security model: [SECURITY.md](SECURITY.md).
 
 ## Preview
 
-Every user message carries a **↶ rewind** button in its action row. Clicking it opens a mode-selection popover — "**rewind conversation only**" or "**rewind conversation and code**", the latter showing the file-change list for confirmation first. You can also pick and rewind conveniently via the **`/rewind` and `/undo` commands**.
+Every user message carries a **↶ rewind** button in its action row. Clicking it opens a mode-selection popover — "**rewind conversation only**" or "**rewind conversation and files**", the latter showing the file-change list for confirmation first. You can also pick and rewind conveniently via the **`/rewind` and `/undo` commands**.
 
 <table>
   <tr>
@@ -24,7 +24,7 @@ Every user message carries a **↶ rewind** button in its action row. Clicking i
     <td align="center"><img src="assets/screenshots/mode-popover.png" width="440" alt="Mode-selection popover"><br><sub>Mode-selection popover</sub></td>
   </tr>
   <tr>
-    <td align="center"><img src="assets/screenshots/impact-list.png" width="440" alt="Impact list"><br><sub>"Conversation and code" impact list</sub></td>
+    <td align="center"><img src="assets/screenshots/impact-list.png" width="440" alt="Impact list"><br><sub>"Conversation and files" impact list</sub></td>
     <td align="center"><img src="assets/screenshots/rewind-candidates.png" width="440" alt="/rewind candidate picker"><br><sub>/rewind candidate picker</sub></td>
   </tr>
 </table>
@@ -55,7 +55,7 @@ then install the new one.
 ## Usage
 
 1. Find the user message you want to rewind to in the conversation, or type `/rewind` (or its alias `/undo`) to open the candidate picker.
-2. **Select it.** A small popover offers the two modes — "conversation only" or "conversation and code".
+2. **Select it.** A small popover offers the two modes — "conversation only" or "conversation and files".
 3. The rewind takes effect immediately: the conversation returns to how it looked at the target message, and the target message's text is filled back into the composer — edit and re-send.
 
 **Keyboard**: both the candidate picker and the mode popover support ↑↓ to move, Enter to confirm, Esc to cancel/back.
@@ -121,7 +121,7 @@ The whole design rests on two principles, simple but deliberate: **the conversat
 
 ### 1. Conversation rewind: a single "mask", not a delete
 
-`append-only` is a hard rule: the session log only grows and is never rewritten — the foundation of auditability and privacy. A rewind never touches history; it makes a single move: append **one "empty message" marker** to the end of the log and use it to "mask + replace" everything after the target message, so the model and the UI see only the part before it.
+`append-only` is a hard rule: the session log only grows and is never rewritten — the foundation of auditability and privacy. A rewind never touches history; it makes a single move: append **one "empty message" marker** to the end of the log and use it to "mask + replace" the target message and everything after it, so the model and the UI see only what came before it.
 
 - **One and the same log** — the append happens only in the current session's log: no new session, no new branch, so no residue or copy is left behind;
 - **The marker is canonical** — the same "hide + replace" as the official `/compact`: `/compact` compresses a span of history into a summary, while `/rewind` swaps in an "empty message" marker. Because it is canonical, DSH's log replay, compaction, and resume preflight all recognize it and never mistake it for a real message;
@@ -178,7 +178,7 @@ withdrew should consume the stable, locale-independent helpers exported from
 
 ## Security
 
-This plugin only appends rewind-marker events to the session log; it never deletes or rewrites logged history. Workspace files are written only when you choose "conversation and code"; backups are stored under `<dsh home>/rewind-snapshots/`; restores draw only from those backups. It never touches your git repository, makes no network requests, and accesses no credentials. For sessions you've left inactive for a long time, a global auto-cleanup (off by default) can remove their snapshot directory in whole, leaving the active session and the chat log untouched. Full security model: [SECURITY.md](SECURITY.md).
+This plugin only appends rewind-marker events to the session log; it never deletes or rewrites logged history. Workspace files are written only when you choose "conversation and files"; backups are stored under `<dsh home>/rewind-snapshots/`; restores draw only from those backups. It never touches your git repository, makes no network requests, and accesses no credentials. For sessions you've left inactive for a long time, a global auto-cleanup (off by default) can remove their snapshot directory in whole, leaving the active session and the chat log untouched. Full security model: [SECURITY.md](SECURITY.md).
 
 ## Development
 

package/README.md

@@ -16,7 +16,7 @@ DeepSeek Harness 插件：**一键就地回退对话到任意更早的用户消
 
 ## 效果预览
 
-每条用户消息的操作行都有一个 **↶ 回退** 按钮。点击后弹出模式选择浮层——「**仅回退对话**」或「**回退对话和代码**」，后者会先展示文件变更清单再确认。还可以通过 **`/rewind` 和 `/undo` 命令**便捷地选择和回退。
+每条用户消息的操作行都有一个 **↶ 回退** 按钮。点击后弹出模式选择浮层——「**仅回退对话**」或「**回退对话和文件**」，后者会先展示文件变更清单再确认。还可以通过 **`/rewind` 和 `/undo` 命令**便捷地选择和回退。
 
 <table>
   <tr>
@@ -24,7 +24,7 @@ DeepSeek Harness 插件：**一键就地回退对话到任意更早的用户消
     <td align="center"><img src="assets/screenshots/mode-popover.png" width="440" alt="模式选择浮层"><br><sub>模式选择浮层</sub></td>
   </tr>
   <tr>
-    <td align="center"><img src="assets/screenshots/impact-list.png" width="440" alt="影响清单"><br><sub>「回退对话和代码」影响清单</sub></td>
+    <td align="center"><img src="assets/screenshots/impact-list.png" width="440" alt="影响清单"><br><sub>「回退对话和文件」影响清单</sub></td>
     <td align="center"><img src="assets/screenshots/rewind-candidates.png" width="440" alt="/rewind 候选面板"><br><sub>/rewind 候选面板</sub></td>
   </tr>
 </table>
@@ -52,7 +52,7 @@ dsh plugin --profile <name> add dsh-rewind-plugin@<版本>
 ## 使用
 
 1. 在对话中找到要回退的那条用户消息，或输入 `/rewind`（或其别名 `/undo`）打开候选列表选择。
-2. **选中它。** 小浮层提供两种模式——「仅回退对话」或「回退对话和代码」。
+2. **选中它。** 小浮层提供两种模式——「仅回退对话」或「回退对话和文件」。
 3. 回退立即生效：对话回到目标消息当时的样子，目标消息的文本自动回填输入框——改完直接重发。
 
 **键盘操作**：候选列表与模式浮层均支持 ↑↓ 移动、Enter 确认、Esc 取消/返回。
@@ -105,7 +105,7 @@ rm <dsh home>/snapshot-cleanup-last-sweep.json
 
 ### 1. 对话回退：一次「遮蔽」，而不是「删除」
 
-`append-only` 是铁律：会话日志只追加、从不改写——这是可审计与信息安全的地基。回退从不动历史，它只做一步：往日志末尾追加一条 **“空消息”标记**，把目标消息之后的全部内容「遮蔽 + 替换」掉，让模型和界面都只看得到目标之前的部分。
+`append-only` 是铁律：会话日志只追加、从不改写——这是可审计与信息安全的地基。回退从不动历史，它只做一步：往日志末尾追加一条 **“空消息”标记**，把目标消息及其之后的全部内容「遮蔽 + 替换」掉，让模型和界面都只看得到目标之前的部分。
 
 - **同一份日志**——只在当前会话的日志做简单追加，不新建会话、不新建分支，因此不会留下残留和副本；
 - **标记是规范的**——采用与官方 `/compact` 相同的「隐藏 + 替换」：`/compact` 把一段历史压缩成摘要，`/rewind` 则换成一条“空消息”标记。由于其规范性，DSH 的日志重放、压缩、续接检查都能正确识别它，绝不会把它误认为真实对话；
@@ -159,7 +159,7 @@ rm <dsh home>/snapshot-cleanup-last-sweep.json
 
 ## 安全
 
-本插件只向会话日志追加回退标记事件，从不删除或改写已记录的历史。工作区文件仅在「回退对话和代码」时被改写，备份存储于 `<dsh home>/rewind-snapshots/`；还原以备份为唯一来源。不触碰你的 git 仓库，无网络请求，不访问任何凭据。对**长期不活跃**的会话，另有默认关闭的全局自动清理可整目录移除其快照，不影响活动会话与对话日志。完整安全模型：[SECURITY.md](SECURITY.md)。
+本插件只向会话日志追加回退标记事件，从不删除或改写已记录的历史。工作区文件仅在「回退对话和文件」时被改写，备份存储于 `<dsh home>/rewind-snapshots/`；还原以备份为唯一来源。不触碰你的 git 仓库，无网络请求，不访问任何凭据。对**长期不活跃**的会话，另有默认关闭的全局自动清理可整目录移除其快照，不影响活动会话与对话日志。完整安全模型：[SECURITY.md](SECURITY.md)。
 
 ## 开发
 

package/lib/client.js

@@ -278,47 +278,58 @@ var STYLE = `
   width: calc(15px + var(--dsh-content-font-delta, 0px));
   height: calc(15px + var(--dsh-content-font-delta, 0px));
 }
-.dsh-rewind-btn:hover {
-  background: var(--dsw-alias-interactive-bg-hover);
-  color: var(--dsw-alias-label-secondary);
+@media (hover: hover) {
+  .dsh-rewind-btn:hover {
+    background: var(--dsw-alias-interactive-bg-hover);
+    color: var(--dsw-alias-label-secondary);
+  }
 }
 
 .dsh-rewind-popover {
   position: fixed;
-  z-index: 1000;
-  width: 288px;
-  padding: 12px;
+  z-index: 1100;
+  box-sizing: border-box;
+  width: min(300px, calc(100vw - 24px));
+  padding: 16px;
   border: 0;
-  border-radius: var(--dsw-radius-md);
+  border-radius: var(--dsw-radius-lg);
   background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));
   backdrop-filter: var(--dsw-menu-backdrop-filter);
   isolation: isolate;
   --dsw-elevation-stroke-color: var(--dsw-alias-border-l1);
+  /* Elevated surface: match the menu cards' l2 scrollbar tokens. */
+  --dsh-scrollbar-thumb: var(--dsw-alias-scrollbar-bg-l2);
+  --dsh-scrollbar-thumb-hover: var(--dsw-alias-scrollbar-hover-l2);
   box-shadow: var(--dsw-elevation-prominent);
-  font-size: 14px;
-  line-height: 20px;
+  font-size: 12px;
+  line-height: 18px;
   color: var(--dsw-alias-label-primary);
 }
 .dsh-rewind-popover-title {
-  font-size: 14px;
-  font-weight: 600;
-  line-height: 20px;
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 18px;
 }
 .dsh-rewind-popover-target {
-  margin: 4px 0 10px;
+  margin: 2px 0 10px;
   font-size: 12px;
-  line-height: 16px;
+  line-height: 18px;
   color: var(--dsw-alias-label-tertiary);
   word-break: break-all;
+  /* The full message sits above the popover; two lines are enough context. */
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
 }
 .dsh-rewind-popover-option {
   display: flex;
   flex-direction: column;
   gap: 2px;
   width: 100%;
-  margin: 0 0 6px;
-  padding: 8px 10px;
-  border: 1px solid transparent;
+  margin: 0 0 2px;
+  padding: 6px 8px;
+  border: 0;
   border-radius: 8px;
   background: transparent;
   color: inherit;
@@ -338,7 +349,7 @@ var STYLE = `
   outline: none;
 }
 .dsh-rewind-popover-option:disabled {
-  opacity: 0.5;
+  opacity: 0.4;
   cursor: default;
 }
 .dsh-rewind-popover-option-label {
@@ -371,15 +382,15 @@ var STYLE = `
   display: flex;
   justify-content: flex-end;
   gap: 8px;
+  margin-top: 8px;
 }
 .dsh-rewind-popover-primary,
 .dsh-rewind-popover-ghost {
-  padding: 5px 12px;
+  height: 28px;
+  padding: 0 10px;
   border: none;
   border-radius: 8px;
   font: inherit;
-  font-size: 13px;
-  line-height: 18px;
   cursor: pointer;
 }
 .dsh-rewind-popover-primary {
@@ -390,7 +401,7 @@ var STYLE = `
   background: var(--dsw-alias-button-primary-hover);
 }
 .dsh-rewind-popover-primary:disabled {
-  opacity: 0.5;
+  opacity: 0.4;
   cursor: default;
 }
 .dsh-rewind-popover-ghost {
@@ -400,6 +411,9 @@ var STYLE = `
 .dsh-rewind-popover-ghost:hover {
   background: var(--dsw-alias-interactive-bg-hover);
 }
+.dsh-rewind-popover-ghost:active {
+  background: var(--dsw-alias-interactive-bg-active);
+}
 
 .dsh-rewind-guard-hint {
   position: fixed;
@@ -452,12 +466,21 @@ var STYLE = `
 
 // src/client/popover.ts
 var popoverEl = null;
+var popoverAnchor = null;
 var disposeOutside = null;
 var liveSessionId = null;
 var composerFocuser = null;
 function registerComposerFocuser(focus) {
   composerFocuser = focus;
 }
+function markOpen(anchor) {
+  popoverAnchor = anchor;
+  anchor.setAttribute("aria-expanded", "true");
+}
+function markClosed() {
+  popoverAnchor?.setAttribute("aria-expanded", "false");
+  popoverAnchor = null;
+}
 function closePopover() {
   if (popoverEl !== null) {
     popoverEl.remove();
@@ -467,6 +490,7 @@ function closePopover() {
     disposeOutside();
     disposeOutside = null;
   }
+  markClosed();
   const sessionId = liveSessionId;
   liveSessionId = null;
   if (sessionId !== null) {
@@ -476,13 +500,6 @@ function closePopover() {
     }
   }
 }
-function formatTarget(t, seq, time, preview) {
-  const d = new Date(time);
-  const hh = String(d.getHours()).padStart(2, "0");
-  const mm = String(d.getMinutes()).padStart(2, "0");
-  const previewText = preview.length > 0 ? preview : t("popover.noText");
-  return `seq ${seq} \xB7 ${hh}:${mm} \xB7 ${previewText}`;
-}
 function findCommand(chat, match) {
   if (chat === void 0) return void 0;
   let found;
@@ -566,7 +583,7 @@ function moveFocus(root, dir) {
   const next = index === -1 ? dir === 1 ? 0 : buttons.length - 1 : (index + dir + buttons.length) % buttons.length;
   buttons[next]?.focus();
 }
-function renderImpactStep(root, opts, back, cached) {
+function renderImpactStep(root, opts, back, reposition, cached) {
   const { session, seq, t } = opts;
   const impact = el("div", CLASS.popoverImpact, t("popover.impact.loading"));
   const actions = el("div", CLASS.popoverActions);
@@ -584,6 +601,7 @@ function renderImpactStep(root, opts, back, cached) {
   actions.append(confirm);
   root.replaceChildren(impact, actions);
   focusFirst(root);
+  reposition();
   void (async () => {
     const outcome = cached ?? await previewImpact(session.sessionId, seq);
     if (outcome === null) {
@@ -619,16 +637,44 @@ function renderImpactStep(root, opts, back, cached) {
     });
   })().catch(() => {
     impact.textContent = t("popover.impact.failed", { message: "unexpected error" });
+  }).finally(() => {
+    reposition();
   });
 }
 function mountShell(root, anchor, onKeyDown) {
+  const margin = 12;
+  const gap = 4;
+  let flippedAbove = null;
   const position = () => {
+    if (!root.isConnected) return;
+    if (!anchor.isConnected) {
+      if (popoverEl === root) closePopover();
+      return;
+    }
     const rect = anchor.getBoundingClientRect();
-    const gap = 4;
     const height = root.offsetHeight;
-    const top = rect.bottom + gap + height <= window.innerHeight - 8 ? rect.bottom + gap : Math.max(8, rect.top - gap - height);
+    if (flippedAbove === null) {
+      flippedAbove = rect.bottom + gap + height > window.innerHeight - margin;
+    }
+    const top = flippedAbove ? Math.max(margin, rect.top - gap - height) : Math.min(Math.max(margin, rect.bottom + gap), Math.max(margin, window.innerHeight - margin - height));
     root.style.top = `${Math.round(top)}px`;
-    root.style.left = `${Math.round(Math.min(rect.right, window.innerWidth - 8 - root.offsetWidth))}px`;
+    root.style.left = `${Math.round(Math.max(margin, Math.min(rect.right, window.innerWidth - margin - root.offsetWidth)))}px`;
+  };
+  let frame = 0;
+  const schedule = () => {
+    if (typeof requestAnimationFrame !== "function") {
+      position();
+      return;
+    }
+    if (frame !== 0) return;
+    frame = requestAnimationFrame(() => {
+      frame = 0;
+      position();
+    });
+  };
+  const onScroll = (event) => {
+    if (event.target instanceof Node && root.contains(event.target)) return;
+    schedule();
   };
   const onPointerDown = (event) => {
     const target = event.target;
@@ -639,19 +685,30 @@ function mountShell(root, anchor, onKeyDown) {
     document.addEventListener("pointerdown", onPointerDown);
     document.addEventListener("keydown", onKeyDown, true);
   }, 0);
+  document.body.append(root);
+  position();
+  const observer = typeof ResizeObserver === "undefined" ? null : new ResizeObserver(() => {
+    schedule();
+  });
+  observer?.observe(root);
+  window.addEventListener("scroll", onScroll, true);
+  window.addEventListener("resize", schedule);
   const dispose = () => {
     clearTimeout(deferred);
     document.removeEventListener("pointerdown", onPointerDown);
     document.removeEventListener("keydown", onKeyDown, true);
+    window.removeEventListener("scroll", onScroll, true);
+    window.removeEventListener("resize", schedule);
+    observer?.disconnect();
+    if (frame !== 0) cancelAnimationFrame(frame);
   };
-  document.body.append(root);
-  position();
   return { position, dispose };
 }
 function openRetractPopover(opts) {
   closePopover();
   const { preview, anchor, t, retract, onRetract } = opts;
   if (retract === void 0 || onRetract === void 0) return;
+  markOpen(anchor);
   const root = el("div", CLASS.popover);
   root.setAttribute("role", "dialog");
   root.setAttribute("aria-label", t("popover.retract.title"));
@@ -711,6 +768,7 @@ function openPopover(opts) {
   const { session, seq, time, preview, anchor, t } = opts;
   const onRewind = opts.onRewind;
   if (seq === void 0 || time === void 0 || onRewind === void 0) return;
+  markOpen(anchor);
   const durableOpts = { session, seq, time, preview, anchor, t, onRewind };
   const root = el("div", CLASS.popover);
   root.setAttribute("role", "dialog");
@@ -718,11 +776,14 @@ function openPopover(opts) {
   let bothState = { state: "loading" };
   let impactOutcome = null;
   let step = "modes";
+  let reposition = () => {
+  };
   const renderModes = () => {
     step = "modes";
+    const previewText = preview.length > 0 ? preview : t("popover.noText");
     const children = [
       el("div", CLASS.popoverTitle, t("popover.title")),
-      el("div", CLASS.popoverTarget, formatTarget(t, seq, time, preview)),
+      el("div", CLASS.popoverTarget, previewText),
       modeOption(t("popover.chat"), t("popover.chat.hint"), () => {
         closePopover();
         durableOpts.onRewind("chat");
@@ -741,20 +802,13 @@ function openPopover(opts) {
       if (bothState.state === "loading") option.disabled = true;
       children.push(option);
     }
-    const actions = el("div", CLASS.popoverActions);
-    const cancel = document.createElement("button");
-    cancel.type = "button";
-    cancel.className = CLASS.popoverGhost;
-    cancel.textContent = t("popover.cancel");
-    cancel.addEventListener("click", closePopover);
-    actions.append(cancel);
-    children.push(actions);
     root.replaceChildren(...children);
     focusFirst(root);
+    reposition();
   };
   const renderImpact = () => {
     step = "impact";
-    renderImpactStep(root, durableOpts, renderModes, impactOutcome);
+    renderImpactStep(root, durableOpts, renderModes, reposition, impactOutcome);
   };
   const onKeyDown = (event) => {
     if (event.key === "ArrowDown") {
@@ -778,6 +832,7 @@ function openPopover(opts) {
   };
   renderModes();
   const shell = mountShell(root, anchor, onKeyDown);
+  reposition = shell.position;
   popoverEl = root;
   disposeOutside = shell.dispose;
   void (async () => {
@@ -789,17 +844,16 @@ function openPopover(opts) {
       bothState = { state: "error", message: outcome?.kind === "error" ? outcome.text : "preview request timed out" };
     }
     renderModes();
-    shell.position();
   })().catch(() => {
     bothState = { state: "error", message: "unexpected error" };
     renderModes();
-    shell.position();
   });
 }
 
 // src/client/portals.tsx
 var import_react = require("react");
 var import_react_dom = require("react-dom");
+var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 
 // src/client/pending.ts
 var QUEUE_PREVIEW_CHARS = 200;
@@ -1291,17 +1345,17 @@ function RewindButton({ target, sessionId, sessionOf, chatOf, watchChat, isMainV
       }
     });
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Tooltip, { label: t("button.title"), side: "bottom", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     "button",
     {
       type: "button",
       className: CLASS.button,
       "aria-label": t("button.aria"),
-      title: t("button.title"),
+      "aria-haspopup": "dialog",
       onClick,
       dangerouslySetInnerHTML: { __html: REWIND_ICON_SVG }
     }
-  );
+  ) });
 }
 function composerText() {
   const surface = composerSurface();
@@ -1343,17 +1397,17 @@ function RetractButton({ target, sessionId, sessionOf, setComposerText, t }) {
       }
     });
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Tooltip, { label: t("button.retract.title"), side: "bottom", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     "button",
     {
       type: "button",
       className: CLASS.button,
       "aria-label": t("button.retract.aria"),
-      title: t("button.retract.title"),
+      "aria-haspopup": "dialog",
       onClick,
       dangerouslySetInnerHTML: { __html: REWIND_ICON_SVG }
     }
-  );
+  ) });
 }
 function createRewindBridge(deps) {
   return function RewindBridge({ sessionId }) {
@@ -1421,9 +1475,9 @@ async function candidatesOverRpc(connection, sessionId) {
 }
 
 // src/client/build-info.ts
-var PLUGIN_VERSION = true ? "0.18.0" : "dev";
+var PLUGIN_VERSION = true ? "0.18.1" : "dev";
 var PLUGIN_PACKAGE = "dsh-rewind-plugin";
-var BUILD_HASH = true ? "18b65dfa" : "dev";
+var BUILD_HASH = true ? "8a3779b4" : "dev";
 
 // src/client/locales.ts
 var zh = {
@@ -1438,11 +1492,11 @@ var zh = {
   "popover.retract.hint": "\u64A4\u56DE\u8FD9\u6761\u53CA\u4E4B\u540E\u7684\u63D2\u8BDD\u6D88\u606F\uFF0C\u4E0D\u6253\u65AD\u5F53\u524D\u751F\u6210",
   "popover.retract.confirm": "\u786E\u8BA4\u56DE\u9000",
   "popover.chat": "\u4EC5\u56DE\u9000\u5BF9\u8BDD",
-  "popover.chat.hint": "\u53EA\u56DE\u9000\u6A21\u578B\u4E0A\u4E0B\u6587\uFF0C\u4E0D\u52A8\u5DE5\u4F5C\u533A\u6587\u4EF6",
-  "popover.both": "\u56DE\u9000\u5BF9\u8BDD\u548C\u4EE3\u7801",
-  "popover.both.hint": "\u5BF9\u8BDD\u56DE\u9000\u5E76\u8FD8\u539F\u5DE5\u4F5C\u533A\u6587\u4EF6",
+  "popover.chat.hint": "\u4EC5\u56DE\u9000\u4E0A\u4E0B\u6587\uFF0C\u4E0D\u52A8\u5DE5\u4F5C\u533A\u6587\u4EF6",
+  "popover.both": "\u56DE\u9000\u5BF9\u8BDD\u548C\u6587\u4EF6",
+  "popover.both.hint": "\u56DE\u9000\u4E0A\u4E0B\u6587\u5E76\u8FD8\u539F\u5DE5\u4F5C\u533A\u6587\u4EF6",
   "popover.checking": "\u6B63\u5728\u68C0\u67E5\u6587\u4EF6\u53D8\u66F4\u2026",
-  "popover.noChanges": "\u6B64\u6D88\u606F\u4E4B\u540E\u6CA1\u6709\u53EF\u8FD8\u539F\u7684\u6587\u4EF6\u53D8\u66F4\uFF0C\u4EC5\u53EF\u56DE\u9000\u5BF9\u8BDD",
+  "popover.noChanges": "\u65E0\u53EF\u8FD8\u539F\u7684\u6587\u4EF6\u53D8\u66F4",
   "popover.backupDisabled": "\u5FEB\u7167\u5907\u4EFD\u5DF2\u5173\u95ED\uFF0C\u8FD8\u539F\u53EF\u80FD\u4E0D\u5145\u5206",
   "popover.cancel": "\u53D6\u6D88",
   "popover.impact.loading": "\u6B63\u5728\u83B7\u53D6\u5F71\u54CD\u6E05\u5355\u2026",
@@ -1481,11 +1535,11 @@ var en = {
   "popover.retract.hint": "Retracts this pending message and the ones after it, without interrupting the run",
   "popover.retract.confirm": "Confirm rewind",
   "popover.chat": "Rewind conversation only",
-  "popover.chat.hint": "Cut the model context only; workspace files stay untouched",
-  "popover.both": "Rewind conversation and code",
-  "popover.both.hint": "Cut the context and restore workspace files",
+  "popover.chat.hint": "Context only; workspace untouched",
+  "popover.both": "Rewind conversation and files",
+  "popover.both.hint": "Context and restore workspace files",
   "popover.checking": "Checking for file changes\u2026",
-  "popover.noChanges": "No tracked file changes after this message; conversation-only rewind",
+  "popover.noChanges": "No restorable file changes",
   "popover.backupDisabled": "Snapshots off; the restore may be incomplete",
   "popover.cancel": "Cancel",
   "popover.impact.loading": "Fetching impact list\u2026",
@@ -1514,7 +1568,7 @@ var en = {
 };
 
 // src/client/settings-card.tsx
-var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
+var import_dsh_client_ui_primitives2 = require("@deepseek-ai/dsh-client-ui-primitives");
 var import_jsx_runtime2 = require("react/jsx-runtime");
 var SETTINGS_ENTRY_ID = "dsh-rewind-plugin";
 var DEFAULT_MAX_AGE_DAYS = 30;
@@ -1542,10 +1596,10 @@ function formLabels(t) {
   };
 }
 function settingsForm(scope) {
-  const form = new import_dsh_client_ui_primitives.SettingsFormModel(scope, [
+  const form = new import_dsh_client_ui_primitives2.SettingsFormModel(scope, [
     fileCheckpointingEnabledField(),
     autoCleanupEnabledField(),
-    (0, import_dsh_client_ui_primitives.settingsNumberField)("autoCleanupMaxAgeDays")
+    (0, import_dsh_client_ui_primitives2.settingsNumberField)("autoCleanupMaxAgeDays")
   ]);
   return {
     form,
@@ -1565,7 +1619,7 @@ function SettingsCard(props) {
   const checkpointing = state.checkpointingEnabled.text === "true";
   const cleanupEnabled = state.enabled.text === "true";
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
-    import_dsh_client_ui_primitives.SettingsForm,
+    import_dsh_client_ui_primitives2.SettingsForm,
     {
       labels: formLabels(t),
       state,
@@ -1576,7 +1630,7 @@ function SettingsCard(props) {
           /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-settings-toggle-row", children: [
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dsh-rewind-settings-toggle-label", children: t("backup.title") }),
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-              import_dsh_client_ui_primitives.Switch,
+              import_dsh_client_ui_primitives2.Switch,
               {
                 checked: checkpointing,
                 label: t("backup.title"),
@@ -1594,7 +1648,7 @@ function SettingsCard(props) {
           /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-settings-toggle-row", children: [
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dsh-rewind-settings-toggle-label", children: t("cleanup.auto") }),
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-              import_dsh_client_ui_primitives.Switch,
+              import_dsh_client_ui_primitives2.Switch,
               {
                 checked: cleanupEnabled,
                 label: t("cleanup.auto"),
@@ -1608,7 +1662,7 @@ function SettingsCard(props) {
           /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dsh-rewind-settings-hint", children: t(cleanupEnabled ? "cleanup.auto.on" : "cleanup.auto.off") })
         ] }),
         cleanupEnabled ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-          import_dsh_client_ui_primitives.SettingsValueField,
+          import_dsh_client_ui_primitives2.SettingsValueField,
           {
             id: "dsh-rewind-cleanup-maxage",
             label: t("cleanup.maxAge"),

package/lib/index.js

@@ -28,7 +28,7 @@ var en = {
   "storeUnsupported": "file restore unavailable: these snapshots use a newer store format (v{version}) than this plugin understands; nothing was changed. Update the plugin or clear this session's snapshots.",
   "success": "Withdrawn seq {targetSeq} and everything after it (conversation returned to earlier){restore}.",
   "noUserMessages": "This session has no rewindable user messages yet.",
-  "command.description": "Rewind the conversation and/or code to a previous point",
+  "command.description": "Rewind the conversation and/or files to a previous point",
   "command.undoDescription": "Alias of /rewind",
   "engine.description": "dsh-rewind internal command",
   "engine.rejected": "Internal command: use /rewind or /undo.",
@@ -74,7 +74,7 @@ var zh = {
   "storeUnsupported": "\u6587\u4EF6\u8FD8\u539F\u4E0D\u53EF\u7528\uFF1A\u8FD9\u4E9B\u5FEB\u7167\u4F7F\u7528\u4E86\u6BD4\u672C\u63D2\u4EF6\u66F4\u65B0\u7684\u5B58\u50A8\u683C\u5F0F\uFF08v{version}\uFF09\uFF1B\u5DE5\u4F5C\u533A\u672A\u505A\u4EFB\u4F55\u6539\u52A8\u3002\u8BF7\u66F4\u65B0\u63D2\u4EF6\uFF0C\u6216\u6E05\u9664\u8BE5\u4F1A\u8BDD\u7684\u5FEB\u7167\u3002",
   "success": "\u5DF2\u64A4\u56DE seq {targetSeq} \u53CA\u4E4B\u540E\u5185\u5BB9\uFF08\u5BF9\u8BDD\u5DF2\u56DE\u5230\u6B64\u524D\uFF09{restore}\u3002",
   "noUserMessages": "\u5F53\u524D\u4F1A\u8BDD\u8FD8\u6CA1\u6709\u53EF\u56DE\u9000\u7684\u7528\u6237\u6D88\u606F\u3002",
-  "command.description": "\u56DE\u9000\u5BF9\u8BDD\u548C/\u6216\u4EE3\u7801\u5230\u4E4B\u524D\u7684\u67D0\u6761\u6D88\u606F",
+  "command.description": "\u628A\u5BF9\u8BDD\u548C/\u6216\u6587\u4EF6\u56DE\u9000\u5230\u4E4B\u524D\u7684\u67D0\u6761\u6D88\u606F",
   "command.undoDescription": "/rewind \u7684\u522B\u540D",
   "engine.description": "dsh-rewind \u5185\u90E8\u547D\u4EE4",
   "engine.rejected": "\u5185\u90E8\u547D\u4EE4\uFF1A\u8BF7\u4F7F\u7528 /rewind \u6216 /undo\u3002",

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

@@ -32,4 +32,4 @@ export declare const CLASS: {
  */
 export declare const REWIND_ICON_SVG: string;
 /** One injected stylesheet (scoped under `.dsh-rewind-*`). */
-export declare const STYLE = "\n.dsh-rewind-btn {\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  /* The neighbouring action buttons scale by this delta too. */\n  width: calc(28px + var(--dsh-content-font-delta, 0px));\n  height: calc(28px + var(--dsh-content-font-delta, 0px));\n  padding: 6px;\n  border: none;\n  border-radius: var(--dsw-radius-sm, 8px);\n  background: transparent;\n  color: var(--dsw-alias-label-tertiary);\n  cursor: pointer;\n}\n.dsh-rewind-btn svg {\n  width: calc(15px + var(--dsh-content-font-delta, 0px));\n  height: calc(15px + var(--dsh-content-font-delta, 0px));\n}\n.dsh-rewind-btn:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n  color: var(--dsw-alias-label-secondary);\n}\n\n.dsh-rewind-popover {\n  position: fixed;\n  z-index: 1000;\n  width: 288px;\n  padding: 12px;\n  border: 0;\n  border-radius: var(--dsw-radius-md);\n  background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));\n  backdrop-filter: var(--dsw-menu-backdrop-filter);\n  isolation: isolate;\n  --dsw-elevation-stroke-color: var(--dsw-alias-border-l1);\n  box-shadow: var(--dsw-elevation-prominent);\n  font-size: 14px;\n  line-height: 20px;\n  color: var(--dsw-alias-label-primary);\n}\n.dsh-rewind-popover-title {\n  font-size: 14px;\n  font-weight: 600;\n  line-height: 20px;\n}\n.dsh-rewind-popover-target {\n  margin: 4px 0 10px;\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-tertiary);\n  word-break: break-all;\n}\n.dsh-rewind-popover-option {\n  display: flex;\n  flex-direction: column;\n  gap: 2px;\n  width: 100%;\n  margin: 0 0 6px;\n  padding: 8px 10px;\n  border: 1px solid transparent;\n  border-radius: 8px;\n  background: transparent;\n  color: inherit;\n  font: inherit;\n  text-align: left;\n  cursor: pointer;\n}\n.dsh-rewind-popover-option:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n/* Arrow navigation moves real focus, so the focused row carries the pointer's\n   fill and the browser ring is suppressed: in dark mode the UA two-tone ring\n   draws its dark half against the filled row and reads as a residue edge (the\n   harness Menu suppresses it the same way). */\n.dsh-rewind-popover-option:focus-visible:not(:disabled) {\n  background: var(--dsw-alias-interactive-bg-hover);\n  outline: none;\n}\n.dsh-rewind-popover-option:disabled {\n  opacity: 0.5;\n  cursor: default;\n}\n.dsh-rewind-popover-option-label {\n  font-weight: 500;\n}\n.dsh-rewind-popover-option-hint {\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-tertiary);\n}\n.dsh-rewind-popover-impact {\n  margin: 4px 0 10px;\n  padding: 8px 10px;\n  border-radius: 8px;\n  background: var(--dsw-alias-interactive-bg-hover);\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-secondary);\n  white-space: pre-wrap;\n  max-height: 160px;\n  overflow: auto;\n}\n.dsh-rewind-popover-note {\n  margin-top: 6px;\n  font-size: 11px;\n  line-height: 15px;\n  color: var(--dsw-alias-label-tertiary);\n}\n.dsh-rewind-popover-actions {\n  display: flex;\n  justify-content: flex-end;\n  gap: 8px;\n}\n.dsh-rewind-popover-primary,\n.dsh-rewind-popover-ghost {\n  padding: 5px 12px;\n  border: none;\n  border-radius: 8px;\n  font: inherit;\n  font-size: 13px;\n  line-height: 18px;\n  cursor: pointer;\n}\n.dsh-rewind-popover-primary {\n  background: var(--dsw-alias-button-primary-fill);\n  color: var(--dsw-alias-label-primary-foreground);\n}\n.dsh-rewind-popover-primary:hover:not(:disabled) {\n  background: var(--dsw-alias-button-primary-hover);\n}\n.dsh-rewind-popover-primary:disabled {\n  opacity: 0.5;\n  cursor: default;\n}\n.dsh-rewind-popover-ghost {\n  background: transparent;\n  color: var(--dsw-alias-label-secondary);\n}\n.dsh-rewind-popover-ghost:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.dsh-rewind-guard-hint {\n  position: fixed;\n  z-index: 1000;\n  max-width: min(440px, calc(100vw - 24px));\n  padding: 8px 12px;\n  border: 0;\n  border-radius: var(--dsw-radius-md);\n  background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));\n  backdrop-filter: var(--dsw-menu-backdrop-filter);\n  isolation: isolate;\n  --dsw-elevation-stroke-color: var(--dsw-alias-border-l1);\n  box-shadow: var(--dsw-elevation-panel);\n  font-size: 13px;\n  line-height: 18px;\n  color: var(--dsw-alias-label-primary);\n  pointer-events: none;\n}\n\n/* ---- Plugin configuration form ---- */\n/* Only the card's own controls: the two switch rows, their hints, and the divider. */\n.dsh-rewind-settings-divider {\n  border-top: 1px solid var(--dsw-alias-border-l2);\n}\n.dsh-rewind-settings-section {\n  display: grid;\n  gap: 6px;\n  padding: 12px 0;\n}\n.dsh-rewind-settings-toggle-row {\n  display: flex;\n  align-items: flex-start;\n  justify-content: space-between;\n  gap: 16px;\n  font-size: 13px;\n  line-height: 1.5;\n  color: var(--dsw-alias-label-primary);\n}\n.dsh-rewind-settings-toggle-label {\n  flex: 1;\n  min-width: 0;\n}\n.dsh-rewind-settings-hint {\n  margin: 0;\n  font-size: 12px;\n  line-height: 1.5;\n  color: var(--dsw-alias-label-tertiary);\n}\n";
+export declare const STYLE = "\n.dsh-rewind-btn {\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  /* The neighbouring action buttons scale by this delta too. */\n  width: calc(28px + var(--dsh-content-font-delta, 0px));\n  height: calc(28px + var(--dsh-content-font-delta, 0px));\n  padding: 6px;\n  border: none;\n  border-radius: var(--dsw-radius-sm, 8px);\n  background: transparent;\n  color: var(--dsw-alias-label-tertiary);\n  cursor: pointer;\n}\n.dsh-rewind-btn svg {\n  width: calc(15px + var(--dsh-content-font-delta, 0px));\n  height: calc(15px + var(--dsh-content-font-delta, 0px));\n}\n@media (hover: hover) {\n  .dsh-rewind-btn:hover {\n    background: var(--dsw-alias-interactive-bg-hover);\n    color: var(--dsw-alias-label-secondary);\n  }\n}\n\n.dsh-rewind-popover {\n  position: fixed;\n  z-index: 1100;\n  box-sizing: border-box;\n  width: min(300px, calc(100vw - 24px));\n  padding: 16px;\n  border: 0;\n  border-radius: var(--dsw-radius-lg);\n  background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));\n  backdrop-filter: var(--dsw-menu-backdrop-filter);\n  isolation: isolate;\n  --dsw-elevation-stroke-color: var(--dsw-alias-border-l1);\n  /* Elevated surface: match the menu cards' l2 scrollbar tokens. */\n  --dsh-scrollbar-thumb: var(--dsw-alias-scrollbar-bg-l2);\n  --dsh-scrollbar-thumb-hover: var(--dsw-alias-scrollbar-hover-l2);\n  box-shadow: var(--dsw-elevation-prominent);\n  font-size: 12px;\n  line-height: 18px;\n  color: var(--dsw-alias-label-primary);\n}\n.dsh-rewind-popover-title {\n  font-size: 12px;\n  font-weight: 500;\n  line-height: 18px;\n}\n.dsh-rewind-popover-target {\n  margin: 2px 0 10px;\n  font-size: 12px;\n  line-height: 18px;\n  color: var(--dsw-alias-label-tertiary);\n  word-break: break-all;\n  /* The full message sits above the popover; two lines are enough context. */\n  display: -webkit-box;\n  -webkit-box-orient: vertical;\n  -webkit-line-clamp: 2;\n  overflow: hidden;\n}\n.dsh-rewind-popover-option {\n  display: flex;\n  flex-direction: column;\n  gap: 2px;\n  width: 100%;\n  margin: 0 0 2px;\n  padding: 6px 8px;\n  border: 0;\n  border-radius: 8px;\n  background: transparent;\n  color: inherit;\n  font: inherit;\n  text-align: left;\n  cursor: pointer;\n}\n.dsh-rewind-popover-option:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n/* Arrow navigation moves real focus, so the focused row carries the pointer's\n   fill and the browser ring is suppressed: in dark mode the UA two-tone ring\n   draws its dark half against the filled row and reads as a residue edge (the\n   harness Menu suppresses it the same way). */\n.dsh-rewind-popover-option:focus-visible:not(:disabled) {\n  background: var(--dsw-alias-interactive-bg-hover);\n  outline: none;\n}\n.dsh-rewind-popover-option:disabled {\n  opacity: 0.4;\n  cursor: default;\n}\n.dsh-rewind-popover-option-label {\n  font-weight: 500;\n}\n.dsh-rewind-popover-option-hint {\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-tertiary);\n}\n.dsh-rewind-popover-impact {\n  margin: 4px 0 10px;\n  padding: 8px 10px;\n  border-radius: 8px;\n  background: var(--dsw-alias-interactive-bg-hover);\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-secondary);\n  white-space: pre-wrap;\n  max-height: 160px;\n  overflow: auto;\n}\n.dsh-rewind-popover-note {\n  margin-top: 6px;\n  font-size: 11px;\n  line-height: 15px;\n  color: var(--dsw-alias-label-tertiary);\n}\n.dsh-rewind-popover-actions {\n  display: flex;\n  justify-content: flex-end;\n  gap: 8px;\n  margin-top: 8px;\n}\n.dsh-rewind-popover-primary,\n.dsh-rewind-popover-ghost {\n  height: 28px;\n  padding: 0 10px;\n  border: none;\n  border-radius: 8px;\n  font: inherit;\n  cursor: pointer;\n}\n.dsh-rewind-popover-primary {\n  background: var(--dsw-alias-button-primary-fill);\n  color: var(--dsw-alias-label-primary-foreground);\n}\n.dsh-rewind-popover-primary:hover:not(:disabled) {\n  background: var(--dsw-alias-button-primary-hover);\n}\n.dsh-rewind-popover-primary:disabled {\n  opacity: 0.4;\n  cursor: default;\n}\n.dsh-rewind-popover-ghost {\n  background: transparent;\n  color: var(--dsw-alias-label-secondary);\n}\n.dsh-rewind-popover-ghost:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n.dsh-rewind-popover-ghost:active {\n  background: var(--dsw-alias-interactive-bg-active);\n}\n\n.dsh-rewind-guard-hint {\n  position: fixed;\n  z-index: 1000;\n  max-width: min(440px, calc(100vw - 24px));\n  padding: 8px 12px;\n  border: 0;\n  border-radius: var(--dsw-radius-md);\n  background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));\n  backdrop-filter: var(--dsw-menu-backdrop-filter);\n  isolation: isolate;\n  --dsw-elevation-stroke-color: var(--dsw-alias-border-l1);\n  box-shadow: var(--dsw-elevation-panel);\n  font-size: 13px;\n  line-height: 18px;\n  color: var(--dsw-alias-label-primary);\n  pointer-events: none;\n}\n\n/* ---- Plugin configuration form ---- */\n/* Only the card's own controls: the two switch rows, their hints, and the divider. */\n.dsh-rewind-settings-divider {\n  border-top: 1px solid var(--dsw-alias-border-l2);\n}\n.dsh-rewind-settings-section {\n  display: grid;\n  gap: 6px;\n  padding: 12px 0;\n}\n.dsh-rewind-settings-toggle-row {\n  display: flex;\n  align-items: flex-start;\n  justify-content: space-between;\n  gap: 16px;\n  font-size: 13px;\n  line-height: 1.5;\n  color: var(--dsw-alias-label-primary);\n}\n.dsh-rewind-settings-toggle-label {\n  flex: 1;\n  min-width: 0;\n}\n.dsh-rewind-settings-hint {\n  margin: 0;\n  font-size: 12px;\n  line-height: 1.5;\n  color: var(--dsw-alias-label-tertiary);\n}\n";

package/lib/types/index.d.ts

@@ -4,8 +4,8 @@
  * lives in `src/client/`).
  *
  * Rewind mechanism: planning is pure (`src/rewind.ts`); execution appends a
- * marker `user/message` whose `surfaceOp` replaces every surface node after the
- * target with itself, cutting only the model-visible surface
+ * marker `user/message` whose `surfaceOp` replaces the target and every surface
+ * node after it with itself, cutting only the model-visible surface
  * (`docs/architecture.md`).
  *
  * File restore (mode `both`) follows Claude Code's checkpointing: unless

package/lib/types/rewind.d.ts

@@ -4,10 +4,10 @@
  * and the ordered surface, so this module stays unit-testable.
  *
  * Rewind semantics: rewinding to a user message appends a marker node into the
- * session log whose `surfaceOp` replaces every surface node AFTER the target
- * with itself. The log (audit trail, rendered transcript) is untouched; only
- * the model-visible surface is cut, so the next request derives its context
- * from the target message onward. The marker is a `user/message` carrying a
+ * session log whose `surfaceOp` replaces the target and every surface node
+ * after it with itself. The log (audit trail, rendered transcript) is
+ * untouched; only the model-visible surface is cut, so the next request
+ * derives its context from before the target message. The marker is a `user/message` carrying a
  * replace `surfaceOp` and the producer-owned source `{ kind: 'dsh-rewind' }`
  * (see `marker.ts`); the shape's invariants and history are documented in
  * `docs/architecture.md`.
@@ -51,13 +51,13 @@ export interface RewindCandidate {
 }
 /** A validated rewind: the target plus the exact surface range to shadow. */
 export interface RewindPlan {
-    /** Target user message seq (stays on the surface). */
+    /** Target user message seq (withdrawn with the surface range). */
     readonly targetSeq: number;
     /** The target's ordered position in the surface. */
     readonly targetIndex: number;
-    /** Ordered surface node seqs the rewind shadows (everything after the target). */
+    /** Ordered surface node seqs the rewind shadows (the target and everything after it). */
     readonly shadowedSeqs: readonly number[];
-    /** First surface node after the target — the replace range start (inclusive). */
+    /** The target — the replace range start (inclusive). */
     readonly surfaceStart: number;
     /** Last surface node — the replace range end (inclusive). */
     readonly surfaceEnd: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "In-window conversation rewind with workspace file restore · 同窗口内对话回退并可还原工作区文件",
   "icon": "./assets/icon.svg",
   "keywords": [
@@ -152,42 +152,42 @@
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.5",
     "@deepseek-ai/cosmokit": "1.8.6",
-    "@deepseek-ai/dsh-agent": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-api-session-controller": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-attachment": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-connection": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-locale": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-store": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-commands": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-input-trigger": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-plugin-manager": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-session": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-command-compact": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-commands": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-compaction": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-compaction-basic": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-compaction-image-offload": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-fs": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-goal": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-home-paths": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-llm": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-plan-mode": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-sandbox": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-scope": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-session": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-session-projection": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-session-stats": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-session-title": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-settings": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-token-meter": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-tools": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-typert-protocol": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-user-questions": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-working-directory": "0.2.1-rc.2",
+    "@deepseek-ai/dsh-agent": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-api-session-controller": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-attachment": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-connection": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-locale": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-store": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-commands": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-input-trigger": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-plugin-manager": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-session": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-settings": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-slots": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-command-compact": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-commands": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-compaction": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-compaction-basic": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-compaction-image-offload": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-fs": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-goal": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-home-paths": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-llm": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-plan-mode": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-sandbox": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-scope": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-session": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-session-projection": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-session-stats": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-session-title": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-settings": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-token-meter": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-tools": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-typert-protocol": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-user-questions": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-working-directory": "0.2.1-rc.3",
     "@deepseek-ai/schemastery": "3.18.5",
     "@types/node": "^24.0.0",
     "@types/react": "^18.3.31",