dsh-rewind-plugin 0.9.0 → 0.9.1

package/README.en.md

@@ -96,8 +96,8 @@ The whole design rests on two principles, simple but deliberate: **the conversat
 
 `append-only` is a hard rule: the session log only grows and is never rewritten — the foundation of auditability and privacy. A rewind never touches history; it makes a single move: append **one content-empty marker message** to the end of the log and use it to "mask + replace" everything after the target message, so the model and the UI see only the part before it.
 
-- The marker is **canonical** — the plugin **replicates** `/compact`'s "hide + replace": `/compact` compresses a span of history into a summary, while `/rewind` swaps in an empty user message. Because it's canonical, the harness's own log replay, `/compact` compaction, and resume preflight all recognize it and never mistake it for a real message.
-- The replacement is **empty** — the model fully ignores the empty message, with no effect (verified theoretically and empirically). Together with the plugin's UI handling, what you and the model see is exactly how the conversation looked at the target — truly "in place".
+- The marker is **canonical** — the plugin **replicates** `/compact`'s "hide + replace": `/compact` compresses a span of history into a summary, while `/rewind` swaps in an empty marker message. Because it's canonical, the harness's own log replay, `/compact` compaction, and resume preflight all recognize it and never mistake it for a real message.
+- The replacement is **imperceptible** — the model ignores the empty marker, with no effect (verified empirically). Together with the plugin's UI handling, what you and the model see is exactly how the conversation looked at the target — truly "in place".
 - Because this is **masking, not deleting**, every withdrawn event stays in the log — auditable, traceable, viewable, and in principle manually recoverable.
 
 > **Design highlight**: the entire conversation rewind is **a single append**. It's deterministic, auditable, and — because the log was never broken — a "clean" time-travel. Minimal action, complete semantics. The compatibility subtleties with the harness (replicating `/compact`, the empty-message mask) are where this plugin is genuinely professional — each is pinned by a dedicated probe test.

package/README.md

@@ -86,8 +86,8 @@ dsh plugin --profile web add dsh-rewind-plugin
 
 `append-only` 是铁律：会话日志只追加、从不改写——这是可审计与信息安全的地基。回退从不动历史，它只做一步：往日志末尾追加一条**内容为空的标记消息**，把目标消息之后的全部内容「遮蔽 + 替换」掉，让模型和界面都只看得到目标之前的部分。
 
-- **标记是规范的**——插件复刻 `/compact` 标准的「隐藏 + 替换」：`/compact` 把一段历史压缩成摘要，`/rewind` 则换成一条空用户消息。由于其规范性，harness 的日志重放、`/compact` 压缩、续接检查都能正确识别它，绝不会把它误认为真实对话；
-- **替换内容是空的**——模型对空消息完全忽略、无感（理论 + 实测验证）。配合插件对界面显示的处理，模型和你看到的对话就是目标消息当时的样子，真正的「就地」；
+- **标记是规范的**——插件复刻 `/compact` 标准的「隐藏 + 替换」：`/compact` 把一段历史压缩成摘要，`/rewind` 则换成一条空标记消息。由于其规范性，harness 的日志重放、`/compact` 压缩、续接检查都能正确识别它，绝不会把它误认为真实对话；
+- **替换内容无感**——模型对空标记忽略、无感（实测验证）。配合插件对界面显示的处理，模型和你看到的对话就是目标消息当时的样子，真正的「就地」；
 - 因为是「遮蔽」而非「删除」，**被撤回的每一条事件都完整留在日志里**，可审计、可追溯、可查看，原则上也随时能手动恢复。
 
 > **设计点睛**：整个对话回退就是**一条**追加。它确定、可审计，且因为日志从未被破坏，回溯是「干净的」——用最小的动作，实现最完整的语义。那些与 harness 内部的兼容细节（对 `/compact` 的复刻、空消息的遮蔽）正是插件的专业所在，每一条都由专门的探针测试固化。

package/lib/client.js

@@ -1333,8 +1333,8 @@ function createRewindBridge(deps) {
 }
 
 // src/client/build-info.ts
