dsh-rewind-plugin 0.6.1 → 0.6.3

package/README.en.md

@@ -12,7 +12,7 @@ A deliberately focused plugin with one job: **rewind to any user message, no mat
 
 - **Rewinding is time-travel** — the target message and everything after it (agent replies, tool calls) are withdrawn from the model context *and* the rendered transcript at once, with no new session and no window switch; the target's text is offered back in the composer so you can edit and re-send it — **truly seamless and convenient by design**.
 - **Lightweight workspace backup** — Claude Code-aligned behavior: tracks files edited by the write-class tools, and external changes to **already-tracked** files are restorable too. Selective tracking, before-write backup, store only on change. One lightweight plugin gives you a **complete** agentic rewind capability.
-- **Privacy-first** — the plugin never deletes or rewrites the session log (append-only) and never actually deletes any of your conversation; file restores stay inside the plugin's own backup directory. Full security model: [SECURITY.md](SECURITY.md).
+- **Privacy-first** — the plugin never deletes or rewrites the session log (append-only) and never actually deletes any of your conversation; backups live in the plugin's own snapshot directory; restores draw only from those backups. Full security model: [SECURITY.md](SECURITY.md).
 - **A complete test system** — unit, probe, and end-to-end host verification, covering compatibility probing, log replay, resume, cross-restart and other scenarios; maintained continuously as the harness evolves to ensure feature stability.
 
 ## Preview
@@ -152,10 +152,11 @@ withdrew should consume the stable, locale-independent helpers exported from
 2. **Lightweight file rewind has a cost** — in specific cases not all changes can be rewound. Consistent with Claude Code. See: [File-rewind tracking boundary](docs/compat/tracking-boundary.md).
 3. **Rewinds from `≤ v0.2.4`** — sessions rewound with these versions may **fail to load history** after more conversation. Install a v0.3.3-or-earlier release and use its bundled repair tool ([docs/compat/troubleshooting.md](docs/compat/troubleshooting.md)).
 4. **Rewinds from `≤ v0.3.3`** — compaction (`/compact`) is unavailable for those sessions. Newer versions are compatible; for affected old sessions, start a new session.
+5. **The turn-rail shows rewound turns** — the right-side rail added in DSH `v0.1.2-alpha.1` keeps ticks for withdrawn messages: clicking does not jump and hovering shows the withdrawn text. Only a display difference; no functional impact.
 
 ## 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 and restores stay under `<dsh home>/rewind-snapshots/`. It never touches your git repository, makes no network requests, and accesses no credentials. Delete `~/.dsh/rewind-snapshots/` to wipe file backups only (chat rewinds are unaffected); the plugin rebuilds automatically. 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 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. Delete `~/.dsh/rewind-snapshots/` to wipe file backups only (chat rewinds are unaffected); the plugin rebuilds automatically. 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

@@ -12,7 +12,7 @@ DeepSeek Harness 插件：**一键就地回退对话到任意更早的用户消
 
 - **回退 = 时间回溯**——目标消息及其之后的全部内容（agent 回复、工具调用）同时从**模型上下文**和**渲染对话**中撤回，不新建会话、不切换窗口；目标消息文本会回填输入框，改完可重发。**在原理上就真正无感、便捷**。
 - **轻量工作区备份**——对齐 Claude Code：追踪写类工具编辑过的文件，**已跟踪文件的外部变更也能还原**。局部追踪、写前备份、不变不存。一个轻型插件，即拥有**完备的智能体回退能力**。
-- **信息安全优先**——插件从不删改会话日志（append-only），从不真正删除你的任何对话；文件还原限定在插件自己的备份目录。完整安全模型：[SECURITY.md](SECURITY.md)。
+- **信息安全优先**——插件从不删改会话日志（append-only），从不真正删除你的任何对话；备份存于自己的快照目录；还原只用这些备份。完整安全模型：[SECURITY.md](SECURITY.md)。
 - **完备测试系统**——单元、探针、端到端主机验证，覆盖兼容性探测、日志重放、续接、跨重启等场景；随 harness 升级持续维护，确保功能稳定。
 
 ## 效果预览
@@ -140,10 +140,11 @@ dsh plugin --profile web add dsh-rewind-plugin
 2. **轻量文件回退存在代价**——特定情况可能无法回退所有修改。行为与 Claude Code 一致。详见：[文件回退的追踪边界](docs/compat/tracking-boundary.zh.md)。
 3. **v0.2.4 及更早版本**回退过的会话，继续对话后可能加载历史失败。可安装 v0.3.3 及之前版本的随附修复工具处理（[完整步骤](docs/compat/troubleshooting.zh.md)）。
 4. **v0.3.3 及更早版本**回退过的会话，压缩对话（compact）不可用。新版本已兼容；受影响的旧会话建议新建会话。
+5. **导轨显示已回退轮次**——DSH `v0.1.2-alpha.1` 新增的右侧导轨，会为已撤回消息保留刻度：点击不跳转、悬浮显示已撤回正文。仅显示差异，无功能影响。
 
 ## 安全
 
