dsh-rewind-plugin 0.2.8 → 0.3.0

package/README.md

@@ -29,12 +29,10 @@ Each user message gains a compact **↶ rewind** action in its action row. Click
   </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/guard-hint.png" width="440" alt="Manual /rewind guard hint"><br><sub>Manual /rewind guard hint</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>
 
-Manual `/rewind` input in the composer is intercepted — submitting shows a transient hint pointing at the ↶ button.
-
 ## Install
 
 ```sh
@@ -45,14 +43,7 @@ Restart `dsh web` (`--profile web`) after installing.
 
 > ⚠️ The npm name `dsh-rewind` belongs to another author's package — install with `dsh-rewind-plugin`.
 
-From a local checkout or a pinned GitHub commit:
-
-```sh
-dsh plugin --profile web add /path/to/dsh-rewind              # local checkout
-dsh plugin --profile web add github:SiriLee/dsh-rewind#<sha>  # pinned commit
-```
-
-A git install fails on first run: pnpm blocks git dependencies from running build scripts. Follow the CLI hint to add an `allowBuilds` key to the profile's `pnpm-workspace.yaml`, then retry — pnpm runs the plugin's `prepare` (full build) and installs it.
+For contributors: install from a local checkout or a pinned commit — `dsh plugin --profile web add /path/to/dsh-rewind` or `dsh plugin --profile web add github:SiriLee/dsh-rewind#<sha>`. A git install fails on first run until you add an `allowBuilds` key to the profile's `pnpm-workspace.yaml` (pnpm blocks git dependencies from running build scripts); after that it runs the plugin's `prepare` and installs it.
 
 ## Usage
 
@@ -60,7 +51,9 @@ A git install fails on first run: pnpm blocks git dependencies from running buil
 2. **Click it.** The target is that message; a small popover offers the two modes ("conversation and code" is hidden when no tracked file changes exist after the target).
 3. The rewind executes as an in-session command; a result message confirms, and the withdrawn message's text is filled back into the composer for editing and re-sending.
 
-The ↶ button appears on user messages rendered in the **current session view** — switch to another session before rewinding it. A rewind can itself be rewound (its marker enters the log), but the file-restore action is not re-backed up.
+**Command-line entry**: type a bare `/rewind` and press Enter to open the candidate picker; selecting a target continues the same flow as the button.
+
+Rewinds can be repeated (each appends a marker to the log). A rewind cannot be undone through the plugin, but the withdrawn messages can be recovered by manually editing the session log. The file-restore action is not re-backed up.
 
 ## How it works
 
@@ -70,7 +63,7 @@ The plugin appends an **empty-content marker** `assistant/message` into the sess
 
 - The marker carries `sourceEventSeqs` covering every shadowed node, and `Session.append`'s surface rules validate the cut (a contiguous range on the current surface).
 - Because the marker is **empty**, the harness derives it to `null` — it never enters the model context and never renders as conversation content. Agent and user both see the conversation exactly as it was at the target.
-- The marker's **turn number reuses the last started turn** (`markerTurnOf`), never `lastTurn + 1`: the harness numbers its next real turn exactly `last turn/start + 1`, so a `maxTurn + 1` marker would sit *before* that `turn/start` — the client conversation builder rejects the ordering (`…turn-tail… received an update before its start Match`), history load fails, and the whole conversation disappears from the UI (the real defect in ≤ 0.2.4, fixed in 0.2.5). Reusing an already-consumed turn makes the marker a harmless trailing update on the previous completed turn's tail — it can never collide with a future turn.
+- The marker's **turn number reuses the last started turn** (`markerTurnOf`), never `lastTurn + 1`: the harness numbers its next real turn exactly `last turn/start + 1`, so a `maxTurn + 1` marker would sit *before* that `turn/start` — the client conversation builder rejects the ordering (`…turn-tail… received an update before its start Match`) and history load fails. Reusing an already-consumed turn makes the marker a harmless trailing update on the previous completed turn's tail — it can never collide with a future turn.
 - The append-only log is **untouched** — every withdrawn event stays in the audit trail; only the model-visible surface is cut, so the next request derives its context from the target onward.
 
 A running turn (LLM thinking / streaming) is force-stopped first (`cancel({ kind: 'user' })`) and the rewind waits for quiescence; if it can't stop, the rewind is aborted with an error.
