dsh-rewind-plugin 0.1.9 → 0.1.10

package/README.md

@@ -2,19 +2,19 @@
 
 DeepSeek Harness 插件：**同一会话窗口的 in-place 对话回退**（Claude Code `/rewind` 语义）。主交互为**用户消息旁的「回退」按钮**，点击后选择回退模式；命令仅作辅助。
 
-> 状态：v0.1.9 已实现并发布（`dsh-rewind-plugin`，npm + GitHub Actions Trusted Publishing）。交互以 Claude Code 行为为参考，并贴合 dsh Web 实际 UI（利用现有 DOM 锚点与运行时快照，纯插件、不改仓库核心）。
+> 状态：v0.1.10 已实现并发布（`dsh-rewind-plugin`，npm + GitHub Actions Trusted Publishing）。交互以 Claude Code 行为为参考，并贴合 dsh Web 实际 UI（利用现有 DOM 锚点与运行时快照，纯插件、不改仓库核心）。
 
-## 实现状态（v0.1.9）
+## 实现状态（v0.1.10）
 
-- ✅ host 端 `/rewind` 命令（两步文本引导 + 直接执行 + `preview` 影响清单）
+- ✅ host 端 `/rewind` 命令（手动单动作：不接受参数、撤回最近一条；参数化形式保留为按钮内部调用）
 - ✅ host 端变更台账（`tools/execute` 捕获 before、`tools/post-execute` 提交），按会话隔离
 - ✅ **与其他审批类插件共存**：捕获在 around-dispatch 阶段，`tools/pre-execute` 被 `ask` 短路（如 dsh-edit-approval）后批准仍能记录；被拒绝的调用不留 pending 残留
 - ✅ **路径按会话 cwd 解析**（复刻 `dsh-tool-fs` 的 session-cwd 规则），相对路径台账/还原指向真实文件；台账记录解析后的 display path
 - ✅ **fs 服务动态获取**（`ctx.inject(['fs'])`）：fs 后挂载也不失效，无 fs 部署时命令仍可用
 - ✅ 同窗口 in-place 回退：追加空内容标记 + `surfaceOp: replace` 替换目标及之后全部 surface（真实 `dsh-session` 集成测试通过）
-- ✅ client 端「回退」按钮（MutationObserver 注入用户消息行操作区）+ 模式选择浮层（含 both 模式影响清单确认）
+- ✅ client 端「回退」按钮（MutationObserver 注入用户消息行操作区）+ 模式选择浮层（含 both 模式影响清单确认）+ 手动 `/rewind` 参数拦截
 - ✅ 测试：纯函数单测 + 真实 `dsh-session` 集成测试 + `verify-host` 端到端（14 项，含审批短路/会话 cwd 场景）
-- ⏳ 二期：快捷键、git-first 快照式文件回退、命令路径的 client 两步浮层接管
+- ⏳ 二期：快捷键、git-first 快照式文件回退
 
 ## 安装
 
@@ -68,12 +68,12 @@ git push --tags      # push v<version> tag → 触发 .github/workflows/publish.
 
 - 每条用户消息 hover 出现「↶ 回退」按钮：点击 → 选择「仅回退对话」或
   「回退对话和代码」（后者先展示影响清单再确认）。
-- **回退 = 撤回（时间回溯）**：对**任意**用户消息回退（按钮或 `/rewind <目标>`），
+- **回退 = 撤回（时间回溯）**：对**任意**用户消息回退（按钮，或 `/rewind` 撤回最近一条），
   效果是**撤回该消息及它之后的所有内容**（含 agent 回复、工具调用）——对话界面与
   Agent 上下文都回到这条消息发送之前；**该消息的文本自动填入输入框（编辑区）**，
   可直接修改后重发。命令结果提示"已撤回 seq N 及之后内容"。
-- 键盘流：`/rewind` → 选消息 → `/rewind <序号> chat|both`；`/rewind preview <目标>`
-  只输出影响清单不执行。
+- 手动 `/rewind` **不接受参数**：直接撤回最近一条用户消息（内容填回输入框可修改重发）；
+  回退到更早的消息请用该消息旁的 ↶ 按钮（参数化命令保留为按钮内部调用）。
 - **回退后前端与 Agent 一致**：回退标记是空内容消息（deriveMessages 会跳过，模型
   上下文无任何标记噪音）；client 端隐藏被撤回范围内的消息行与 `/rewind` 命令结果，
   可见对话即"撤回点之前的内容"。会话日志（append-only 审计）不受影响。
