dsh-rewind-plugin 0.14.0-beta.1 → 0.14.0-beta.2

package/README.en.md

@@ -16,7 +16,7 @@ A deliberately focused plugin with one job: **rewind to any user message, no mat
 
 ## Preview
 
-Every user message carries a **↶ rewind** button in its action row. Clicking it opens a mode-selection popover — "**rewind conversation only**" or "**rewind conversation and code**", the latter showing the file-change list for confirmation first. You can also rewind conveniently via the **`/rewind` command** or a **keyboard shortcut**.
+Every user message carries a **↶ rewind** button in its action row. Clicking it opens a mode-selection popover — "**rewind conversation only**" or "**rewind conversation and code**", the latter showing the file-change list for confirmation first. You can also pick and rewind conveniently via the **`/rewind` and `/undo` commands**.
 
 <table>
   <tr>
@@ -29,7 +29,7 @@ Every user message carries a **↶ rewind** button in its action row. Clicking i
   </tr>
 </table>
 
-## Install and update
+## Install
 
 Check your local DSH version, then find the matching plugin version in
 [Releases](https://github.com/SiriLee/dsh-rewind/releases).
@@ -42,12 +42,16 @@ dsh plugin --profile web add dsh-rewind-plugin@<version>
 
 **Graphical interface**: the **Plugins** page in the sidebar → **Add plugin** → enter `dsh-rewind-plugin@<version>` → install → restart DSH and refresh the browser.
 
-> ⚠️ The npm name `dsh-rewind` belongs to another author's package — install with `dsh-rewind-plugin`.
+<img src="assets/screenshots/add-plugin.png" width="600" alt="Add plugin dialog: enter dsh-rewind-plugin@version in the field"><br>
+<sub>The screenshot is an example only — use the version that matches your DSH version.</sub>
 
 **Updating**: the command line overwrites the installed version directly; the
 graphical interface rejects a re-install, so uninstall the old version first,
 then install the new one.
 
+> [!WARNING]
+> The npm name `dsh-rewind` belongs to another author's package — install with `dsh-rewind-plugin`.
+
 ## Usage
 
 1. Find the user message you want to rewind to in the conversation, or type `/rewind` (or its alias `/undo`) to open the candidate picker.

package/README.md

@@ -16,7 +16,7 @@ DeepSeek Harness 插件：**一键就地回退对话到任意更早的用户消
 
 ## 效果预览
 
-每条用户消息的操作行都有一个 **↶ 回退** 按钮。点击后弹出模式选择浮层——「**仅回退对话**」或「**回退对话和代码**」，后者会先展示文件变更清单再确认。还可以通过 **`/rewind` 命令**和**键盘操作**便捷地选择和回退。
+每条用户消息的操作行都有一个 **↶ 回退** 按钮。点击后弹出模式选择浮层——「**仅回退对话**」或「**回退对话和代码**」，后者会先展示文件变更清单再确认。还可以通过 **`/rewind` 和 `/undo` 命令**便捷地选择和回退。
 
 <table>
   <tr>
@@ -29,7 +29,7 @@ DeepSeek Harness 插件：**一键就地回退对话到任意更早的用户消
   </tr>
 </table>
 
-## 安装与更新
+## 安装
 
 确认本机 DSH 版本后，在 [Release](https://github.com/SiriLee/dsh-rewind/releases) 找到适配的插件版本。
 
@@ -41,10 +41,14 @@ dsh plugin --profile web add dsh-rewind-plugin@<版本>
 
 **图形界面**：侧栏「插件」页 →「添加插件」→ 填 `dsh-rewind-plugin@<版本>` → 安装 → 重启 DSH 并刷新浏览器。
 
-> ⚠️ npm 上的 `dsh-rewind` 属于其他作者，请用 `dsh-rewind-plugin` 安装。
+<img src="assets/screenshots/add-plugin.png" width="600" alt="「添加插件」弹窗：在输入框填入 dsh-rewind-plugin@版本号"><br>
+<sub>图片仅为示例，请以实际适配版本号为准。</sub>
 
 **更新**：命令行可直接覆盖安装；图形界面会拒绝重复安装，需先卸载旧版本，再装新版本。
 
+> [!WARNING]
+> npm 上的 `dsh-rewind` 属于其他作者，请用 `dsh-rewind-plugin` 安装。
+
 ## 使用
 
 1. 在对话中找到要回退的那条用户消息，或输入 `/rewind`（或其别名 `/undo`）打开候选列表选择。

package/assets/icon.svg

@@ -1,7 +1,7 @@
-<svg width="32" height="32" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
   <!-- Layout follows the terminal card glyph (packages/client/ui-sidebar-terminal):
-       a rounded tile inset from the canvas (28/36 here, 22/28 there) with a
-       white round-capped prompt. The fill follows the Subagent plugin artwork
+       a rounded tile inset from the canvas with a white round-capped prompt. The
+       fill follows the Subagent plugin artwork
        (packages/client/ui-primitives/src/plugin-artwork.tsx), whose blue square
        carries the same vertical light-to-dark gradient: #69B9FF at the top,
        #324DE2 at the bottom.
@@ -10,13 +10,17 @@
        (1.75,1.75)-(14.25,12.75) on that grid, so the translate lands its centre
        on the tile centre (18,18), and the ink spans 62.5% of the tile width —
        the terminal glyph's own ratio.
-       The drawing is 36 viewBox units but renders at 32 px, i.e. a uniform
-       shrink inside the card's and row's fixed frames; no inner coordinate
-       changes, so the mark cannot shift. -->
-  <rect x="4" y="4" width="28" height="28" rx="8" fill="url(#rewind_blue)" />
-  <g transform="translate(6.8 7.85) scale(1.4)" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
-    <path d="M6.5 2.5 2.5 6.5l4 4" />
-    <path d="M2.5 6.5h7a4 4 0 0 1 4 4v1.5" />
+       The canvas stays 36x36, the size the harness and the official artwork use,
+       so the consumer's `size` attribute keeps the authority over display size;
+       the inner group shrinks the finished drawing to 26/28 of the canvas around
+       its centre — one uniform scale over coordinates that are already correct,
+       so the tile, its radius, the mark and the stroke ratio stay in proportion. -->
+  <g transform="translate(18 18) scale(0.9286) translate(-18 -18)">
+    <rect x="4" y="4" width="28" height="28" rx="8" fill="url(#rewind_blue)" />
+    <g transform="translate(6.8 7.85) scale(1.4)" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
+      <path d="M6.5 2.5 2.5 6.5l4 4" />
+      <path d="M2.5 6.5h7a4 4 0 0 1 4 4v1.5" />
+    </g>
   </g>
   <defs>
     <linearGradient id="rewind_blue" x1="18" y1="4" x2="18" y2="32" gradientUnits="userSpaceOnUse">

package/docs/compat/audit.md

@@ -1,31 +1,24 @@
 # Compatibility audit (compat-audit)
 
 > Method: **the tests are the audit**. The probes in `tests/compat-invariants.test.ts`,
-> `tests/compat-interop.test.ts`, `tests/compat-gaps.test.ts` and
+> `tests/compat-interop.test.ts`, `tests/compat-gaps.test.ts`,
+> `tests/compat-tool-updates.test.ts` and
 > `scripts/verify-host.mjs` drive the plugin's real execution paths through the DSH
 > subsystems' **real consumer paths** (real `@deepseek-ai/*` packages) and assert
 > compatibility invariants. A probe failure is a finding; it enters the
 > fix/pin/record loop.
 >
-> Targeted version: npm `@deepseek-ai/*@0.1.7-rc.1`, declared by the peers as `^0.1.7-rc.1`.
+> Targeted version: npm `@deepseek-ai/*@0.1.7-rc.2`, declared by the peers as `^0.1.7-rc.2`.
 > Source reference: the upstream [github.com/deepseek-ai/deepseek-harness](https://github.com/deepseek-ai/deepseek-harness).
 >
-> Version alignment: `peerDependencies` use one tuple per DSH line
-> (e.g. `^0.1.2-rc.1`). npm's prerelease matching rules require a candidate to
-> share the range comparator's `[major, minor, patch]` tuple, so a new DSH tuple
-> replaces the peer tuple (single-line model). The range is conservative — it
-> declares only what was verified, so a release already inside it changes
-> nothing — unless it changes interfaces inside the tuple: `0.1.6-alpha.2`
-> removed the client session-ownership and queue-mirror APIs, and
-> `0.1.7-alpha.1` moved the session writer to format v4 (producer-owned message
-> sources, tool-role results, `developer/message`) and replaced the settings
-> namespace registry with each entry's volatile `Config`, so the peer floor and
-> both plugin seams moved with them. Signal: `npm view @deepseek-ai/dsh dist-tags`;
-> flow: `scripts/check-dsh-version.mjs` (it reads the `latest` dist-tag only; a
-> prerelease published under another tag is a manual pre-release check).
->
-> The plugin targets a single DSH version line; compatibility with earlier
-> lines is not kept.
+> Version alignment: one peer tuple per DSH line, declaring only what was verified — the
+> model, the update steps, and the `check-dsh-version.mjs` signal live in
+> `docs/release/release.md`. The floor moved when a release changed interfaces inside the
+> tuple: `0.1.6-alpha.2` removed the client session-ownership and queue-mirror APIs, and
+> `0.1.7-alpha.1` moved the session writer to format v4 (producer-owned message sources,
+> tool-role results, `developer/message`) and replaced the settings namespace registry with
+> each entry's volatile `Config`, so the peer floor and both plugin seams moved with them.
+> The plugin targets a single DSH version line; compatibility with earlier lines is not kept.
 
 ### Single channel
 
@@ -53,29 +46,25 @@ legacy branch).
 | I6 tool pipeline | before-snapshot capture/commit/restore is correct (existing `snapshot.test.ts` + `verify-host` 4–8) for the tracked tools `write` / `edit` — `str_replace_editor` is an optional DSH package that stopped being a default tool in DSH 0.1.3, so it is not tracked; cancellation timing never hangs | `verify-host` 4–9 |
 | I7 client ordering | A log carrying tool turns and rewind markers (a single `user/message` replace) satisfies the client builder ordering | `compat-interop` I7 |
 | I8 runtime safety | `rewind`/`compact` combinations never leave a dangling step/turn frame | `verify-host` 13 |
+| I9 tool-update projection | rc.2 folds mid-conversation tool additions from the whole log while a rewind cuts only the surface: after a withdrawal no `tool-addition`/`tool-removal` block reaches the provider and the current declarations stay complete | `compat-tool-updates` I9 |
 
 ## Verified-compatible surfaces (probes pass)
 
-- **token-meter replay** (the `user/message` marker + multiple rewinds + interleaved real turns + compact stacking).
 - **compaction transactions**: `toolPairingBalancedBefore/After` stays balanced after a marker cut; the real `/compact` command (`command-compact` + `compaction-basic`, stub summarizer) can land `compaction/start…end` on top of a rewind marker and stay replayable; `/compact` is a legal no-op on a small surface.
-- **resume replay**: `Session.create(id, events)` replays a rewind/compact-bearing log.
+- **tool-update history (`0.1.7-rc.2`)**: `Session.toolHistory()` folds the full append-only log, so a withdrawn `tool-addition` stays recorded after a rewind; `projectToolUpdates` drops every update whose message left the request and falls back to the complete current declarations. Pin: `tests/compat-tool-updates.test.ts` (on-surface projection, then the post-rewind fallback).
 - **session-stats**: the `user/message` marker adds no step (the step count stays at the real turns' steps), no phantom turn.
 - **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**: the marker is a turn-less `user/message` (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.
-- **settings-card registration (`0.1.7-alpha.1`)**: `settingsScope` is gone with the namespace registry. The card declares `configForms` as a module-level inject (the web profile always composes `ui-settings`), stages through the harness's own `SettingsFormModel` + `SettingsForm`, and registers into `plugins.bundle.config` keyed by the bundle package name; it reads the entry's form snapshot and writes through its revision-fenced `mutate`, and disposes the model's subscription with the fiber.
+- **settings card (`0.1.7-alpha.1`)**: the card declares `configForms` as a module-level inject (the web profile always composes `ui-settings`), stages through the harness's own `SettingsFormModel` + `SettingsForm`, and registers into `plugins.bundle.config` keyed by the bundle package name; it reads that shared per-entry form's snapshot and writes through its revision-fenced `mutate`, disposing the model's subscription with the fiber. The host half declares the bundle's page policy (`configure({ auto: false }, ctx.fiber)` inside a `ctx.inject(['settings'])` child, per the dsh-settings README), opting the entry out of a client-built schema page. Pins: `verify:host` (`the bundle declares its own config page`), `tests/client-settings-card.test.ts` (staged plan, refusal, subscription release), `tests/client-lifecycle.test.ts`.
 - **client session ownership (`0.1.6-alpha.2`)**: `SessionListState.current` / `currentAddress` are gone; main-view ownership is read from the row's `retainedBy.mainView` label — what `ui-workspace` retains the open session with. Pin: `tests/client-refill.test.ts`.
 - **client pending input (`0.1.6-alpha.2`)**: `SessionSnapshot.queue` and the host `queue-mirror` are gone; pending steering rows come from the session's own `inbox` projection, and only USER-sourced `next-step` rows are retractable (the removed mapping was `source.kind === 'user' ? 'steering' : 'context'`). Pins: `tests/pending.test.ts`, `tests/client-retract.test.ts`.
 - **client settings slot (`0.1.6-alpha.2`)**: `settings.plugin.item` is gone; the configuration form registers into `plugins.bundle.config`, keyed by the bundle package name. Pin: `tests/client-contract.test.ts`.
-- **client settings form (`0.1.7-alpha.1`)**: the same release retired the `settingsScope` bind (namespace registry) in favour of the shared per-entry form; the card now reads that form's snapshot and stages edits through `mutate`. Pin: `tests/client-settings-card.test.ts` (staged plan, refusal, and the fiber releasing the model's subscription), `tests/client-lifecycle.test.ts`.
-
 - **`agent/created` lifecycle guard**: the session-format reconcile runs on the alpha line's `agent/created` (fire-and-forget); pin: `verify-host` 4e dispatches it.
 - **marker vs `/compact`**: the checkpoint shape is unchanged on this line — a `user/message` replace (`surfaceOp {replace, startSeq, endSeq}` + `sourceEventSeqs`); `assistant/message` still cannot carry `sourceEventSeqs`.
 - **`image/offload` projection**: the alpha line's first `SessionMessageProjection` changes derived content without touching surface node membership; candidate listing and target resolution tolerate it. Pin: `tests/image-offload-projection.test.ts`.
 - **session-cwd**: the fs tools no longer canonicalize a parent-traversing cwd, so `src/session-cwd.ts` returns `header.cwd` verbatim. Pin: `tests/session-cwd.test.ts`.
-- **startup admission (`0.1.7-rc.1`)**: the new gate reads the manifest's own `@deepseek-ai/dsh-*` peers and requires each to satisfy the runtime with `includePrerelease`; it runs for a profile bundle and again for every row its patch inserts, and a denial skips the bundle or disables the row. This plugin's declarations all satisfy `0.1.7-rc.1`, so it is admitted with no exemption — a skipped bundle on a later line is a peer mismatch, not a load failure.
+- **startup admission (`0.1.7-rc.1`)**: the gate reads the manifest's own `@deepseek-ai/dsh-*` peers and requires each to satisfy the runtime with `includePrerelease`; it runs for a profile bundle and again for every row its patch inserts, and a denial skips the bundle or disables the row. This plugin's declarations all satisfy `0.1.7-rc.2`, so it is admitted with no exemption — a skipped bundle on a later line is a peer mismatch, not a load failure.
 
 ## Known behavior boundaries (deterministic differences, non-crash, documented)
 
@@ -89,107 +78,88 @@ legacy branch).
 - **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`.
 - **Bundle card metadata is declared by the plugin, not by the manager (`0.1.7-alpha.1`)**: the manager still titles a bundle with `shortName(pkg.name)` and its raw `package.json` description when nothing else is declared, but it now reads plugin-owned resources first — `locale/<lang>.json` (`meta.title`/`meta.description`) through the package exports map, and an `icon` file relative to the manifest. This plugin declares both, so its card shows an icon and copy that follows the active language; only the fallback description remains mixed-language. Pin: `tests/package-layout.test.ts` (icon path/media/size and both dictionaries).
-
-- **Synchronous Session history reads are deprecated** on this line (`snapshotEvents` / `eventAt` / `ownEvents`): existing calls may remain, new calls are prohibited. The plugin keeps its existing reads (turn anchor + candidate listing); the migration path is a `ctx.sessionProjections` projection unit or the async paged history read this line has not shipped yet — not a plugin-side index. Not migrated in this release.
+- **Synchronous Session history reads are deprecated** on this line (`snapshotEvents` / `eventAt` / `ownEvents`): existing calls may remain, new calls are prohibited. The plugin keeps its existing reads (turn anchor + candidate listing); the migration path is a `ctx.sessionProjections` projection unit or the async paged history read this line has not shipped yet — not a plugin-side index.
 
 ## Upstream (harness) issues and the plugin's no-compensation stance
 
-The plugin treats these as harness-side defects it does not compensate for. Each entry records the harness issue, its current status, and the plugin's stance, so a future maintainer does not "fix the wrong direction."
+The plugin treats these as harness-side defects it does not compensate for. Each entry records
+the harness issue, its current status, and the plugin's stance, so a future maintainer does not
+"fix the wrong direction."
 
 ### RU-I18N (resolved on the 0.1.7 line): host command copy follows the user's language
 
-- **History (0.1.2–0.1.6 lines)**: the plugin resolved `activeLocale` in an
-  `ctx.inject(['settings'])` callback that read `settings.get('locale').preference`
-  **once, with no retry** (`src/index.ts`), while `dsh-client-locale`'s host half registered that
-  `locale` settings section through its own `ctx.inject(['settings'])`
-  (`packages/client/locale/src/index.ts`). Both callbacks wait only on `settings` and are
-  independent of each other, so cordis made **no ordering guarantee** between the section
-  registration and the plugin's read. The plugin's own command descriptors were registered
-  **synchronously** in the same `apply`, i.e. before that microtask ran, so their `description`
-  strings were baked in the neutral English default — the defect reported as #28 — while the
-  runtime output, evaluated later at command execution from the then-updated `activeLocale`, did
-  follow the stored preference. A preference changed *after* the mount reached the output only on
-  the next mount, because the read was one-shot.
-- **Resolution (0.1.7)**: the section is gone — the locale host half now only calls
-  `settings.configure({ auto: false })`, and the preference lives in the `locale` entry's own
-  Config. The plugin reads that same value through the settings service's descriptor read
-  (`readHostLocale` in `src/index.ts` calls `settings.describe({ redactSecrets: true })`, the route
-  the settings UI and the client's own locale runtime take): at mount, which is what the
-  once-registered command descriptions carry, and again before each command renders, so the output
-  follows a language switch without a remount (the descriptors keep the mount-time language until
-  the plugin remounts). The read is best-effort: a missing method, a missing entry, or a
-  throwing read stays on the neutral English default.
-- **Client-side command-description i18n is still first-party-only**: DSH localizes host command
-  descriptions through the client `locale` binding (`ui-commands`), but the description keys come
-  from a **closed allowlist** (`HOST_FACES`: compact, export, feedback, goal,
-  permission, plan). A command outside that set — every third-party plugin — is passed through
-  verbatim, never translated (`builtinRowFace` only rewrites a description that equals the
-  first-party English copy), and no host command *output* is localized by the harness for anyone.
-  This plugin's host dictionary is what carries both, in the language read above.
-
-### R-OPENSTEP (rewind part resolved): an unclosed `step` in the log breaks token-meter replay; the rewind no longer compounds it
-
-> **Root cause (harness-side)**: an unclosed step left by a crash makes token-meter replay
-> reject any later step activity. DSH `0.1.1-rc.2` now auto-closes crash-left step/turn/tool
-> boundaries at load via `interruptedTurnClosers` (`dsh-session`, consumed by
-> `packages/core/agent-loop/src/index.ts:907`) — **the crash path is fixed**.
+> **Status**: the `locale` settings section is gone — the locale host half only calls
+> `settings.configure({ auto: false })`, and the preference lives in the `locale` entry's own
+> Config. The plugin reads that value through the settings service's descriptor read
+> (`readHostLocale` in `src/index.ts` calls `settings.describe({ redactSecrets: true })`, the
+> route the settings UI and the client's own locale runtime take) at mount — which is what the
+> once-registered command descriptions carry — and again before each command renders, so the
+> output follows a language switch without a remount. The read is best-effort: a missing
+> method, a missing entry, or a throwing read stays on the neutral English default.
+>
+> **Client-side command-description i18n is still first-party-only**: DSH localizes host
+> command descriptions through the client `locale` binding (`ui-commands`), but the
+> description keys come from a **closed allowlist** (`HOST_FACES`: compact, export, feedback,
+> goal, permission, plan). A command outside that set — every third-party plugin — is passed
+> through verbatim, and no host command *output* is localized by the harness for anyone. This
+> plugin's host dictionary is what carries both, in the language read above.
 >
-> **Plugin guard (attempted and reverted)**: a `hasOpenStep` + `planRewind` pre-refusal was
-> implemented (`open-step`) but misjudged on **real session logs** (normal rewinds refused, GUI
-> verification broken), and was reverted (`177ec14`). Conclusion: **the plugin sets no guard**,
-> accepting residual risk (an unclosed step produced by a third-party plugin can break
-> `/compact` — that log is already abnormal, and continuing the conversation triggers the same).
-> The fix direction is in the harness (token-meter recovery for unclosed steps), not the plugin.
-
-#### Concrete `step/start` trigger paths (source-confirmed)
-
-The tree has exactly **one** `append('step/start')` producer: `packages/core/agent-loop/src/agent.ts:303`
-(no other producer inside the official packages; `session/end-seed` etc. only truncate torn writes,
-not logically-unclosed steps).
-
-| # | Trigger path | Plausibility | Basis |
-|---|---|---|---|
-| P1 | **Abnormal process termination**: `step/start` is batched to disk (write-behind, `maxDelayMs` per batch) → the step is mid-execution (LLM stream/tool, seconds to minutes) → SIGKILL / OOM-kill / power loss / WSL hard-close → `step/end` (in `finally`, only runs while the process is alive) is never persisted | **Most realistic** | `agent.ts:313` finally; write-behind batching; torn-write fix truncates only a half-written line |
-| P2 | **Third-party plugin bug**: only the official agent-loop produces one, but external plugins may `session.append('step/start', …)` and never close it | possible | public `Session.append` |
-| P3 | **Manual session-file editing**: edit `~/.dsh/…/session.jsonl[.zstd]` (zstd needs decompress/recompress; plaintext config edits directly) | possible but laborious | `persistence-jsonl/format.ts` (`JsonlCompression = 'zstd' \| 'none'`) |
-| P4 | **append itself failing**: `append('step/end')` in `finally` throws (payload is plain numbers, nearly impossible) | theoretical | `agent.ts:313` |
-
-**Amplifier (rewind is not the only trigger)**: after a crash resume, agent-loop `turn()` opens a
-new turn at `phase.turn + 1` (`agent.ts:277-283`) **without closing the leftover step** — so
-"continue the conversation" (a new `step/start`) trips the same token-meter check. Scope:
-
-- **The conversation itself is unaffected** (the request path does not call `tokenMeter.measure`; only compaction-basic does tree-wide).
-- **Manual `/compact` fails permanently** (`compactNow`'s first `measure()` throws the raw error).
-- **Automatic compaction silently stays disabled** (the `agent/pre-step` hook catches and warns; the conversation continues).
-- **rewind's role (resolved)**: the v2 `user/message` rewind marker appends no `step/start`, so a rewind no longer introduces the first trip-wire and the R-OPENSTEP rewind amplifier is closed. The harness-side root cause (an unclosed step after a crash, tripped by continuing the conversation) remains.
+> **Plugin stance**: no compensation; the seam is the descriptor read above. The wrong direction
+> is the earlier one — reading `settings.get('locale').preference` once inside an
+> `ctx.inject(['settings'])` callback and assuming cordis ordered the locale section before it
+> (it does not; the descriptors were baked in the English default, defect #28).
+
+### R-OPENSTEP (rewind part resolved): an unclosed `step` in the log breaks token-meter replay
+
+> **Situation**: once a step is left unclosed, replay rejects any later step activity, so
+> manual `/compact` fails permanently and automatic compaction silently stays disabled (the
+> `agent/pre-step` hook catches and warns). The conversation itself is unaffected — only
+> compaction-basic measures tree-wide. DSH now auto-closes crash-left step/turn/tool
+> boundaries at load (`interruptedTurnClosers`, consumed by
+> `packages/core/agent-loop/src/index.ts:907`), so **the crash path is fixed**. The tree has
+> exactly one `append('step/start')` producer, `agent-loop/src/agent.ts:303`; an unclosed step
+> otherwise comes from a third-party plugin appending `step/start` through the public
+> `Session.append`, or from a hand-edited log. After a crash resume, `turn()` opens a new turn
+> (`agent.ts:277-283`) without closing the leftover step, so continuing the conversation trips
+> the same check — a rewind is **not** the only trigger.
+>
+> **Rewind's part**: the marker is a `user/message` and appends no `step/start`, so a rewind
+> no longer introduces the first trip-wire and the R-OPENSTEP rewind amplifier is closed.
+>
+> **Plugin stance**: no guard. A `hasOpenStep` + `planRewind` pre-refusal was implemented and
+> misjudged on **real session logs** (normal rewinds refused, GUI verification broken), so it
+> was reverted — do not re-attempt a plugin-side pre-refusal. The fix direction is upstream
+> (token-meter recovery for unclosed steps), and the residual risk is accepted: that log is
+> already abnormal.
 
 ### R-PROMPTCARD (resolved on the 0.1.7 line): the repeated `System prompt` card is filtered out of chat
 
-> **History (0.1.2–0.1.6 lines)**: Chat rendered a collapsed `System prompt`
-> card at every request-series start. Any surface mutation bumps `contentGeneration` (a positional
-> `replace` — rewind, `/compact` — or a `SessionMessageProjection`, e.g. image offload), so the next
-> request logs `request/header { reason: 'series' }`; a process restart logs `'resume'`. The client
-> shows the card for every reason except `'change'`. The effective prompt is unchanged — only the
-> card repeats. Triggers beyond rewind: `/compact`, restart/resume, projections, explicit
-> `startsSeries`.
->
-> **Upstream decision (deliberate, twice)**: `6ad01cbd8d` suppressed the repeat on `resume` (note
-> `2026-09-03-resume-headers-do-not-repeat-system-prompts.md`, rejecting the card as a "lifecycle
-> marker" that "incorrectly implies another prompt injection"); three days later `77b6b10c21`
-> restored it — a resume/series header starts a visible request series. Locked by the `ui-chat` test
-> `repeats an unchanged system prompt after a surface rewrite…`.
+> **Status**: `isVisibleChatNode`
+> (`packages/client/ui-chat/src/client/contract/chat-visibility.ts`) drops `system-prompt`
+> nodes — and the `permission` command — from the visible chat rows before the row is built,
+> so a rewind on this line adds no prompt row at all; the durable events and the trajectory
+> inspection keep them. #22, #31 and README known issue #4 no longer reproduce.
 >
-> **Resolution (0.1.7)**: upstream stopped rendering the card in chat at all. `isVisibleChatNode`
-> (`packages/client/ui-chat/src/client/contract/chat-visibility.ts`, added by `b6f99fad55`
-> "feat(ui-chat): filter system prompts and permission commands") drops `system-prompt` nodes — and
-> the `permission` command — from the visible chat rows, while the durable events and the trajectory
-> inspection keep them. The `showsPrompt` computation is unchanged and no longer matters: the node is
-> filtered before the row is built, so a rewind on this line adds no prompt row at all. #22, #31 and
-> README known issue #4 no longer reproduce.
+> **Plugin stance**: still no compensation. The DOM row-hiding seam (`hiddenSeqsOf`) covers
+> withdrawn messages, where hiding is essential, not cosmetic.
+
+### R-PANELKEYS: the panel keyboard stays the plugin's own
+
+> **Situation**: on Web, Escape, Tab, the four arrows, and Enter without Alt are
+> platform-reserved — inline in the shortcuts `bindingIssue` list, with no exported form — so
+> neither a plugin nor a user may bind them and there is nothing to read and follow. `Menu`
+> is the dropdown primitive, while the harness's command-option panel (`ui-commands`'
+> popupSelect) renders `MenuSurface` plus its own controller with `role="listbox"`/
+> `role="option"`. `ui-commands`' `settle()` also calls `focusComposer()` unconditionally
+> after `await onSelect(...)`; its only early return requires replacing the popup binding,
+> which needs the internal `segment` that business code cannot reach.
 >
-> **Plugin stance**: still no compensation. The DOM row-hiding seam (`hiddenSeqsOf`) covers withdrawn
-> messages, where hiding is essential, not cosmetic; nothing was added for the card, and the
-> display-layer workup above stays valid history.
+> **Decision**: the mode-selection and retract panels keep their own capture-phase
+> Escape/↑/↓ handling — focus-independent, the shape the official command panel uses — and
+> keep `role="dialog"`. The plugin neither renders `Menu` nor compensates the composer focus
+> restore. Capture ownership is pinned by `tests/client-popover.test.ts`; the ghost-row walk
+> exclusion is **not** pinned, and on the typed `/rewind` path Enter still needs a row to hold
+> focus after the shell's focus restore.
 
 ## Uncovered boundaries (need an additional e2e layer; non-blocking)
 
@@ -216,8 +186,6 @@ new turn at `phase.turn + 1` (`agent.ts:277-283`) **without closing the leftover
 | client ordering | — | — | ✓ | — | — | — | ✓ | — |
 | plan-mode | ✓ | — | ✓ | — | — | — | — | ✓ (static) |
 
-✓ = probe passes; — = not applicable. RU-I18N and R-PROMPTCARD are resolved on the 0.1.7 line (see
-above); R-OPENSTEP is an upstream issue the
-plugin does not compensate for (see above); G3 is a confirmed-non-defect behavior pinned in
-`compat-gaps.test.ts` (G1 surface classification via `foldSurface` and G2 projection checkpoint
-both pass).
+✓ = probe passes; — = not applicable. Statuses and stances for the named findings live in the
+sections above; G1 (surface classification via `foldSurface`), G2 (projection checkpoint) and
+G3 (the confirmed-non-defect usage anchor on token-meter) all pass in `compat-gaps.test.ts`.

package/lib/client.js

@@ -430,6 +430,11 @@ var STYLE = `
 // src/client/popover.ts
 var popoverEl = null;
 var disposeOutside = null;
+var liveSessionId = null;
+var composerFocuser = null;
+function registerComposerFocuser(focus) {
+  composerFocuser = focus;
+}
 function closePopover() {
   if (popoverEl !== null) {
     popoverEl.remove();
@@ -439,6 +444,14 @@ function closePopover() {
     disposeOutside();
     disposeOutside = null;
   }
+  const sessionId = liveSessionId;
+  liveSessionId = null;
+  if (sessionId !== null) {
+    try {
+      composerFocuser?.(sessionId);
+    } catch {
+    }
+  }
 }
 function formatTarget(t, seq, time, preview) {
   const d = new Date(time);
@@ -689,6 +702,7 @@ function openRetractPopover(opts) {
 }
 function openPopover(opts) {
   closePopover();
+  liveSessionId = opts.session.sessionId;
   if (opts.retract !== void 0) {
     openRetractPopover(opts);
     return;
@@ -854,6 +868,10 @@ function writeComposer(text, facade) {
   if (facade !== void 0) {
     try {
       facade.setDraft(text);
+      try {
+        facade.focus?.();
+      } catch {
+      }
       return true;
     } catch {
     }
@@ -973,6 +991,7 @@ function hideWithdrawnSeats(chat, seats, hiddenSeqs, hidden) {
       delete seat.dataset.dshRewindHidden;
       hidden.delete(seat);
     }
+    if (seat.dataset.chatNodeKey === void 0) continue;
     const shell = seat.parentElement?.closest(GROUP_SHELL_SELECTOR);
     if (shell === null || shell === void 0) continue;
     shells.set(shell, (shells.get(shell) ?? true) && withdrawn);
@@ -1233,9 +1252,9 @@ function createRewindBridge(deps) {
 }
 
 // src/client/build-info.ts
-var PLUGIN_VERSION = true ? "0.14.0-beta.1" : "dev";
+var PLUGIN_VERSION = true ? "0.14.0-beta.2" : "dev";
 var PLUGIN_PACKAGE = "dsh-rewind-plugin";
-var BUILD_HASH = true ? "190a881a" : "dev";
+var BUILD_HASH = true ? "1afddb1d" : "dev";
 
 // src/client/locales.ts
 var zh = {
@@ -1438,24 +1457,35 @@ function apply(ctx) {
         return void 0;
       }
     };
+    const composerFacade = (sessionId) => {
+      const conversation = ctx.get("conversation");
+      const input = conversation?.input;
+      const scope = ctx.sessions.scope?.(sessionId);
+      if (input === void 0 || scope === void 0) return void 0;
+      return {
+        setDraft: (draft) => {
+          input.for(scope).setDraft(draft);
+        },
+        focus: () => {
+          input.for(scope).focus();
+        }
+      };
+    };
     const setComposerText = (sessionId, text) => {
       try {
-        const conversation = ctx.get("conversation");
-        const input = conversation?.input;
-        const scope = ctx.sessions.scope?.(sessionId);
-        const facade = input !== void 0 && scope !== void 0;
-        const ok = writeComposer(
-          text,
-          facade ? { setDraft: (draft) => {
-            input.for(scope).setDraft(draft);
-          } } : void 0
-        );
-        return ok;
+        return writeComposer(text, composerFacade(sessionId));
       } catch (error) {
         rewindLog.warn("refill", "composer write threw", error);
         return false;
       }
     };
+    registerComposerFocuser((sessionId) => {
+      try {
+        composerFacade(sessionId)?.focus();
+      } catch (error) {
+        rewindLog.warn("refill", "composer focus threw", error);
+      }
+    });
     const watchChat = (sessionId, cb) => resolveChatWatch(
       (id) => {
         try {

package/lib/index.js

@@ -2766,6 +2766,9 @@ function apply(ctx, config) {
   ctx.effect(() => () => {
     lifecycle.abort();
   }, "dsh-rewind lifecycle abort");
+  ctx.inject(["settings"], (child) => {
+    child.effect(() => child.settings.configure({ auto: false }, ctx.fiber), "dsh-rewind page policy");
+  });
   const dshHome = config?.dshHome;
   const store = new SnapshotStore(config?.snapshotDir, { dedup: config?.dedup, dshHome });
   const configKey = cleanupConfigKey(rewindConfigKey(ctx));

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

@@ -54,7 +54,12 @@ export interface PopoverOptions {
      */
     readonly onRewind?: (mode: 'chat' | 'both') => void;
 }
-/** Close the current popover, if any. */
+/**
+ * Register the composer focus channel (called once by the client plugin).
+ * @param focus - returns the keyboard to one session's composer, caret included.
+ */
+export declare function registerComposerFocuser(focus: (sessionId: string) => void): void;
+/** Close the current popover, if any, handing the keyboard back to its composer. */
 export declare function closePopover(): void;
 /**
  * Seqs of the command nodes currently matching `match`. Sample BEFORE issuing

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

@@ -124,6 +124,12 @@ export interface SlotsLike {
  */
 interface ComposerDraftWriter {
     setDraft(text: string): void;
+    /**
+     * Return the keyboard to the composer with the caret it last held (the
+     * facade's own `focus`). Optional so the DOM fallback and older faces still
+     * restore the text.
+     */
+    focus?(): void;
 }
 /**
  * Fill the dsh composer with `text` through the `contenteditable`
@@ -206,6 +212,14 @@ export declare function actionsContainerOf(row: HTMLElement | undefined): HTMLEl
  * that member is genuinely on the surface, in which case the shell stays; a
  * shell the batch carries no member of is left alone.
  *
+ * A MEMBER is a real chat node seat — `ChatNodeSeat` is the one shape that
+ * writes `data-chat-node-key` beside the anchor key. An anchor-only descendant
+ * (the tool call tree's own `call:<callId>` row, or a third-party anchor) is
+ * nested decoration: it resolves to no chat node, so it does NOT vote on the
+ * shell's emptiness. Counting such a row as "still live" is what left a fully
+ * withdrawn "command executed" tool group on screen as an empty expandable row
+ * after every member below it had been hidden.
+ *
  * Cost stays O(seats) per refresh: the caller queries the batch once, and each
  * shell decision reuses the member outcomes already computed here — no second
  * document scan, and no per-shell subtree walk.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
   "description": "In-window conversation rewind with workspace file restore · 同窗口内对话回退并可还原工作区文件",
   "icon": "./assets/icon.svg",
   "keywords": [
@@ -53,7 +53,7 @@
       "patch": "./cordis.patch.yml"
     },
     "engines": {
-      "dsh": ">=0.1.7-rc.1"
+      "dsh": ">=0.1.7-rc.2"
     },
     "client": {
       "inject": [
@@ -78,20 +78,20 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-client-locale": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-commands": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-plugin-manager": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-commands": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-fs": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-home-paths": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-sandbox": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-session": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-settings": "^0.1.7-rc.1",
-    "@deepseek-ai/dsh-tools": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-locale": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-commands": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-plugin-manager": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-commands": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-fs": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-home-paths": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-sandbox": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-session": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-settings": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-tools": "^0.1.7-rc.2",
     "@deepseek-ai/schemastery": "^3.18.1"
   },
   "peerDependenciesMeta": {
@@ -147,41 +147,41 @@
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.3",
     "@deepseek-ai/cosmokit": "1.8.4",
-    "@deepseek-ai/dsh-agent": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-api-session-controller": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-attachment": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-connection": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-locale": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-store": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-commands": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-input-trigger": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-plugin-manager": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-session": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-command-compact": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-commands": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-compaction": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-compaction-basic": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-compaction-image-offload": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-fs": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-goal": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-home-paths": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-llm": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-plan-mode": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-sandbox": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-scope": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-session": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-session-projection": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-session-stats": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-session-title": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-settings": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-token-meter": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-tools": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-typert-protocol": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-user-questions": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-agent": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-api-session-controller": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-attachment": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-connection": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-locale": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-store": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-commands": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-input-trigger": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-plugin-manager": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-session": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-command-compact": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-commands": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-compaction": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-compaction-basic": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-compaction-image-offload": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-fs": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-goal": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-home-paths": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-plan-mode": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-sandbox": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-scope": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-projection": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-stats": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-title": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-settings": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-token-meter": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-tools": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-typert-protocol": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-user-questions": "0.1.7-rc.2",
     "@deepseek-ai/schemastery": "3.18.3",
     "@types/node": "^24.0.0",
     "@types/react": "^18.3.31",