@@ -125,12 +118,14 @@ Full instructions: [docs/troubleshooting.md](docs/troubleshooting.md)
 
 This plugin only appends rewind-marker events to the session log; it never deletes or rewrites logged history. File writes happen only when you choose "conversation and code" — before-backups and restores stay under `~/.dsh/rewind-snapshots/`. It never touches your git repository, makes no network requests, and accesses no credentials.
 
+> **Note:** a rewind only hides messages from view — the exported session log (`/export`) still contains them, and this plugin cannot alter exports. To remove a conversation completely, delete its session file.
+
 ## Development
 
 ```sh
 npm install            # devDeps from the npm registry
 npm run typecheck      # tsc on both compilation surfaces (host + client)
-npm test               # vitest: rewind / snapshot / hidden / session-cwd / integration (46 cases)
+npm test               # vitest: rewind / snapshot / hidden / session-cwd / integration
 npm run build          # esbuild: lib/index.js (host ESM) + lib/client.js (loader closure) + .d.ts
 node scripts/verify-host.mjs   # boot the BUILT host artifact end-to-end (18 checks)
 ```

package/README.zh.md

@@ -29,12 +29,10 @@
   </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/guard-hint.png" width="440" alt="手动 /rewind 拦截提示"><br><sub>手动 /rewind 拦截提示</sub></td>
+    <td align="center"><img src="assets/screenshots/rewind-candidates.png" width="440" alt="/rewind 候选面板"><br><sub>/rewind 候选面板</sub></td>
   </tr>
 </table>
 
-在输入框手动输入 `/rewind`（含裸命令）会被**拦截**——提交时弹出临时提示，指向消息旁的 ↶ 按钮。
-
 ## 安装
 
 ```sh
@@ -45,14 +43,7 @@ dsh plugin --profile web add dsh-rewind-plugin
 
 > ⚠️ npm 上的 `dsh-rewind` 属于其他作者，请用 `dsh-rewind-plugin` 安装。
 
-本地 checkout 或 pin 一个 GitHub commit：
-
-```sh
-dsh plugin --profile web add /path/to/dsh-rewind              # 本地 checkout
-dsh plugin --profile web add github:SiriLee/dsh-rewind#<sha>  # pin commit
-```
-
-git 安装首次会失败：pnpm 默认禁止 git 依赖执行构建脚本。按 CLI 提示在 profile 的 `pnpm-workspace.yaml` 中加 `allowBuilds` 后重试——pnpm 会执行插件的 `prepare`（完整构建）并装入 profile。
+给贡献者：可从本地 checkout 或 pin 的 commit 安装——`dsh plugin --profile web add /path/to/dsh-rewind` 或 `dsh plugin --profile web add github:SiriLee/dsh-rewind#<sha>`。git 安装首次会失败：pnpm 默认禁止 git 依赖执行构建脚本，需先在 profile 的 `pnpm-workspace.yaml` 加 `allowBuilds`；之后 pnpm 会执行插件的 `prepare`（完整构建）并装入 profile。
 
 ## 使用
 
@@ -60,7 +51,9 @@ git 安装首次会失败：pnpm 默认禁止 git 依赖执行构建脚本。按
 2. **点击它。** 目标即这条消息；小浮层提供两种模式（目标之后没有跟踪的变更时，「回退对话和代码」不显示）。
 3. 回退以一条会话内命令执行；结果消息确认，被撤回消息的文本自动填入输入框，可编辑后重发。
 
-↶ 按钮只出现在**当前会话视图**渲染的用户消息行上——回退其他会话前先切换到该会话。回退本身可再回退（标记进入日志），但文件还原动作不再记录新备份。
+**命令行入口**：输入裸 `/rewind` 回车打开候选面板，选择目标后流程与按钮一致。
+
+回退可重复进行（每次追加一条标记到日志）。回退无法通过插件撤销，但可以手动编辑会话日志恢复。文件还原动作不再记录新备份。
 
 ## 原理
 
@@ -70,7 +63,7 @@ git 安装首次会失败：pnpm 默认禁止 git 依赖执行构建脚本。按
 
 - 标记携带 `sourceEventSeqs` 覆盖所有被遮蔽节点，`Session.append` 的 surface 规则校验切割合法性（仅限当前 surface 上的连续区间）。
 - 因为标记**内容为空**，harness 会将其派生为 `null`——永不进入模型上下文、也永不渲染成对话内容。agent 与用户看到的对话都回到目标消息当时的样子。