-本插件只向会话日志追加回退标记事件，从不删除或改写已记录的历史。工作区文件仅在「回退对话和代码」时被改写，备份与还原都限定在 `~/.dsh/rewind-snapshots/` 内。不触碰你的 git 仓库，无网络请求，不访问任何凭据。对**长期不活跃**的会话，另有默认关闭的全局自动清理可整目录移除其快照，不影响活动会话与对话日志。完整安全模型：[SECURITY.md](SECURITY.md)。
+本插件只向会话日志追加回退标记事件，从不删除或改写已记录的历史。工作区文件仅在「回退对话和代码」时被改写，备份存储于 `~/.dsh/rewind-snapshots/`；还原以备份为唯一来源。不触碰你的 git 仓库，无网络请求，不访问任何凭据。对**长期不活跃**的会话，另有默认关闭的全局自动清理可整目录移除其快照，不影响活动会话与对话日志。完整安全模型：[SECURITY.md](SECURITY.md)。
 
 ## 开发
 

package/SECURITY.md

@@ -83,9 +83,8 @@ and is repaired offline (see `docs/compat/troubleshooting.md`).
 
 - **Store root**: `<harness home>/rewind-snapshots/` by default (resolved via
   `resolveDshHome`, so `~/.dsh/...` when `DSH_HOME` is unset); the `snapshotDir`
-  config, then `DSH_REWIND_SNAPSHOT_DIR` env, override it. The store never
-  overlaps the workspace; deleting it only removes file backups and the store
-  rebuilds from scratch.
+  config, then `DSH_REWIND_SNAPSHOT_DIR` env, override it. Deleting it only
+  removes file backups and the store rebuilds from scratch.
 - **Path sanitization**: session ids and call ids are scrubbed to
   `[a-zA-Z0-9._-]` (`safeSessionId` / `safeFileId`) before joining the store
   root; `.` and `..` bare values are replaced — hostile ids cannot traverse
@@ -138,10 +137,18 @@ and is repaired offline (see `docs/compat/troubleshooting.md`).
   same operating-system user: state files are created with the process
   default permissions (no special modes are set — a standard umask applies),
   and the host user remains trusted.
-- It does **not** exclude paths from the store: recording and restore mirror the
-  paths the model's file tools touched, so a sensitive file (e.g. `.env`) the
-  model may read or edit will be backed up and restorable. Keeping one out is
-  a **DSH model-permission** concern (a per-path deny), not a rewind feature.
+- It does **not** exclude paths from the store, and it never oversteps: the
+  plugin only adds backup/restore on top of permissions DSH already holds. Two
+  distinct cases follow:
+  1. **Sensitive / personal-information files** (e.g. a `.env` file, which may
+     sit inside the workspace) the model may read or edit are backed up and
+     restorable.
+  2. **Files outside the session workspace** the model is allowed to touch are
+     likewise backed up and restored.
+  In both cases the plugin introduces no authority of its own — DSH already
+  granted the read/edit; the plugin merely records a before-backup and can
+  restore it. Keeping a path out is a **DSH model-permission** concern (a
+  per-path deny), not a rewind feature.
 - It does **not** touch git (no refs, index, or worktree operations), makes
   **no network requests**, and does **not** access credentials.
 - It does **not** roll back whole-log state: telemetry, search, and `/export`

package/docs/architecture.md

@@ -98,7 +98,7 @@ pruneStale            cross-session auto-cleanup (default off): whole
 
 ## Compatibility strategy
 
-- **Peer ranges as OR-union of DSH rc tuples** (`^0.1.0-rc.6 || ^0.1.1-rc.2`):
+- **Peer ranges as OR-union of DSH version tuples** (`^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2`):
   npm's prerelease rules require the peer range to share the host's
   `[major, minor, patch]` tuple; `scripts/check-dsh-version.mjs` detects when
   a new tuple requires appending. See `docs/release/release.md`.

package/docs/compat/audit.md

@@ -11,28 +11,37 @@
 > source reference: the `oss/deepseek-harness` local fork.
 >
 > Version alignment: `peerDependencies` use an OR-union (e.g.
-> `^0.1.0-rc.6 || ^0.1.1-rc.2`) covering each published rc tuple series. npm's
+> `^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2`) covering each published tuple series. npm's
 > prerelease matching rules require a candidate to share the range comparator's
 > `[major, minor, patch]` tuple, so each new tuple series (e.g. a future
 > `0.1.2-rc.x`, `0.2.x`) requires appending a union member; rc rolling within a
 > tuple (`0.1.1-rc.2 → rc.3`) is a no-op. Signal: `npm view @deepseek-ai/dsh version`;
-> flow: `scripts/check-dsh-version.mjs`.
+> flow: `scripts/check-dsh-version.mjs` (it reads the `latest` dist-tag only; a
+> `-alpha` prerelease published under another tag, e.g. `0.1.2-alpha.2` under
+> `alpha`, is a manual pre-release check).
 >
-> Client channel (harness `0.1.2-alpha.1`, a **bundled pre-release — NOT published
-> to npm**): the plugin also reads the session chat when a DSH Desktop build ships
-> that version (`latest` on the registry is still `0.1.1-rc.2`; the alpha is only
-> in the bundled `app.asar.unpacked/node_modules/@deepseek-ai/*`). There
-> `uiConversation` exposes the chat as a per-session named `"chat"` view
+> Client channel (harness `0.1.2-alpha.x`; `0.1.2-alpha.2` is published to npm
+> under the `alpha` dist-tag while `latest` stays `0.1.1-rc.2`): the plugin reads
+> the session chat through `uiConversation` whenever the DSH client exposes it.
+> `uiConversation` surfaces the chat as a per-session named `"chat"` view
 > (contributed by `dsh-client-ui-chat` through the `uiSession` slot hook) instead
 > of the session-face `chat` field. `src/client/hidden.ts` (`chatSnapshotOf`) reads
 > the session-face snapshot first (rc.2 path), then the `uiConversation` `"chat"`
