dsh-rewind-plugin 0.9.0-alpha.1 → 0.9.0-alpha.2

package/README.en.md

@@ -1,5 +1,8 @@
 # dsh-rewind
 
+> [!WARNING]
+> **Planning to use DSH `0.1.3`? Upgrade to the latest plugin (`>= 0.9.0-alpha.1`) as soon as possible and run `/dsh-rewind-fix` to update old rewind markers** ([update guide](docs/rewind-fix.md)).
+
 Conversation rewind for DeepSeek Harness: **rewind the conversation to any earlier user message in one click, in the same window** — no new branch, no window switch, with optional workspace-file restore (full Claude Code `/rewind` semantics).
 
 [![npm version](https://img.shields.io/npm/v/dsh-rewind-plugin.svg)](https://www.npmjs.com/package/dsh-rewind-plugin)
@@ -8,9 +11,6 @@ Conversation rewind for DeepSeek Harness: **rewind the conversation to any earli
 
 > English | [中文](README.md)
 
-> [!WARNING]
-> For the upcoming DSH line (v0.1.3), users who want the latest DSH should move to the new plugin (`>=0.9.0-alpha.1`) and update their session logs — see the [update guide](docs/rewind-fix.md).
-
 A deliberately focused plugin with one job: **rewind to any user message, no matter how far back, in place** — and conveniently **restore the files it changed** along the way.
 
 - **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**.

package/README.md

@@ -1,5 +1,8 @@
 # dsh-rewind
 
+> [!WARNING]
+> **计划使用 DSH `0.1.3` 的用户：请尽早升级到最新插件（`>= 0.9.0-alpha.1`），并运行 `/dsh-rewind-fix` 更新旧回退标记**（[更新指南](docs/rewind-fix.zh.md)）。
+
 DeepSeek Harness 插件：**一键就地回退对话到任意更早的用户消息**——同窗口内完成，不新建分支、不换窗口，可一并还原工作区文件（完整 Claude Code `/rewind` 语义）。
 
 [![npm version](https://img.shields.io/npm/v/dsh-rewind-plugin.svg)](https://www.npmjs.com/package/dsh-rewind-plugin)
@@ -8,9 +11,6 @@ DeepSeek Harness 插件：**一键就地回退对话到任意更早的用户消
 
 > [English](README.en.md) | 中文
 
-> [!WARNING]
-> 为了适配未来版本（DSH v0.1.3），期望使用最新版 DSH 的用户，请尽早使用新版插件（`>=0.9.0-alpha.1`）。并更新你的会话日志，详见：[更新指南](docs/rewind-fix.zh.md)
-
 刻意聚焦、保持极简，只做一件事：**就地回退到任意远的用户消息**，还能**顺手还原改过的文件**。
 
 - **回退 = 时间回溯**——目标消息及其之后的全部内容（agent 回复、工具调用）同时从**模型上下文**和**渲染对话**中撤回，不新建会话、不切换窗口；目标消息文本会回填输入框，改完可重发。**在原理上就真正无感、便捷**。

package/docs/rewind-fix.md

@@ -9,9 +9,17 @@
 
 ## Background
 
-`/rewind` appends a **marker** to the session log, telling DSH "everything from this screen onward is withdrawn". Aged plugin versions used a "ghost step frame" for this; the current version uses a more canonical, functionally-equivalent shape — a content-empty `user/message` that replaces the content after the target (see the [README](../README.en.md), the "How it works" section).
+`dsh-rewind` rewinds **within the same session** — it never forks a branch. It also follows the conservative policy of **deleting no history** (the session log is an append-only audit trail): it only **appends a marker**, telling DSH "the model-visible conversation continues from this message; everything after it is rolled back". Older plugin versions wrote that **rewind marker** as a "ghost step frame", which worked reliably on DSH v0.1.2-rc.1 and earlier.
 
-The next DSH line (`v0.1.3`) will reject the old shape, so **sessions rewound by an older plugin may fail to open after an upgrade**. That's why the plugin ships `/dsh-rewind-fix`: it translates those old markers into the new shape and makes the sessions usable again. The new shape is also fully compatible with older DSH versions.
+But DSH v0.1.3 (alpha) introduces a stricter **session-format validation**. We discovered ahead of time that the **rewind markers** written by older plugin versions **cannot be validated** under those stricter checks, so **a session rewound with `/rewind` may fail to open** when that line ships.
+
+The plugin is prepared in two parts, both shipped in the new version:
+
+1. **New rewind markers use the new shape** (forward) — this is a **correct, low-risk**, long-term change (see the [README](../README.en.md), the "How it works" section), and the new shape is fully compatible with **both old and new** DSH.
+
+2. **The `/dsh-rewind-fix` command** (backward) — for **already-existing** old sessions, the plugin ships a convenient update command that translates those old markers into the new shape so the sessions are usable again.
+
+This document covers mainly the **update command**.
 
 ## Warnings
 

package/docs/rewind-fix.zh.md

@@ -9,9 +9,17 @@
 
 ## 背景
 
-`/rewind` 回退会往会话日志追加一条**标记**，告诉 DSH 从某一屏往后都算「已撤回」。旧版插件用的是「幽灵步骤框架」写法；新版本已换成更规范且功能一致的形态——一条内容为空的 `user/message`，把目标之后的内容整体替换掉（原理见 [README](../README.md) 的「原理」一节）。
+`dsh-rewind` 的回退是**同一会话**的消息回退。它从不新建分支，同时遵循保守策略：**不删除任何历史**（会话日志是 append-only 审计轨迹），只在日志里**追加一条标记**，表示“模型可见的对话从这条消息继续，其后内容回卷”。旧版插件的 **rewind 标记**用的是「幽灵步骤框架」写法，在 DSH v0.1.2-rc.1 及之前版本长期验证有效。
 
-新一代 DSH（`v0.1.3`）会拒绝旧写法，所以**用旧版插件回退过的会话，升级后可能打不开**。因此本插件提供了 `/dsh-rewind-fix` 便捷命令，把这些旧标记「翻译」成新格式，让会话重新可用。新格式同样对旧版本 DSH 完全兼容。
+但 DSH v0.1.3（alpha）引入了更严格的**会话格式校验**。我们提前发现：旧版本往会话日志里写入的 **rewind 标记**，在这种严格校验下**无法自证合法**，届时会导致**碰过 `/rewind` 的旧会话打不开**。
+
+插件做了两阶段准备，已在新版本中包含：
+
+1. **新产生的 rewind 标记换成新格式**（向前）——这一步是**正确、低风险**的长期改动（见 [README](../README.md) 的「原理」一节），新格式对**新旧版本** DSH 均完全兼容。
+
+2. **提供 `/dsh-rewind-fix` 命令**（向后）——对于**已经存在**的旧会话，本插件提供便捷更新命令，把旧标记「翻译」成新格式，让会话重新可用。
+
+本文档主要讲解**更新命令**的使用方法。
 
 ## 警告
 

package/lib/client.js

@@ -1333,7 +1333,7 @@ function createRewindBridge(deps) {
 }
 
 // src/client/build-info.ts
-var PLUGIN_VERSION = true ? "0.9.0-alpha.1" : "dev";
+var PLUGIN_VERSION = true ? "0.9.0-alpha.2" : "dev";
 var BUILD_HASH = true ? "ca24fc4e" : "dev";
 
 // src/client/locales.ts

package/lib/index.js

@@ -58,6 +58,7 @@ var en = {
   "rewindfix.cancelled": "=== cancelled ===",
   "rewindfix.launcherGuard": "! This session itself needs updating; it is open and cannot be modified in place. Start a NEW session (or close it) \u2014 a closed session is updated when no window holds it.",
   "rewindfix.counts": "A={a} B={b} \u2192 C={c}",
+  "rewindfix.args": "\xB7 rewired args target {n}",
   "rewindfix.writeOk": "\u21B3 snapCleared \u2713 written \u2713",
   "rewindfix.skip.loaded": "SKIP (loaded)",
   "rewindfix.skip.noMarkers": "SKIP (no markers)",
@@ -125,6 +126,7 @@ var zh = {
   "rewindfix.cancelled": "=== \u5DF2\u53D6\u6D88 ===",
   "rewindfix.launcherGuard": "! \u4F60\u6B63\u5728\u4E00\u4E2A\u672C\u8EAB\u9700\u8981\u66F4\u65B0\u7684\u4F1A\u8BDD\u91CC\u8FD0\u884C\uFF1B\u5B83\u5904\u4E8E\u6253\u5F00\u72B6\u6001\uFF0C\u65E0\u6CD5\u539F\u5730\u4FEE\u6539\u3002\u8BF7\u65B0\u5EFA\u4E00\u4E2A\u4F1A\u8BDD\uFF08\u6216\u5173\u95ED\u5B83\uFF09\u2014\u2014\u5173\u95ED\u7684\u4F1A\u8BDD\u4F1A\u5728\u6CA1\u6709\u7A97\u53E3\u6301\u6709\u5B83\u65F6\u88AB\u66F4\u65B0\u3002",
   "rewindfix.counts": "A={a} B={b} \u2192 C={c}",
+  "rewindfix.args": "\xB7 \u4FEE\u6B63 args \u76EE\u6807 {n}",
   "rewindfix.writeOk": "\u21B3 \u5FEB\u7167\u5DF2\u6E05 \u2713 \u5DF2\u5199\u56DE \u2713",
   "rewindfix.skip.loaded": "\u8DF3\u8FC7\uFF08\u5DF2\u52A0\u8F7D\uFF09",
   "rewindfix.skip.noMarkers": "\u8DF3\u8FC7\uFF08\u65E0\u6807\u8BB0\uFF09",
@@ -1357,6 +1359,9 @@ function isReplaceSurfaceOp(value) {
 function isLegacyRewindMarker(event) {
   return isLegacyRewindMarkerRow(asRow(event));
 }
+function isFormCMarker(event) {
+  return isFormCMarkerRow(asRow(event));
+}
 function repairRewindMarkers(input) {
   const rows = input.map(toRow);
   const stats = { a: 0, b: 0, c: 0, removedGhosts: 0 };
@@ -1470,8 +1475,54 @@ function remapReferences(row, mapSeq) {
   }
   const singleSeq = data["sourceEventSeq"];
   if (typeof singleSeq === "number") data["sourceEventSeq"] = map(singleSeq);
+  if (row.type === "command/run" && data["name"] === "rewind") {
+    const args = data["args"];
+    if (typeof args === "string") {
+      data["args"] = args.replace(/@(\d+)/g, (match, seqText) => {
+        const seq = Number(seqText);
+        return Number.isSafeInteger(seq) ? `@${mapSeq(seq)}` : match;
+      });
+    }
+  }
   return row;
 }
+function rewindTargetSeqOfArgs(args) {
+  if (typeof args !== "string") return void 0;
+  const match = args.match(/@(\d+)/);
+  return match !== null ? Number(match[1]) : void 0;
+}
+function repairStaleArgs(input) {
+  const markerBySeq = /* @__PURE__ */ new Map();
+  for (const event of input) {
+    if (isFormCMarker(event)) markerBySeq.set(event.seq, event);
+  }
+  const markerSeqByCommandId = /* @__PURE__ */ new Map();
+  for (const event of input) {
+    if (event.type !== "command/done") continue;
+    const data = event.data;
+    if (typeof data.commandId === "string" && typeof data.sourceEventSeq === "number") {
+      markerSeqByCommandId.set(data.commandId, data.sourceEventSeq);
+    }
+  }
+  let fixed = 0;
+  const events = input.map((event) => {
+    if (event.type !== "command/run") return event;
+    const data = event.data;
+    if (data.name !== "rewind" || typeof data.commandId !== "string" || typeof data.args !== "string") {
+      return event;
+    }
+    const markerSeq = markerSeqByCommandId.get(data.commandId);
+    const marker = markerSeq === void 0 ? void 0 : markerBySeq.get(markerSeq);
+    const start = marker?.surfaceOp?.start;
+    const target = rewindTargetSeqOfArgs(data.args);
+    if (start === void 0 || target === void 0 || target === start) return event;
+    const newArgs = data.args.replace(new RegExp(`@${target}(?!\\d)`), `@${start}`);
+    if (newArgs === data.args) return event;
+    fixed += 1;
+    return { ...event, data: { ...data, args: newArgs } };
+  });
+  return { events, fixed };
+}
 
 // src/rewind-fix.ts
 import { copyFile, rename as rename2, unlink, writeFile as writeFile2, readFile as readFile2, open } from "node:fs/promises";
@@ -1609,38 +1660,50 @@ async function runRewindFix(deps, opts) {
 async function processOneSession(deps, opts, header) {
   const id = header.id;
   if (deps.isSessionLoaded(header.id)) {
-    return { id, status: "skipped", a: 0, b: 0, c: 0, reason: "loaded" };
+    return { id, status: "skipped", a: 0, b: 0, c: 0, staleArgs: 0, reason: "loaded" };
   }
   let decoded;
   try {
     decoded = await readEvents(deps, header.id, opts.signal);
   } catch (error) {
-    return { id, status: "failed", a: 0, b: 0, c: 0, reason: "unreadable", error: textOf(error) };
+    return { id, status: "failed", a: 0, b: 0, c: 0, staleArgs: 0, reason: "unreadable", error: textOf(error) };
   }
   if (decoded === void 0) {
-    return { id, status: "skipped", a: 0, b: 0, c: 0, reason: "no-artifact" };
+    return { id, status: "skipped", a: 0, b: 0, c: 0, staleArgs: 0, reason: "no-artifact" };
+  }
+  let converted;
+  try {
+    converted = repairRewindMarkers(decoded.events);
+  } catch (error) {
+    return { id, status: "failed", a: 0, b: 0, c: 0, staleArgs: 0, reason: "repair", error: textOf(error) };
   }
-  let repair;
+  let stale;
   try {
-    repair = repairRewindMarkers(decoded.events);
+    stale = repairStaleArgs(converted.events);
   } catch (error) {
-    return { id, status: "failed", a: 0, b: 0, c: 0, reason: "repair", error: textOf(error) };
+    return { id, status: "failed", a: 0, b: 0, c: 0, staleArgs: 0, reason: "repair", error: textOf(error) };
   }
-  const hasMarkers = repair.stats.a + repair.stats.b > 0;
-  if (!hasMarkers) {
-    return { id, status: "skipped", a: 0, b: 0, c: 0, reason: "no-markers" };
+  const a = converted.stats.a;
+  const b = converted.stats.b;
+  const c = converted.stats.a + converted.stats.b + converted.stats.c;
+  const staleArgs = stale.fixed;
+  const needsRepair = a + b > 0 || staleArgs > 0;
+  if (!needsRepair) {
+    return { id, status: "skipped", a, b, c, staleArgs, reason: "no-markers" };
   }
   if (!opts.apply) {
-    return { id, status: "repaired", a: repair.stats.a, b: repair.stats.b, c: repair.stats.a + repair.stats.b + repair.stats.c };
+    return { id, status: "repaired", a, b, c, staleArgs };
   }
+  const repair = { events: stale.events, a, b, c, staleArgs };
   return executeSession(deps, header, decoded.headerLine, repair);
 }
 async function executeSession(deps, header, headerLine, repair) {
   const base = {
     id: header.id,
-    a: repair.stats.a,
-    b: repair.stats.b,
-    c: repair.stats.a + repair.stats.b + repair.stats.c
+    a: repair.a,
+    b: repair.b,
+    c: repair.c,
+    staleArgs: repair.staleArgs
   };
   if (deps.isSessionLoaded(header.id)) {
     return { ...base, status: "skipped", reason: "loaded-between", error: "loaded between scan and write" };
@@ -1761,8 +1824,9 @@ function sessionLines(outcome, index, total, apply2, render) {
   const head = `[${index}/${total}] ${outcome.id}`;
   if (outcome.status === "repaired") {
     const counts = render("rewindfix.counts", { a: outcome.a, b: outcome.b, c: outcome.c });
-    if (!apply2) return [`${head}  ${counts}`];
-    return [`${head}  ${counts}`, `  ${render("rewindfix.writeOk")}`];
+    const argsNote = outcome.staleArgs > 0 ? " " + render("rewindfix.args", { n: outcome.staleArgs }) : "";
+    if (!apply2) return [`${head}  ${counts}${argsNote}`];
+    return [`${head}  ${counts}${argsNote}`, `  ${render("rewindfix.writeOk")}`];
   }
   if (outcome.status === "skipped") {
     return [`${head}  ${skipLabel(outcome, render)}`];

package/lib/types/locales.d.ts

@@ -76,6 +76,7 @@ export declare const en: {
     'rewindfix.cancelled': string;
     'rewindfix.launcherGuard': string;
     'rewindfix.counts': string;
+    'rewindfix.args': string;
     'rewindfix.writeOk': string;
     'rewindfix.skip.loaded': string;
     'rewindfix.skip.noMarkers': string;

package/lib/types/rewind-fix.d.ts

@@ -74,6 +74,8 @@ export interface SessionOutcome {
     readonly a: number;
     readonly b: number;
     readonly c: number;
+    /** Number of `/rewind` `args` targets rewired (C→C stale-args repair). */
+    readonly staleArgs: number;
     readonly reason?: OutcomeReason;
     readonly error?: string;
 }

package/lib/types/rewind-marker-repair.d.ts

@@ -81,3 +81,30 @@ export interface RepairOutput {
  *   (a removed ghost frame); failing closed avoids writing a corrupt log.
  */
 export declare function repairRewindMarkers(input: ReadonlyArray<SessionEvent | unknown>): RepairOutput;
+/** Result of {@link repairStaleArgs}. */
+export interface StaleArgsRepair {
+    /** The coherence-repaired events, in log order. */
+    readonly events: SessionEvent[];
+    /** Number of `/rewind` command `args` targets rewritten. */
+    readonly fixed: number;
+}
+/** The rewind-target seq parsed from a `/rewind` command's `args` string. */
+export declare function rewindTargetSeqOfArgs(args: unknown): number | undefined;
+/**
+ * C→C coherence repair: after a legacy→C migration renumbered a session's
+ * seqs, a `/rewind` command's `args @<seq>` target can remain in the OLD
+ * numbering while its (form-C) marker carries the NEW `surfaceOp.start`. The
+ * client `hiddenSeqsOf` derives the USER-side hide span from
+ * `args @<target>` + `outcome.sourceEventSeq`; when the two diverge it hides
+ * the wrong set (the AGENT-side hide reads the marker's `sourceEventSeqs`,
+ * which IS correctly remapped). This rewrites each such `@<seq>` to the
+ * marker's `surfaceOp.start` — the authoritative post-migration target.
+ *
+ * Matching follows the same channel `hiddenSeqsOf` uses: a command/run is
+ * joined to its marker via the command/done with the same `commandId` (whose
+ * `sourceEventSeq` cites the marker seq). It is a no-op for a coherent session
+ * (a fresh live rewind, or one already repaired), so it is idempotent and safe
+ * to run on every closed session. It never mutates its input: a rewritten
+ * command/run is rebuilt onto a fresh event object.
+ */
+export declare function repairStaleArgs(input: readonly SessionEvent[]): StaleArgsRepair;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.9.0-alpha.1",
+  "version": "0.9.0-alpha.2",
   "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",