dsh-rewind-plugin 0.18.0 → 0.19.0

package/lib/index.js

@@ -28,7 +28,7 @@ var en = {
   "storeUnsupported": "file restore unavailable: these snapshots use a newer store format (v{version}) than this plugin understands; nothing was changed. Update the plugin or clear this session's snapshots.",
   "success": "Withdrawn seq {targetSeq} and everything after it (conversation returned to earlier){restore}.",
   "noUserMessages": "This session has no rewindable user messages yet.",
-  "command.description": "Rewind the conversation and/or code to a previous point",
+  "command.description": "Rewind the conversation and/or files to a previous point",
   "command.undoDescription": "Alias of /rewind",
   "engine.description": "dsh-rewind internal command",
   "engine.rejected": "Internal command: use /rewind or /undo.",
@@ -74,7 +74,7 @@ var zh = {
   "storeUnsupported": "\u6587\u4EF6\u8FD8\u539F\u4E0D\u53EF\u7528\uFF1A\u8FD9\u4E9B\u5FEB\u7167\u4F7F\u7528\u4E86\u6BD4\u672C\u63D2\u4EF6\u66F4\u65B0\u7684\u5B58\u50A8\u683C\u5F0F\uFF08v{version}\uFF09\uFF1B\u5DE5\u4F5C\u533A\u672A\u505A\u4EFB\u4F55\u6539\u52A8\u3002\u8BF7\u66F4\u65B0\u63D2\u4EF6\uFF0C\u6216\u6E05\u9664\u8BE5\u4F1A\u8BDD\u7684\u5FEB\u7167\u3002",
   "success": "\u5DF2\u64A4\u56DE seq {targetSeq} \u53CA\u4E4B\u540E\u5185\u5BB9\uFF08\u5BF9\u8BDD\u5DF2\u56DE\u5230\u6B64\u524D\uFF09{restore}\u3002",
   "noUserMessages": "\u5F53\u524D\u4F1A\u8BDD\u8FD8\u6CA1\u6709\u53EF\u56DE\u9000\u7684\u7528\u6237\u6D88\u606F\u3002",
-  "command.description": "\u56DE\u9000\u5BF9\u8BDD\u548C/\u6216\u4EE3\u7801\u5230\u4E4B\u524D\u7684\u67D0\u6761\u6D88\u606F",
+  "command.description": "\u628A\u5BF9\u8BDD\u548C/\u6216\u6587\u4EF6\u56DE\u9000\u5230\u4E4B\u524D\u7684\u67D0\u6761\u6D88\u606F",
   "command.undoDescription": "/rewind \u7684\u522B\u540D",
   "engine.description": "dsh-rewind \u5185\u90E8\u547D\u4EE4",
   "engine.rejected": "\u5185\u90E8\u547D\u4EE4\uFF1A\u8BF7\u4F7F\u7528 /rewind \u6216 /undo\u3002",

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

@@ -43,7 +43,6 @@ export interface CandidateChat {
 /** A user/steering row subset; only fields the listing reads are real. */
 export interface CandidateUserNode {
     readonly kind: string;
-    readonly anchorSeq?: number;
     readonly data: {
         readonly seq: number;
         readonly time: number;
@@ -64,15 +63,14 @@ export declare function messagePreviewOf(message: {
 export declare function formatCandidateTime(time: number): string;
 /**
  * List the selectable rewind candidates of a session chat snapshot: user and
- * steering rows still on the surface (not hidden by a previous rewind), the
- * newest `limit` kept, newest first — the top row is the default highlight,
+ * steering rows still on the surface (withdrawn rows are absent from `order`),
+ * the newest `limit` kept, newest first — the top row is the default highlight,
  * i.e. the most recent message and the most common rewind target.
  * @param snap - the session chat snapshot.
- * @param hidden - anchor seqs withdrawn by rewinds (from `hiddenSeqsOf`).
  * @param limit - maximum number of candidates to return.
  */
-export declare function rewindCandidatesOf(snap: CandidateChat, hidden: ReadonlySet<number>, limit?: number): RewindCandidate[];
-/** The candidates of a live chat snapshot, withdrawn rows already excluded. */
+export declare function rewindCandidatesOf(snap: CandidateChat, limit?: number): RewindCandidate[];
+/** The candidates of a live chat snapshot; withdrawn rows are already excluded from `order`. */
 export declare function rewindCandidatesOfChat(snap: CandidateChat): RewindCandidate[];
 /**
  * Map typed candidates to popupSelect rows. The list comes from the host over

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

@@ -1,7 +1,5 @@
 /**
- * Pure computation of the chat rows a rewind hides from the rendered
- * transcript. Extracted from the client plugin (`src/client/index.ts`) so the
- * multi-rewind cut logic stays unit-testable without a DOM.
+ * Pure Chat-snapshot readers and executed-rewind cut derivation.
  *
  * @module dsh-rewind/client/hidden
  */
@@ -15,35 +13,39 @@ export declare const ENGINE_COMMAND = "rewind-plugin";
 export declare const LEGACY_ENGINE_COMMAND = "rewind";
 /** Engine command names the client recognizes. */
 export declare const ENGINE_COMMANDS: ReadonlySet<string>;
-/** A chat-snapshot view node as the hiding / composer-refill logic reads it.
- * The harness's view node shape plus the `anchorSeq` the chat snapshot carries
- * (the plugin reads `anchorSeq` off each node; it is not declared on the
- * harness's `ConversationViewNode`). */
+/** A Chat-snapshot view node as the client readers see it. */
 export interface ChatConversationViewNode {
     readonly key: string;
     readonly kind?: string;
     readonly data?: unknown;
     readonly anchorSeq: number;
-    /** Owning Turn as the chat snapshot carries it; its `turn` and `start` are read
-     * (see `addWithdrawnTurnChrome`). */
+    /** Owning Turn, when the node has one (used by the visibility summary pass). */
     readonly location?: {
         readonly turn?: {
             readonly turn?: unknown;
             readonly start?: unknown;
         };
     };
+    /** Chat-only row visibility; absent on older test doubles. */
+    readonly visibility?: 'visible' | 'hidden';
 }
-/** Minimal chat snapshot reader the hiding logic needs. */
+/** Minimal Chat-snapshot reader the client helpers need. */
 export interface HiddenChat {
     readonly order: readonly string[];
     readonly nodes: {
         get(key: string): ChatConversationViewNode | undefined;
-    };
-    /** Turn-keyed node index; absent on older snapshots, which the chrome pass tolerates. */
-    readonly locations?: {
-        getTurn(turn: number): readonly string[];
+        /** Every materialized node, including hidden ones. Absent on older snapshots. */
+        values?(): readonly ChatConversationViewNode[];
     };
 }
+/**
+ * Every materialized Chat node, preferring the store's own values (which also
+ * includes rows the visibility layer hid) and falling back to the visible
+ * order for older snapshots / test doubles.
+ * @param chat - the live chat snapshot, when available.
+ * @returns all nodes in store insertion order.
+ */
+export declare function chatNodesOf(chat: HiddenChat | undefined): readonly ChatConversationViewNode[];
 /**
  * Reader for one session's live chat snapshot: the chat is served by the
  * `uiConversation` service's named "chat" view (contributed by
@@ -71,7 +73,7 @@ export declare function resolveChatWatch(resolveView: (sessionId: string) => {
 /**
  * Resolve the chat snapshot from the `uiConversation` "chat" view. The view's
  * `getSnapshot()` returns undefined until the named view is registered, which
- * degrades to `undefined` (no targets, no hiding — never a crash).
+ * degrades to `undefined` (no targets — never a crash).
  */
 export declare function chatSnapshotOf(chatView: {
     getSnapshot(): unknown;
@@ -131,26 +133,18 @@ export declare function targetSeqOfArgs(args: string | null | undefined): number
  * never trigger a fill.
  */
 export declare function isExecutedRewindCommand(node: CommandNode, seq: number): boolean;
+/** One executed rewind's cut: the target seq through the marker's seq, inclusive. */
+export interface RewindCut {
+    /** First withdrawn anchor seq. */
+    readonly target: number;
+    /** Marker log seq, the last withdrawn anchor seq. */
+    readonly marker: number;
+}
 /**
- * True when an engine command node is a legacy candidate-list probe
- * (`__candidates`). New candidate lists travel over RPC; this only keeps
- * probe rows in historical sessions hidden.
- */
-export declare function isCandidateCommand(command: CommandNode): boolean;
-/**
- * Anchor seqs that must be hidden from the rendered transcript so the user sees
- * the conversation as the agent sees it: every legacy probe flow node (it only
- * exists to feed the popover) and every SUCCESSFUL executed `/rewind` command
- * row, plus every message a rewind withdrew — the target, everything after it,
- * and the (unrendered) marker.
- *
- * Each executed rewind cuts ONE span `[target, marker]`, and callers must keep
- * the spans SEPARATE: collapsing them to `[min target, max marker]` would hide a
- * still-on-surface gap of new traffic between an earlier marker and a later
- * target. Endpoints come from the command nodes (`sourceEventSeq` is the
- * marker's log seq; the outcome text carries the target seq).
- *
- * A Turn whose rows were ALL withdrawn also contributes its Turn-process summary
- * row, whose own anchor can precede the target (see `addWithdrawnTurnChrome`).
+ * Read every executed rewind cut from a node set. Internal probes never
+ * contribute; a success without a marker rewound nothing; a command whose
+ * args carry no `@<seq>` target has no recoverable span.
+ * @param nodes - every materialized Chat node.
+ * @returns one cut per marker-carrying successful engine command, in input order.
  */
-export declare function hiddenSeqsOf(snap: HiddenChat): Set<number>;
+export declare function rewindCutsOf(nodes: Iterable<ChatConversationViewNode>): RewindCut[];

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

@@ -9,8 +9,7 @@
  * The command decoration (`ctx.commandUi.decorate`) makes a bare `/rewind` (or
  * its alias `/undo`) open the harness's own popupSelect instead of executing;
  * the parameterized `@<seq>` form stays the execution channel, while the
- * popover's impact and candidate reads go over the host RPC channel. The
- * exported contract is specified in `docs/contract/client-contract.md`.
+ * popover's impact and candidate reads go over the host RPC channel.
  *
  * @module dsh-rewind/client
  */
@@ -46,8 +45,3 @@ export interface ClientContext {
  * @param ctx - client root context carrying `slots`, `sessions`, `locale` and `commandUi`.
  */
 export declare function apply(ctx: ClientContext): void;
-/**
- * Public contract — rewind visibility. Stable, semver-protected; the rest of
- * this module is internal. See `docs/contract/client-contract.md`.
- */
-export { hiddenSeqsOf, targetSeqOfArgs, type HiddenChat } from './hidden.ts';

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

@@ -170,22 +170,6 @@ export declare function writeComposer(text: string, facade: ComposerDraftWriter
  * after switching sessions or restarting dsh.
  */
 export declare function runRewindAndFill(session: SessionFace, seq: number, mode: 'chat' | 'both', isMainViewSession: (sessionId: string) => boolean, chatOf: ChatOf, watchChat: ChatWatch, setComposerText: (sessionId: string, text: string) => boolean, restoreImages?: (sessionId: string, images: readonly MessageImageRef[]) => Promise<void>): Promise<void>;
-/**
- * The snapshot seq a rendered seat stands for.
- *
- * A seat carries two keys: `data-chat-anchor-key` (the FLOW key, which for a
- * step/process part is the composite `["<nodeKey>", "<part>"]`) and
- * `data-chat-node-key` (always the plain node key). Resolving only the flow key
- * made every grouped process row — the "正在分析/已完成分析" step rows, tool
- * groups — unresolvable, so a withdrawn one could never be hidden and stayed on
- * screen after a rewind. This mirrors the official viewport's own identity read
- * (`anchorKey === key || nodeKey === key`).
- *
- * @param element - one rendered seat.
- * @param chat - the live chat snapshot the seat belongs to.
- * @returns the node's `anchorSeq`, or undefined when the seat has no resolvable node.
- */
-export declare function resolveSeatAnchorSeq(element: HTMLElement, chat: HiddenChat | undefined): number | undefined;
 /**
  * Locate the actions container of a user/steering seat row — the element the
  * ↶ button portals into (the copy/branch IconActions row).
@@ -203,57 +187,12 @@ export declare function resolveSeatAnchorSeq(element: HTMLElement, chat: HiddenC
  * both durable and pending row shapes without a full React portal render.
  */
 export declare function actionsContainerOf(row: HTMLElement | undefined): HTMLElement | undefined;
-/**
- * Hide every rendered seat a rewind withdrew, plus the step/process GROUP shells
- * those seats empty.
- *
- * A seat's seq comes from `resolveSeatAnchorSeq`: `data-chat-anchor-key` (the
- * FLOW key, composite for a step/process part) with `data-chat-node-key` (always
- * the plain node key) as the fallback. A group shell is different: it carries
- * the composite `group:<json>` anchor, which resolves to no chat node — the
- * group is a view construct, not a message. It is therefore judged by its
- * members, which THIS batch already holds: a shell whose every member seat is
- * withdrawn has no live content left, so it is hidden too. That is what stops a
- * fully withdrawn "analysis completed" / "command executed" group from staying
- * on screen as an expandable empty row. A shell keeps one live member only if
- * 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.
- *
- * Every hidden element carries `data-dsh-rewind-hidden` (see
- * `docs/contract/client-contract.md`).
- *
- * @param chat - the live chat snapshot the seats belong to.
- * @param seats - this refresh's seat batch (every `[data-chat-anchor-key]`).
- * @param hiddenSeqs - anchor seqs withdrawn by the executed rewinds.
- * @param hidden - elements this pass has hidden, so a re-created row is re-judged.
- */
-export declare function hideWithdrawnSeats(chat: HiddenChat | undefined, seats: Iterable<HTMLElement>, hiddenSeqs: ReadonlySet<number>, hidden: Set<HTMLElement>): void;
-/**
- * Undo every hide the given set recorded, so a live disable (or a session-slot
- * collapse) cannot leave the transcript truncated.
- *
- * The hide is the plugin's OWN mutation of host rows ({@link hideWithdrawnSeats}),
- * and nothing else would ever revert it: a disposed bridge runs no further
- * refresh, so rows it hid would stay hidden with no affordance to bring them
- * back.
- *
- * @param hidden - the elements this bridge currently hides; emptied.
- */
-export declare function showHiddenSeats(hidden: Set<HTMLElement>): 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
  * is otherwise only reachable through a full React portal render.
  */
-export declare function collectTargets(chat: HiddenChat, hiddenSeqs: ReadonlySet<number>): readonly PortalTarget[];
+export declare function collectTargets(chat: HiddenChat): readonly PortalTarget[];
 /**
  * The session-kind slice the durable-target gate reads — the session
  * snapshot's `subagent` cell, the Harness's own runtime signal for a
@@ -285,9 +224,8 @@ export declare function isRewindInertSession(snapshot: SessionKindLike): boolean
  * pure, directly testable decision.
  * @param snapshot - the session snapshot carrying the `subagent` cell.
  * @param chat - the session's chat snapshot, or undefined while unavailable.
- * @param hiddenSeqs - anchor seqs withdrawn by previous rewinds.
  */
-export declare function collectDurableTargets(snapshot: SessionKindLike, chat: HiddenChat | undefined, hiddenSeqs: ReadonlySet<number>): readonly PortalTarget[];
+export declare function collectDurableTargets(snapshot: SessionKindLike, chat: HiddenChat | undefined): readonly PortalTarget[];
 /**
  * The pending bubble row's compared text and its message-attachment block
  * count, read from a CLONE (the live row is never touched).
@@ -320,7 +258,7 @@ interface RewindPortalsProps extends RewindBridgeDeps {
  * synchronous full-transcript scan inside a commit microtask.
  *
  * The refresh is driven by the three inputs its targets are made of: the chat
- * snapshot (`hiddenSeqsOf`), the session's `inbox` projection (the pending
+ * snapshot's visible order, the session's `inbox` projection (the pending
  * occurrences — see `syncInboxSubscription`), and the DOM (row/actions mounts,
  * via the scoped observer).
  */

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

@@ -32,4 +32,4 @@ export declare const CLASS: {
  */
 export declare const REWIND_ICON_SVG: string;
 /** One injected stylesheet (scoped under `.dsh-rewind-*`). */
-export declare const STYLE = "\n.dsh-rewind-btn {\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  /* The neighbouring action buttons scale by this delta too. */\n  width: calc(28px + var(--dsh-content-font-delta, 0px));\n  height: calc(28px + var(--dsh-content-font-delta, 0px));\n  padding: 6px;\n  border: none;\n  border-radius: var(--dsw-radius-sm, 8px);\n  background: transparent;\n  color: var(--dsw-alias-label-tertiary);\n  cursor: pointer;\n}\n.dsh-rewind-btn svg {\n  width: calc(15px + var(--dsh-content-font-delta, 0px));\n  height: calc(15px + var(--dsh-content-font-delta, 0px));\n}\n.dsh-rewind-btn:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n  color: var(--dsw-alias-label-secondary);\n}\n\n.dsh-rewind-popover {\n  position: fixed;\n  z-index: 1000;\n  width: 288px;\n  padding: 12px;\n  border: 0;\n  border-radius: var(--dsw-radius-md);\n  background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));\n  backdrop-filter: var(--dsw-menu-backdrop-filter);\n  isolation: isolate;\n  --dsw-elevation-stroke-color: var(--dsw-alias-border-l1);\n  box-shadow: var(--dsw-elevation-prominent);\n  font-size: 14px;\n  line-height: 20px;\n  color: var(--dsw-alias-label-primary);\n}\n.dsh-rewind-popover-title {\n  font-size: 14px;\n  font-weight: 600;\n  line-height: 20px;\n}\n.dsh-rewind-popover-target {\n  margin: 4px 0 10px;\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-tertiary);\n  word-break: break-all;\n}\n.dsh-rewind-popover-option {\n  display: flex;\n  flex-direction: column;\n  gap: 2px;\n  width: 100%;\n  margin: 0 0 6px;\n  padding: 8px 10px;\n  border: 1px solid transparent;\n  border-radius: 8px;\n  background: transparent;\n  color: inherit;\n  font: inherit;\n  text-align: left;\n  cursor: pointer;\n}\n.dsh-rewind-popover-option:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n/* Arrow navigation moves real focus, so the focused row carries the pointer's\n   fill and the browser ring is suppressed: in dark mode the UA two-tone ring\n   draws its dark half against the filled row and reads as a residue edge (the\n   harness Menu suppresses it the same way). */\n.dsh-rewind-popover-option:focus-visible:not(:disabled) {\n  background: var(--dsw-alias-interactive-bg-hover);\n  outline: none;\n}\n.dsh-rewind-popover-option:disabled {\n  opacity: 0.5;\n  cursor: default;\n}\n.dsh-rewind-popover-option-label {\n  font-weight: 500;\n}\n.dsh-rewind-popover-option-hint {\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-tertiary);\n}\n.dsh-rewind-popover-impact {\n  margin: 4px 0 10px;\n  padding: 8px 10px;\n  border-radius: 8px;\n  background: var(--dsw-alias-interactive-bg-hover);\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-secondary);\n  white-space: pre-wrap;\n  max-height: 160px;\n  overflow: auto;\n}\n.dsh-rewind-popover-note {\n  margin-top: 6px;\n  font-size: 11px;\n  line-height: 15px;\n  color: var(--dsw-alias-label-tertiary);\n}\n.dsh-rewind-popover-actions {\n  display: flex;\n  justify-content: flex-end;\n  gap: 8px;\n}\n.dsh-rewind-popover-primary,\n.dsh-rewind-popover-ghost {\n  padding: 5px 12px;\n  border: none;\n  border-radius: 8px;\n  font: inherit;\n  font-size: 13px;\n  line-height: 18px;\n  cursor: pointer;\n}\n.dsh-rewind-popover-primary {\n  background: var(--dsw-alias-button-primary-fill);\n  color: var(--dsw-alias-label-primary-foreground);\n}\n.dsh-rewind-popover-primary:hover:not(:disabled) {\n  background: var(--dsw-alias-button-primary-hover);\n}\n.dsh-rewind-popover-primary:disabled {\n  opacity: 0.5;\n  cursor: default;\n}\n.dsh-rewind-popover-ghost {\n  background: transparent;\n  color: var(--dsw-alias-label-secondary);\n}\n.dsh-rewind-popover-ghost:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.dsh-rewind-guard-hint {\n  position: fixed;\n  z-index: 1000;\n  max-width: min(440px, calc(100vw - 24px));\n  padding: 8px 12px;\n  border: 0;\n  border-radius: var(--dsw-radius-md);\n  background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));\n  backdrop-filter: var(--dsw-menu-backdrop-filter);\n  isolation: isolate;\n  --dsw-elevation-stroke-color: var(--dsw-alias-border-l1);\n  box-shadow: var(--dsw-elevation-panel);\n  font-size: 13px;\n  line-height: 18px;\n  color: var(--dsw-alias-label-primary);\n  pointer-events: none;\n}\n\n/* ---- Plugin configuration form ---- */\n/* Only the card's own controls: the two switch rows, their hints, and the divider. */\n.dsh-rewind-settings-divider {\n  border-top: 1px solid var(--dsw-alias-border-l2);\n}\n.dsh-rewind-settings-section {\n  display: grid;\n  gap: 6px;\n  padding: 12px 0;\n}\n.dsh-rewind-settings-toggle-row {\n  display: flex;\n  align-items: flex-start;\n  justify-content: space-between;\n  gap: 16px;\n  font-size: 13px;\n  line-height: 1.5;\n  color: var(--dsw-alias-label-primary);\n}\n.dsh-rewind-settings-toggle-label {\n  flex: 1;\n  min-width: 0;\n}\n.dsh-rewind-settings-hint {\n  margin: 0;\n  font-size: 12px;\n  line-height: 1.5;\n  color: var(--dsw-alias-label-tertiary);\n}\n";
+export declare const STYLE = "\n.dsh-rewind-btn {\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  /* The neighbouring action buttons scale by this delta too. */\n  width: calc(28px + var(--dsh-content-font-delta, 0px));\n  height: calc(28px + var(--dsh-content-font-delta, 0px));\n  padding: 6px;\n  border: none;\n  border-radius: var(--dsw-radius-sm, 8px);\n  background: transparent;\n  color: var(--dsw-alias-label-tertiary);\n  cursor: pointer;\n}\n.dsh-rewind-btn svg {\n  width: calc(15px + var(--dsh-content-font-delta, 0px));\n  height: calc(15px + var(--dsh-content-font-delta, 0px));\n}\n@media (hover: hover) {\n  .dsh-rewind-btn:hover {\n    background: var(--dsw-alias-interactive-bg-hover);\n    color: var(--dsw-alias-label-secondary);\n  }\n}\n\n.dsh-rewind-popover {\n  position: fixed;\n  z-index: 1100;\n  box-sizing: border-box;\n  width: min(300px, calc(100vw - 24px));\n  padding: 16px;\n  border: 0;\n  border-radius: var(--dsw-radius-lg);\n  background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));\n  backdrop-filter: var(--dsw-menu-backdrop-filter);\n  isolation: isolate;\n  --dsw-elevation-stroke-color: var(--dsw-alias-border-l1);\n  /* Elevated surface: match the menu cards' l2 scrollbar tokens. */\n  --dsh-scrollbar-thumb: var(--dsw-alias-scrollbar-bg-l2);\n  --dsh-scrollbar-thumb-hover: var(--dsw-alias-scrollbar-hover-l2);\n  box-shadow: var(--dsw-elevation-prominent);\n  font-size: 12px;\n  line-height: 18px;\n  color: var(--dsw-alias-label-primary);\n}\n.dsh-rewind-popover-title {\n  font-size: 12px;\n  font-weight: 500;\n  line-height: 18px;\n}\n.dsh-rewind-popover-target {\n  margin: 2px 0 10px;\n  font-size: 12px;\n  line-height: 18px;\n  color: var(--dsw-alias-label-tertiary);\n  word-break: break-all;\n  /* The full message sits above the popover; two lines are enough context. */\n  display: -webkit-box;\n  -webkit-box-orient: vertical;\n  -webkit-line-clamp: 2;\n  overflow: hidden;\n}\n.dsh-rewind-popover-option {\n  display: flex;\n  flex-direction: column;\n  gap: 2px;\n  width: 100%;\n  margin: 0 0 2px;\n  padding: 6px 8px;\n  border: 0;\n  border-radius: 8px;\n  background: transparent;\n  color: inherit;\n  font: inherit;\n  text-align: left;\n  cursor: pointer;\n}\n.dsh-rewind-popover-option:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n/* Arrow navigation moves real focus, so the focused row carries the pointer's\n   fill and the browser ring is suppressed: in dark mode the UA two-tone ring\n   draws its dark half against the filled row and reads as a residue edge (the\n   harness Menu suppresses it the same way). */\n.dsh-rewind-popover-option:focus-visible:not(:disabled) {\n  background: var(--dsw-alias-interactive-bg-hover);\n  outline: none;\n}\n.dsh-rewind-popover-option:disabled {\n  opacity: 0.4;\n  cursor: default;\n}\n.dsh-rewind-popover-option-label {\n  font-weight: 500;\n}\n.dsh-rewind-popover-option-hint {\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-tertiary);\n}\n.dsh-rewind-popover-impact {\n  margin: 4px 0 10px;\n  padding: 8px 10px;\n  border-radius: 8px;\n  background: var(--dsw-alias-interactive-bg-hover);\n  font-size: 12px;\n  line-height: 16px;\n  color: var(--dsw-alias-label-secondary);\n  white-space: pre-wrap;\n  max-height: 160px;\n  overflow: auto;\n}\n.dsh-rewind-popover-note {\n  margin-top: 6px;\n  font-size: 11px;\n  line-height: 15px;\n  color: var(--dsw-alias-label-tertiary);\n}\n.dsh-rewind-popover-actions {\n  display: flex;\n  justify-content: flex-end;\n  gap: 8px;\n  margin-top: 8px;\n}\n.dsh-rewind-popover-primary,\n.dsh-rewind-popover-ghost {\n  height: 28px;\n  padding: 0 10px;\n  border: none;\n  border-radius: 8px;\n  font: inherit;\n  cursor: pointer;\n}\n.dsh-rewind-popover-primary {\n  background: var(--dsw-alias-button-primary-fill);\n  color: var(--dsw-alias-label-primary-foreground);\n}\n.dsh-rewind-popover-primary:hover:not(:disabled) {\n  background: var(--dsw-alias-button-primary-hover);\n}\n.dsh-rewind-popover-primary:disabled {\n  opacity: 0.4;\n  cursor: default;\n}\n.dsh-rewind-popover-ghost {\n  background: transparent;\n  color: var(--dsw-alias-label-secondary);\n}\n.dsh-rewind-popover-ghost:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n.dsh-rewind-popover-ghost:active {\n  background: var(--dsw-alias-interactive-bg-active);\n}\n\n.dsh-rewind-guard-hint {\n  position: fixed;\n  z-index: 1000;\n  max-width: min(440px, calc(100vw - 24px));\n  padding: 8px 12px;\n  border: 0;\n  border-radius: var(--dsw-radius-md);\n  background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));\n  backdrop-filter: var(--dsw-menu-backdrop-filter);\n  isolation: isolate;\n  --dsw-elevation-stroke-color: var(--dsw-alias-border-l1);\n  box-shadow: var(--dsw-elevation-panel);\n  font-size: 13px;\n  line-height: 18px;\n  color: var(--dsw-alias-label-primary);\n  pointer-events: none;\n}\n\n/* ---- Plugin configuration form ---- */\n/* Only the card's own controls: the two switch rows, their hints, and the divider. */\n.dsh-rewind-settings-divider {\n  border-top: 1px solid var(--dsw-alias-border-l2);\n}\n.dsh-rewind-settings-section {\n  display: grid;\n  gap: 6px;\n  padding: 12px 0;\n}\n.dsh-rewind-settings-toggle-row {\n  display: flex;\n  align-items: flex-start;\n  justify-content: space-between;\n  gap: 16px;\n  font-size: 13px;\n  line-height: 1.5;\n  color: var(--dsw-alias-label-primary);\n}\n.dsh-rewind-settings-toggle-label {\n  flex: 1;\n  min-width: 0;\n}\n.dsh-rewind-settings-hint {\n  margin: 0;\n  font-size: 12px;\n  line-height: 1.5;\n  color: var(--dsw-alias-label-tertiary);\n}\n";

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

@@ -0,0 +1,89 @@
+/**
+ * Snapshot-level rewind visibility.
+ *
+ * DSH's Chat builder already supports hidden rows: a node stays in the node
+ * store (so the composer can read its text/images) but leaves `order`,
+ * `locations`, Turn navigation, and grouping whenever its `visibility` is
+ * `'hidden'`. This module wraps the registered `chat` view builder and marks
+ * the nodes inside an executed rewind's `[target, marker]` span hidden before
+ * the builder sees them.
+ *
+ * The seam is private: `uiConversation.views` is a first-party registry and
+ * `definition.create()` is not an extension point. Its shape is checked and it
+ * is restored on unload.
+ *
+ * @module dsh-rewind/client/visibility
+ */
+import { type ChatConversationViewNode } from './hidden.ts';
+interface BuilderLike {
+    readonly empty: unknown;
+    replace(input: BuilderInput): unknown;
+    apply(input: BuilderApplyInput): unknown;
+    groupInput?(): unknown;
+    publish?(): void;
+}
+interface BuilderInput {
+    readonly nodes: readonly ChatConversationViewNode[];
+    readonly timeline: unknown;
+    readonly changedTurns?: readonly number[];
+}
+interface BuilderApplyInput {
+    readonly upserts: readonly ChatConversationViewNode[];
+    readonly timeline: unknown;
+    readonly changedTurns?: readonly number[];
+}
+interface SessionsLike {
+    readonly list?: {
+        getSnapshot(): {
+            readonly ids?: readonly string[];
+            readonly byId?: Readonly<Record<string, {
+                readonly retainedBy?: Readonly<Record<string, number>>;
+            }>>;
+        };
+    };
+}
+/** Context subset the installer needs; structurally satisfied by the client root. */
+export interface VisibilityContext {
+    get(name: string): unknown;
+    effect?(execute: () => (() => void) | void, label?: string): unknown;
+    inject?(names: readonly string[], callback: (scope: VisibilityContext) => void): unknown;
+    readonly sessions?: SessionsLike;
+}
+/**
+ * Wrap the registered `chat` view builder so rewind spans enter the builder as
+ * `visibility: 'hidden'`. Idempotent across registry changes and HMR.
+ * @param ctx - client root context.
+ */
+export declare function installChatViewVisibility(ctx: VisibilityContext): void;
+/**
+ * Structural wrapper over the registered Chat builder. It forwards every
+ * builder method, keeps the original node objects, and only changes
+ * `visibility`. A full replacement is used whenever the cut set changes;
+ * otherwise it stays on the builder's incremental `apply` path.
+ */
+export declare class RewindVisibilityBuilder implements BuilderLike {
+    private readonly inner;
+    private originals;
+    private commands;
+    private byTurn;
+    private turnProcess;
+    private derived;
+    private cuts;
+    private cutSignature;
+    private lastSignature;
+    /** @param inner - the real Chat builder. */
+    constructor(inner: BuilderLike);
+    get empty(): unknown;
+    replace(input: BuilderInput): unknown;
+    apply(input: BuilderApplyInput): unknown;
+    groupInput(): unknown;
+    publish(): void;
+    private setAll;
+    private setOriginal;
+    private unindex;
+    private refreshCuts;
+    private deriveAll;
+    private deriveOne;
+    private deriveTurnProcess;
+}
+export {};

package/lib/types/index.d.ts

@@ -4,8 +4,8 @@
  * lives in `src/client/`).
  *
  * Rewind mechanism: planning is pure (`src/rewind.ts`); execution appends a
- * marker `user/message` whose `surfaceOp` replaces every surface node after the
- * target with itself, cutting only the model-visible surface
+ * marker `user/message` whose `surfaceOp` replaces the target and every surface
+ * node after it with itself, cutting only the model-visible surface
  * (`docs/architecture.md`).
  *
  * File restore (mode `both`) follows Claude Code's checkpointing: unless

package/lib/types/rewind.d.ts

@@ -4,10 +4,10 @@
  * and the ordered surface, so this module stays unit-testable.
  *
  * Rewind semantics: rewinding to a user message appends a marker node into the
- * session log whose `surfaceOp` replaces every surface node AFTER the target
- * with itself. The log (audit trail, rendered transcript) is untouched; only
- * the model-visible surface is cut, so the next request derives its context
- * from the target message onward. The marker is a `user/message` carrying a
+ * session log whose `surfaceOp` replaces the target and every surface node
+ * after it with itself. The log (audit trail, rendered transcript) is
+ * untouched; only the model-visible surface is cut, so the next request
+ * derives its context from before the target message. The marker is a `user/message` carrying a
  * replace `surfaceOp` and the producer-owned source `{ kind: 'dsh-rewind' }`
  * (see `marker.ts`); the shape's invariants and history are documented in
  * `docs/architecture.md`.
@@ -51,13 +51,13 @@ export interface RewindCandidate {
 }
 /** A validated rewind: the target plus the exact surface range to shadow. */
 export interface RewindPlan {
-    /** Target user message seq (stays on the surface). */
+    /** Target user message seq (withdrawn with the surface range). */
     readonly targetSeq: number;
     /** The target's ordered position in the surface. */
     readonly targetIndex: number;
-    /** Ordered surface node seqs the rewind shadows (everything after the target). */
+    /** Ordered surface node seqs the rewind shadows (the target and everything after it). */
     readonly shadowedSeqs: readonly number[];
-    /** First surface node after the target — the replace range start (inclusive). */
+    /** The target — the replace range start (inclusive). */
     readonly surfaceStart: number;
     /** Last surface node — the replace range end (inclusive). */
     readonly surfaceEnd: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "In-window conversation rewind with workspace file restore · 同窗口内对话回退并可还原工作区文件",
   "icon": "./assets/icon.svg",
   "keywords": [
@@ -152,42 +152,42 @@
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.5",
     "@deepseek-ai/cosmokit": "1.8.6",
-    "@deepseek-ai/dsh-agent": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-api-session-controller": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-attachment": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-connection": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-locale": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-store": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-commands": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-input-trigger": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-plugin-manager": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-session": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-command-compact": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-commands": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-compaction": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-compaction-basic": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-compaction-image-offload": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-fs": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-goal": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-home-paths": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-llm": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-plan-mode": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-sandbox": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-scope": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-session": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-session-projection": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-session-stats": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-session-title": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-settings": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-token-meter": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-tools": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-typert-protocol": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-user-questions": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-working-directory": "0.2.1-rc.2",
+    "@deepseek-ai/dsh-agent": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-api-session-controller": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-attachment": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-connection": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-locale": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-store": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-commands": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-input-trigger": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-plugin-manager": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-session": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-settings": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-client-ui-slots": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-command-compact": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-commands": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-compaction": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-compaction-basic": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-compaction-image-offload": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-fs": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-goal": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-home-paths": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-llm": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-plan-mode": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-sandbox": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-scope": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-session": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-session-projection": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-session-stats": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-session-title": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-settings": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-token-meter": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-tools": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-typert-protocol": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-user-questions": "0.2.1-rc.3",
+    "@deepseek-ai/dsh-working-directory": "0.2.1-rc.3",
     "@deepseek-ai/schemastery": "3.18.5",
     "@types/node": "^24.0.0",
     "@types/react": "^18.3.31",