@@ -93,9 +93,10 @@ git push --tags      # push v<version> tag → 触发 .github/workflows/publish.
 
 社区 rewind 类插件（`dsh-recall-plugin`、`dsh-checkpoint-rewind`、`dsh-turn-rewind`）均为 **fork 路线**（回退 = fork 出新会话，用户切换会话继续），且没有「仅回退对话 / 对话+代码」的选项。本插件提供：**在当前会话窗口内**改写模型上下文 + 可选还原工作区文件。
 
-## 交互设计（Claude Code 式两步：先选消息，再选模式）
+## 交互设计（按钮两步；手动命令为单动作）
 
-所有入口（按钮、命令）都遵循同一流程：**第一步选择要回退到的 user 消息，第二步选择回退模式**。不会在一开始就要求指定模式。
+按钮流程遵循两步：**第一步选择要回退到的 user 消息，第二步选择回退模式**。手动
+`/rewind` 命令不参与两步流程——它不接受参数，只撤回最近一条消息。
 
 ### 1. 用户消息旁的「回退」按钮（主入口）
 
@@ -108,18 +109,16 @@ git push --tags      # push v<version> tag → 触发 .github/workflows/publish.
 - 选「回退对话和代码」时，浮层内先显示将受影响的内容清单（将还原/删除的文件名与数量），确认后执行。
 - 执行结果以一条对话内消息呈现（如「已回退到 seq N，移除 M 条上下文；还原 2 个文件」）。
 
-### 2. 命令（辅助入口，面向键盘流与 headless；同样两步）
+### 2. 命令（辅助入口，仅支持手动撤回最近一条）
 
 ```
-/rewind                   第一步：列出最近的 user 消息（序号 + 时间 + 内容预览），等待选择
-/rewind <序号|@seq>        第二步：对选中的消息展示模式选项，等待选择
-/rewind <序号|@seq> chat   执行：仅回退对话
-/rewind <序号|@seq> both   执行：对话 + 代码
-/rewind preview <目标>     只输出影响清单，不执行
+/rewind   撤回最近一条用户消息（不接受参数；内容填回输入框可修改重发）
 ```
 
-- 分步示例：`/rewind` → 返回「1. 14:02 … / 2. 13:47 …」→ 输 `/rewind 1` → 返回「回退到消息 1：/rewind 1 chat 或 /rewind 1 both」→ 输 `/rewind 1 both` 执行。
-- 若输入直接带全参数（`/rewind 1 both`），等价于跳过前两步直接执行——高级用法，不强制。
+- 手动 `/rewind` 是**单动作**：不接受任何参数，直接撤回最近一条用户消息（对话回到
+  上一条消息之前）。参数化形式（`@seq chat|both`、`preview`）仍存在于 host 端，
+  但**仅供 ↶ 按钮内部调用**——client 端会在输入框拦截带参数的手动 `/rewind` 并提示
+  改用按钮。回退到更早的消息请使用该消息旁的「回退」按钮。
 - UI 按钮与命令共享同一套 host 端回退逻辑（`/rewind @seq <mode>`）。
 
 ## 回退机制（host 端，全部公开 API）
@@ -153,7 +152,7 @@ git push --tags      # push v<version> tag → 触发 .github/workflows/publish.
 
 - 按钮注入锚点：用户行 `[data-chat-flow-kind="user"]`（行容器 `data-chat-anchor-key` 为节点 key）；用 MutationObserver 跟踪新增行。
 - 消息 seq 获取：从行元素的 `data-chat-anchor-key` → 运行时快照 `session.getSnapshot().chat.nodes.get(key)` → `UserMessageNode.seq`（DOM 只用于定位，数据取自 runtime，不解析 DOM 文本）。