-> view (alpha.1 path); both missing degrades to `undefined` (no targets, never a
-> crash). Peers are intentionally **NOT** extended for `0.1.2-alpha.1` because it is
-> not a registry version (see above); the OR-union stays
-> `^0.1.0-rc.6 || ^0.1.1-rc.2` and will gain the `0.1.2` tuple when the harness
-> publishes it. Pinned by `tests/chat-channel.test.ts` (channel precedence + the
-> alpha.1 snapshot shape) and `tests/client-dom.test.ts` (the button-target
-> pairing that consumes the chat).
+> view (alpha path); both missing degrades to `undefined` (no targets, never a
+> crash). The channel is held via a lazy `ctx.get` (never a declared `inject`), so
+> the plugin keeps the rc.2 type baseline while the OR-union covers the published
+> `0.1.2` tuple: `^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2`. Pinned by
+> `tests/chat-channel.test.ts` (channel precedence + the alpha snapshot shape) and
+> `tests/client-dom.test.ts` (the button-target pairing that consumes the chat).
+> The composer refill is dual-channel the same way: on alpha the withdrawn text is
+> written through the `conversation` service's `input` resolver's `setDraft` (the
+> harness's own Lexical editor), else the rc.2 `<textarea>` / alpha `contenteditable`
+> DOM write (`writeComposer` in `src/client/portals.tsx`); pinned by
+> `tests/client-composer.test.ts`. The session-seat button DOM is dual-channel
+> the same way: the actions (copy/branch) row was located by `[data-time-hover-root]`
+> on ≤ 0.1.1-rc.x and by `[data-actions-reveal]` on 0.1.2-alpha.2
+> (`ACTIONS_ROOT_SELECTOR` / `PENDING_SEAT_SELECTOR` in `src/client/portals.tsx`);
+> pinned by `tests/client-dom.test.ts`.
 
 ## Definition of "fully compatible" (invariants)
 
@@ -56,7 +65,7 @@
 - **session-title / goal fold**: a marker does not disturb `foldSessionTitle` / `foldGoal`.
 - **client ordering**: turn-tail ordering + `step/start` uniqueness hold for tool turns + marker logs.
 - **rewind across a compact checkpoint**: `RewindError('not-on-surface')` refuses cleanly, no crash.
-- **plan-mode**: `hasOpenTurn` pairs only `turn/start`/`turn/end`; a marker produces no `turn/start`, so a rewind during active plan is unaffected (static review confirmed).
+- **plan-mode**: a marker reuses the last started turn (no phantom turn); a rewind never touches the log-only `plan/mode` state (plan mode stays active; the user leaves it with `/plan off`) and the log stays replayable (`compat-invariants` I1/I3 marker + `plan/mode` probe, `verify-host`).
 - **agent-loop cancellation**: `finally` guarantees step/turn closure; the rewind force-stop path leaves no dangling frame.
 
 ## Known behavior boundaries (deterministic differences, non-crash, documented)
@@ -67,6 +76,7 @@
 - **Session title auto-regeneration**: the title derives from the surface, so an automatically-derived title may change after a rewind.
 - **Files written but uncommitted in a cancelled turn**: a `both` rewind cannot restore them (tool side-effect timing; same as Claude Code).
 - **Attachment files left after a message is shadowed**: attachment storage is not cleaned with the surface (`dsh-attachment-local` not installed, not automatically verified).
+- **Rewind leaves plan mode untouched**: `/plan text` is two independent actions (enter plan mode + steer the message). Rewinding the message undoes only the message — the log-only `plan/mode` state stays active, and the user leaves plan mode with `/plan off`, which still commits after a rewind (the marker creates no open turn). Pin: `verify-host` plan checks (`plan rewind leaves plan mode active`, `/plan off after rewind turns plan mode off`), `tests/hidden.test.ts` `messageTextAt`.
 
 ## Upstream (harness) issues and the plugin's no-compensation stance
 
@@ -157,7 +167,7 @@ new turn at `phase.turn + 1` (`agent.ts:251-255`) **without closing the leftover
 | resume / session-query replay | ✓ | — | ✓ | — | — | — | ✓ | — |
 | tool pipeline (snapshot/restore) | — | — | — | — | — | ✓ | — | ✓ |
 | client ordering | — | — | ✓ | — | — | — | ✓ | — |
-| plan-mode | — | — | — | — | — | — | — | ✓ (static) |
+| plan-mode | ✓ | — | ✓ | — | — | — | — | ✓ (static) |
 
 ✓ = probe passes; — = not applicable. RU-I18N and R-OPENSTEP are upstream issues the plugin
 does not compensate for (see above); G3 is a confirmed-non-defect behavior pinned in

package/docs/contract/client-contract.md

@@ -21,7 +21,7 @@ the plugin itself uses (it never reads the DOM or host copy):
 ```ts
 import { hiddenSeqsOf, type HiddenChat } from 'dsh-rewind-plugin/client'
 
-const chat = session.getSnapshot().chat
+const chat = session.getSnapshot().chat // rc.2 source; 0.1.2-alpha.1+ uses the uiConversation "chat" view
 const hidden = hiddenSeqsOf(chat as HiddenChat) // Set<number> of anchor seqs
 ```
 

package/docs/contract/client-contract.zh.md

@@ -20,7 +20,7 @@
 ```ts
 import { hiddenSeqsOf, type HiddenChat } from 'dsh-rewind-plugin/client'
 
-const chat = session.getSnapshot().chat
+const chat = session.getSnapshot().chat // rc.2 来源；0.1.2-alpha.1+ 用 uiConversation "chat" 视图
 const hidden = hiddenSeqsOf(chat as HiddenChat) // 被隐藏的 anchor seq 集合
 ```
 

package/docs/release/release.md

@@ -54,18 +54,18 @@ git push origin main --tags   # triggers .github/workflows/publish.yml
 
 DSH is still in rc; npm's prerelease matching rules require a peer range to
 share the host version's `[major, minor, patch]` tuple. So `peerDependencies`
-uses an OR-union covering every published rc tuple series
-(e.g. `^0.1.0-rc.6 || ^0.1.1-rc.2`), extended as DSH releases new tuples.
+uses an OR-union covering every published tuple series
+(e.g. `^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2`), extended as DSH releases new tuples.
 
 - **When to update**: only when DSH releases a new tuple
   (`0.1.1 → 0.1.2 → 0.2.x`); rc rolling within a tuple (`0.1.1-rc.2 → rc.3`)
   needs nothing. All `@deepseek-ai/*` packages release together;
   `npm view @deepseek-ai/dsh version` is the authoritative signal.
 - **Published-tuple check (optional)**: `node scripts/check-dsh-version.mjs`
-  compares the latest npm version against the tuples the peers cover (exit 0 =
-  nothing to do, exit 1 = update). It reads npm published versions only; a
-  newer-but-unpublished pre-release is a manual pre-release check — see the
-  "Before bumping" step above.
+  compares the `latest` dist-tag version against the tuples the peers cover
+  (exit 0 = nothing to do, exit 1 = update). It reads the `latest` tag only; a
+  pre-release published under another tag (e.g. `alpha`) or bundled without
+  going to npm is a manual pre-release check — see the "Before bumping" step above.
 - **Update steps**: append `|| ^<new-tuple>-rc.<n>` to every
   `@deepseek-ai/dsh-*` peer → bump devDependencies to the latest → `npm
   install` → `npm run check` → release.

package/docs/release/release.zh.md

@@ -49,15 +49,16 @@ git push origin main --tags   # 触发 .github/workflows/publish.yml
 
 DSH 仍在 rc 阶段，npm 的 prerelease 匹配规则要求 peer 范围与宿主版本
 **同 `[major, minor, patch]` 元组**才能匹配。因此 peerDependencies 采用
-OR 并集覆盖 DSH 已发布的每个 rc 元组系列（如 `^0.1.0-rc.6 || ^0.1.1-rc.2`），
+OR 并集覆盖 DSH 已发布的每个元组系列（如 `^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2`），
 并随 DSH 发版追加。
 
 - **何时需要更新**：仅当 DSH 发布新元组（`0.1.1 → 0.1.2 → 0.2.x`）时；
   同元组内 rc 滚动（`0.1.1-rc.2 → rc.3`）无需动作。DSH 所有包同版本发布，
   `npm view @deepseek-ai/dsh version` 即权威信号。
-- **已发布元组检查（可选）**：`node scripts/check-dsh-version.mjs` 用 npm 最新版本
-  对比 peer 覆盖的元组（exit 0 无需动作，exit 1 需要）。它**只读 npm 已发布版本**；
-  更新的未发布 pre-release 走**手动发布前检查**——见上文"升版前手动确认"。
+- **已发布元组检查（可选）**：`node scripts/check-dsh-version.mjs` 用 npm `latest`
+  dist-tag 版本对比 peer 覆盖的元组（exit 0 无需动作，exit 1 需要）。它**只读
+  `latest` tag**；发布在其它 tag（如 `alpha`）的 pre-release 走**手动发布前检查**
+  ——见上文"升版前手动确认"。
 - **更新步骤**：给每个 `@deepseek-ai/dsh-*` peer 追加 `|| ^<新元组>-rc.<n>`
   → devDependencies 同步升到最新 → `npm install` → `npm run check` → 发版。
 - **正式版后收敛**：DSH 发布 final 版本后，正式版不受 prerelease 元组规则

package/lib/client.js

@@ -40,6 +40,18 @@ function chatSnapshotOf(face, chatView) {
   if (legacy !== void 0) return legacy;
   return chatView?.getSnapshot() ?? void 0;
 }
+function messageTextAt(chat, seq) {
+  if (chat === void 0) return void 0;
+  for (const key of chat.order) {
+    const node = chat.nodes.get(key);
+    if (node === void 0 || node.kind !== "user" && node.kind !== "steering") continue;
+    const data = node.data;
+    if (data.seq === seq) {
+      return data.content?.map((block) => block.type === "text" && typeof block.text === "string" ? block.text : "").join("");
+    }
+  }
+  return void 0;
+}
 function targetSeqOfArgs(args) {
   if (args === void 0 || args === null) return void 0;
   const match = args.match(/@(\d+)/);
@@ -677,20 +689,8 @@ function retractSpan(steering, targetId) {
 
 // src/client/portals.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
-function userTextAt(chat, seq) {
-  if (chat === void 0) return void 0;
-  for (const key of chat.order) {
-    const node = chat.nodes.get(key);
-    if (node === void 0 || node.kind !== "user") continue;
-    const user = node.data;
-    if (user.seq === seq) {
-      return user.content.map((block) => block.type === "text" && typeof block.text === "string" ? block.text : "").join("");
-    }
-  }
-  return void 0;
-}
-function fillComposer(text) {
-  const textarea = document.querySelector(COMPOSER_SELECTOR);
+function fillComposerTextarea(text) {
+  const textarea = document.querySelector(COMPOSER_TEXTAREA_SELECTOR);
   if (textarea === null) return false;
   const setter = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, "value")?.set;
   setter?.call(textarea, text);
@@ -698,12 +698,48 @@ function fillComposer(text) {
   textarea.focus();
   return true;
 }
+function fillComposerEditable(text) {
+  const editable = document.querySelector(COMPOSER_EDITABLE_SELECTOR);
+  if (editable === null) return false;
+  editable.focus();
+  const selection = document.getSelection();
+  if (selection !== null) {
+    const range = document.createRange();
+    range.selectNodeContents(editable);
+    selection.removeAllRanges();
+    selection.addRange(range);
+  }
+  let ok = false;
+  try {
+    ok = document.execCommand("insertText", false, text);
+  } catch {
+    ok = false;
+  }
+  if (ok) return true;
+  editable.textContent = text;
+  editable.dispatchEvent(new Event("input", { bubbles: true }));
+  return true;
+}
+function fillComposer(text) {
+  if (fillComposerTextarea(text)) return true;
+  return fillComposerEditable(text);
+}
+function writeComposer(text, facade) {
+  if (facade !== void 0) {
+    try {
+      facade.setDraft(text);
+      return true;
+    } catch {
+    }
+  }
+  return fillComposer(text);
+}
 function userNodeOf(chat, key) {
   const node = chat?.nodes.get(key);
   if (node === void 0 || node.kind !== "user" && node.kind !== "steering") return void 0;
   return node.data;
 }
-async function runRewindAndFill(session, seq, mode, currentSessionId, chatOf) {
+async function runRewindAndFill(session, seq, mode, currentSessionId, chatOf, setComposerText) {
   const known = knownCommandSeqs(session, chatOf, (node) => isExecutedRewindCommand(node, seq));
   const result = await session.command(`/rewind @${seq} ${mode}`);
   if (!result.ok || result.value?.matched !== true) return;
@@ -714,30 +750,34 @@ async function runRewindAndFill(session, seq, mode, currentSessionId, chatOf) {
     return;
   }
   if (currentSessionId() !== session.sessionId) return;
-  const text = userTextAt(chatOf(session), seq);
+  const text = messageTextAt(chatOf(session), seq);
   if (text === void 0 || text === "") return;
-  fillComposer(text);
+  setComposerText(session.sessionId, text);
+}
+function composerSurface() {
+  return document.querySelector(COMPOSER_TEXTAREA_SELECTOR) ?? document.querySelector(COMPOSER_EDITABLE_SELECTOR);
 }
 function showHint(text) {
-  const textarea = document.querySelector(COMPOSER_SELECTOR);
+  const surface = composerSurface();
   const hint = document.createElement("div");
   hint.className = CLASS.guardHint;
   hint.setAttribute("role", "status");
   hint.textContent = text;
   document.body.appendChild(hint);
-  if (textarea !== null) {
-    const card = textarea.closest("[data-composer-card]");
-    const rect = card instanceof HTMLElement ? card.getBoundingClientRect() : textarea.getBoundingClientRect();
+  if (surface !== null) {
+    const card = surface.closest("[data-composer-card]");
+    const rect = card instanceof HTMLElement ? card.getBoundingClientRect() : surface.getBoundingClientRect();
     hint.style.left = `${Math.round(rect.left)}px`;
     hint.style.bottom = `${Math.round(window.innerHeight - rect.top + 8)}px`;
   }
   window.setTimeout(() => hint.remove(), 3200);
 }
-var COMPOSER_SELECTOR = "[data-input-scroll] textarea, textarea[data-phase]";
+var COMPOSER_TEXTAREA_SELECTOR = "[data-input-scroll] textarea, textarea[data-phase]";
+var COMPOSER_EDITABLE_SELECTOR = "[data-composer-input]";
 var USER_SEAT_SELECTOR = '[data-chat-flow-kind="user"][data-chat-anchor-key], [data-chat-flow-kind="steering"][data-chat-anchor-key]';
 var CHAT_SEAT_SELECTOR = "[data-chat-anchor-key]";
-var ACTIONS_ROOT_SELECTOR = "[data-time-hover-root]";
-var PENDING_SEAT_SELECTOR = "[data-pending-steering][data-time-hover-root]";
+var ACTIONS_ROOT_SELECTOR = "[data-time-hover-root], [data-actions-reveal]";
+var PENDING_SEAT_SELECTOR = "[data-pending-steering][data-time-hover-root], [data-pending-steering][data-actions-reveal]";
 function collectTargets(chat, hiddenSeqs) {
   const rows = /* @__PURE__ */ new Map();
   for (const element of document.querySelectorAll(USER_SEAT_SELECTOR)) {
@@ -801,7 +841,7 @@ function sameTargets(left, right) {
     return other.kind === "pending" && target.itemId === other.itemId;
   });
 }
-function RewindPortals({ sessionId, sessionOf, chatOf, currentSessionId, t, subscribeLocale }) {
+function RewindPortals({ sessionId, sessionOf, chatOf, currentSessionId, t, subscribeLocale, setComposerText }) {
   const [targets, setTargets] = (0, import_react.useState)([]);
   const hidden = (0, import_react.useRef)(/* @__PURE__ */ new WeakSet());
   const [, forceRender] = (0, import_react.useReducer)((count) => count + 1, 0);
@@ -869,6 +909,7 @@ function RewindPortals({ sessionId, sessionOf, chatOf, currentSessionId, t, subs
         sessionId,
         sessionOf,
         chatOf,
+        setComposerText,
         t
       },
       target.key
@@ -880,6 +921,7 @@ function RewindPortals({ sessionId, sessionOf, chatOf, currentSessionId, t, subs
         sessionOf,
         chatOf,
         currentSessionId,
+        setComposerText,
         t
       },
       target.key
@@ -888,7 +930,7 @@ function RewindPortals({ sessionId, sessionOf, chatOf, currentSessionId, t, subs
     target.key
   ));
 }
-function RewindButton({ target, sessionId, sessionOf, chatOf, currentSessionId, t }) {
+function RewindButton({ target, sessionId, sessionOf, chatOf, currentSessionId, setComposerText, t }) {
   const onClick = (event) => {
     event.stopPropagation();
     const session = sessionOf(sessionId);
@@ -907,7 +949,7 @@ function RewindButton({ target, sessionId, sessionOf, chatOf, currentSessionId,
       anchor: event.currentTarget,
       t,
       onRewind: (mode) => {
-        void runRewindAndFill(session, node.seq, mode, currentSessionId, chatOf);
+        void runRewindAndFill(session, node.seq, mode, currentSessionId, chatOf, setComposerText);
       }
     });
   };
@@ -924,10 +966,12 @@ function RewindButton({ target, sessionId, sessionOf, chatOf, currentSessionId,
   );
 }
 function composerText() {
-  const textarea = document.querySelector(COMPOSER_SELECTOR);
-  return textarea === null ? "" : textarea.value;
+  const surface = composerSurface();
+  if (surface === null) return "";
+  if (surface instanceof HTMLTextAreaElement) return surface.value;
+  return surface.textContent ?? "";
 }
-async function retractPending(session, itemId, text) {
+async function retractPending(session, itemId, text, setComposerText) {
   await session.cancel();
   const queue = session.getSnapshot().queue;
   const steering = queue.filter((item) => item.placement === "steering");
@@ -935,10 +979,10 @@ async function retractPending(session, itemId, text) {
     await session.updateQueue(id, { kind: "remove" });
   }
   if (text !== null && text !== "" && composerText().trim() === "") {
-    fillComposer(text);
+    setComposerText(session.sessionId, text);
   }
 }
-function RetractButton({ target, sessionId, sessionOf, chatOf, t }) {
+function RetractButton({ target, sessionId, sessionOf, chatOf, setComposerText, t }) {
   const onClick = (event) => {
     event.stopPropagation();
     const session = sessionOf(sessionId);
@@ -951,7 +995,7 @@ function RetractButton({ target, sessionId, sessionOf, chatOf, t }) {
       t,
       retract: { itemId: target.itemId, text: target.text },
       onRetract: () => {
-        void retractPending(session, target.itemId, target.text);
+        void retractPending(session, target.itemId, target.text, setComposerText);
       }
     });
   };
@@ -1032,7 +1076,8 @@ var name = "dsh-rewind";
 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]";
+var COMPOSER_TEXTAREA_SELECTOR2 = "[data-input-scroll] textarea, textarea[data-phase]";
+var COMPOSER_EDITABLE_SELECTOR2 = "[data-composer-input]";
 function apply(ctx) {
   ctx.effect(function* () {
     yield ctx.locale.register(NS, { zh, en });
@@ -1055,6 +1100,17 @@ function apply(ctx) {
         return void 0;
       }
     };
+    const setComposerText = (sessionId, text) => {
+      const conversation = ctx.get("conversation");
+      const input = conversation?.input;
+      const scope = ctx.sessions.scope?.(sessionId);
+      return writeComposer(
+        text,
+        input !== void 0 && scope !== void 0 ? { setDraft: (draft) => {
+          input.for(scope).setDraft(draft);
+        } } : void 0
+      );
+    };
     const slots = ctx.slots;
     yield slots.inject(HEADER_ACTIONS_SLOT, () => slots.register(
       {
@@ -1064,7 +1120,7 @@ function apply(ctx) {
         id: "dsh-rewind-portals",
         order: 1e3
       },
-      createRewindBridge({ sessionOf, chatOf, currentSessionId, t, subscribeLocale })
+      createRewindBridge({ sessionOf, chatOf, currentSessionId, setComposerText, t, subscribeLocale })
     ));
     const commandUi = ctx.get("commandUi");
     const hasCandidates = (sessionId) => {
@@ -1082,9 +1138,9 @@ function apply(ctx) {
     };
     const hostCandidatesCache = /* @__PURE__ */ new Map();
     const composerAnchor = () => {
-      const textarea = composerTextarea();
-      const card = textarea?.closest("[data-composer-card]");
-      return card ?? textarea ?? document.body;
+      const surface = composerSurface2();
+      const card = surface?.closest("[data-composer-card]");
+      return card ?? surface ?? document.body;
     };
     const rewindPopupSpec = {
       // The picker exists exactly while the surface has a reachable user
@@ -1117,7 +1173,7 @@ function apply(ctx) {
             anchor: composerAnchor(),
             t,
             onRewind: (mode) => {
-              void runRewindAndFill(face, candidate.seq, mode, currentSessionId, chatOf);
+              void runRewindAndFill(face, candidate.seq, mode, currentSessionId, chatOf, setComposerText);
             }
           });
         }
@@ -1126,7 +1182,7 @@ function apply(ctx) {
     for (const name2 of ["rewind", "undo"]) {
       yield commandUi.decorate({ name: name2, ...rewindPopupSpec });
     }
-    const composerTextarea = () => document.querySelector(COMPOSER_SELECTOR2);
+    const composerSurface2 = () => document.querySelector(COMPOSER_TEXTAREA_SELECTOR2) ?? document.querySelector(COMPOSER_EDITABLE_SELECTOR2);
     yield () => {
       style.remove();
     };

package/lib/index.js

@@ -1,7 +1,7 @@
 // src/index.ts
 import { createAssistantMessage } from "@deepseek-ai/dsh-llm";
 import { unlink } from "node:fs/promises";
-import { settingsNamespace } from "@deepseek-ai/dsh-settings";
+import * as dshSettings from "@deepseek-ai/dsh-settings";
 
 // src/locales.ts
 var en = {
@@ -114,6 +114,12 @@ function translate(lang, key, params = {}) {
   return text;
 }
 
+// src/settings-locale.ts
+function readSettingsSection(provider, ns, brand) {
+  const key = brand?.(ns) ?? ns;
+  return provider.get(key);
+}
+
 // src/rewind.ts
 var RewindError = class extends Error {
   constructor(code, message) {
@@ -1887,7 +1893,11 @@ function apply(ctx, config) {
   const trackedBySession = /* @__PURE__ */ new Map();
   let fsService;
   ctx.inject(["settings"], (settingsCtx) => {
-    const section = settingsCtx.settings.get(settingsNamespace("locale"));
+    const section = readSettingsSection(
+      settingsCtx.settings,
+      "locale",
+      dshSettings.settingsNamespace
+    );
     if (section?.preference === "zh" || section?.preference === "en") {
       activeLocale = section.preference;
     }

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

@@ -41,6 +41,16 @@ export declare function chatSnapshotOf(face: {
 } | undefined, chatView: {
     getSnapshot(): unknown;
 } | undefined): HiddenChat | undefined;
+/**
+ * The plain text of the human message at `seq` in the chat snapshot, for
+ * filling the composer after a withdraw. Accepts BOTH `user` and `steering`
+ * nodes: a plan-mode (`/plan <text>`) input is delivered through the agent
+ * inbox next-step and claimed, so it renders as `steering`, and its text must
+ * still return to the composer (`portals.tsx` `runRewindAndFill`) — the old
+ * `user`-only read silently left it empty. State absent → undefined; a message
+ * with no text blocks → ''. Same text-blocks join the candidate side uses.
+ */
+export declare function messageTextAt(chat: HiddenChat | undefined, seq: number): string | undefined;
 /**
  * Extract the rewind target seq from a `/rewind` command's structured `args`
  * (e.g. `@5 chat`, `preview @5 both`). Locale-independent — never parses the

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

@@ -61,6 +61,13 @@ export interface RewindBridgeDeps {
     readonly currentSessionId: () => string | undefined;
     readonly t: Translate;
     readonly subscribeLocale: (cb: () => void) => () => void;
+    /**
+     * Session-aware dual-channel composer writer (see `writeComposer`): the
+     * alpha.1+ `conversation.input` facade `setDraft` when reachable, else the
+     * rc.2/alpha.1 DOM fill. Session-scoped so the refill only lands in the
+     * session that just rewound.
+     */
+    readonly setComposerText: (sessionId: string, text: string) => boolean;
 }
 /** Structural face of the runtime slot service (see the module doc). */
 export interface SlotsLike {
@@ -73,14 +80,36 @@ export interface SlotsLike {
         readonly sessionId: string;
     }) => ReactNode): () => void;
 }
+/** Join the text blocks of a user message into one plain preview. */
 /**
- * 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.
+ * The alpha.1+ session input facade's write face (structural, so the plugin
+ * never imports the conversation UI package). `setDraft` replaces the whole
+ * composer draft through the harness's own Lexical editor — the correct way
+ * to restore the withdrawn text.
+ */
+interface ComposerDraftWriter {
+    setDraft(text: string): void;
+}
+/**
+ * Fill the dsh composer with `text`. DOM dual-channel fallback: the rc.2
+ * `<textarea>` path, then the alpha.1+ `contenteditable` path. Used by
+ * `setComposerText` (the harness-facade-aware writer) as the last-resort and
+ * by `runRewindAndFill` to put the withdrawn target message back into the
+ * composer after a rewind. Best-effort — no composer match means false,
+ * never a throw.
  */
 export declare function fillComposer(text: string): boolean;
+/**
+ * Dual-channel composer write, mirroring `chatSnapshotOf`: prefer the harness
+ * facade's `setDraft` (alpha.1+, correct whole-draft replace), then degrade
+ * to the DOM `fillComposer` (rc.2 textarea / alpha.1 contenteditable). A
+ * facade that throws (session teardown) is treated as absent so the DOM path
+ * still restores the text. Never throws.
+ * @param text - the withdrawn target message text.
+ * @param facade - the alpha.1+ session input draft writer, when reachable.
+ * @returns whether a channel applied the text.
+ */
+export declare function writeComposer(text: string, facade: ComposerDraftWriter | undefined): 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
@@ -94,7 +123,7 @@ export declare function fillComposer(text: string): boolean;
  * the old baseline heuristic refilled withdrawn text into the composer
  * after switching sessions or restarting dsh.
  */
-export declare function runRewindAndFill(session: SessionFace, seq: number, mode: 'chat' | 'both', currentSessionId: () => string | undefined, chatOf: ChatOf): Promise<void>;
+export declare function runRewindAndFill(session: SessionFace, seq: number, mode: 'chat' | 'both', currentSessionId: () => string | undefined, chatOf: ChatOf, setComposerText: (sessionId: string, text: string) => boolean): Promise<void>;
 /**
  * Collect the portal targets of one session: user rows × snapshot nodes.
  * Exported as a test seam — the DOM→targets pairing that drives the ↶ button
@@ -111,7 +140,11 @@ interface RewindPortalsProps extends RewindBridgeDeps {
  * skipped when the target set is unchanged), so the plugin never runs a
  * synchronous full-transcript scan inside a commit microtask.
  */
-export declare function RewindPortals({ sessionId, sessionOf, chatOf, currentSessionId, t, subscribeLocale }: RewindPortalsProps): ReactNode;
+export declare function RewindPortals({ sessionId, sessionOf, chatOf, currentSessionId, t, subscribeLocale, setComposerText }: RewindPortalsProps): ReactNode;
+/** The current composer draft, on whichever channel: rc.2 textarea `.value`,
+ * alpha.1+ contenteditable `textContent`. Empty when the composer is absent.
+ * Exported as a test seam (the empty-composer guard in `retractPending`). */
+export declare function composerText(): string;
 /**
  * Build the slot-entry component for the plugin apply(): a tiny bridge that
  * injects the apply-time capabilities (session resolution, locale, rewind

package/lib/types/settings-locale.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Version-neutral settings-namespace reading for the host half.
+ *
+ * DSH rc.2 exposes a `settingsNamespace(value)` brand helper, and `settings.get`
+ * is typed to require a branded `SettingsNamespace`. DSH 0.1.2-alpha.2 removed
+ * that helper (the `SettingsNamespace` *type* remains) and `settings.get`
+ * accepts the raw namespace string. This module collapses both into one runtime
+ * call: on rc.2 the brand is a compile-time marker erased at runtime (so
+ * `settingsNamespace(ns)` returns `ns`), on 0.1.2-alpha.2 the brand helper is
+ * absent and the raw `ns` string is used directly. That is what lets a single
+ * compiled host bundle link and run on both harness generations.
+ *
+ * @module dsh-rewind/settings-locale
+ */
+/** Minimal structural face of the settings provider the host reads from. */
+export interface SettingsProviderLike {
+    /**
+     * Read one registered settings section by namespace. Accepts whatever the
+     * running DSH generation passes: a branded `SettingsNamespace` (rc.2, brand
+     * erased) or the raw namespace string (0.1.2-alpha.2).
+     */
+    get(ns: string): unknown;
+}
+/** The `settingsNamespace(ns)` brand helper, or `undefined` when removed (0.1.2-alpha.2). */
+export type SettingsNamespaceBrand = ((value: string) => string) | undefined;
+/**
+ * Read one settings section keyed by `ns`, tolerant of the settings-namespace
+ * brand across DSH generations. Pass the brand helper when available (the rc.2
+ * path); it is `undefined` on 0.1.2-alpha.2, where the raw `ns` string is used
+ * directly. Never throws: an absent section simply returns `undefined`.
+ */
+export declare function readSettingsSection(provider: SettingsProviderLike, ns: string, brand: SettingsNamespaceBrand): unknown;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "DSH 插件：真正便捷无感的同窗口内对话回退，从不新建分支；自带轻量工作区备份，可一并还原文件（完整 Claude Code /rewind 语义）。 · DSH plugin: genuinely effortless in-window conversation rewind — never forking a new session; ships a lightweight workspace backup that restores files together with the rewind (full Claude Code /rewind semantics).",
   "keywords": [
     "deepseek-harness",
@@ -72,18 +72,18 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6 || ^0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2",
     "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6 || ^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-commands": "^0.1.0-rc.6 || ^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6 || ^0.1.1-rc.2",
-    "@deepseek-ai/dsh-commands": "^0.1.0-rc.6 || ^0.1.1-rc.2",
-    "@deepseek-ai/dsh-fs": "^0.1.0-rc.6 || ^0.1.1-rc.2",
-    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6 || ^0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-rc.2",
-    "@deepseek-ai/dsh-sandbox": "^0.1.0-rc.6 || ^0.1.1-rc.2",
-    "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-rc.2",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.8 || ^0.1.1-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-rc.2"
+    "@deepseek-ai/dsh-client-ui-commands": "^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-commands": "^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-fs": "^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-sandbox": "^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-settings": "^0.1.0-rc.8 || ^0.1.1-rc.2 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-rc.2 || ^0.1.2-alpha.2"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/cordis": {
@@ -142,6 +142,7 @@
     "@deepseek-ai/dsh-goal": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-home-paths": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-llm": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-plan-mode": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-sandbox": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-session": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-session-projection": "^0.1.1-rc.2",