-- 标记的 **turn 号复用最后一个已开始的回合**（`markerTurnOf`），而不是「最后回合 + 1」：harness 恰好用 `最后 turn/start + 1` 编号下一条真实回合。若标记也取这个数，日志里就会出现同一 turn 的 `assistant/message` 先于 `turn/start` 的乱序，客户端 conversation 构建器会以 `conversation Context …:turn-tail… received an update before its start Match` 拒绝重放——历史加载失败、整个对话从界面消失（0.2.4 及之前的真实缺陷，已在 0.2.5 修复）。复用已消费的 turn 号则标记只是上一个已完成回合尾部的一次无害追加，永不与新回合冲突。
+- 标记的 **turn 号复用最后一个已开始的回合**（`markerTurnOf`），而不是「最后回合 + 1」：harness 恰好用 `最后 turn/start + 1` 编号下一条真实回合。若标记也取这个数，日志里就会出现同一 turn 的 `assistant/message` 先于 `turn/start` 的乱序，客户端 conversation 构建器会以 `conversation Context …:turn-tail… received an update before its start Match` 拒绝重放——历史加载失败、整个对话从界面消失。复用已消费的 turn 号则标记只是上一个已完成回合尾部的一次无害追加，永不与新回合冲突。
 - append-only 日志**不被改写**——审计轨迹完整保留每条被撤回的事件，只有模型可见的 surface 被剪掉，下一条请求从目标消息起派生上下文。
 
 若 agent 正在运行（LLM 思考/流式输出），会先强制停止（`cancel({ kind: 'user' })`）并等待 quiescence 再回退；停不下来则中止并报错。
@@ -125,12 +118,14 @@ git 安装首次会失败：pnpm 默认禁止 git 依赖执行构建脚本。按
 
 本插件只向会话日志追加回退标记事件，从不删除或改写已记录的历史。文件写入仅在你选择「回退对话和代码」时发生，备份与还原都限定在 `~/.dsh/rewind-snapshots/` 内。不触碰你的 git 仓库，无网络请求，不访问任何凭据。
 
+> **注意：** 回退只是把消息从视图中隐藏——导出的会话日志（`/export`）仍包含撤回前的内容，本插件无法改动导出。要彻底删除对话，请删除对应的会话文件。
+
 ## 开发
 
 ```sh
 npm install            # devDeps 来自 npm registry
 npm run typecheck      # tsc 双面编译（host + client）
-npm test               # vitest：rewind / snapshot / hidden / session-cwd / 集成（46 例）
+npm test               # vitest：rewind / snapshot / hidden / session-cwd / 集成
 npm run build          # esbuild：lib/index.js（host ESM）+ lib/client.js（loader 闭包）+ .d.ts
 node scripts/verify-host.mjs   # 端到端验证构建产物（18 项检查）
 ```

package/docs/harness-reference.md

@@ -48,7 +48,7 @@ src/client/styles.ts    injected styles (dsh design tokens)
 scripts/build.mjs       esbuild: lib/index.js (host ESM) + lib/client.js (loader closure) + .d.ts
 scripts/verify-host.mjs end-to-end host verification (18 checks)
 scripts/repair-markers.mjs  offline marker-turn repair tool (ships as `dsh-rewind-repair`)
-tests/                  vitest suites (rewind / snapshot / hidden / session-cwd / integration, 46 cases)
+tests/                  vitest suites (rewind / snapshot / hidden / session-cwd / integration)
 docs/                   maintainer docs: harness reference, troubleshooting, release steps
 assets/screenshots/     UI screenshots
 cordis.patch.yml        bundle patch (mounts the dual-face plugin row)

package/lib/client.js

