dsh-rewind-plugin 0.6.1 → 0.6.2

package/README.en.md

@@ -152,6 +152,7 @@ withdrew should consume the stable, locale-independent helpers exported from
 2. **Lightweight file rewind has a cost** — in specific cases not all changes can be rewound. Consistent with Claude Code. See: [File-rewind tracking boundary](docs/compat/tracking-boundary.md).
 3. **Rewinds from `≤ v0.2.4`** — sessions rewound with these versions may **fail to load history** after more conversation. Install a v0.3.3-or-earlier release and use its bundled repair tool ([docs/compat/troubleshooting.md](docs/compat/troubleshooting.md)).
 4. **Rewinds from `≤ v0.3.3`** — compaction (`/compact`) is unavailable for those sessions. Newer versions are compatible; for affected old sessions, start a new session.
+5. **The turn-rail shows rewound turns** — the right-side rail added in DSH `v0.1.2-alpha.1` keeps ticks for withdrawn messages: clicking does not jump and hovering shows the withdrawn text. Only a display difference; no functional impact.
 
 ## Security
 

package/README.md

@@ -140,6 +140,7 @@ dsh plugin --profile web add dsh-rewind-plugin
 2. **轻量文件回退存在代价**——特定情况可能无法回退所有修改。行为与 Claude Code 一致。详见：[文件回退的追踪边界](docs/compat/tracking-boundary.zh.md)。
 3. **v0.2.4 及更早版本**回退过的会话，继续对话后可能加载历史失败。可安装 v0.3.3 及之前版本的随附修复工具处理（[完整步骤](docs/compat/troubleshooting.zh.md)）。
 4. **v0.3.3 及更早版本**回退过的会话，压缩对话（compact）不可用。新版本已兼容；受影响的旧会话建议新建会话。
+5. **导轨显示已回退轮次**——DSH `v0.1.2-alpha.1` 新增的右侧导轨，会为已撤回消息保留刻度：点击不跳转、悬浮显示已撤回正文。仅显示差异，无功能影响。
 
 ## 安全
 

package/docs/compat/audit.md

@@ -32,7 +32,11 @@
 > `^0.1.0-rc.6 || ^0.1.1-rc.2` and will gain the `0.1.2` tuple when the harness
 > publishes it. Pinned by `tests/chat-channel.test.ts` (channel precedence + the
 > alpha.1 snapshot shape) and `tests/client-dom.test.ts` (the button-target
-> pairing that consumes the chat).
+> pairing that consumes the chat). The composer refill is dual-channel the same
+> way: on alpha.1 the withdrawn text is written through the `conversation`
+> service's `input` resolver's `setDraft` (the harness's own Lexical editor),
+> else the rc.2 `<textarea>` / alpha.1 `contenteditable` DOM write (`writeComposer`
+> in `src/client/portals.tsx`); pinned by `tests/client-composer.test.ts`.
 
 ## Definition of "fully compatible" (invariants)
 

package/docs/contract/client-contract.md

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

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

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

package/lib/client.js

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

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

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

package/package.json

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