@kangyishuai/dsh-session-rewind 0.3.0 → 0.5.0

package/README.md

@@ -8,7 +8,7 @@
 
 Unofficial plugin for [DeepSeek Harness (DSH)](https://github.com/deepseek-ai/deepseek-harness). Not affiliated with DeepSeek.
 
-> **Status: early.** Verified end to end on DSH 0.2.2-rc.1: 31 GUI assertions in a throwaway DSH home, 158 unit tests, and a CDP-driven desktop pass (conflict refusal, conversation + file rewind, created-file trash, modified-file restore, rescue restore, panel/audit/diagnostics). Young software — keep backups of anything you cannot lose.
+> **Status: early.** Verified end to end on DSH 0.2.2-rc.1: 185 unit tests, 34 GUI assertions in a throwaway DSH home, and **36 assertions against the real desktop app** (read-only surface plus file mode: created-file trash, modified-file restore, rescue restore, timeline). `pnpm gate:session-rewind` runs the whole release gate in one command. Young software — keep backups of anything you cannot lose.
 
 ## What it does
 
@@ -16,11 +16,13 @@ Long conversations drift. A few turns later you wish you had answered a prompt d
 
 - **Two entries.** Press `Esc` `Esc` to open the rewind dialog, or click the ↶ button in any user message's action row (next to Copy).
 - **Running turns are not a dead end.** Confirming a rewind while a turn is running cancels that turn (keeping the queue), waits for it to go idle, then re-plans against the settled history.
+- **State-change warnings.** If the withdrawn range changed session state that lives outside the transcript — plan mode, goal, todo list, model selection, permission/sandbox presets, agent preset, scheduled tasks, working directory — the dialog lists it and says that rewinding does not roll that state back.
 - **Two scopes, chosen per rewind.** The confirmation dialog offers **Rewind conversation only** (default) and **Rewind conversation and files**. The dialog first shows a dry-run preview: how many messages and roughly how many tokens will be withdrawn, which files will be restored or moved to the trash, conflicts, and skipped files.
 - **Conversation.** The target message and everything after it are withdrawn from the model-visible context and from the transcript. The session id, title and earlier history are untouched. Nothing is deleted from the log — one marker event is appended.
 - **Files (optional).** Files changed by `write` / `edit` / `apply_patch` in the withdrawn turns are restored to their pre-change content. Files created after the target are moved to the plugin's trash instead of deleted. A rescue point of the current files is created before anything is written; failures roll back from it.
 - **Composer.** The target message's text (and images) is put back into the composer, ready to edit and send again. An existing draft is never overwritten. Tick **Send this message again right after rewinding** in the confirmation dialog to retry the turn in one click (conversation-only rewinds).
-- **Rewind panel.** A new header action opens a panel with four tabs: **Withdrawn** (every message each rewind removed, searchable, copy or put back in the composer), **History** (audit of each rewind: scope, message count, tokens, file results), **Rescue points** (restore files from an earlier rescue), and **Settings** (default scope, page size, confirm-on-list, diagnostics).
+- **Every view stays in sync.** Rewind in one tab or window and other open views of the same session hide the withdrawn rows immediately, without a reload (the notice travels through `localStorage`; the host's cuts remain the only source of truth).
+- **Rewind panel.** A new header action opens a panel with four tabs: **Withdrawn** (every message each rewind removed, searchable, copy or put back in the composer), **History** (a timeline of each rewind and each rescue-point file restore, newest first: scope, message count, tokens, file results), **Rescue points** (restore files from an earlier rescue), and **Settings** (default scope, page size, confirm-on-list, diagnostics).
 
 ## Read-only agent tool
 
@@ -104,9 +106,9 @@ On startup the plugin also removes data for sessions that no longer exist (they
 
 ## Compatibility
 
-| DSH version | Status                                                                                                                      |
-| ----------- | --------------------------------------------------------------------------------------------------------------------------- |
-| 0.2.2-rc.1  | Verified: `pnpm smoke:session-rewind` (31/31) + 158 unit tests + CDP-driven desktop pass (conversation-only and file modes) |
+| DSH version | Status                                                                                                 |
+| ----------- | ------------------------------------------------------------------------------------------------------ |
+| 0.2.2-rc.1  | Verified: 185 unit tests + `smoke:session-rewind` 34/34 + desktop 36/36 (`--deep`, file mode included) |
 
 The plugin declares no `engines.dsh` and no `@deepseek-ai/*` peer range: DSH is pre-release and semver ranges over prereleases are unreliable (see [ADR 0005](../../docs/adr/0005-dsh-version-compatibility.md)). Treat the table as the compatibility statement. After a DSH upgrade run `pnpm probe:runtime`, `pnpm smoke:session-rewind`, and check the plugin's diagnostics tab; if a private seam changed, the plugin degrades instead of breaking the session.
 
@@ -116,7 +118,7 @@ The plugin declares no `engines.dsh` and no `@deepseek-ai/*` peer range: DSH is
 pnpm test                     # unit tests (host engine, host RPC, client helpers)
 pnpm verify                   # repo-wide gates
 pnpm smoke:session-rewind           # temp DSH home + real GUI end-to-end (needs dsh & ego-browser)
-pnpm smoke:session-rewind-desktop   # read-only desktop check (needs --remote-debugging-port=9222)
+pnpm smoke:session-rewind-desktop   # desktop (Electron) check: 21 read-only + 12 with --deep --workspace <dir>
 ```
 
 Design notes: [ADR 0006](../../docs/adr/0006-session-rewind-architecture.md) and [ADR 0007](../../docs/adr/0007-session-rewind-file-restore.md) (Chinese; the repository docs are written in Chinese).

package/README.zh-CN.md

@@ -8,7 +8,7 @@
 
 非官方插件，与 DeepSeek 无关。面向 [DeepSeek Harness (DSH)](https://github.com/deepseek-ai/deepseek-harness)。
 
-> **状态：早期。** 已在 DSH 0.2.2-rc.1 上端到端验证：一次性 DSH 目录里 31 项 GUI 断言 + 158 个单测 + CDP 驱动的桌面版实测（冲突拒绝、对话+文件回退、新建文件进回收站、修改文件还原、救援点恢复、面板/审计/诊断）。插件还年轻，重要数据请自行备份。
+> **状态：早期。** 已在 DSH 0.2.2-rc.1 上端到端验证：185 个单测、一次性 DSH 目录里 34 项 GUI 断言、以及**真实桌面版 36 项断言**（只读界面 + 文件模式：新建文件进回收站、修改文件还原、救援点恢复、时间线）。`pnpm gate:session-rewind` 一条命令跑完发版门禁。插件还年轻，重要数据请自行备份。
 
 ## 它做什么
 
@@ -18,9 +18,11 @@
 - **每次回溯二选一**：确认框里提供「**仅回退对话**」（默认）与「**回退对话和文件**」，并先展示 dry-run 预览：将撤回多少条消息、约多少 token、哪些文件会还原/移入回收站、冲突与被跳过的文件。
 - **对话**：目标消息及其后的内容从模型上下文和渲染对话中撤回；会话 id、标题和目标之前的历史不变；日志只追加一条 marker，不删历史。
 - **文件（可选）**：被撤回轮次里由 `write` / `edit` / `apply_patch` 改过的文件还原到改动前内容；目标之后新建的文件移入插件回收站而不是删除。写入前先建救援点，失败从救援点回滚。
+- **状态变更提示**：如果要撤回的区间里改过会话状态（plan 模式、goal、待办、模型选择、权限/沙箱预设、智能体预设、定时任务、工作目录），确认框会列出来并明确说明——回溯只撤回对话，**不会**回滚这些状态。
 - **运行中也能回退**：确认回退时如果这一轮正在跑，会先取消它（保留队列）、等它空闲，再对新历史重新求值。
 - **输入框**：目标消息文本（以及图片）放回输入框，改完可直接重发；已有草稿绝不覆盖。勾选「回退后立即重发」可一键重试这一轮（仅对话模式）。
-- **回溯面板**：会话头部新增一个入口，四个页签：**已撤回**（每次回溯撤回的全部消息，可搜索、复制、放回输入框）、**回溯记录**（审计：范围、条数、token、文件结果）、**救援点**（手动恢复文件）、**设置**（默认范围、每页数量、列表确认、诊断）。
+- **多视图自动同步**：在一个标签页/窗口里回溯后，其它已打开的同会话视图会立刻隐藏被撤回的行，无需刷新（通知走 `localStorage`，渲染只认宿主 cuts）。
+- **回溯面板**：会话头部新增一个入口，四个页签：**已撤回**（每次回溯撤回的全部消息，可搜索、复制、放回输入框）、**回溯记录**（时间线：每次回溯与每次救援点恢复，新在上；范围、条数、token、文件结果）、**救援点**（手动恢复文件）、**设置**（默认范围、每页数量、列表确认、诊断）。
 
 ## 只读 agent 工具
 
@@ -104,9 +106,9 @@ dsh plugin --profile desktop add /tmp/kangyishuai-dsh-session-rewind-*.tgz
 
 ## 兼容性
 
-| DSH 版本   | 状态                                                                                              |
-| ---------- | ------------------------------------------------------------------------------------------------- |
-| 0.2.2-rc.1 | 已验证：`pnpm smoke:session-rewind` 31/31 + 158 个单测 + CDP 驱动的桌面版实测（仅对话与文件模式） |
+| DSH 版本   | 状态                                                                                     |
+| ---------- | ---------------------------------------------------------------------------------------- |
+| 0.2.2-rc.1 | 已验证：185 个单测 + `smoke:session-rewind` 34/34 + 桌面版 36/36（`--deep`，含文件模式） |
 
 插件不声明 `engines.dsh`，也不声明 `@deepseek-ai/*` 的 peer 范围：DSH 还在预发布阶段，预发布版本的 semver 范围不可靠（见 [ADR 0005](../../docs/adr/0005-dsh-version-compatibility.md)）。以这张表为准。DSH 升级后跑 `pnpm probe:runtime`、`pnpm smoke:session-rewind`，并看插件诊断页签；私有 seam 变了会降级而不是让会话出错。
 
@@ -116,7 +118,7 @@ dsh plugin --profile desktop add /tmp/kangyishuai-dsh-session-rewind-*.tgz
 pnpm test                     # 单测（宿主文件引擎、宿主 RPC、客户端 helper）
 pnpm verify                   # 仓库统一门禁
 pnpm smoke:session-rewind           # 临时 DSH 目录 + 真实 GUI 端到端（需要 dsh 与 ego-browser）
-pnpm smoke:session-rewind-desktop   # 只读桌面回归（需要以 --remote-debugging-port=9222 重启）
+pnpm smoke:session-rewind-desktop   # 桌面（Electron）回归：只读 21 项，加 --deep --workspace <dir> 再 +12 项
 ```
 
 设计记录：[ADR 0006](../../docs/adr/0006-session-rewind-architecture.md)、[ADR 0007](../../docs/adr/0007-session-rewind-file-restore.md)。

package/lib/client.js

@@ -72,6 +72,20 @@ window.__ModuleLoader__.load({
       "confirm.resendHint":
         "适合「重试这一轮」：回退后自动把原文发出去，想改内容就在输入框里编辑后再发。",
       "confirm.openToolCall": "目标之后有未完成的工具调用，回溯会截断它",
+      "confirm.stateChanges": "这段区间里改过会话状态：{list}；回溯只撤回对话，不会回滚这些状态",
+      "confirm.stateHint": "如需一并回退 plan/goal/待办等状态，请手动调整。",
+      "state.planMode": "计划模式",
+      "state.goal": "目标（goal）",
+      "state.todo": "待办清单",
+      "state.model": "模型选择",
+      "state.permission": "权限预设",
+      "state.sandbox": "沙箱模式",
+      "state.agentPreset": "智能体预设",
+      "state.schedule": "定时任务",
+      "state.workingDirectory": "工作目录",
+      "state.separator": "、",
+      "timeline.kindRescue": "文件恢复",
+      "timeline.rescueMeta": "从救援点恢复 {restored} 个文件 · {id}",
       "toast.done": "已回退到此处，原消息已放回输入框",
       "toast.draft": "已回退；输入框已有内容，未覆盖",
       "toast.noComposer": "已回退，但未找到输入框",
@@ -202,6 +216,21 @@ window.__ModuleLoader__.load({
       "confirm.resendHint":
         "Use this to retry a turn; to change the text, edit it in the composer instead.",
       "confirm.openToolCall": "An unfinished tool call follows the target; rewinding truncates it.",
+      "confirm.stateChanges":
+        "Session state changed inside this range: {list}. Rewinding only withdraws messages; these stay as they are.",
+      "confirm.stateHint": "Adjust plan/goal/todo state by hand if you need it rolled back too.",
+      "state.planMode": "plan mode",
+      "state.goal": "goal",
+      "state.todo": "todo list",
+      "state.model": "model selection",
+      "state.permission": "permission preset",
+      "state.sandbox": "sandbox mode",
+      "state.agentPreset": "agent preset",
+      "state.schedule": "scheduled task",
+      "state.workingDirectory": "working directory",
+      "state.separator": ", ",
+      "timeline.kindRescue": "File restore",
+      "timeline.rescueMeta": "Restored {restored} file(s) from rescue {id}",
       "toast.stoppedTurn": ", and the running turn was stopped",
       "toast.resent": ", and the message was sent again",
       "toast.done": "Rewound. The original message is back in the composer.",
@@ -545,6 +574,33 @@ window.__ModuleLoader__.load({
     /** localStorage 偏好键；版本化，方便未来迁移。 */
     let PREF_STORAGE_KEY = "dsh-session-rewind.prefs.v1";
 
+    /** 跨视图广播键：某个视图回溯成功后写入，其它视图据此重新拉宿主 cuts。 */
+    let CUT_BROADCAST_KEY = "dsh-session-rewind.cut-broadcast.v1";
+
+    /**
+     * 解析跨视图广播载荷（脏数据一律返回 null）。
+     * @param {any} raw localStorage 里的字符串
+     * @returns {{sessionId: string, targetSeq: number|null, markerSeq: number|null, at: number} | null}
+     */
+    function parseCutBroadcast(raw) {
+      if (typeof raw !== "string" || raw === "") return null;
+      let value;
+      try {
+        value = JSON.parse(raw);
+      } catch (_error) {
+        return null;
+      }
+      if (!value || typeof value !== "object") return null;
+      let sessionId = typeof value.sessionId === "string" ? value.sessionId : "";
+      if (sessionId === "") return null;
+      return {
+        sessionId: sessionId,
+        targetSeq: typeof value.targetSeq === "number" ? value.targetSeq : null,
+        markerSeq: typeof value.markerSeq === "number" ? value.markerSeq : null,
+        at: typeof value.at === "number" ? value.at : 0,
+      };
+    }
+
     /** 客户端偏好默认值：默认仅回退对话、每页 100 条、列表选择先确认。 */
     let PREF_DEFAULTS = Object.freeze({
       defaultMode: "chat",
@@ -691,7 +747,25 @@ window.__ModuleLoader__.load({
      * @param {any} value
      * @returns {any}
      */
-    function normalizePreview(value) {
+    /** 会话状态变更提示（plan/goal/todo/模型…）。 @param {any} value */
+    function normalizeStateChanges(value) {
+      /** @type {any[]} */
+      let out = [];
+      let source = Array.isArray(value) ? value : [];
+      for (let i = 0; i < source.length; i += 1) {
+        let item = source[i];
+        if (!item || typeof item !== "object") continue;
+        if (typeof item.labelKey !== "string") continue;
+        out.push({
+          type: typeof item.type === "string" ? item.type : "",
+          labelKey: item.labelKey,
+          count: typeof item.count === "number" && item.count > 0 ? item.count : 1,
+        });
+      }
+      return out;
+    }
+
+    function normalizePreview(/** @type {any} */ value) {
       let source = value && typeof value === "object" ? value : {};
       let target = source.target && typeof source.target === "object" ? source.target : {};
       let chat = source.chat && typeof source.chat === "object" ? source.chat : {};
@@ -731,6 +805,7 @@ window.__ModuleLoader__.load({
           crossesOpenToolCall: chat.crossesOpenToolCall === true,
           reachable: chat.reachable !== false,
         },
+        stateChanges: normalizeStateChanges(source.stateChanges ?? chat.stateChanges),
         files: normalizeFiles(source.files),
         warnings: warnings,
       };
@@ -965,8 +1040,13 @@ window.__ModuleLoader__.load({
           : typeof entry.id === "number"
             ? String(entry.id)
             : "";
+      let action = typeof entry.action === "string" ? entry.action : "";
+      let kind =
+        action === "rescue-restore" ? "rescue-restore" : entry.mode === "both" ? "both" : "chat";
       return {
         id: id,
+        action: action,
+        kind: kind,
         time: typeof entry.time === "number" ? entry.time : null,
         targetSeq: typeof entry.targetSeq === "number" ? entry.targetSeq : null,
         markerSeq: typeof entry.markerSeq === "number" ? entry.markerSeq : null,
@@ -989,6 +1069,12 @@ window.__ModuleLoader__.load({
         if (entry.id === "") continue;
         out.push(entry);
       }
+      // 时间线按时间倒序（新在上）；缺时间戳的排最后。
+      out.sort((/** @type {any} */ left, /** @type {any} */ right) => {
+        let l = typeof left.time === "number" ? left.time : -1;
+        let r = typeof right.time === "number" ? right.time : -1;
+        return r - l;
+      });
       return out;
     }
 
@@ -1928,6 +2014,27 @@ window.__ModuleLoader__.load({
             h("div", { key: "tool", className: "dsh-srw-warn" }, t("confirm.openToolCall")),
           );
         }
+        // 区间里改过的会话状态：回溯只切模型上下文，不会回滚这些设置。
+        let stateChanges = Array.isArray(preview.stateChanges) ? preview.stateChanges : [];
+        if (stateChanges.length > 0) {
+          let labels = stateChanges
+            .map((/** @type {any} */ item) =>
+              item.count > 1 ? `${t(item.labelKey)} ×${item.count}` : t(item.labelKey),
+            )
+            .join(t("state.separator"));
+          blocks.push(
+            h(
+              "div",
+              { key: "state", className: "dsh-srw-warn", "data-rewind-state": "true" },
+              t("confirm.stateChanges", { list: labels }),
+            ),
+            h(
+              "div",
+              { key: "state-hint", className: "dsh-srw-option-hint" },
+              t("confirm.stateHint"),
+            ),
+          );
+        }
         blocks.push(
           h(ModePicker, {
             key: "modes",
@@ -2307,12 +2414,14 @@ window.__ModuleLoader__.load({
       if (data.entries.length === 0) {
         return h("div", { className: "dsh-srw-dim" }, t("audit.empty"));
       }
+      // 时间线：竖线 + 节点。回溯事件与「从救援点恢复文件」放在同一条轴上，按时间倒序。
       return h(
         "div",
-        { className: "dsh-srw-cuts" },
+        { className: "dsh-srw-timeline" },
         data.entries.map((/** @type {any} */ entry) => {
           let expanded = data.expanded && data.expanded[entry.id] === true;
           let files = entry.files;
+          let isRescueRestore = entry.kind === "rescue-restore";
           /** @type {any[]} */
           let pathGroups = [];
           if (files) {
@@ -2334,70 +2443,86 @@ window.__ModuleLoader__.load({
             (/** @type {any} */ sum, /** @type {any} */ group) => sum + group.paths.length,
             0,
           );
+          let badge = isRescueRestore ? t("timeline.kindRescue") : t(modeLabelKey(entry.mode));
+          let meta = isRescueRestore
+            ? t("timeline.rescueMeta", {
+                restored: files ? files.restored.length : 0,
+                id: entry.rescueId || "",
+              })
+            : t("audit.meta", {
+                mode: t(modeLabelKey(entry.mode)),
+                n: entry.removedCount,
+                tokens: formatCount(entry.tokens),
+              });
           return h(
             "div",
-            { key: entry.id, className: "dsh-srw-cut" },
+            {
+              key: entry.id,
+              className: "dsh-srw-tl-node",
+              "data-kind": isRescueRestore ? "rescue-restore" : entry.mode,
+            },
+            h("span", { className: "dsh-srw-tl-dot", "aria-hidden": "true" }),
             h(
               "div",
-              { className: "dsh-srw-cut-head" },
-              h("span", { className: "dsh-srw-strong" }, formatDateTime(entry.time) || entry.id),
-              h("span", { className: "dsh-srw-badge" }, t(modeLabelKey(entry.mode))),
+              { className: "dsh-srw-tl-card" },
               h(
-                "span",
-                { className: "dsh-srw-time" },
-                t("audit.meta", {
-                  mode: t(modeLabelKey(entry.mode)),
-                  n: entry.removedCount,
-                  tokens: formatCount(entry.tokens),
-                }),
+                "div",
+                { className: "dsh-srw-tl-head" },
+                h("span", { className: "dsh-srw-strong" }, formatDateTime(entry.time) || entry.id),
+                h("span", { className: "dsh-srw-badge" }, badge),
               ),
-            ),
-            files
-              ? h(
-                  "div",
-                  { className: "dsh-srw-audit-files" },
-                  t("audit.files", {
-                    restored: files.restored.length,
-                    trashed: files.trashed.length,
-                    skipped: files.skipped.length,
-                    failed: files.failed.length,
-                  }),
-                )
-              : null,
-            files?.rescueId
-              ? h("div", { className: "dsh-srw-dim" }, t("audit.rescueId", { id: files.rescueId }))
-              : null,
-            h(
-              "div",
-              { className: "dsh-srw-item-actions dsh-srw-audit-actions" },
-              pathCount > 0
+              h("div", { className: "dsh-srw-time" }, meta),
+              files
                 ? h(
-                    LinkBtn,
-                    { onClick: () => api.toggleAuditPaths(entry.id) },
-                    expanded ? t("audit.pathsLess") : t("audit.paths", { n: pathCount }),
+                    "div",
+                    { className: "dsh-srw-audit-files" },
+                    t("audit.files", {
+                      restored: files.restored.length,
+                      trashed: files.trashed.length,
+                      skipped: files.skipped.length,
+                      failed: files.failed.length,
+                    }),
                   )
                 : null,
-              h(LinkBtn, { onClick: () => api.copyJson(entry) }, t("audit.copyJson")),
-            ),
-            expanded
-              ? h(
-                  "div",
-                  { className: "dsh-srw-paths" },
-                  pathGroups.map((/** @type {any} */ group) =>
-                    group.paths.map((/** @type {any} */ path) =>
-                      h(
-                        "div",
-                        {
-                          key: `${group.kind}:${path}`,
-                          className: "dsh-srw-path",
-                          "data-kind": group.kind,
-                        },
-                        h("span", { className: "dsh-srw-path-name", title: path }, path),
+              files?.rescueId
+                ? h(
+                    "div",
+                    { className: "dsh-srw-dim" },
+                    t("audit.rescueId", { id: files.rescueId }),
+                  )
+                : null,
+              h(
+                "div",
+                { className: "dsh-srw-item-actions dsh-srw-audit-actions" },
+                pathCount > 0
+                  ? h(
+                      LinkBtn,
+                      { onClick: () => api.toggleAuditPaths(entry.id) },
+                      expanded ? t("audit.pathsLess") : t("audit.paths", { n: pathCount }),
+                    )
+                  : null,
+                h(LinkBtn, { onClick: () => api.copyJson(entry) }, t("audit.copyJson")),
+              ),
+              expanded
+                ? h(
+                    "div",
+                    { className: "dsh-srw-paths" },
+                    pathGroups.map((/** @type {any} */ group) =>
+                      group.paths.map((/** @type {any} */ path) =>
+                        h(
+                          "div",
+                          {
+                            key: `${group.kind}:${path}`,
+                            className: "dsh-srw-path",
+                            "data-kind": group.kind,
+                          },
+                          h("span", { className: "dsh-srw-path-name", title: path }, path),
+                        ),
                       ),
                     ),
-                  ),
-                )
-              : null,
+                  )
+                : null,
+            ),
           );
         }),
       );
@@ -3004,6 +3129,16 @@ window.__ModuleLoader__.load({
           ".dsh-srw-tab[data-active=true]{color:var(--dsw-alias-label-primary,inherit);border-bottom-color:var(--dsw-alias-brand-primary,#4f7cff);}",
           ".dsh-srw-tab-body{display:flex;flex-direction:column;gap:10px;}",
           ".dsh-srw-cuts{display:flex;flex-direction:column;gap:12px;}",
+          // 时间线：竖线 + 圆点 + 卡片
+          ".dsh-srw-timeline{display:flex;flex-direction:column;gap:0;position:relative;}",
+          ".dsh-srw-tl-node{position:relative;display:flex;gap:12px;padding:0 0 14px 0;}",
+          ".dsh-srw-tl-node::before{content:'';position:absolute;left:5px;top:14px;bottom:0;width:1px;background:var(--dsw-alias-border-secondary,rgba(128,128,128,.35));}",
+          ".dsh-srw-tl-node:last-child{padding-bottom:0;}",
+          ".dsh-srw-tl-node:last-child::before{display:none;}",
+          ".dsh-srw-tl-dot{flex:none;width:11px;height:11px;margin-top:4px;border-radius:50%;background:var(--dsw-alias-brand-primary,#4f7cff);box-shadow:0 0 0 2px var(--dsw-alias-bg-primary,transparent);}",
+          ".dsh-srw-tl-node[data-kind='rescue-restore'] .dsh-srw-tl-dot{background:var(--dsw-alias-label-secondary,GrayText);}",
+          ".dsh-srw-tl-card{display:flex;flex-direction:column;gap:4px;min-width:0;flex:1;}",
+          ".dsh-srw-tl-head{display:flex;gap:8px;align-items:baseline;flex-wrap:wrap;}",
           ".dsh-srw-cut{display:flex;flex-direction:column;gap:4px;}",
           ".dsh-srw-cut-head{display:flex;gap:8px;align-items:baseline;flex-wrap:wrap;}",
           ".dsh-srw-strong{font-weight:600;}",
@@ -3662,6 +3797,8 @@ window.__ModuleLoader__.load({
         });
         rebuildSessionById(sessionId);
         let outcome = fillComposer(sessionId, summary.text || target.text || "");
+        // 同源其它视图也要立刻隐藏这些行（它们不会被这次 append 唤醒）。
+        broadcastCut(sessionId, summary);
         let text = t("toast.rewound", {
           n: summary.removedCount,
           tokens: formatCount(summary.tokens),
@@ -4142,6 +4279,57 @@ window.__ModuleLoader__.load({
       }
 
       /** 拉一次宿主 cuts 作为可见性兜底（静默失败）。 */
+      /**
+       * 把「这个会话刚回溯过」广播给同源其它视图（多标签/多窗口一致性）。
+       * localStorage 的 storage 事件只在**其它** document 触发，不会回环到自己。
+       * @param {any} sessionId
+       * @param {any} summary
+       */
+      function broadcastCut(sessionId, summary) {
+        try {
+          if (!window.localStorage) return;
+          window.localStorage.setItem(
+            CUT_BROADCAST_KEY,
+            JSON.stringify({
+              sessionId: sessionId,
+              targetSeq:
+                summary && typeof summary.targetSeq === "number" ? summary.targetSeq : null,
+              markerSeq:
+                summary && typeof summary.markerSeq === "number" ? summary.markerSeq : null,
+              at: Date.now(),
+            }),
+          );
+        } catch (_error) {
+          /* 存储不可用时退化为「只有本视图知道」 */
+        }
+      }
+
+      /**
+       * 监听其它视图的广播：收到就按宿主 cuts 重新隐藏（宿主是权威来源，不信任广播内容）。
+       * @returns {() => void} disposer
+       */
+      function installCutBroadcast() {
+        /** @param {any} event */
+        function onStorage(event) {
+          if (!event || event.key !== CUT_BROADCAST_KEY) return;
+          let payload = parseCutBroadcast(event.newValue);
+          if (!payload) return;
+          seedCuts(payload.sessionId);
+        }
+        try {
+          window.addEventListener("storage", onStorage);
+        } catch (_error) {
+          return function noop() {};
+        }
+        return function dispose() {
+          try {
+            window.removeEventListener("storage", onStorage);
+          } catch (_error) {
+            /* ignore */
+          }
+        };
+      }
+
       function seedCuts(/** @type {any} */ sessionId) {
         return call("cuts", { sessionId: sessionId })
           .then((/** @type {any} */ value) => {
@@ -4195,6 +4383,9 @@ window.__ModuleLoader__.load({
 
       installChatVisibility(ctx, cutStore);
 
+      // 多视图一致性：别的标签页回溯后，本视图按宿主 cuts 重新隐藏。
+      ctx.effect(() => installCutBroadcast(), "session-rewind: cut broadcast");
+
       ctx.effect(
         () =>
           installRowAction(ctx.slots, {
@@ -4426,6 +4617,9 @@ window.__ModuleLoader__.load({
         normalizePathList: normalizePathList,
         normalizeFiles: normalizeFiles,
         normalizePreview: normalizePreview,
+        normalizeStateChanges: normalizeStateChanges,
+        parseCutBroadcast: parseCutBroadcast,
+        CUT_BROADCAST_KEY: CUT_BROADCAST_KEY,
         fileModeState: fileModeState,
         effectiveMode: effectiveMode,
         conflictPathsOf: conflictPathsOf,

package/lib/service.js

@@ -29,6 +29,7 @@ import {
 } from "./operations.js";
 import { findOrphans, pruneOrphans } from "./orphans.js";
 import { cutsOf, hasOpenToolCalls, listCandidatesPage, targetContent } from "./plan.js";
+import { stateChangeSummary } from "./state-changes.js";
 import { describeToolImpact, installRewindTool, listToolCandidates } from "./tool.js";
 
 /**
@@ -477,6 +478,8 @@ export class SessionRewindService extends TypertRemoteService {
       const tokens = this.estimateTokens(events, plan.shadowedSeqs);
       const target = targetContent(targetEvent);
       const subtitle = target.text.replace(/\s+/gu, " ").trim();
+      // 被撤回区间里改过的会话状态（plan/goal/todo/模型…）：回溯不会回滚它们，只提示。
+      const stateChanges = stateChangeSummary(events, plan.surfaceStart, plan.surfaceEnd);
       /** @type {any} */
       let files = {
         available: false,
@@ -541,7 +544,9 @@ export class SessionRewindService extends TypertRemoteService {
           tokens,
           crossesOpenToolCall: hasOpenToolCalls(events, plan.targetSeq),
           reachable: true,
+          stateChanges,
         },
+        stateChanges,
         files,
         warnings,
       };
@@ -852,6 +857,37 @@ export class SessionRewindService extends TypertRemoteService {
         throw new RewindRequestError(ERROR_CODES.rescueNotFound, "a rescue id is required");
       }
       const result = await this.store.restoreRescue({ sessionId, cwd, rescueId });
+      // 审计：时间线里要把「从救援点恢复文件」和回溯事件放在同一条轴上。
+      try {
+        await this.store.appendAudit({
+          version: 1,
+          action: "rescue-restore",
+          id:
+            typeof this.store.newAuditId === "function"
+              ? this.store.newAuditId()
+              : `rr-${Date.now()}`,
+          time: Date.now(),
+          sessionId,
+          rescueId,
+          mode: "files",
+          targetSeq: null,
+          markerSeq: null,
+          removedCount: null,
+          tokens: null,
+          files: {
+            restored: result.restored ?? [],
+            trashed: [],
+            skipped: [],
+            failed: result.failed ?? [],
+            rescueId: result.safetyRescueId ?? null,
+          },
+          requestedBy: "ui",
+        });
+      } catch (error) {
+        this.ctx?.logger?.warn?.(
+          `session-rewind: rescue-restore audit failed: ${error instanceof Error ? error.message : String(error)}`,
+        );
+      }
       if (Array.isArray(result.failed) && result.failed.length > 0) {
         const error = new RewindRequestError(
           ERROR_CODES.filesFailed,

package/lib/state-changes.js

@@ -0,0 +1,71 @@
+// @ts-check
+// 「被撤回区间里改过哪些会话状态」的提示。
+//
+// 为什么需要：回溯只替换**模型可见的 surface**，日志与会话状态投影不动。所以区间里的
+// `plan/mode`、`goal/change`、`todo/write` 这类状态事件在回溯后仍然生效——用户很容易误以为
+// 「退回去就等于那些设置也退回去了」。这里只做事实提示，不做任何回滚。
+//
+// 未知事件类型一律忽略（AGENTS.md 约定 1：不写死内部实现，遇到不认识的保留）。
+
+/** 已知的会话状态事件 → 文案键。 */
+export const STATE_EVENT_LABELS = Object.freeze({
+  "plan/mode": "state.planMode",
+  "goal/change": "state.goal",
+  "todo/write": "state.todo",
+  "model/selection": "state.model",
+  "permission/preset": "state.permission",
+  "sandbox/mode": "state.sandbox",
+  "agent-preset/selected": "state.agentPreset",
+  "schedule/change": "state.schedule",
+  "working-directory/change": "state.workingDirectory",
+});
+
+/**
+ * @typedef {object} StateChange
+ * @property {string} type 事件类型
+ * @property {string} labelKey 文案键（`state.*`）
+ * @property {number} count 次数
+ * @property {number} firstSeq 第一次出现的 seq
+ */
+
+/**
+ * 扫描 [fromSeq, toSeq] 区间里的会话状态事件，按出现顺序聚合。
+ * @param {any[]} events
+ * @param {number} fromSeq 含
+ * @param {number} toSeq 含；传 `Number.MAX_SAFE_INTEGER` 表示到日志末尾
+ * @returns {StateChange[]}
+ */
+export function collectStateChanges(events, fromSeq, toSeq) {
+  const source = Array.isArray(events) ? events : [];
+  const start = typeof fromSeq === "number" ? fromSeq : 0;
+  const end = typeof toSeq === "number" ? toSeq : Number.MAX_SAFE_INTEGER;
+  /** @type {Map<string, StateChange>} */
+  const groups = new Map();
+  for (const event of source) {
+    if (!event || typeof event.seq !== "number") continue;
+    if (event.seq < start || event.seq > end) continue;
+    const type = event.type;
+    if (typeof type !== "string") continue;
+    const labelKey = /** @type {Record<string, string>} */ (STATE_EVENT_LABELS)[type];
+    if (labelKey === undefined) continue;
+    const existing = groups.get(type);
+    if (existing) existing.count += 1;
+    else groups.set(type, { type, labelKey, count: 1, firstSeq: event.seq });
+  }
+  return [...groups.values()].sort((left, right) => left.firstSeq - right.firstSeq);
+}
+
+/**
+ * 给提示用的简短摘要（不含本地化文案，只出 key 与次数）。
+ * @param {any[]} events
+ * @param {number} fromSeq
+ * @param {number} toSeq
+ * @returns {Array<{type: string, labelKey: string, count: number}>}
+ */
+export function stateChangeSummary(events, fromSeq, toSeq) {
+  return collectStateChanges(events, fromSeq, toSeq).map((item) => ({
+    type: item.type,
+    labelKey: item.labelKey,
+    count: item.count,
+  }));
+}

package/locale/en.json

@@ -122,6 +122,20 @@
     "toast.stoppedTurn": ", and the running turn was stopped",
     "confirm.resend": "Send this message again right after rewinding",
     "confirm.resendHint": "Use this to retry a turn; to change the text, edit it in the composer instead.",
-    "toast.resent": ", and the message was sent again"
+    "toast.resent": ", and the message was sent again",
+    "confirm.stateChanges": "Session state changed inside this range: {list}. Rewinding only withdraws messages; these stay as they are.",
+    "confirm.stateHint": "Adjust plan/goal/todo state by hand if you need it rolled back too.",
+    "state.planMode": "plan mode",
+    "state.goal": "goal",
+    "state.todo": "todo list",
+    "state.model": "model selection",
+    "state.permission": "permission preset",
+    "state.sandbox": "sandbox mode",
+    "state.agentPreset": "agent preset",
+    "state.schedule": "scheduled task",
+    "state.workingDirectory": "working directory",
+    "state.separator": ", ",
+    "timeline.kindRescue": "File restore",
+    "timeline.rescueMeta": "Restored {restored} file(s) from rescue {id}"
   }
 }

package/locale/zh.json

@@ -122,6 +122,20 @@
     "toast.stoppedTurn": "，已停止运行中的回合",
     "confirm.resend": "回退后立即重发这条消息",
     "confirm.resendHint": "适合「重试这一轮」：回退后自动把原文发出去，想改内容就在输入框里编辑后再发。",
-    "toast.resent": "，已重发这条消息"
+    "toast.resent": "，已重发这条消息",
+    "confirm.stateChanges": "这段区间里改过会话状态：{list}；回溯只撤回对话，不会回滚这些状态",
+    "confirm.stateHint": "如需一并回退 plan/goal/待办等状态，请手动调整。",
+    "state.planMode": "计划模式",
+    "state.goal": "目标（goal）",
+    "state.todo": "待办清单",
+    "state.model": "模型选择",
+    "state.permission": "权限预设",
+    "state.sandbox": "沙箱模式",
+    "state.agentPreset": "智能体预设",
+    "state.schedule": "定时任务",
+    "state.workingDirectory": "工作目录",
+    "state.separator": "、",
+    "timeline.kindRescue": "文件恢复",
+    "timeline.rescueMeta": "从救援点恢复 {restored} 个文件 · {id}"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kangyishuai/dsh-session-rewind",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "In-place conversation rewind for DSH: withdraw a user message and everything after it, then refill the composer",
   "keywords": [
     "dsh",