-var PLUGIN_VERSION = true ? "0.9.0" : "dev";
-var BUILD_HASH = true ? "ca24fc4e" : "dev";
+var PLUGIN_VERSION = true ? "0.9.1" : "dev";
+var BUILD_HASH = true ? "39613bb7" : "dev";
 
 // src/client/locales.ts
 var zh = {

package/lib/index.js

@@ -51,7 +51,7 @@ var en = {
   "cleanup.clearCancelled": "Clear cancelled.",
   "cleanup.clearFailed": "Could not clear session {sessionId}: {detail}.",
   "cleanup.usage": "Usage:\n  /snapshot-auto-cleanup                 show status\n  /snapshot-auto-cleanup on|off          enable/disable auto-cleanup\n  /snapshot-auto-cleanup max-age <days>  set the idle cutoff\n  /snapshot-auto-cleanup run [--apply]   dry-run, or execute with --apply\n  /snapshot-auto-cleanup run --current [--apply]   dry-run/clear this session's snapshots",
-  "rewindfix.description": "Update legacy rewind markers (A/B) in closed sessions to the current form-C shape",
+  "rewindfix.description": "Update legacy rewind markers (A/B) in closed sessions to form-C, and fill old empty form-C content with the (empty message) placeholder",
   "rewindfix.inputHint": "no args = dry-run preview; --apply = execute (takes minutes)",
   "rewindfix.dryRun": "=== dry-run: {scan} sessions scanned / {will} will be updated / {skip} skipped / {fail} failed ({secs}s) ===",
   "rewindfix.done": "=== done: {repair} updated / {skip} skipped / {fail} failed ({secs}s) ===",
@@ -119,7 +119,7 @@ var zh = {
   "cleanup.clearCancelled": "\u6E05\u7A7A\u5DF2\u53D6\u6D88\u3002",
   "cleanup.clearFailed": "\u65E0\u6CD5\u6E05\u9664\u4F1A\u8BDD {sessionId}\uFF1A{detail}\u3002",
   "cleanup.usage": "\u7528\u6CD5\uFF1A\n  /snapshot-auto-cleanup                 \u67E5\u770B\u72B6\u6001\n  /snapshot-auto-cleanup on|off          \u5F00\u542F/\u5173\u95ED\u81EA\u52A8\u6E05\u7406\n  /snapshot-auto-cleanup max-age <\u5929\u6570>  \u8BBE\u7F6E\u5931\u6D3B\u9608\u503C\uFF08\u5929\uFF09\n  /snapshot-auto-cleanup run [--apply]   \u9884\u6F14\uFF0C\u6216\u52A0 --apply \u6267\u884C\n  /snapshot-auto-cleanup run --current [--apply]  \u9884\u6F14/\u6E05\u9664\u672C\u4F1A\u8BDD\u5FEB\u7167",
-  "rewindfix.description": "\u5C06\u5DF2\u5173\u95ED\u4F1A\u8BDD\u4E2D\u7684\u65E7\u7248 rewind \u6807\u8BB0\uFF08A/B\uFF09\u66F4\u65B0\u4E3A\u5F53\u524D form-C \u5F62\u6001",
+  "rewindfix.description": "\u5C06\u5DF2\u5173\u95ED\u4F1A\u8BDD\u4E2D\u7684\u65E7\u7248 rewind \u6807\u8BB0\uFF08A/B\uFF09\u66F4\u65B0\u4E3A form-C\uFF0C\u5E76\u628A\u65E7\u7684\u7A7A form-C \u5185\u5BB9\u8865\u6210 (empty message) \u5360\u4F4D",
   "rewindfix.inputHint": "\u65E0\u53C2 = dry-run \u9884\u89C8\uFF1B--apply = \u6267\u884C\uFF08\u9700\u6570\u5206\u949F\uFF09",
   "rewindfix.dryRun": "=== \u9884\u6F14\uFF1A\u626B\u63CF {scan} \u4E2A\u4F1A\u8BDD / \u5C06\u66F4\u65B0 {will} \u4E2A / \u8DF3\u8FC7 {skip} \u4E2A / \u5931\u8D25 {fail} \u4E2A\uFF08{secs}s\uFF09===",
   "rewindfix.done": "=== \u5B8C\u6210\uFF1A\u66F4\u65B0 {repair} \u4E2A / \u8DF3\u8FC7 {skip} \u4E2A / \u5931\u8D25 {fail} \u4E2A\uFF08{secs}s\uFF09===",
@@ -1344,7 +1344,10 @@ async function reconcileTracked(store, sessionId, anchorSeq, tracked, probe = de
 
 // src/rewind-marker-repair.ts
 var REWIND_MARKER_SOURCE = { kind: "plugin", plugin: "dsh-rewind" };
-var REWIND_MARKER_CONTENT = [];
+var REWIND_MARKER_CONTENT = [{ type: "text", text: "(empty message)" }];
+function isCanonicalMarkerContent(content) {
+  return Array.isArray(content) && content.length === 1 && content[0]?.type === "text" && content[0]?.text === "(empty message)";
+}
 function buildRewindMarkerData(id) {
   return {
     role: "user",
@@ -1365,6 +1368,7 @@ function isFormCMarker(event) {
 function repairRewindMarkers(input) {
   const rows = input.map(toRow);
   const stats = { a: 0, b: 0, c: 0, removedGhosts: 0 };
+  let contentUpgrades = 0;
   for (const row of rows) {
     if (isFormCMarkerRow(row)) stats.c += 1;
   }
@@ -1392,7 +1396,12 @@ function repairRewindMarkers(input) {
     const original = rows[i];
     const newSeq = survivors.length;
     oldToNew.set(original.seq, newSeq);
-    survivors.push(isLegacyRewindMarkerRow(original) ? toEvent(retargetToC(original, newSeq)) : toEvent({ ...original, seq: newSeq }));
+    if (!isRewindMarkerRow(original) || isCanonicalCMarker(original)) {
+      survivors.push(toEvent({ ...original, seq: newSeq }));
+    } else {
+      if (isFormCMarkerRow(original)) contentUpgrades += 1;
+      survivors.push(toEvent(retargetToC(original, newSeq)));
+    }
   }
   const mapSeq = (old) => {
     const mapped = oldToNew.get(old);
@@ -1402,21 +1411,31 @@ function repairRewindMarkers(input) {
     return mapped;
   };
   const events = survivors.map((event) => toEvent(remapReferences(toRow(event), mapSeq)));
-  return { events, mapSeq: oldToNew, stats };
+  return { events, mapSeq: oldToNew, stats, contentUpgrades };
+}
+function rowSource(row) {
+  const message = row.data["message"];
+  return message?.["source"] ?? row.data["source"];
 }
 function isLegacyRewindMarkerRow(row) {
   if (row.type !== "assistant/message") return false;
-  const message = row.data["message"];
-  const source = message?.["source"];
+  const source = rowSource(row);
   if (source?.["kind"] !== "model") return false;
   if (source?.["provider"] !== "dsh-rewind" || source?.["model"] !== "rewind-marker") return false;
   return isReplaceSurfaceOp(row.surfaceOp);
 }
 function isFormCMarkerRow(row) {
-  if (row.type !== "user/message") return false;
-  const source = row.data["source"];
+  if (row.type !== "user/message" && row.type !== "assistant/message") return false;
+  if (!isReplaceSurfaceOp(row.surfaceOp)) return false;
+  const source = rowSource(row);
   return source?.["kind"] === "plugin" && source?.["plugin"] === "dsh-rewind";
 }
+function isRewindMarkerRow(row) {
+  return isLegacyRewindMarkerRow(row) || isFormCMarkerRow(row);
+}
+function isCanonicalCMarker(row) {
+  return row.type === "user/message" && isFormCMarkerRow(row) && isCanonicalMarkerContent(row.data["content"]);
+}
 function asRow(event) {
   const e = event;
   return {
@@ -1446,7 +1465,7 @@ function toEvent(row) {
 }
 function retargetToC(row, seq) {
   const message = row.data["message"];
-  const id = typeof message?.["id"] === "string" ? message["id"] : void 0;
+  const id = typeof message?.["id"] === "string" ? message["id"] : typeof row.data["id"] === "string" ? row.data["id"] : void 0;
   return {
     type: "user/message",
     seq,
@@ -1687,7 +1706,8 @@ async function processOneSession(deps, opts, header) {
   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;
+  const contentUpgrades = converted.contentUpgrades;
+  const needsRepair = a + b > 0 || staleArgs > 0 || contentUpgrades > 0;
   if (!needsRepair) {
     return { id, status: "skipped", a, b, c, staleArgs, reason: "no-markers" };
   }
@@ -2119,10 +2139,9 @@ async function commitEntry(store, pending, anchorCache, trackedBySession, exec,
   }
   tracked.add(capture.path);
 }
-var REWIND_MARKER_CONTENT2 = [];
 function buildMarker() {
   return createUserMessage({
-    content: REWIND_MARKER_CONTENT2,
+    content: REWIND_MARKER_CONTENT,
     source: REWIND_MARKER_SOURCE
   });
 }

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

@@ -104,7 +104,7 @@ export declare function isCandidateCommand(command: CommandNode): boolean;
  * (pending, succeeded, or errored — it only exists to feed the popover) and
  * every SUCCESSFUL executed `/rewind` command row, plus every message
  * withdrawn by a rewind — the target message itself, everything after it, and
- * the (empty, unrendered) marker.
+ * the (unrendered) marker.
  *
  * Each executed rewind cuts ONE span `[target, marker]`: the target message
  * and everything after it, up to the marker appended at rewind time. Spans are

package/lib/types/index.d.ts

@@ -8,12 +8,12 @@
  * surface node after the target message with the marker. The append-only log
  * (and the rendered transcript) is untouched — only the model-visible surface
  * is cut, so the next request derives its context from the target onward.
- * The marker is an EMPTY `user/message`: v2 reserves surface `replace` to a
- * node that cites every shadowed seq (`sourceEventSeqs`), and
- * `assistant/message` can no longer carry those — so the replacement node is
- * a `user/message`, exactly as /compact's checkpoint is. An empty
- * `user/message` derives to itself (a present-but-empty user turn), so the
- * marker stays as the surface-tail cut point rather than vanishing.
+ * The marker is a `user/message` carrying the shadowed-seq citations
+ * (`sourceEventSeqs`): v2 reserves surface `replace` to a node that cites
+ * every shadowed seq, and `assistant/message` can no longer carry those — so
+ * the replacement node is a `user/message`, exactly as /compact's checkpoint
+ * is. It derives to itself (a present user turn), so the marker stays as the
+ * surface-tail cut point rather than vanishing.
  *
  *
  * File restore (mode `both`) follows Claude Code's checkpointing: the plugin

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

@@ -4,9 +4,12 @@
  * The `/dsh-rewind-fix` command rewrites the OLD plugin's rewind marker — a
  * bare `assistant/message(turn=N, step=0)` (form A) or a ghost-frame
  * `[step/start][assistant/message][step/end]` inside a closed turn (form B) —
- * into the CURRENT marker shape (form C): an empty-content `user/message` whose
- * `source` cites the plugin and whose `surfaceOp`/`sourceEventSeqs` still carry
- * the surface replace. Form C is what a 0.1.3 harness accepts.
+ * into the CURRENT marker shape (form C): a `user/message` whose `source` cites
+ * the plugin, whose `surfaceOp`/`sourceEventSeqs` still carry the surface
+ * replace, and whose content is the constant `(empty message)` placeholder
+ * (never empty, so a strict gateway does not reject it). Form C is what a 0.1.3
+ * harness accepts. It ALSO upgrades an older form-C marker whose content was
+ * empty to the canonical placeholder.
  *
  * This module is PURE: it only recognizes event shapes and rewrites them. It
  * does zero IO and has no dependency on the harness session services. The
@@ -36,13 +39,23 @@ export declare const REWIND_MARKER_SOURCE: {
     readonly kind: 'plugin';
     readonly plugin: 'dsh-rewind';
 };
-/** The rewind-marker message content: empty (closest to "invisible"). */
-export declare const REWIND_MARKER_CONTENT: readonly ContentBlock[];
+/**
+ * The rewind-marker message content: always this minimal self-declaring
+ * placeholder. It is provider-independent — a strict OpenAI-compatible gateway
+ * rejects an empty user message (HTTP 400, Issue #21), and the session log is
+ * immutable while the model serving it may change. A constant non-empty
+ * placeholder is accepted by every gate and reads as an empty one the model
+ * need not act on.
+ */
+export declare const REWIND_MARKER_CONTENT: ContentBlock[];
+/** Whether a form-C marker's content is already the canonical placeholder. */
+export declare function isCanonicalMarkerContent(content: unknown): boolean;
 /**
  * Build the form-C marker `data` (the `user/message` payload). When `id` is
  * supplied it is preserved verbatim (the repair keeps the original marker's
- * `message.id`); when omitted a fresh id is generated so the running plugin can
- * reuse this contract for its live `buildMarker()`.
+ * id, whether nested at `data.message.id` or at `data.id`); when omitted a
+ * fresh id is generated so the running plugin can reuse this contract for its
+ * live `buildMarker()`.
  */
 export declare function buildRewindMarkerData(id?: string): Record<string, unknown>;
 /** The surface `replace` op carried by a rewind marker. */
@@ -55,7 +68,11 @@ export interface ReplaceSurfaceOp {
 export declare function isReplaceSurfaceOp(value: unknown): value is ReplaceSurfaceOp;
 /** Is `event` a legacy rewind marker in either form A or B? */
 export declare function isLegacyRewindMarker(event: Readonly<SessionEvent>): boolean;
-/** Is `event` already a form-C rewind marker? (the target shape) */
+/**
+ * Is `event` already a form-C rewind marker (a `user/message`, or a re-typed
+ * `assistant/message`, carrying the dsh-rewind plugin source + replace op)? the
+ * target shape.
+ */
 export declare function isFormCMarker(event: Readonly<SessionEvent>): boolean;
 /** Result of {@link repairRewindMarkers}. */
 export interface RepairOutput {
@@ -70,6 +87,8 @@ export interface RepairOutput {
         c: number;
         removedGhosts: number;
     };
+    /** Form-C markers whose content was upgraded to the canonical placeholder. */
+    contentUpgrades: number;
 }
 /**
  * Rewrite any number of stacked rewind markers (forms A and B, interleaved)

package/lib/types/rewind.d.ts

@@ -9,10 +9,10 @@
  * transcript) is untouched; only the model-visible surface is cut, so the
  * next request derives its context from the target message onward.
  *
- * Marker shape (v0.1.3/v2): the marker is an EMPTY `user/message` carrying a
- * replace `surfaceOp` — a single event:
+ * Marker shape (v0.1.3/v2): the marker is a `user/message` carrying a replace
+ * `surfaceOp` — a single event:
  *
- *   user/message (marker, empty content) → { surfaceOp {replace, start, end} }
+ *   user/message (marker content) → { surfaceOp {replace, start, end} }
  *
  * v2 reserves surface `replace` to a node that cites every shadowed seq via
  * `sourceEventSeqs`, and `assistant/message` can no longer carry
@@ -21,10 +21,8 @@
  * is. No ghost `step/start`…`step/end` frame is needed: the token-meter's
  * step state machine ignores `user/message`, and the session invariant
  * (`invariant.ts`) imposes no open-turn requirement on it, so the marker is
- * appended while idle, outside any turn. The empty content means the marker
- * carries no language; it sits at the surface tail as the model-visible
- * "cut point" (an empty `user/message` derives to itself, so it remains a
- * present-but-empty user turn in derived history).
+ * appended while idle, outside any turn. It sits at the surface tail as the
+ * model-visible "cut point" — a present user turn in derived history.
  *
  * @module dsh-rewind/rewind
  */

package/package.json

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