dsh-rewind-plugin 0.12.2 → 0.13.0-alpha.2

package/lib/index.js

@@ -208,14 +208,11 @@ function planRewind(events, surface, target) {
 }
 
 // src/session-cwd.ts
-import { canonicalPath } from "@deepseek-ai/dsh-sandbox";
-var PARENT_PATH_SEGMENT = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
-function sessionCwd(cwd, requestedPath) {
-  if (cwd === void 0 || !PARENT_PATH_SEGMENT.test(cwd) && !PARENT_PATH_SEGMENT.test(requestedPath)) return cwd;
-  return canonicalPath(cwd);
+function sessionCwd(cwd) {
+  return cwd;
 }
-function execSessionCwd(exec, requestedPath) {
-  return sessionCwd(exec.agent?.session.header.cwd, requestedPath);
+function execSessionCwd(exec) {
+  return sessionCwd(exec.agent?.session.header.cwd);
 }
 
 // src/snapshot.ts
@@ -232,7 +229,6 @@ var LEGACY_JOURNAL_PREFIX = "restore-journal-";
 var PENDING_MAX_AGE_MS = 24 * 60 * 60 * 1e3;
 var COMPARE_CHUNK_BYTES = 64 * 1024;
 var REPLACEMENT_CHAR = "\uFFFD";
-var DEFAULT_SNAPSHOT_ROOT = join(resolveDshHome(), SNAPSHOT_DIR_NAME);
 var SNAPSHOT_ROOT_ENV = "DSH_REWIND_SNAPSHOT_DIR";
 var MAX_ANCHOR_GROUPS = 100;
 var CURRENT_STORE_VERSION = 2;
@@ -668,7 +664,7 @@ var SnapshotStore = class _SnapshotStore {
   /**
    * Session-format version snapshots are anchored under, stamped into each
    * session's `format` marker when an entry is recorded. `null` until the host
-   * sets it (from `agent/session-start`), so a session that never records is
+   * sets it (from `agent/created`), so a session that never records is
    * never materialized and a marker is only written where snapshots exist.
    */
   formatVersion = null;
@@ -1788,7 +1784,7 @@ var SnapshotStore = class _SnapshotStore {
       }
     }
   }
-  /** True when a path exists on disk (used by tests and diagnostics). */
+  /** True when a path exists on disk. */
   async exists(path) {
     try {
       await stat(path);
@@ -2010,7 +2006,7 @@ var SnapshotStore = class _SnapshotStore {
   }
   /**
    * Set the session-format version the store stamps onto every snapshot it
-   * records. The host sets this once per process from `agent/session-start`
+   * records. The host sets this once per process from `agent/created`
    * (`agent.session.header.version`), so a marker is only materialized for a
    * session that actually records a snapshot.
    */
@@ -2063,7 +2059,7 @@ var SnapshotStore = class _SnapshotStore {
    * Session-format-version guard: clear a session's snapshot dir when the
    * format its snapshots were anchored under differs from the current session
    * format, so seq-anchored references can never survive a format migration
-   * mis-mapped. Runs at `agent/session-start` — after DSH has migrated/loaded
+   * mis-mapped. Runs at `agent/created` — after DSH has migrated/loaded
    * the session, so `sessionVersion` is the post-migration value.
    *
    * Conservative rule (per the "delete stale snapshots" policy): a session
@@ -2169,6 +2165,9 @@ async function saveLastSweepAt(path, ms) {
   await writeFile2(tmp, JSON.stringify({ lastSweepAt: ms }), "utf8");
   await rename2(tmp, path);
 }
+function isAborted(signal) {
+  return signal?.aborted === true;
+}
 async function runAutoCleanupCheck(deps, sessionId) {
   try {
     const loaded = await deps.readConfig();
@@ -2177,8 +2176,11 @@ async function runAutoCleanupCheck(deps, sessionId) {
       return;
     }
     if (!loaded.config.enabled) return;
+    if (isAborted(deps.signal)) return;
     if (!shouldRunAutoSweep(await loadLastSweepAt(deps.statePath), Date.now())) return;
+    if (isAborted(deps.signal)) return;
     await deps.pruner.pruneStale({ keepActiveId: sessionId, maxAgeDays: loaded.config.maxAgeDays });
+    if (isAborted(deps.signal)) return;
     await saveLastSweepAt(deps.statePath, Date.now());
   } catch (error) {
     deps.log(`[dsh-rewind] snapshot auto-cleanup failed: ${error instanceof Error ? error.message : String(error)}`);
@@ -2313,7 +2315,7 @@ async function captureBefore(fs, store, exec, pending) {
   if (session !== void 0 && isSubagentSession(session)) return;
   const path = mutationPathOf(exec);
   if (path === void 0) return;
-  const cwd = execSessionCwd(exec, path);
+  const cwd = execSessionCwd(exec);
   const target = await resolveTarget(fs, path, cwd, exec.signal);
   if (target === void 0) return;
   const info = await fs.stat(target, exec.signal).catch((error) => {
@@ -2594,15 +2596,23 @@ async function handleRewind(ctx, store, fs, invocation, inflight) {
   return executeRewind(ctx, store, fs, invocation, target, mode, inflight);
 }
 var autoSweepChecked = false;
-async function maybeRunAutoCleanup(ctx, store, sessionId, dshHome) {
-  if (autoSweepChecked) return;
+async function maybeRunAutoCleanup(ctx, store, sessionId, dshHome, signal) {
+  if (autoSweepChecked || signal?.aborted === true) return;
   autoSweepChecked = true;
-  await runAutoCleanupCheck({
-    pruner: store,
-    readConfig: () => readCleanupPolicy(),
-    statePath: resolveCleanupStatePath(dshHome),
-    log: (msg) => ctx.logger.warn(msg)
-  }, sessionId);
+  try {
+    await runAutoCleanupCheck({
+      pruner: store,
+      readConfig: () => readCleanupPolicy(),
+      statePath: resolveCleanupStatePath(dshHome),
+      log: (msg) => ctx.logger.warn(msg),
+      ...signal === void 0 ? {} : { signal }
+    }, sessionId);
+  } catch (error) {
+    try {
+      ctx.logger.warn(`[dsh-rewind] snapshot auto-cleanup failed: ${error instanceof Error ? error.message : String(error)}`);
+    } catch {
+    }
+  }
 }
 async function readCleanupPolicy() {
   if (cleanupStore === void 0) {
@@ -2713,15 +2723,28 @@ async function handleClearCurrent(store, invocation, apply2, trackedBySession) {
   }
 }
 function apply(ctx, config) {
+  activeLocale = "en";
+  cleanupStore = void 0;
+  autoSweepChecked = false;
+  const lifecycle = new AbortController();
+  ctx.effect(() => () => {
+    lifecycle.abort();
+  }, "dsh-rewind lifecycle abort");
   const dshHome = config?.dshHome;
   const store = new SnapshotStore(config?.snapshotDir, { dedup: config?.dedup, dshHome });
   const pending = /* @__PURE__ */ new Map();
+  ctx.effect(() => () => {
+    const captures = [...pending.values()];
+    pending.clear();
+    return Promise.all(captures.map((capture) => discardCapture(capture))).then(() => void 0);
+  }, "dsh-rewind dispose pending captures");
   const anchorCache = /* @__PURE__ */ new WeakMap();
   const inflight = /* @__PURE__ */ new Set();
   const trackedBySession = /* @__PURE__ */ new Map();
   let fsService;
   ctx.inject(["settings"], (settingsCtx) => {
     const settings = settingsCtx;
+    activeLocale = "en";
     const section = settings.settings.get("locale");
     if (section?.preference === "zh" || section?.preference === "en") {
       activeLocale = section.preference;
@@ -2731,7 +2754,11 @@ function apply(ctx, config) {
       CleanupConfigSchema,
       { base: DEFAULT_CLEANUP_CONFIG }
     );
-    cleanupStore = settingsCleanupStore(cleanupScope);
+    const mountedStore = settingsCleanupStore(cleanupScope);
+    cleanupStore = mountedStore;
+    settingsCtx.effect(() => () => {
+      if (cleanupStore === mountedStore) cleanupStore = void 0;
+    }, "dsh-rewind cleanup store");
   });
   ctx.effect(function* () {
     const rewindHandler = (invocation) => handleRewind(ctx, store, fsService, invocation, inflight);
@@ -2752,11 +2779,12 @@ function apply(ctx, config) {
       handler: (invocation) => handleSnapshotCleanup(store, invocation, dshHome, trackedBySession)
     });
   }, "dsh-rewind command");
-  ctx.on("agent/session-start", ({ agent }) => {
+  ctx.on("agent/created", ({ agent }) => {
     const session = agent.session;
     if (isSubagentSession(session)) return;
     void (async () => {
       try {
+        if (lifecycle.signal.aborted) return;
         store.setFormatVersion(session.header.version);
         try {
           await store.assertKnownStoreVersion(session.id);
@@ -2764,6 +2792,7 @@ function apply(ctx, config) {
           ctx.logger.warn(`[dsh-rewind] file restore disabled for ${session.id}: ${error instanceof Error ? error.message : String(error)}`);
           return;
         }
+        if (lifecycle.signal.aborted) return;
         const result = await store.reconcileFormatVersion(session.id, session.header.version);
         if (result.cleared) {
           ctx.logger.warn(`[dsh-rewind] cleared snapshots for ${session.id}: session format changed (v${session.header.version})`);
@@ -2778,14 +2807,16 @@ function apply(ctx, config) {
     if (isSubagentSession(session)) return;
     void (async () => {
       try {
+        if (lifecycle.signal.aborted) return;
         const sessionId = session.id;
-        void maybeRunAutoCleanup(ctx, store, sessionId, dshHome);
+        void maybeRunAutoCleanup(ctx, store, sessionId, dshHome, lifecycle.signal);
         let tracked = trackedBySession.get(sessionId);
         if (tracked === void 0) {
           tracked = await store.trackedPaths(sessionId);
           trackedBySession.set(sessionId, tracked);
         }
         if (tracked.size === 0) return;
+        if (lifecycle.signal.aborted) return;
         await reconcileTracked(store, sessionId, event.seq, tracked);
       } catch (error) {
         ctx.logger.warn(`[dsh-rewind] boundary re-check failed: ${error instanceof Error ? error.message : String(error)}`);
@@ -2807,7 +2838,7 @@ function apply(ctx, config) {
       try {
         const session = exec.agent?.session;
         if (session !== void 0 && !isSubagentSession(session)) {
-          void maybeRunAutoCleanup(ctx, store, session.id, dshHome);
+          void maybeRunAutoCleanup(ctx, store, session.id, dshHome, lifecycle.signal);
         }
         await commitEntry(store, pending, anchorCache, trackedBySession, exec, result);
       } catch (error) {

package/lib/types/client/build-info.d.ts

@@ -15,5 +15,11 @@
  */
 /** Plugin version baked in at build time (from `package.json`). */
 export declare const PLUGIN_VERSION: string;
+/**
+ * The bundle's package name — one identity for the client entry id, the
+ * `plugins.bundle.config` key and the `<style data-plugin>` marker the
+ * harness's owned-style fallback matches; a test pins it to `package.json`.
+ */
+export declare const PLUGIN_PACKAGE = "dsh-rewind-plugin";
 /** Short content hash of the client source, for stale-bundle detection. */
 export declare const BUILD_HASH: string;

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

@@ -80,8 +80,6 @@ export declare function rewindCandidatesOfChat(snap: CandidateChat): RewindCandi
  * label/detail flex layout, with no recency numbers.
  */
 export declare function rewindOptionsOf(snap: CandidateChat, t: Translate): SelectOption[];
-/** Resolve one candidate by log seq (the mode popover's re-entry after a pick). */
-export declare function candidateBySeq(snap: CandidateChat, seq: number): RewindCandidate | undefined;
 /**
  * Parse the host's candidate-list encoding (see `formatCandidateList` in
  * src/rewind.ts) into typed candidates. Malformed lines are skipped; a

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

@@ -24,18 +24,17 @@ export interface HiddenChat {
     };
 }
 /**
- * Reader for one session's live chat snapshot. On the 0.1.2-rc.1 line (the
- * plugin's single baseline) the chat is served by the `uiConversation`
- * service's named "chat" view (contributed by dsh-client-ui-chat through the
- * uiSession slot hook).
+ * Reader for one session's live chat snapshot: the chat is served by the
+ * `uiConversation` service's named "chat" view (contributed by
+ * dsh-client-ui-chat through the uiSession slot hook).
  */
 export type ChatOf = (session: {
     readonly sessionId: string;
 } | undefined) => HiddenChat | undefined;
 /**
  * Subscribe to one session's live chat-update signal, for waiting on a chat
- * snapshot change without polling. The 0.1.2-rc.1 `uiConversation` "chat"
- * view's own `subscribe` is the chat-update signal; `cb` fires whenever the
+ * snapshot change without polling. The `uiConversation` "chat" view's own
+ * `subscribe` is the chat-update signal; `cb` fires whenever the
  * chat snapshot invalidates.
  */
 export type ChatWatch = (sessionId: string, cb: () => void) => () => void;
@@ -87,7 +86,7 @@ export declare function isExecutedRewindCommand(node: CommandNode, seq: number):
  *
  * Reads ONLY the machine-readable `impact=<n>` trailer the host appends to
  * preview text. Older host output without the trailer is treated as having no
- * changes (never guesses from human copy). Unknown/absent text degrades to
+ * changes (never guesses from human copy). Absent text (undefined) degrades to
  * always-show so a working option is never hidden on a failed probe.
  */
 export declare function hasFileImpact(text: string | undefined): boolean;

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

@@ -25,23 +25,19 @@ export declare const zh: {
     'popover.impact.delete': string;
     'popover.confirm': string;
     'popover.back': string;
-    'cleanup.title': string;
-    'cleanup.desc': string;
-    'cleanup.expand': string;
-    'cleanup.collapse': string;
-    'cleanup.unsaved': string;
     'cleanup.auto': string;
     'cleanup.auto.on': string;
     'cleanup.auto.off': string;
     'cleanup.maxAge': string;
     'cleanup.maxAge.hint': string;
     'cleanup.invalid': string;
-    'cleanup.discard': string;
+    'cleanup.overridden': string;
+    'cleanup.reset': string;
     'cleanup.save': string;
     'cleanup.saving': string;
-    'cleanup.saved': string;
     'cleanup.saveFailed': string;
     'cleanup.readonly': string;
+    'cleanup.unavailable': string;
 };
 /** The rewind namespace key union. */
 export type RewindKey = keyof typeof zh;
@@ -77,21 +73,17 @@ export declare const en: {
     'popover.impact.delete': string;
     'popover.confirm': string;
     'popover.back': string;
-    'cleanup.title': string;
-    'cleanup.desc': string;
-    'cleanup.expand': string;
-    'cleanup.collapse': string;
-    'cleanup.unsaved': string;
     'cleanup.auto': string;
     'cleanup.auto.on': string;
     'cleanup.auto.off': string;
     'cleanup.maxAge': string;
     'cleanup.maxAge.hint': string;
     'cleanup.invalid': string;
-    'cleanup.discard': string;
+    'cleanup.overridden': string;
+    'cleanup.reset': string;
     'cleanup.save': string;
     'cleanup.saving': string;
-    'cleanup.saved': string;
     'cleanup.saveFailed': string;
     'cleanup.readonly': string;
+    'cleanup.unavailable': string;
 };

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

@@ -1,17 +1,14 @@
 /**
- * Pure pending-message matching: pairs the rendered pending-steering bubble
- * rows with the session's transient queue mirror rows (`placement === 'steering'`).
+ * Pure pending-message matching: pairs the rendered pre-admission steering
+ * bubble rows with the session's `next-step` inbox rows.
  *
- * Both sides derive from the host's next-step inbox order — the ChatView
- * renders `pendingSteering` in array order and the queue mirror keeps the same
- * host order — so index-primary matching is reliable. Text equality is still
- * verified as a per-row cross-check, and a row that fails (or a row with no
- * mirror item, or a mirror item with no row) is skipped INDIVIDUALLY: one bad
- * row never takes down the other rows' buttons. The matching text is the
- * bubble's message text WITHOUT its actions container — the harness copy
- * button's Tooltip mounts a label bubble inside that container on hover, so
- * the full row textContent would flip between "message" and "message+Copy"
- * with the mouse, flickering the button (see `bubbleTextOf` in portals.tsx).
+ * Both sides follow the same host order, so index-primary matching is reliable;
+ * text equality is still verified per row, and a row that fails (or has no
+ * counterpart) is skipped INDIVIDUALLY: one bad row never takes down the other
+ * rows' buttons. The compared text excludes the bubble's actions container —
+ * the copy button's Tooltip mounts a label bubble there on hover, so the row's
+ * full `textContent` would flip between "message" and "message+Copy" with the
+ * mouse (see `bubbleTextOf` in portals.tsx).
  *
  * The browser half lives in `portals.tsx`; this module stays DOM-free so the
  * matching contract is unit-testable in a plain node environment.
@@ -23,16 +20,61 @@ export interface PendingRow {
     /** The bubble's message text, excluding the actions container (see module doc). */
     readonly text: string;
 }
-/** One steering occurrence from the session queue mirror. */
+/** One wire content block of an inbox row (only the fields the derivation reads). */
+export interface InboxBlockLike {
+    /** Wire block type (`text` | `image` | `file` | …). */
+    readonly type: string;
+    /** The block's text, on a `text` block. */
+    readonly text?: string;
+}
+/** One pending-inbox row (the alpha.2 `inbox` projection element). */
+export interface InboxMessageLike {
+    /** Agent-owned inbox occurrence identity; the harness brands it as `MessageId`. */
+    readonly id: string;
+    /** Wire content blocks, in prompt order. */
+    readonly content: readonly InboxBlockLike[];
+    /** Message origin; only `kind: 'user'` rows are retractable (see `steeringItemsOf`). */
+    readonly source?: {
+        readonly kind?: string;
+    } | undefined;
+}
+/**
+ * The alpha.2 `inbox` projection value: the agent's pending input folded per
+ * target order. Replaces the removed `SessionSnapshot.queue` mirror.
+ */
+export interface InboxLike {
+    /** Messages claimed at the next turn boundary. */
+    readonly 'next-turn': readonly InboxMessageLike[];
+    /** Messages injected at the next step boundary (user or plugin/command). */
+    readonly 'next-step': readonly InboxMessageLike[];
+}
+/** One steering occurrence derived from the session's inbox projection. */
 export interface PendingSteeringItem {
     readonly id: string;
     /** Complete editable text; null when the message contains non-text blocks. */
     readonly text: string | null;
+    /** Space-collapsed preview with image/file blocks excluded (the harness QueueDock rule). */
+    readonly preview: string;
 }
+/**
+ * Project the inbox `next-step` rows into the fields the retract path needs.
+ *
+ * ONLY user-sourced rows are steering: the host's deleted mapping
+ * (`queueItemsFromInbox`) called a `next-step` row `steering` for
+ * `source.kind === 'user'` and `context` otherwise, and this plugin has only
+ * ever retracted the former. An injected row must not get a button, and because
+ * `retractSpan` removes the target AND its future it must not be swept into a
+ * retract either; keeping it would also shift the positional match against the
+ * rendered submission echoes and cost every later row its button.
+ * @param nextStep - the inbox projection's `next-step` list (absent before the
+ *   fold state exists, hence `undefined`).
+ * @returns one item per USER steering row, in host (FIFO) order.
+ */
+export declare function steeringItemsOf(nextStep: readonly InboxMessageLike[] | undefined): readonly PendingSteeringItem[];
 /**
  * Pair rows to steering items by index, verifying text equality per row.
  * @param rows - pending bubble rows in DOM order (== render order).
- * @param steering - steering queue items in host order (== render order).
+ * @param steering - steering items in host order (== render order).
  * @returns the item id for each row, or null for rows that cannot be matched
  *   safely (missing counterpart, text mismatch). A bad row never affects the
  *   other rows.
@@ -44,7 +86,7 @@ export declare function matchPendingRows(rows: readonly PendingRow[], steering:
  * order. Queued (next-turn) messages are deliberately NOT included — the
  * harness QueueDock already offers the user per-item edit/remove, so a rewind
  * must not silently drop messages the user may still want to send.
- * @param steering - steering queue items in host order (== render order).
+ * @param steering - steering items in host order (== render order).
  * @param targetId - the rewind target's inbox occurrence id.
  * @returns the ids to remove, oldest-first; empty when the target is no
  *   longer pending (already claimed/consumed).

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

@@ -33,7 +33,7 @@ export interface PopoverOptions {
     readonly onRetract?: () => void;
     readonly preview: string;
     /**
-     * Chat reader on the 0.1.2-rc.1 `uiConversation` "chat" view: the durable
+     * Chat reader on the `uiConversation` "chat" view: the durable
      * variant's command probes scan the chat through it. Unused by the
      * pending-retract variant.
      */

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

@@ -25,14 +25,18 @@
  * `conversation.chat.assistant-actions` slot are wired for assistant messages
  * only, and no per-user-message action slot exists. So this portal targets
  * undocumented internal structure — the `data-chat-flow-kind`,
- * `data-chat-anchor-key`, `data-composer-input`, `data-composer-card`,
- * `data-pending-steering` and `data-time-hover-root` attributes plus the
- * `anchorSeq` field read in `client/hidden.ts`. Those are harness-internal and
- * may change with the UI; this module (and `hidden.ts`) must be re-adapted to
- * follow, and is the migration target when a first-class user-action slot or
- * an official renderer hook surface appears. The coupling is accepted
- * deliberately because a standards-conformant alternative does not exist
- * today; it is not a defect to be removed while the DOM-portal approach stands.
+ * `data-chat-anchor-key`, `data-composer-input`, `data-composer-card` and
+ * `data-pending-steering` attributes plus the `anchorSeq` field read in
+ * `client/hidden.ts`. Those are harness-internal and may change with the UI;
+ * this module (and `hidden.ts`) must be re-adapted to follow, and is the
+ * migration target when a first-class user-action slot or an official renderer
+ * hook surface appears. The coupling is accepted deliberately because a
+ * standards-conformant alternative does not exist today; it is not a defect to
+ * be removed while the DOM-portal approach stands.
+ *
+ * Re-verified against 0.1.6-alpha.2: the five remaining anchors still exist (the
+ * anchor key and flow kind still come from `ChatNodeSeat`, values `user` /
+ * `steering`); only `data-time-hover-root` is gone, and nothing read it.
  *
  * @module dsh-rewind/client/portals
  */
@@ -67,7 +71,7 @@ export type PortalTarget = {
 export interface RewindBridgeDeps {
     readonly sessionOf: (sessionId: string) => SessionFace | undefined;
     /**
-     * Chat reader on the 0.1.2-rc.1 `uiConversation` "chat" view: every chat
+     * Chat reader on the `uiConversation` "chat" view: every chat
      * snapshot read goes through it. See `chatSnapshotOf` in hidden.ts.
      */
     readonly chatOf: ChatOf;
@@ -77,11 +81,17 @@ export interface RewindBridgeDeps {
      * snapshot changes. Passed through to `waitForCommand`.
      */
     readonly watchChat: ChatWatch;
-    readonly currentSessionId: () => string | undefined;
+    /**
+     * Whether a session is the one the MAIN VIEW currently retains — the alpha.2
+     * replacement for the removed `SessionListState.current` (see
+     * `isMainViewSession` in index.ts). A predicate rather than "the current
+     * session id", so a multi-window client can never refill the wrong composer.
+     */
+    readonly isMainViewSession: (sessionId: string) => boolean;
     readonly t: Translate;
     readonly subscribeLocale: (cb: () => void) => () => void;
     /**
-     * Session-aware composer writer (see `writeComposer`): the 0.1.2-rc.1
+     * Session-aware composer writer (see `writeComposer`): the
      * `conversation.input` facade `setDraft` when reachable, else the DOM fill.
      * Session-scoped so the refill only lands in the session that just rewound.
      */
@@ -99,9 +109,8 @@ export interface SlotsLike {
         readonly inject?: () => P;
     }, component: (props: P) => ReactNode): () => void;
 }
-/** Join the text blocks of a user message into one plain preview. */
 /**
- * The 0.1.2-rc.1 session input facade's write face (structural, so the plugin
+ * The 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.
@@ -110,7 +119,7 @@ interface ComposerDraftWriter {
     setDraft(text: string): void;
 }
 /**
- * Fill the dsh composer with `text` through the 0.1.2-rc.1 `contenteditable`
+ * Fill the dsh composer with `text` through the `contenteditable`
  * DOM 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
@@ -118,12 +127,12 @@ interface ComposerDraftWriter {
  */
 export declare function fillComposer(text: string): boolean;
 /**
- * Composer write: prefer the harness facade's `setDraft` (0.1.2-rc.1, correct
- * whole-draft replace), then degrade to the DOM `fillComposer` (0.1.2-rc.1
- * contenteditable). A facade that throws (session teardown) is treated as
- * absent so the DOM path still restores the text. Never throws.
+ * Composer write: prefer the harness facade's `setDraft` (correct whole-draft
+ * replace), then degrade to the DOM `fillComposer` (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 0.1.2-rc.1 session input draft writer, when reachable.
+ * @param facade - the session input draft writer, when reachable.
  * @returns whether a channel applied the text.
  */
 export declare function writeComposer(text: string, facade: ComposerDraftWriter | undefined): boolean;
@@ -140,16 +149,17 @@ export declare function writeComposer(text: string, facade: ComposerDraftWriter
  * 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, watchChat: ChatWatch, setComposerText: (sessionId: string, text: string) => boolean): Promise<void>;
+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): Promise<void>;
 /**
  * Locate the actions container of a user/steering seat row — the element the
  * ↶ button portals into (the copy/branch IconActions row).
  *
- * On the 0.1.2-rc.1 line the `data-time-hover-root` marker lives only on the
- * per-turn tail footer (`TurnTailNodeView`), and the user action row is
- * revealed via CSS `:has()`. The container is located structurally: the direct
- * holder of the copy `<button>` (the `MessageIconActions` container, which
- * mounts that button as a direct child — `MessageIconActions.tsx:83,86`).
+ * The finder is STRUCTURAL on purpose: no harness attribute marks the actions
+ * row on the user seat (the old `data-time-hover-root` marker lived on the
+ * per-turn tail footer and is gone in 0.1.6-alpha.2), so the container is
+ * located as the direct holder of the copy `<button>` (the `MessageIconActions`
+ * container, which mounts that button as a direct child —
+ * `MessageIconActions.tsx:83,86`).
  *
  * Returns undefined when no qualifying container is found; the caller refuses
  * to portal (never a crash, never a wrong attachment). Exported as a test seam
@@ -207,8 +217,8 @@ 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, watchChat, t, subscribeLocale, setComposerText }: RewindPortalsProps): ReactNode;
-/** The current composer draft: the 0.1.2-rc.1 contenteditable `textContent`.
+export declare function RewindPortals({ sessionId, sessionOf, chatOf, isMainViewSession, watchChat, t, subscribeLocale, setComposerText }: RewindPortalsProps): ReactNode;
+/** The current composer draft: the contenteditable `textContent`.
  * Empty when the composer is absent. Exported as a test seam (the
  * empty-composer guard in `retractPending`). */
 export declare function composerText(): string;