-- **两步选择浮层（命令与按钮共用）**：输入 `/rewind` 或点击消息旁按钮时，客户端接管交互——第一步展示最近 user 消息列表（序号 + 时间 + 预览），选中后第二步展示模式选项（仅回退对话 / 回退对话和代码 / 取消）；确认后调 `session.command('/rewind @<seq> <mode>')` 执行。host 端分步文本引导作为无客户端/headless 场景的降级。
+- **按钮两步选择浮层**：点击消息旁按钮时，客户端接管交互——目标即该消息，第二步展示模式选项（仅回退对话 / 回退对话和代码 / 取消）；确认后调 `session.command('/rewind @<seq> <mode>')` 执行。**手动 `/rewind` 不经过浮层**：它不接受参数，直接撤回最近一条消息；client 端在输入框拦截带参数的手动 `/rewind` 并提示改用按钮。
 - 执行结果以命令节点出现在对话中。
 - 注入按钮与「在新对话中分支」等官方操作并排，样式遵循 dsh 设计 token。
 

package/lib/client.js

@@ -47,7 +47,8 @@ var zh = {
   "popover.impact.failed": "\u65E0\u6CD5\u83B7\u53D6\u5F71\u54CD\u6E05\u5355\uFF1A{message}",
   "popover.impact.none": "\u76EE\u6807\u4E4B\u540E\u6CA1\u6709\u53F0\u8D26\u8BB0\u5F55\u7684\u5199\u7C7B\u53D8\u66F4\uFF0C\u65E0\u9700\u8FD8\u539F\u6587\u4EF6\u3002",
   "popover.confirm": "\u786E\u8BA4\u56DE\u9000",
-  "popover.back": "\u8FD4\u56DE"
+  "popover.back": "\u8FD4\u56DE",
+  "guard.hint": "/rewind \u4E0D\u63A5\u53D7\u53C2\u6570\uFF0C\u53EA\u80FD\u64A4\u56DE\u6700\u8FD1\u4E00\u6761\u6D88\u606F\uFF1B\u56DE\u9000\u5230\u66F4\u65E9\u6D88\u606F\u8BF7\u7528\u8BE5\u6D88\u606F\u65C1\u7684 \u21B6 \u6309\u94AE"
 };
 var en = {
   "button.aria": "Rewind to this message",
@@ -63,7 +64,8 @@ var en = {
   "popover.impact.failed": "Could not fetch the impact list: {message}",
   "popover.impact.none": "No ledger-recorded file changes after the target; nothing to restore.",
   "popover.confirm": "Confirm rewind",
-  "popover.back": "Back"
+  "popover.back": "Back",
+  "guard.hint": "/rewind takes no parameters \u2014 it only withdraws the most recent message. To rewind to an earlier message, use the \u21B6 button on that message."
 };
 
 // src/client/styles.ts
@@ -79,7 +81,8 @@ var CLASS = {
   popoverImpact: "dsh-rewind-popover-impact",
   popoverActions: "dsh-rewind-popover-actions",
   popoverPrimary: "dsh-rewind-popover-primary",
-  popoverGhost: "dsh-rewind-popover-ghost"
+  popoverGhost: "dsh-rewind-popover-ghost",
+  guardHint: "dsh-rewind-guard-hint"
 };
 var REWIND_ICON_SVG = [
   '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true">',
@@ -198,6 +201,20 @@ var STYLE = `
 .dsh-rewind-popover-ghost:hover {
   background: var(--dsw-alias-interactive-bg-hover);
 }
+
+.dsh-rewind-guard-hint {
+  position: fixed;
+  z-index: 1000;
+  max-width: min(440px, calc(100vw - 24px));
+  padding: 8px 12px;
+  border-radius: 10px;
+  background: var(--dsw-specific-surface-1, var(--dsw-alias-surface-1, #1f2127));
+  box-shadow: 0 8px 28px rgba(0, 0, 0, 0.32);
+  font-size: 13px;
+  line-height: 18px;
+  color: var(--dsw-alias-label-primary);
+  pointer-events: none;
+}
 `;
 
 // src/client/popover.ts
@@ -406,10 +423,11 @@ function hiddenSeqsOf(session) {
     const command = node.data;
     if (command.name !== "rewind") continue;
     if (command.outcome?.kind !== "success") continue;
+    if (command.outcome.sourceEventSeq === void 0) continue;
     hidden.add(command.seq);
-    const marker = command.outcome?.sourceEventSeq;
-    const target = targetOfOutcome(command.outcome?.text);
-    if (marker !== void 0 && target !== void 0 && (latest === null || marker > latest.marker)) {
+    const marker = command.outcome.sourceEventSeq;
+    const target = targetOfOutcome(command.outcome.text);
+    if (target !== void 0 && (latest === null || marker > latest.marker)) {
       latest = { marker, target };
     }
   }
@@ -501,45 +519,27 @@ function apply(ctx) {
       buttons.set(key, button);
       seat.setAttribute(REWIND_ATTACHED, "");
     };
-    let lastRewindSeq = -1;
-    let hiddenSeqsCache = null;
     const scan = () => {
       for (const [key, button] of buttons) {
         if (!button.isConnected) buttons.delete(key);
       }
       const session = sessionFor();
-      let newestRewind = -1;
-      if (session !== void 0) {
-        const snap = session.getSnapshot();
-        for (const key of snap.chat.order) {
-          const node = snap.chat.nodes.get(key);
-          if (node === void 0 || node.kind !== "command") continue;
-          const command = node.data;
-          if (command.name === "rewind" && command.outcome?.kind === "success" && command.seq > newestRewind) {
-            newestRewind = command.seq;
-          }
-        }
-      }
-      if (newestRewind > lastRewindSeq) {
-        lastRewindSeq = newestRewind;
-        hiddenSeqsCache = session !== void 0 ? hiddenSeqsOf(session) : null;
-        if (session !== void 0) fillComposerForRewind(session, filledTargets);
-      }
-      const hiddenSeqs = hiddenSeqsCache;
+      const hiddenSeqs = session !== void 0 ? hiddenSeqsOf(session) : /* @__PURE__ */ new Set();
       let hiddenCount = 0;
-      if (hiddenSeqs !== null && hiddenSeqs.size > 0 && session !== void 0) {
-        for (const seat of document.querySelectorAll(CHAT_SEAT_SELECTOR)) {
-          const key = seat.dataset.chatAnchorKey;
-          const anchor = key !== void 0 ? session.getSnapshot().chat.nodes.get(key)?.anchorSeq : void 0;
-          if (anchor !== void 0 && hiddenSeqs.has(anchor)) {
-            seat.style.display = "none";
-            hidden.add(seat);
-            hiddenCount += 1;
-          } else if (hidden.has(seat)) {
-            seat.style.display = "";
-            hidden.delete(seat);
-          }
+      for (const seat of document.querySelectorAll(CHAT_SEAT_SELECTOR)) {
+        const key = seat.dataset.chatAnchorKey;
+        const anchor = key !== void 0 && session !== void 0 ? session.getSnapshot().chat.nodes.get(key)?.anchorSeq : void 0;
+        if (anchor !== void 0 && hiddenSeqs.has(anchor)) {
+          seat.style.display = "none";
+          hidden.add(seat);
+          hiddenCount += 1;
+        } else if (hidden.has(seat)) {
+          seat.style.display = "";
+          hidden.delete(seat);
         }
+      }
+      if (session !== void 0) fillComposerForRewind(session, filledTargets);
+      if (hiddenSeqs.size > 0 || hiddenCount > 0) {
         console.info(
           `[dsh-rewind] hiding: ${hiddenCount} rows, seqs [${[...hiddenSeqs].slice(0, 20).join(", ")}${hiddenSeqs.size > 20 ? "\u2026" : ""}]`
         );
@@ -556,6 +556,7 @@ function apply(ctx) {
         if (node === void 0 || node.kind !== "command") continue;
         const command = node.data;
         if (command.name !== "rewind" || command.outcome?.kind !== "success") continue;
+        if (command.outcome.sourceEventSeq === void 0) continue;
         const target = targetOfOutcome(command.outcome.text);
         if (target === void 0 || filled.has(target)) continue;
         const text = userTextAt(session, target);
@@ -563,10 +564,67 @@ function apply(ctx) {
         if (fillComposer(text)) filled.add(target);
       }
     };
+    const REWIND_WITH_ARGS = /^\s*\/rewind\s+\S/i;
+    const composerTextarea = () => document.querySelector(COMPOSER_SELECTOR);
+    const hasBlockedRewindDraft = () => {
+      const textarea = composerTextarea();
+      return textarea !== null && REWIND_WITH_ARGS.test(textarea.value);
+    };
+    let guardHintEl = null;
+    let guardHintTimer;
+    const showGuardHint = () => {
+      if (guardHintEl !== null) guardHintEl.remove();
+      if (guardHintTimer !== void 0) window.clearTimeout(guardHintTimer);
+      const textarea = composerTextarea();
+      if (textarea === null) return;
+      const card = textarea.closest("[data-composer-card]");
+      const hint = document.createElement("div");
+      hint.className = CLASS.guardHint;
+      hint.setAttribute("role", "status");
+      hint.textContent = t("guard.hint");
+      document.body.appendChild(hint);
+      const rect = card instanceof HTMLElement ? card.getBoundingClientRect() : textarea.getBoundingClientRect();
+      hint.style.left = `${Math.round(rect.left)}px`;
+      hint.style.bottom = `${Math.round(window.innerHeight - rect.top + 8)}px`;
+      guardHintEl = hint;
+      guardHintTimer = window.setTimeout(() => {
+        hint.remove();
+        if (guardHintEl === hint) guardHintEl = null;
+        guardHintTimer = void 0;
+      }, 3200);
+    };
+    const onKeyDownGuard = (event) => {
+      if (event.key !== "Enter" || event.shiftKey || event.isComposing) return;
+      if (!hasBlockedRewindDraft()) return;
+      event.preventDefault();
+      event.stopPropagation();
+      showGuardHint();
+    };
+    const onClickGuard = (event) => {
+      if (event.button !== 0 || !hasBlockedRewindDraft()) return;
+      const target = event.target;
+      if (!(target instanceof Element)) return;
+      const button = target.closest("button");
+      if (button === null) return;
+      const card = button.closest("[data-composer-card]");
+      if (card === null) return;
+      const all = card.querySelectorAll("button");
+      if (all[all.length - 1] !== button) return;
+      if (button.querySelector("rect") !== null) return;
+      event.preventDefault();
+      event.stopPropagation();
+      showGuardHint();
+    };
+    document.addEventListener("keydown", onKeyDownGuard, true);
+    document.addEventListener("click", onClickGuard, true);
     observer = new MutationObserver(scan);
-    observer.observe(document.body, { childList: true, subtree: true });
+    observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ["style"] });
     scan();
     yield () => {
+      document.removeEventListener("keydown", onKeyDownGuard, true);
+      document.removeEventListener("click", onClickGuard, true);
+      if (guardHintEl !== null) guardHintEl.remove();
+      if (guardHintTimer !== void 0) window.clearTimeout(guardHintTimer);
       observer?.disconnect();
       for (const button of buttons.values()) button.remove();
       buttons.clear();

package/lib/index.js

@@ -178,12 +178,6 @@ function planRewind(events, surface, target) {
     surfaceEnd: shadowedSeqs[shadowedSeqs.length - 1]
   };
 }
-function formatCandidate(candidate) {
-  const time = new Date(candidate.time);
-  const hh = String(time.getHours()).padStart(2, "0");
-  const mm = String(time.getMinutes()).padStart(2, "0");
-  return `${candidate.index}. ${hh}:${mm} ${candidate.preview || "(\u65E0\u6587\u672C)"}`;
-}
 
 // src/index.ts
 var name = "dsh-rewind";
@@ -192,11 +186,8 @@ var TRACKED_TOOLS = /* @__PURE__ */ new Set(["write", "edit", "str_replace_edito
 var MUTATING_EDITOR_COMMANDS = /* @__PURE__ */ new Set(["create", "str_replace", "insert"]);
 var USAGE = [
   "Usage:",
-  "  /rewind                        list recent user messages to rewind to",
-  "  /rewind <\u5E8F\u53F7|@seq>             choose a mode for that message",
-  "  /rewind <\u5E8F\u53F7|@seq> chat        rewind the conversation only",
-  "  /rewind <\u5E8F\u53F7|@seq> both        rewind conversation and restore files",
-  "  /rewind preview <\u76EE\u6807>           show the impact list without executing"
+  "  /rewind                        \u64A4\u56DE\u6700\u8FD1\u4E00\u6761\u7528\u6237\u6D88\u606F\uFF08\u4E0D\u63A5\u53D7\u53C2\u6570\uFF09",
+  "  \u56DE\u9000\u5230\u66F4\u65E9\u7684\u6D88\u606F\u8BF7\u4F7F\u7528\u8BE5\u6D88\u606F\u65C1\u7684\u300C\u56DE\u9000\u300D\u6309\u94AE"
 ].join("\n");
 function mutationPathOf(exec) {
   const args = exec.arguments;
@@ -387,17 +378,11 @@ async function handleRewind(ctx, ledger, invocation) {
   const session = invocation.agent.session;
   const input = invocation.rawInput.trim();
   if (input === "") {
-    const candidates = listRewindCandidates(session.events, session.surface.nodes);
+    const candidates = listRewindCandidates(session.events, session.surface.nodes, 1);
     if (candidates.length === 0) {
       return { kind: "error", text: "\u5F53\u524D\u4F1A\u8BDD\u8FD8\u6CA1\u6709\u53EF\u56DE\u9000\u7684\u7528\u6237\u6D88\u606F\u3002" };
     }
-    return {
-      kind: "success",
-      text: `\u9009\u62E9\u8981\u56DE\u9000\u5230\u7684\u7528\u6237\u6D88\u606F\uFF08\u6700\u8FD1\u5728\u4E0A\uFF09\uFF1A
-${candidates.map(formatCandidate).join("\n")}
-
-\u7EE7\u7EED\uFF1A/rewind <\u5E8F\u53F7|@seq>\uFF0C\u6216\u76F4\u63A5 /rewind <\u5E8F\u53F7|@seq> chat|both \u6267\u884C\u3002`
-    };
+    return executeRewind(ctx, ledger, invocation, `@${candidates[0].seq}`, "chat");
   }
   const parts = input.split(/\s+/);
   if (parts[0] === "preview") {

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

@@ -16,6 +16,11 @@
  * before executing. Execution always goes through `session.command(...)`, the
  * same host path the `/rewind` command uses.
  *
+ * Manual composer input of `/rewind` is deliberately restricted (the guard
+ * below): it takes no parameters — a bare `/rewind` withdraws the most recent
+ * message, and any `/rewind <args>` line is blocked with a hint pointing at
+ * the per-message button.
+ *
  * @module dsh-rewind/client
  */
 import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';

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

@@ -15,6 +15,7 @@ export declare const zh: {
     'popover.impact.none': string;
     'popover.confirm': string;
     'popover.back': string;
+    'guard.hint': string;
 };
 /** The rewind namespace key union. */
 export type RewindKey = keyof typeof zh;
@@ -40,4 +41,5 @@ export declare const en: {
     'popover.impact.none': string;
     'popover.confirm': string;
     'popover.back': string;
+    'guard.hint': string;
 };

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

@@ -20,8 +20,9 @@ export declare const CLASS: {
     readonly popoverActions: 'dsh-rewind-popover-actions';
     readonly popoverPrimary: 'dsh-rewind-popover-primary';
     readonly popoverGhost: 'dsh-rewind-popover-ghost';
+    readonly guardHint: 'dsh-rewind-guard-hint';
 };
 /** The ↶ glyph, drawn inline so the bundle stays dependency-free. */
 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  width: 28px;\n  height: 28px;\n  padding: 6px;\n  border: none;\n  border-radius: 28px;\n  background: transparent;\n  color: var(--dsw-alias-label-tertiary);\n  cursor: pointer;\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-radius: 12px;\n  background: var(--dsw-specific-surface-1, var(--dsw-alias-surface-1, #1f2127));\n  box-shadow: 0 8px 28px rgba(0, 0, 0, 0.32);\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.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-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-accent, var(--dsw-accent, #5b8cff));\n  color: var(--dsw-alias-on-accent, #fff);\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";
+export declare const STYLE = "\n.dsh-rewind-btn {\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  width: 28px;\n  height: 28px;\n  padding: 6px;\n  border: none;\n  border-radius: 28px;\n  background: transparent;\n  color: var(--dsw-alias-label-tertiary);\n  cursor: pointer;\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-radius: 12px;\n  background: var(--dsw-specific-surface-1, var(--dsw-alias-surface-1, #1f2127));\n  box-shadow: 0 8px 28px rgba(0, 0, 0, 0.32);\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.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-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-accent, var(--dsw-accent, #5b8cff));\n  color: var(--dsw-alias-on-accent, #fff);\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-radius: 10px;\n  background: var(--dsw-specific-surface-1, var(--dsw-alias-surface-1, #1f2127));\n  box-shadow: 0 8px 28px rgba(0, 0, 0, 0.32);\n  font-size: 13px;\n  line-height: 18px;\n  color: var(--dsw-alias-label-primary);\n  pointer-events: none;\n}\n";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "DeepSeek Harness plugin: in-place conversation rewind in the same session window (Claude Code /rewind semantics) with optional workspace file restore",
   "keywords": [
     "deepseek-harness",

package/scripts/verify-host.mjs

@@ -8,8 +8,8 @@
  *
  * What it proves:
  *  1. the plugin registers a `rewind` command on the ctx;
- *  2. `/rewind` (no args) lists recent user messages;
- *  3. `/rewind @<seq> chat` cuts the surface in-place (log untouched);
+ *  2. `/rewind` (no args) withdraws the most recent user message;
+ *  3. `/rewind @<seq> chat` (the button's call form) cuts the surface in-place (log untouched);
  *  4. the ledger captures through `tools/execute` (NOT pre-execute): a
  *     pre-execute `ask` short-circuit still gets captured after approval, and
  *     a denied call never captures (no pending leak);
@@ -86,17 +86,25 @@ const check = (name, ok, detail) => {
 // 1. command registered
 check('command registered', typeof registered?.handler === 'function' && registered.name === 'rewind', JSON.stringify(registered))
 
-// 2. bare /rewind lists candidates
-const listResult = await call(agent, '')
-check('bare /rewind lists candidates', listResult.kind === 'success' && listResult.text.includes('second question') && listResult.text.includes('first question'), listResult.text)
+// 2. bare /rewind (manual, no parameters) withdraws the most recent user
+//    message (seq 2 "second question") and everything after it
+const bareBefore = [...session.surface.nodes]
+const bareResult = await call(agent, '')
+const bareAfter = [...session.surface.nodes]
+check('bare /rewind succeeds', bareResult.kind === 'success', bareResult.text)
+check('bare /rewind withdraws the latest message', bareAfter.length === 3 && bareAfter[0] === 0 && bareAfter[1] === 1 && bareAfter[2] > 3, `before ${JSON.stringify(bareBefore)} -> after ${JSON.stringify(bareAfter)}`)
+check('log stays append-only (5 events)', session.events.length === 5, `events=${session.events.length}`)
 
-// 3. /rewind @2 chat withdraws the target (seq 2) and everything after it
-const before = [...session.surface.nodes]
-const chatResult = await call(agent, '@2 chat')
-const after = [...session.surface.nodes]
+// 3. /rewind @<seq> chat (the button's exact call form) cuts the surface on a
+//    fresh session
+const paramSession = buildSession('verify-param')
+const paramAgent = { id: paramSession.id, session: paramSession, status: 'idle' }
+const before = [...paramSession.surface.nodes]
+const chatResult = await call(paramAgent, '@2 chat')
+const after = [...paramSession.surface.nodes]
 check('rewind chat succeeds', chatResult.kind === 'success', chatResult.text)
 check('surface cut to [0,1,marker] (target withdrawn)', after.length === 3 && after[0] === 0 && after[1] === 1 && after[2] > 3, `before ${JSON.stringify(before)} -> after ${JSON.stringify(after)}`)
-check('log stays append-only (5 events)', session.events.length === 5, `events=${session.events.length}`)
+check('log stays append-only (5 events)', paramSession.events.length === 5, `events=${paramSession.events.length}`)
 
 const writeExec = (callId, filePath, content) => ({
   callId, name: 'write', arguments: { file_path: filePath, content }, agent, signal: aborted(),