@@ -32,10 +32,6 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// src/client/portals.tsx
-var import_react = require("react");
-var import_react_dom = require("react-dom");
-
 // src/client/hidden.ts
 function targetOfOutcome(text) {
   if (text === void 0) return void 0;
@@ -89,6 +85,48 @@ function hiddenSeqsOf(snap) {
   return hidden;
 }
 
+// src/client/candidates.ts
+var PREVIEW_CHARS = 80;
+function messagePreviewOf(message) {
+  const text = message.content.map((block) => block.type === "text" && typeof block.text === "string" ? block.text : "").join("").replace(/\s+/g, " ").trim();
+  return text.length <= PREVIEW_CHARS ? text : `${text.slice(0, PREVIEW_CHARS - 1)}\u2026`;
+}
+function formatCandidateTime(time) {
+  const d = new Date(time);
+  const hh = String(d.getHours()).padStart(2, "0");
+  const mm = String(d.getMinutes()).padStart(2, "0");
+  return `${hh}:${mm}`;
+}
+function rewindCandidatesOf(snap, hidden, limit = 10) {
+  const candidates = [];
+  for (let i = snap.order.length - 1; i >= 0 && candidates.length < limit; i--) {
+    const key = snap.order[i];
+    if (key === void 0) continue;
+    const node = snap.nodes.get(key);
+    if (node === void 0 || node.kind !== "user" && node.kind !== "steering") continue;
+    if (hidden.has(node.anchorSeq ?? node.data.seq)) continue;
+    candidates.push({
+      seq: node.data.seq,
+      time: node.data.time,
+      preview: messagePreviewOf(node.data)
+    });
+  }
+  return candidates;
+}
+function rewindCandidatesOfChat(snap) {
+  return rewindCandidatesOf(snap, hiddenSeqsOf(snap));
+}
+function rewindOptionsOf(snap, t) {
+  return rewindCandidatesOfChat(snap).map((candidate) => ({
+    id: String(candidate.seq),
+    label: candidate.preview || t("popover.noText"),
+    detail: formatCandidateTime(candidate.time)
+  }));
+}
+function candidateBySeq(snap, seq) {
+  return rewindCandidatesOfChat(snap).find((candidate) => candidate.seq === seq);
+}
+
 // src/client/styles.ts
 var CLASS = {
   button: "dsh-rewind-btn",
@@ -339,6 +377,20 @@ function modeOption(label, hint, onClick) {
   button.addEventListener("click", onClick);
   return button;
 }
+function focusableButtons(root) {
+  return Array.from(root.querySelectorAll("button")).filter((button) => !button.disabled && !button.classList.contains(CLASS.popoverGhost));
+}
+function focusFirst(root) {
+  focusableButtons(root)[0]?.focus();
+}
+function moveFocus(root, dir) {
+  const buttons = focusableButtons(root);
+  if (buttons.length === 0) return;
+  const active = document.activeElement;
+  const index = active instanceof HTMLButtonElement ? buttons.indexOf(active) : -1;
+  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) {
   const { session, seq, t } = opts;
   const impact = el("div", CLASS.popoverImpact, t("popover.impact.loading"));
@@ -356,6 +408,7 @@ function renderImpactStep(root, opts, back, cached) {
   confirm.disabled = true;
   actions.append(confirm);
   root.replaceChildren(impact, actions);
+  focusFirst(root);
   void (async () => {
     const outcome = cached ?? await previewImpact(session, seq);
     if (outcome === null) {
@@ -368,6 +421,7 @@ function renderImpactStep(root, opts, back, cached) {
     }
     impact.textContent = outcome.text === void 0 ? t("popover.impact.none") : stripImpactToken(outcome.text);
     confirm.disabled = false;
+    confirm.focus();
     confirm.addEventListener("click", () => {
       closePopover();
       opts.onRewind("both");
@@ -384,7 +438,9 @@ function openPopover(opts) {
   root.setAttribute("aria-label", t("popover.title"));
   let bothState = { state: "loading" };
   let impactOutcome = null;
+  let step = "modes";
   const renderModes = () => {
+    step = "modes";
     const children = [
       el("div", CLASS.popoverTitle, t("popover.title")),
       el("div", CLASS.popoverTarget, formatTarget(t, seq, time, preview)),
@@ -399,9 +455,7 @@ function openPopover(opts) {
       const option = modeOption(
         t("popover.both"),
         bothState.state === "loading" ? t("popover.checking") : t("popover.both.hint"),
-        () => {
-          renderImpactStep(root, opts, renderModes, impactOutcome);
-        }
+        renderImpact
       );
       if (bothState.state === "loading") option.disabled = true;
       children.push(option);
@@ -415,6 +469,11 @@ function openPopover(opts) {
     actions.append(cancel);
     children.push(actions);
     root.replaceChildren(...children);
+    focusFirst(root);
+  };
+  const renderImpact = () => {
+    step = "impact";
+    renderImpactStep(root, opts, renderModes, impactOutcome);
   };
   const position = () => {
     const rect = anchor.getBoundingClientRect();
@@ -427,6 +486,7 @@ function openPopover(opts) {
   renderModes();
   document.body.append(root);
   position();
+  focusFirst(root);
   void (async () => {
     const outcome = await previewImpact(session, seq);
     impactOutcome = outcome;
@@ -447,25 +507,40 @@ function openPopover(opts) {
     closePopover();
   };
   const onKeyDown = (event) => {
-    if (event.key === "Escape") closePopover();
+    if (event.key === "ArrowDown") {
+      event.preventDefault();
+      event.stopPropagation();
+      moveFocus(root, 1);
+      return;
+    }
+    if (event.key === "ArrowUp") {
+      event.preventDefault();
+      event.stopPropagation();
+      moveFocus(root, -1);
+      return;
+    }
+    if (event.key === "Escape") {
+      event.preventDefault();
+      event.stopPropagation();
+      if (step === "impact") renderModes();
+      else closePopover();
+    }
   };
   const deferred = setTimeout(() => {
     document.addEventListener("pointerdown", onPointerDown);
-    document.addEventListener("keydown", onKeyDown);
+    document.addEventListener("keydown", onKeyDown, true);
   }, 0);
   disposeOutside = () => {
     clearTimeout(deferred);
     document.removeEventListener("pointerdown", onPointerDown);
-    document.removeEventListener("keydown", onKeyDown);
+    document.removeEventListener("keydown", onKeyDown, true);
   };
 }
 
 // src/client/portals.tsx
+var import_react = require("react");
+var import_react_dom = require("react-dom");
 var import_jsx_runtime = require("react/jsx-runtime");
-function messagePreviewOf(node) {
-  const text = node.content.map((block) => block.type === "text" && typeof block.text === "string" ? block.text : "").join("").replace(/\s+/g, " ").trim();
-  return text.length <= 80 ? text : `${text.slice(0, 79)}\u2026`;
-}
 function userTextAt(session, seq) {
   const snap = session.getSnapshot();
   for (const key of snap.chat.order) {
@@ -558,10 +633,12 @@ function RewindPortals({ sessionId, sessionOf, currentSessionId, t, subscribeLoc
         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";
           hidden.current.add(seat);
           hiddenCount += 1;
         } else if (hidden.current.has(seat)) {
           seat.style.display = "";
+          delete seat.dataset.dshRewindHidden;
           hidden.current.delete(seat);
         }
       }
@@ -663,7 +740,7 @@ var zh = {
   "popover.impact.none": "\u76EE\u6807\u4E4B\u540E\u6CA1\u6709\u8DDF\u8E2A\u5230\u7684\u5199\u7C7B\u53D8\u66F4\uFF0C\u65E0\u9700\u8FD8\u539F\u6587\u4EF6\u3002",
   "popover.confirm": "\u786E\u8BA4\u56DE\u9000",
   "popover.back": "\u8FD4\u56DE",
-  "guard.hint": "/rewind \u547D\u4EE4\u4E0D\u652F\u6301\u624B\u52A8\u8F93\u5165\uFF0C\u8BF7\u4F7F\u7528\u6D88\u606F\u65C1\u7684 \u21B6 \u56DE\u9000\u6309\u94AE"
+  "guard.hint": "/rewind \u624B\u52A8\u8F93\u5165\u4E0D\u63A5\u53D7\u53C2\u6570\uFF0C\u8BF7\u76F4\u63A5\u8F93\u5165 /rewind \u6253\u5F00\u56DE\u9000\u83DC\u5355"
 };
 var en = {
   "button.aria": "Rewind to this message",
@@ -682,12 +759,12 @@ var en = {
   "popover.impact.none": "No tracked file changes after the target; nothing to restore.",
   "popover.confirm": "Confirm rewind",
   "popover.back": "Back",
-  "guard.hint": "/rewind cannot be typed manually \u2014 use the \u21B6 button on a message to rewind."
+  "guard.hint": "/rewind takes no typed arguments \u2014 enter /rewind to open the rewind picker."
 };
 
 // src/client/index.ts
 var name = "dsh-rewind";
-var inject = ["slots", "sessions", "locale"];
+var inject = ["slots", "sessions", "locale", "commandUi"];
 var NS = "rewind";
 var HEADER_ACTIONS_SLOT = "conversation.session.header.actions";
 var COMPOSER_SELECTOR2 = "[data-input-scroll] textarea, textarea[data-phase]";
@@ -713,11 +790,58 @@ function apply(ctx) {
       },
       createRewindBridge({ sessionOf, currentSessionId, t, subscribeLocale })
     ));
-    const MANUAL_REWIND = /^\s*\/rewind(?:\s|$)/i;
+    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);
+      return chat !== void 0 && rewindCandidatesOfChat(chat).length > 0;
+    };
+    const composerAnchor = () => {
+      const textarea = composerTextarea();
+      const card = textarea?.closest("[data-composer-card]");
+      return card ?? textarea ?? document.body;
+    };
+    yield commandUi.decorate({
+      name: "rewind",
+      // The picker exists exactly while the surface has a reachable user
+      // message: a fresh session (no candidates) falls through to the host
+      // command, which fails with "no user messages" — matching the harness's
+      // own decoration convention (see ui-permission-presets).
+      available: (session) => hasCandidates(session.sessionId),
+      ui: {
+        kind: "popupSelect",
+        options: (session) => {
+          const chat = chatOf(session.sessionId);
+          return Promise.resolve(chat === void 0 ? [] : rewindOptionsOf(chat, t));
+        },
+        onSelect: (option, session) => {
+          const face = sessionOf(session.sessionId);
+          const chat = chatOf(session.sessionId);
+          const candidate = chat !== void 0 ? candidateBySeq(chat, Number(option.id)) : void 0;
+          if (face === void 0 || candidate === void 0) return;
+          openPopover({
+            session: face,
+            seq: candidate.seq,
+            time: candidate.time,
+            preview: candidate.preview,
+            anchor: composerAnchor(),
+            t,
+            onRewind: (mode) => {
+              void runRewindAndFill(face, candidate.seq, mode, currentSessionId);
+            }
+          });
+        }
+      }
+    });
+    const PARAM_REWIND = /^\s*\/rewind\s+\S+/i;
     const composerTextarea = () => document.querySelector(COMPOSER_SELECTOR2);
-    const hasBlockedRewindDraft = () => {
+    const hasParamRewindDraft = () => {
       const textarea = composerTextarea();
-      return textarea !== null && MANUAL_REWIND.test(textarea.value);
+      return textarea !== null && PARAM_REWIND.test(textarea.value);
     };
     let guardHintEl = null;
     let guardHintTimer;
@@ -742,15 +866,18 @@ function apply(ctx) {
         guardHintTimer = void 0;
       }, 3200);
     };
-    const onKeyDownGuard = (event) => {
-      if (event.key !== "Enter" || event.shiftKey || event.isComposing) return;
-      if (!hasBlockedRewindDraft()) return;
+    const onParamRewindSubmit = (event) => {
+      if (!hasParamRewindDraft()) return;
       event.preventDefault();
       event.stopPropagation();
       showGuardHint();
     };
+    const onKeyDownGuard = (event) => {
+      if (event.key !== "Enter" || event.shiftKey || event.isComposing) return;
+      onParamRewindSubmit(event);
+    };
     const onClickGuard = (event) => {
-      if (event.button !== 0 || !hasBlockedRewindDraft()) return;
+      if (event.button !== 0 || !hasParamRewindDraft()) return;
       const target = event.target;
       if (!(target instanceof Element)) return;
       const button = target.closest("button");
@@ -760,9 +887,7 @@ function apply(ctx) {
       const all = card.querySelectorAll("button");
       if (all[all.length - 1] !== button) return;
       if (button.querySelector("rect") !== null) return;
-      event.preventDefault();
-      event.stopPropagation();
-      showGuardHint();
+      onParamRewindSubmit(event);
     };
     document.addEventListener("keydown", onKeyDownGuard, true);
     document.addEventListener("click", onClickGuard, true);

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

@@ -0,0 +1,76 @@
+/**
+ * Pure candidate computation for the `/rewind` command decoration: which user
+ * messages the harness's popupSelect shell offers, withdrawn-row exclusion,
+ * preview truncation, and the mapping to popupSelect rows. The listing is a
+ * pure function of the session chat snapshot (`rewindCandidatesOf`) so it
+ * stays unit-testable in a node environment. Surface user/steering messages
+ * only, withdrawn (hidden) rows excluded, newest first — the top row is the
+ * default highlight, i.e. the most recent message and the most common rewind
+ * target.
+ *
+ * @module dsh-rewind/client/candidates
+ */
+import type { SelectOption } from '@deepseek-ai/dsh-client-ui-commands/client';
+import type { RewindKey } from './locales.ts';
+type Translate = (key: RewindKey, params?: Record<string, unknown>) => string;
+/** Preview length cap for candidate rows (matches the host's candidate list). */
+export declare const PREVIEW_CHARS = 80;
+/** One selectable rewind target. */
+export interface RewindCandidate {
+    /** Absolute log seq of the `user/message` event. */
+    readonly seq: number;
+    /** Unix epoch ms of the event. */
+    readonly time: number;
+    /** Truncated plain-text preview of the message content. */
+    readonly preview: string;
+}
+/** A chat snapshot subset the candidate listing reads (structural). */
+export interface CandidateChat {
+    readonly order: readonly string[];
+    readonly nodes: {
+        get(key: string): CandidateUserNode | undefined;
+    };
+}
+/** A user/steering row subset; only fields the listing reads are real. */
+export interface CandidateUserNode {
+    readonly kind: string;
+    readonly anchorSeq?: number;
+    readonly data: {
+        readonly seq: number;
+        readonly time: number;
+        readonly content: readonly {
+            type: string;
+            text?: unknown;
+        }[];
+    };
+}
+/** Join the text blocks of a user message into one plain preview. */
+export declare function messagePreviewOf(message: {
+    readonly content: readonly {
+        type: string;
+        text?: unknown;
+    }[];
+}): string;
+/** Format a candidate row's clock time (`HH:MM`), matching the host format. */
+export declare function formatCandidateTime(time: number): string;
+/**
+ * List the selectable rewind candidates of a session chat snapshot: user and
+ * steering rows still on the surface (not hidden by a previous rewind), the
+ * newest `limit` kept, newest first — the top row is the default highlight,
+ * i.e. the most recent message and the most common rewind target.
+ * @param snap - the session chat snapshot.
+ * @param hidden - anchor seqs withdrawn by rewinds (from `hiddenSeqsOf`).
+ * @param limit - maximum number of candidates to return.
+ */
+export declare function rewindCandidatesOf(snap: CandidateChat, hidden: ReadonlySet<number>, limit?: number): RewindCandidate[];
+/** The candidates of a live chat snapshot, withdrawn rows already excluded. */
+export declare function rewindCandidatesOfChat(snap: CandidateChat): RewindCandidate[];
+/**
+ * Map the candidates to popupSelect rows: the message preview as the row
+ * label (left) and the clock time as the detail (right) — the shell's native
+ * label/detail flex layout, with no recency numbers.
+ */
+export declare function rewindOptionsOf(snap: CandidateChat, t: Translate): SelectOption[];
+/** Resolve one candidate by log seq (the mode popover's re-entry after a pick). */
+export declare function candidateBySeq(snap: CandidateChat, seq: number): RewindCandidate | undefined;
+export {};

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

@@ -1,7 +1,8 @@
 /**
- * dsh-rewind client half: the manual `/rewind` composer guard, the locale
- * registration, and the session-scoped portal bridge that renders the
- * per-message ↶ rewind button (see `portals.tsx` for the button itself).
+ * dsh-rewind client half: the `/rewind` command decoration, the
+ * parameterized-input guard, the locale registration, and the session-scoped
+ * portal bridge that renders the per-message ↶ rewind button (see
+ * `portals.tsx` for the button itself).
  *
  * The button is NOT injected by hand into the DOM anymore: the plugin
  * registers a bridge into the harness's `conversation.session.header.actions`
@@ -12,10 +13,16 @@
  * plugin never imports conversation UI types and survives harness version
  * drift.
  *
- * Manual composer input of `/rewind` is deliberately blocked (the guard
- * below): the command exists only as the per-message ↶ button's internal
- * channel, so any `/rewind` line typed by hand — bare or with arguments — is
- * stopped with a hint pointing at the button.
+ * The text-driven flow is the harness's STANDARD command decoration
+ * (`ctx.commandUi.decorate`): a bare `/rewind` — picked from the slash-menu
+ * completion, or typed in full and Entered — opens the harness's own
+ * popupSelect shell (search, ↑↓/Enter, Esc) listing the rewind candidates
+ * instead of executing the command. Picking one continues the SAME flow as
+ * the ↶ button: the mode popover, both-impact confirmation, execution, row
+ * hiding and the composer refill (`runRewindAndFill`). The parameterized
+ * forms (`/rewind @<seq> chat|both`, `/rewind preview …`) stay internal
+ * channels the ↶ button and the popover drive through `session.command`; a
+ * hand-typed parameterized line is stopped with a hint.
  *
  * @module dsh-rewind/client
  */
@@ -23,7 +30,8 @@ import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';
 export declare const name = "dsh-rewind";
 export declare const inject: string[];
 /**
- * Client plugin body: composer guard + locale + the portal bridge.
- * @param ctx - client root context carrying `slots`, `sessions` and `locale`.
+ * Client plugin body: command decoration + parameterized guard + locale + the
+ * portal bridge.
+ * @param ctx - client root context carrying `slots`, `sessions`, `locale` and `commandUi`.
  */
 export declare function apply(ctx: ClientContext): void;

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

@@ -4,6 +4,13 @@
  * offers the two modes. Choosing "both" first fetches the impact list through
  * the `/rewind preview @seq both` command and shows it before confirming.
  *
+ * Keyboard: ↑/↓ move focus across the step's ACTION buttons only (the two
+ * modes, or the confirm button on the impact step), Enter activates the
+ * focused button (native), Esc is the keyboard twin of the ghost back/cancel
+ * buttons — cancel on the modes step, back on the impact step; the ghosts are
+ * never in the arrow cycle. The listener runs in the document capture phase
+ * so the keys are stolen from the composer while the popover is open.
+ *
  * @module dsh-rewind/client/popover
  */
 import type { SessionFace } from '@deepseek-ai/dsh-client-runtime/client';

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

@@ -44,6 +44,28 @@ export interface SlotsLike {
         readonly sessionId: string;
     }) => ReactNode): () => void;
 }
+/**
+ * Fill the dsh composer with `text` (React-controlled textarea: use the
+ * native setter so the value change is seen, then dispatch an input event).
+ * Best-effort — no composer match means the fill is skipped. Used by
+ * `runRewindAndFill` to put the withdrawn target message back into the
+ * composer after a rewind.
+ */
+export declare function fillComposer(text: string): boolean;
+/**
+ * Execute one rewind from the popover and, when it settles successfully,
+ * put the withdrawn target message's text back into the composer so the
+ * user can edit and re-send.
+ *
+ * THE COMPOSER FILL IS EVENT-DRIVEN: it runs only when THIS page performed
+ * the rewind (the user clicked confirm moments ago). It must NEVER scan
+ * loaded history for rewind commands: a session window opens with only
+ * the tail page and grows via loadOlder, so a "command already in the
+ * snapshot" cannot be told apart from "command executed in this page" —
+ * 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>;
 interface RewindPortalsProps extends RewindBridgeDeps {
     readonly sessionId: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.2.8",
+  "version": "0.3.0",
   "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",
@@ -55,6 +55,7 @@
       "inject": [
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-ui-commands",
         "@deepseek-ai/dsh-client-ui-conversation"
       ],
       "platform": "web"
@@ -74,6 +75,7 @@
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-commands": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-commands": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-fs": "^0.1.0-rc.6",
@@ -92,6 +94,9 @@
     "@deepseek-ai/dsh-client-runtime": {
       "optional": true
     },
+    "@deepseek-ai/dsh-client-ui-commands": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-client-ui-slots": {
       "optional": true
     },
@@ -119,6 +124,8 @@
     "@deepseek-ai/dsh-agent": "^0.1.0-rc.7",
     "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.7",
     "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-commands": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-input-trigger": "^0.1.0-rc.7",
     "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.7",
     "@deepseek-ai/dsh-commands": "^0.1.0-rc.7",
     "@deepseek-ai/dsh-fs": "^0.1.0-rc.7",