dsh-rewind-plugin 0.20.0 → 0.21.0

package/lib/client.js

@@ -171,7 +171,7 @@ function rewindCutsOf(nodes) {
 
 // src/client/styles.ts
 var CLASS = {
-  button: "dsh-rewind-btn",
+  action: "dsh-rewind-action",
   popover: "dsh-rewind-popover",
   popoverTitle: "dsh-rewind-popover-title",
   popoverTarget: "dsh-rewind-popover-target",
@@ -185,18 +185,14 @@ var CLASS = {
   popoverGhost: "dsh-rewind-popover-ghost",
   guardHint: "dsh-rewind-guard-hint"
 };
-var REWIND_ICON_SVG = [
-  '<svg width="15" height="15" viewBox="0 0 16 16" fill="none" aria-hidden="true">',
-  '  <path d="M6.5 2.5 2.5 6.5l4 4" stroke="currentColor" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>',
-  '  <path d="M2.5 6.5h7a4 4 0 0 1 4 4v1.5" stroke="currentColor" stroke-width="1.25" stroke-linecap="round"/>',
-  "</svg>"
-].join("");
 var STYLE = `
-.dsh-rewind-btn {
+/* The official action chrome, value for value: the action is Copy's peer in the
+   same 28px row, so a different box, glyph scale, or resting tier would read as
+   a different kind of control. */
+.dsh-rewind-action {
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  /* The neighbouring action buttons scale by this delta too. */
   width: calc(28px + var(--dsh-content-font-delta, 0px));
   height: calc(28px + var(--dsh-content-font-delta, 0px));
   padding: 6px;
@@ -206,12 +202,12 @@ var STYLE = `
   color: var(--dsw-alias-label-tertiary);
   cursor: pointer;
 }
-.dsh-rewind-btn svg {
+.dsh-rewind-action svg {
   width: calc(15px + var(--dsh-content-font-delta, 0px));
   height: calc(15px + var(--dsh-content-font-delta, 0px));
 }
 @media (hover: hover) {
-  .dsh-rewind-btn:hover {
+  .dsh-rewind-action:hover {
     background: var(--dsw-alias-interactive-bg-hover);
     color: var(--dsw-alias-label-secondary);
   }
@@ -513,6 +509,13 @@ function moveFocus(root, dir) {
   const next = index === -1 ? dir === 1 ? 0 : buttons.length - 1 : (index + dir + buttons.length) % buttons.length;
   buttons[next]?.focus();
 }
+function moveFocusByKey(root, event) {
+  if (event.key !== "ArrowDown" && event.key !== "ArrowUp") return false;
+  event.preventDefault();
+  event.stopPropagation();
+  moveFocus(root, event.key === "ArrowDown" ? 1 : -1);
+  return true;
+}
 function renderImpactStep(root, opts, back, reposition, cached) {
   const { session, seq, t } = opts;
   const impact = el("div", CLASS.popoverImpact, t("popover.impact.loading"));
@@ -635,7 +638,6 @@ function mountShell(root, anchor, onKeyDown) {
   return { position, dispose };
 }
 function openRetractPopover(opts) {
-  closePopover();
   const { preview, anchor, t, retract, onRetract } = opts;
   if (retract === void 0 || onRetract === void 0) return;
   markOpen(anchor);
@@ -643,18 +645,7 @@ function openRetractPopover(opts) {
   root.setAttribute("role", "dialog");
   root.setAttribute("aria-label", t("popover.retract.title"));
   const onKeyDown = (event) => {
-    if (event.key === "ArrowDown") {
-      event.preventDefault();
-      event.stopPropagation();
-      moveFocus(root, 1);
-      return;
-    }
-    if (event.key === "ArrowUp") {
-      event.preventDefault();
-      event.stopPropagation();
-      moveFocus(root, -1);
-      return;
-    }
+    if (moveFocusByKey(root, event)) return;
     if (event.key === "Escape") {
       event.preventDefault();
       event.stopPropagation();
@@ -666,7 +657,7 @@ function openRetractPopover(opts) {
   const confirm = document.createElement("button");
   confirm.type = "button";
   confirm.className = CLASS.popoverPrimary;
-  confirm.textContent = t("popover.retract.confirm");
+  confirm.textContent = t("popover.confirm");
   confirm.addEventListener("click", () => {
     closePopover();
     onRetract();
@@ -741,18 +732,7 @@ function openPopover(opts) {
     renderImpactStep(root, durableOpts, renderModes, reposition, impactOutcome);
   };
   const onKeyDown = (event) => {
-    if (event.key === "ArrowDown") {
-      event.preventDefault();
-      event.stopPropagation();
-      moveFocus(root, 1);
-      return;
-    }
-    if (event.key === "ArrowUp") {
-      event.preventDefault();
-      event.stopPropagation();
-      moveFocus(root, -1);
-      return;
-    }
+    if (moveFocusByKey(root, event)) return;
     if (event.key === "Escape") {
       event.preventDefault();
       event.stopPropagation();
@@ -1067,13 +1047,142 @@ function changed(input) {
   return input.changedTurns === void 0 ? {} : { changedTurns: input.changedTurns };
 }
 
-// src/client/portals.tsx
+// src/client/mount.tsx
 var import_react = require("react");
-var import_react_dom = require("react-dom");
+var import_jsx_runtime = require("react/jsx-runtime");
+var CHAT_NODE_SLOT = "conversation.chat.node";
+var ROW_KEYS = /* @__PURE__ */ new Set(["user", "steering"]);
+var TICK_KEY = "dsh-rewind:mount";
+function rendererOf(component) {
+  if (typeof component === "function") return component;
+  if (component === null || typeof component !== "object") return void 0;
+  const type = component.type;
+  return typeof type === "function" ? type : void 0;
+}
+function targetOf(props) {
+  const sessionId = props["sessionId"];
+  const data = props["node"]?.data;
+  if (typeof sessionId !== "string" || typeof data?.seq !== "number" || typeof data.time !== "number") return void 0;
+  return { sessionId, seq: data.seq, time: data.time };
+}
+function rowWithAction(official, render) {
+  return function RowWithAction(props) {
+    const row = official(props);
+    const target = targetOf(props);
+    if (target === void 0 || !(0, import_react.isValidElement)(row)) return row;
+    const actions = row.props.actions;
+    if (typeof actions !== "function") return row;
+    const buildActions = actions;
+    const withAction = (text) => {
+      const actionsRow = buildActions(text);
+      if (!(0, import_react.isValidElement)(actionsRow)) return actionsRow;
+      try {
+        const element = render({ ...target, text });
+        if (element === null || element === void 0) return actionsRow;
+        const existing = actionsRow.props.extraActions;
+        return (0, import_react.cloneElement)(actionsRow, {
+          extraActions: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react.Fragment, { children: [
+            existing,
+            element
+          ] })
+        });
+      } catch {
+        return actionsRow;
+      }
+    };
+    return (0, import_react.cloneElement)(row, { actions: withAction });
+  };
+}
+function installRowAction({ slots, render }) {
+  if (typeof slots.entries !== "function") return () => {
+  };
+  const readEntries = (key) => slots.entries(key);
+  const taken = /* @__PURE__ */ new Map();
+  const takeOver = (entry) => {
+    if (taken.has(entry)) return false;
+    const official = rendererOf(entry.component);
+    if (official === void 0) return false;
+    const replacement = rowWithAction(official, render);
+    taken.set(entry, { original: entry.component, replacement });
+    entry.component = replacement;
+    return true;
+  };
+  const tick = () => {
+    if (typeof slots.register !== "function") return;
+    try {
+      slots.register({ name: CHAT_NODE_SLOT, key: TICK_KEY }, () => null)();
+    } catch {
+    }
+  };
+  const sync = () => {
+    let changed2 = false;
+    for (const entry of readEntries(CHAT_NODE_SLOT)) {
+      const key = entry.options.key;
+      if (key === void 0 || !ROW_KEYS.has(key)) continue;
+      changed2 = takeOver(entry) || changed2;
+    }
+    if (changed2) tick();
+  };
+  sync();
+  const unsubscribe = slots.subscribe?.(CHAT_NODE_SLOT, sync);
+  return () => {
+    unsubscribe?.();
+    for (const [entry, record] of taken) {
+      if (entry.component === record.replacement) entry.component = record.original;
+    }
+    taken.clear();
+  };
+}
+
+// src/client/action.tsx
 var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
+var import_jsx_runtime2 = require("react/jsx-runtime");
+var ICON = /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("svg", { width: "15", height: "15", viewBox: "0 0 16 16", fill: "none", "aria-hidden": "true", children: [
+  /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("path", { d: "M6.5 2.5 2.5 6.5l4 4", stroke: "currentColor", strokeWidth: "1.25", strokeLinecap: "round", strokeLinejoin: "round" }),
+  /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("path", { d: "M2.5 6.5h7a4 4 0 0 1 4 4v1.5", stroke: "currentColor", strokeWidth: "1.25", strokeLinecap: "round" })
+] });
+function RewindActionButton({ t, titleKey, ariaKey, pending = false, onOpen }) {
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_dsh_client_ui_primitives.Tooltip, { label: t(titleKey), side: "bottom", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+    "button",
+    {
+      type: "button",
+      className: CLASS.action,
+      "aria-label": t(ariaKey),
+      "aria-haspopup": "dialog",
+      "data-pending-retract": pending || void 0,
+      onClick: (event) => {
+        event.stopPropagation();
+        onOpen(event.currentTarget);
+      },
+      children: ICON
+    }
+  ) });
+}
+function rewindActionRenderer(t, eligible, open) {
+  return (row) => eligible(row.sessionId) ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+    RewindActionButton,
+    {
+      t,
+      titleKey: "button.title",
+      ariaKey: "button.aria",
+      onOpen: (anchor) => open(row, anchor)
+    }
+  ) : null;
+}
+
+// src/client/pending-mount.tsx
+var import_react2 = require("react");
+var import_react_dom = require("react-dom");
 
 // src/client/pending.ts
-var QUEUE_PREVIEW_CHARS = 200;
+var INBOX_PROJECTION = "inbox";
+function inboxOf(session) {
+  try {
+    return session.projections.faceOf(INBOX_PROJECTION).getSnapshot();
+  } catch {
+    return void 0;
+  }
+}
 function textOf(content) {
   const texts = content.filter((block) => block.type === "text");
   if (texts.length === 0) return null;
@@ -1082,10 +1191,6 @@ function textOf(content) {
 function attachmentsCountOf(content) {
   return content.filter((block) => block.type !== "text").length;
 }
-function previewOf(text) {
-  const chars = Array.from((text ?? "").replace(/\s+/g, " ").trim());
-  return chars.length > QUEUE_PREVIEW_CHARS ? `${chars.slice(0, QUEUE_PREVIEW_CHARS).join("")}\u2026` : chars.join("");
-}
 function steeringItemsOf(nextStep) {
   return (nextStep ?? []).filter((item) => item.source?.kind === "user").map((item) => {
     const text = textOf(item.content);
@@ -1093,23 +1198,18 @@ function steeringItemsOf(nextStep) {
       id: item.id,
       text,
       attachments: attachmentsCountOf(item.content),
-      images: imageRefsOf(item.content),
-      preview: previewOf(text)
+      images: imageRefsOf(item.content)
     };
   });
 }
 function matchPendingRows(rows, steering) {
-  const matched = [];
-  for (let i = 0; i < rows.length; i++) {
-    const row = rows[i];
-    const item = steering[i];
-    matched.push(item !== void 0 && matches2(item, row) ? item.id : null);
-  }
-  return matched;
+  return rows.map((row, index) => {
+    const item = steering[index];
+    return item !== void 0 && matches2(item, row) ? item.id : null;
+  });
 }
 function matches2(item, row) {
-  if (item.attachments > 0) return row.attachments === item.attachments;
-  return row.text === (item.text ?? "");
+  return item.attachments > 0 ? row.attachments === item.attachments : row.text === (item.text ?? "");
 }
 function retractSpan(steering, targetId) {
   const index = steering.findIndex((item) => item.id === targetId);
@@ -1117,8 +1217,8 @@ function retractSpan(steering, targetId) {
   return steering.slice(index).map((item) => item.id);
 }
 
-// src/client/portals.tsx
-var import_jsx_runtime = require("react/jsx-runtime");
+// src/client/rewind-flow.ts
+var COMPOSER_EDITABLE_SELECTOR = "[data-composer-input]";
 function fillComposerEditable(text) {
   const editable = document.querySelector(COMPOSER_EDITABLE_SELECTOR);
   if (editable === null) return false;
@@ -1158,11 +1258,6 @@ function writeComposer(text, facade) {
   }
   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, isMainViewSession, chatOf, watchChat, setComposerText, restoreImages) {
   const known = knownCommandSeqs(session, chatOf, (node) => isExecutedRewindCommand(node, seq));
   let result;
@@ -1246,229 +1341,16 @@ function showHint(text) {
   }
   window.setTimeout(() => hint.remove(), 3200);
 }
-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 IGNORED_PORTAL_SCOPE = [
-  "[data-composer-seat]",
-  "[data-composer-input]",
-  "[data-sidebar-right-panel]",
-  "[data-sidebar-chat]",
-  "[data-plugin-panel]"
-].join(", ");
-var PENDING_SEAT_SELECTOR = "[data-pending-steering]";
-var MESSAGE_ATTACHMENT_SELECTOR = "[data-message-attachments]";
-function actionsContainerOf(row) {
-  const buttons = Array.from(row?.querySelectorAll("button") ?? []);
-  const lastButton = buttons.filter((button) => !button.classList.contains(CLASS.button)).at(-1);
-  const structural = lastButton?.parentElement;
-  if (structural instanceof HTMLElement && structural.querySelector("button") !== null) return structural;
-  return void 0;
-}
-function collectTargets(chat) {
-  const rows = /* @__PURE__ */ new Map();
-  for (const element of document.querySelectorAll(USER_SEAT_SELECTOR)) {
-    const key = element.dataset.chatAnchorKey;
-    if (key !== void 0) rows.set(key, element);
-  }
-  const targets = [];
-  for (const key of chat.order) {
-    const node = chat.nodes.get(key);
-    if (node === void 0 || node.kind !== "user" && node.kind !== "steering") continue;
-    const user = node.data;
-    const row = rows.get(key);
-    const actions = actionsContainerOf(row);
-    if (actions === void 0) continue;
-    targets.push({ kind: "durable", key, container: actions, seq: user.seq, time: user.time, preview: messagePreviewOf(user) });
-  }
-  return targets;
-}
-function isRewindInertSession(snapshot) {
-  return snapshot.subagent !== null && snapshot.subagent !== void 0;
-}
-function collectDurableTargets(snapshot, chat) {
-  if (chat === void 0 || isRewindInertSession(snapshot)) return [];
-  return collectTargets(chat);
-}
-function inboxOf(session) {
-  return session.projections.faceOf(INBOX_PROJECTION).getSnapshot();
-}
-var INBOX_PROJECTION = "inbox";
-function bubbleTextOf(row) {
-  const clone = row.cloneNode(true);
-  clone.lastElementChild?.remove();
-  const originals = row.querySelectorAll(MESSAGE_ATTACHMENT_SELECTOR);
-  const copies = clone.querySelectorAll(MESSAGE_ATTACHMENT_SELECTOR);
-  for (let index = 0; index < copies.length; index++) copies[index]?.remove();
-  return { text: clone.textContent ?? "", attachments: originals.length };
-}
-function collectPendingTargets(snapshot, steering) {
-  if (snapshot.subagent !== null) return [];
-  if (steering.length === 0) return [];
-  const rows = Array.from(document.querySelectorAll(PENDING_SEAT_SELECTOR));
-  const matched = matchPendingRows(rows.map(bubbleTextOf), steering);
-  const targets = [];
-  for (let i = 0; i < matched.length; i++) {
-    const itemId = matched[i];
-    if (itemId === null) continue;
-    const row = rows[i];
-    if (row === void 0) continue;
-    const actions = actionsContainerOf(row);
-    if (actions === void 0) continue;
-    const item = steering[i];
-    targets.push({
-      kind: "pending",
-      key: `pending:${itemId}`,
-      container: actions,
-      itemId,
-      text: item.text,
-      preview: item.preview
-    });
-  }
-  return targets;
-}
-function sameTargets(left, right) {
-  return left.length === right.length && left.every((target, index) => {
-    const other = right[index];
-    if (other === void 0 || target.key !== other.key || target.container !== other.container) return false;
-    if (target.kind === "durable") return other.kind === "durable" && target.seq === other.seq;
-    return other.kind === "pending" && target.itemId === other.itemId;
-  });
-}
-function RewindPortals({ sessionId, sessionOf, chatOf, isMainViewSession, watchChat, t, subscribeLocale, setComposerText, restoreImages }) {
-  const [targets, setTargets] = (0, import_react.useState)([]);
-  const [, forceRender] = (0, import_react.useReducer)((count) => count + 1, 0);
-  (0, import_react.useEffect)(() => subscribeLocale(() => {
-    forceRender();
-  }), [subscribeLocale]);
-  (0, import_react.useLayoutEffect)(() => {
-    let active = true;
-    let queued = false;
-    let unsubscribeInbox;
-    let inboxOwner;
-    const refresh = () => {
-      if (!active) return;
-      const session = sessionOf(sessionId);
-      syncInboxSubscription(session);
-      if (session === void 0) {
-        setTargets([]);
-        return;
-      }
-      const snapshot = session.getSnapshot();
-      const chat = chatOf(session);
-      const durable = collectDurableTargets(snapshot, chat);
-      const next = [...durable, ...collectPendingTargets(snapshot, steeringItemsOf(inboxOf(session)?.["next-step"]))];
-      setTargets((current) => sameTargets(current, next) ? current : next);
-    };
-    const queueRefresh = () => {
-      if (queued || !active) return;
-      queued = true;
-      queueMicrotask(() => {
-        queued = false;
-        refresh();
-      });
-    };
-    const syncInboxSubscription = (session) => {
-      if (session === inboxOwner) return;
-      unsubscribeInbox?.();
-      unsubscribeInbox = void 0;
-      inboxOwner = session;
-      if (session === void 0) return;
-      try {
-        unsubscribeInbox = session.projections.faceOf(INBOX_PROJECTION).subscribe(queueRefresh);
-      } catch (error) {
-        rewindLog.warn("portals", "inbox projection subscribe failed", error);
-      }
-    };
-    refresh();
-    const unsubscribeChat = watchChat(sessionId, queueRefresh);
-    const observer = new MutationObserver((records) => {
-      for (const record of records) {
-        const node = record.target instanceof Element ? record.target : record.target.parentElement;
-        if (node !== null && node.closest(IGNORED_PORTAL_SCOPE) !== null) continue;
-        queueRefresh();
-        return;
-      }
-    });
-    observer.observe(document.body, { childList: true, subtree: true });
-    return () => {
-      active = false;
-      observer.disconnect();
-      unsubscribeChat();
-      unsubscribeInbox?.();
-      unsubscribeInbox = void 0;
-      inboxOwner = void 0;
-    };
-  }, [sessionId, sessionOf, watchChat]);
-  return targets.map((target) => (0, import_react_dom.createPortal)(
-    target.kind === "pending" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      RetractButton,
-      {
-        target,
-        sessionId,
-        sessionOf,
-        setComposerText,
-        restoreImages,
-        t
-      },
-      target.key
-    ) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      RewindButton,
-      {
-        target,
-        sessionId,
-        sessionOf,
-        chatOf,
-        watchChat,
-        isMainViewSession,
-        setComposerText,
-        restoreImages,
-        t
-      },
-      target.key
-    ),
-    target.container,
-    target.key
-  ));
-}
-function RewindButton({ target, sessionId, sessionOf, chatOf, watchChat, isMainViewSession, setComposerText, restoreImages, t }) {
-  const onClick = (event) => {
-    event.stopPropagation();
-    const session = sessionOf(sessionId);
-    if (session === void 0) {
-      rewindLog.warn("portals", "rewind button clicked with no session binding");
-      return;
-    }
-    const node = userNodeOf(chatOf(session), target.key);
-    if (node === void 0) return;
-    openPopover({
-      session,
-      seq: node.seq,
-      time: node.time,
-      preview: messagePreviewOf(node),
-      anchor: event.currentTarget,
-      t,
-      onRewind: (mode) => {
-        void runRewindAndFill(session, node.seq, mode, isMainViewSession, chatOf, watchChat, setComposerText, restoreImages);
-      }
-    });
-  };
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Tooltip, { label: t("button.title"), side: "bottom", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-    "button",
-    {
-      type: "button",
-      className: CLASS.button,
-      "aria-label": t("button.aria"),
-      "aria-haspopup": "dialog",
-      onClick,
-      dangerouslySetInnerHTML: { __html: REWIND_ICON_SVG }
-    }
-  ) });
-}
 function composerText() {
   const surface = composerSurface();
   if (surface === null) return "";
   return surface.textContent ?? "";
 }
+function isRewindInertSession(snapshot) {
+  return snapshot.subagent !== null && snapshot.subagent !== void 0;
+}
+
+// src/client/retract.ts
 async function retractPending(session, itemId, text, setComposerText, restoreImages) {
   const steering = steeringItemsOf(inboxOf(session)?.["next-step"]);
   const images = steering.find((item) => item.id === itemId)?.images ?? [];
@@ -1497,37 +1379,177 @@ async function retractPending(session, itemId, text, setComposerText, restoreIma
     setComposerText(session.sessionId, text);
   }
 }
-function RetractButton({ target, sessionId, sessionOf, setComposerText, restoreImages, t }) {
-  const onClick = (event) => {
-    event.stopPropagation();
-    const session = sessionOf(sessionId);
-    if (session === void 0) return;
+
+// src/client/pending-mount.tsx
+var import_jsx_runtime3 = require("react/jsx-runtime");
+var PENDING_SEAT_SELECTOR = "[data-pending-steering]";
+var MESSAGE_ATTACHMENT_SELECTOR = "[data-message-attachments]";
+var SESSION_CONTENT_SELECTOR = "[data-conversation-session]";
+var NO_TARGETS = [];
+function bubbleTextOf(row) {
+  const clone = row.cloneNode(true);
+  clone.lastElementChild?.remove();
+  const attachments = row.querySelectorAll(MESSAGE_ATTACHMENT_SELECTOR).length;
+  for (const block of clone.querySelectorAll(MESSAGE_ATTACHMENT_SELECTOR)) block.remove();
+  return { text: clone.textContent ?? "", attachments };
+}
+function actionsContainerOf(row) {
+  const buttons = [...row.querySelectorAll("button")].filter((button) => button.dataset["pendingRetract"] === void 0);
+  const structural = buttons.at(-1)?.parentElement;
+  return structural instanceof HTMLElement && structural.querySelector("button") !== null ? structural : void 0;
+}
+function collectTargets(roots, steering) {
+  const targets = [];
+  for (const root of roots) {
+    const rows = [...root.querySelectorAll(PENDING_SEAT_SELECTOR)];
+    const matched = matchPendingRows(rows.map(bubbleTextOf), steering);
+    for (const [index, row] of rows.entries()) {
+      const itemId = matched[index];
+      const item = steering[index];
+      const container = actionsContainerOf(row);
+      if (itemId === null || itemId === void 0 || item === void 0 || container === void 0) continue;
+      targets.push({ container, itemId, text: item.text });
+    }
+  }
+  return targets;
+}
+function sameTargets(left, right) {
+  return left.length === right.length && left.every((target, index) => {
+    const other = right[index];
+    return other !== void 0 && target.container === other.container && target.itemId === other.itemId;
+  });
+}
+function contentRootsOf(sessionId) {
+  return [...document.querySelectorAll(SESSION_CONTENT_SELECTOR)].filter((element) => element.dataset["conversationSession"] === sessionId);
+}
+function involvesPending(record) {
+  const target = record.target;
+  if (target instanceof Element && target.closest(PENDING_SEAT_SELECTOR) !== null) return true;
+  for (const node of [...record.addedNodes, ...record.removedNodes]) {
+    if (node instanceof Element && (node.matches(PENDING_SEAT_SELECTOR) || node.querySelector(PENDING_SEAT_SELECTOR) !== null)) {
+      return true;
+    }
+  }
+  return false;
+}
+function resolveSession(deps, sessionId) {
+  try {
+    return deps.sessionOf(sessionId);
+  } catch {
+    return void 0;
+  }
+}
+function inboxFaceOf(session) {
+  try {
+    return session.projections.faceOf("inbox");
+  } catch {
+    return void 0;
+  }
+}
+function RetractButton({ target, sessionId, deps }) {
+  const onOpen = (anchor) => {
+    const session = resolveSession(deps, sessionId);
+    if (session === void 0) {
+      rewindLog.warn("retract", "pending retract clicked with no session binding");
+      return;
+    }
     openPopover({
       session,
-      preview: target.preview,
-      anchor: event.currentTarget,
-      t,
+      preview: target.text ?? "",
+      anchor,
+      t: deps.t,
       retract: { itemId: target.itemId, text: target.text },
       onRetract: () => {
-        void retractPending(session, target.itemId, target.text, setComposerText, restoreImages);
+        void retractPending(session, target.itemId, target.text, deps.setComposerText, deps.restoreImages);
       }
     });
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Tooltip, { label: t("button.retract.title"), side: "bottom", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-    "button",
+  return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
+    RewindActionButton,
     {
-      type: "button",
-      className: CLASS.button,
-      "aria-label": t("button.retract.aria"),
-      "aria-haspopup": "dialog",
-      onClick,
-      dangerouslySetInnerHTML: { __html: REWIND_ICON_SVG }
+      t: deps.t,
+      titleKey: "button.title",
+      ariaKey: "button.retract.aria",
+      pending: true,
+      onOpen
     }
-  ) });
+  );
 }
-function createRewindBridge(deps) {
-  return function RewindBridge({ sessionId }) {
-    return (0, import_react.createElement)(RewindPortals, { sessionId, ...deps });
+function PendingRetractLayer({ sessionId, deps }) {
+  const [targets, setTargets] = (0, import_react2.useState)(NO_TARGETS);
+  const [, forceRender] = (0, import_react2.useReducer)((count) => count + 1, 0);
+  (0, import_react2.useLayoutEffect)(() => deps.subscribeLocale(() => {
+    forceRender();
+  }), [deps]);
+  (0, import_react2.useLayoutEffect)(() => {
+    let stopped = false;
+    let queued = false;
+    let observer = null;
+    let observed = [];
+    const stopObserver = () => {
+      observer?.disconnect();
+      observer = null;
+      observed = [];
+    };
+    const observe = (roots) => {
+      if (observer !== null && observed.length === roots.length && observed.every((root, index) => root === roots[index])) return;
+      stopObserver();
+      observed = roots;
+      observer = new MutationObserver((records) => {
+        if (stopped) return;
+        if (observed.some((root) => !root.isConnected)) {
+          refresh();
+          return;
+        }
+        if (records.some(involvesPending)) schedule();
+      });
+      for (const root of observed) observer.observe(root, { childList: true, subtree: true });
+    };
+    const refresh = () => {
+      if (stopped) return;
+      const session2 = resolveSession(deps, sessionId);
+      const steering = session2 === void 0 ? [] : steeringItemsOf(inboxOf(session2)?.["next-step"]);
+      if (session2 === void 0 || steering.length === 0 || isRewindInertSession(session2.getSnapshot())) {
+        setTargets(NO_TARGETS);
+        stopObserver();
+        return;
+      }
+      const roots = contentRootsOf(sessionId);
+      if (roots.length === 0) {
+        setTargets(NO_TARGETS);
+        stopObserver();
+        return;
+      }
+      observe(roots);
+      const next = collectTargets(roots, steering);
+      setTargets((current) => sameTargets(current, next) ? current : next);
+    };
+    const schedule = () => {
+      if (queued || stopped) return;
+      queued = true;
+      queueMicrotask(() => {
+        queued = false;
+        refresh();
+      });
+    };
+    refresh();
+    const session = resolveSession(deps, sessionId);
+    const unsubscribe = session === void 0 ? void 0 : inboxFaceOf(session)?.subscribe?.(schedule);
+    return () => {
+      stopped = true;
+      unsubscribe?.();
+      stopObserver();
+    };
+  }, [sessionId, deps]);
+  return targets.map((target) => (0, import_react_dom.createPortal)(
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(RetractButton, { target, sessionId, deps }, target.itemId),
+    target.container,
+    target.itemId
+  ));
+}
+function createPendingBridge(deps) {
+  return function PendingBridge({ sessionId }) {
+    return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(PendingRetractLayer, { sessionId, deps });
   };
 }
 
@@ -1611,22 +1633,17 @@ async function candidatesOverApi(sessionId) {
 }
 
 // src/client/build-info.ts
-var PLUGIN_VERSION = true ? "0.20.0" : "dev";
+var PLUGIN_VERSION = true ? "0.21.0" : "dev";
 var PLUGIN_PACKAGE = "dsh-rewind-plugin";
-var BUILD_HASH = true ? "c59b80ee" : "dev";
+var BUILD_HASH = true ? "5ab4d025" : "dev";
 
 // src/client/locales.ts
 var en = {
-  "button.aria": "Rewind to this message",
   "button.title": "Rewind",
+  "button.aria": "Rewind to this message",
   "button.retract.aria": "Rewind to this pending message",
-  "button.retract.title": "Rewind",
   "popover.title": "Rewind to this message",
   "popover.noText": "(no text)",
-  "popover.retract.title": "Rewind to this pending message",
-  "popover.retract.target": "Pending \xB7 {preview}",
-  "popover.retract.hint": "Retracts this pending message and the ones after it, without interrupting the run",
-  "popover.retract.confirm": "Confirm rewind",
   "popover.chat": "Rewind conversation only",
   "popover.chat.hint": "Context only; workspace untouched",
   "popover.both": "Rewind conversation and files",
@@ -1634,7 +1651,6 @@ var en = {
   "popover.checking": "Checking for file changes\u2026",
   "popover.noChanges": "No restorable file changes",
   "popover.backupDisabled": "Snapshots off; the restore may be incomplete",
-  "popover.cancel": "Cancel",
   "popover.impact.loading": "Fetching impact list\u2026",
   "popover.impact.failed": "Could not fetch the impact list: {message}",
   "popover.impact.none": "No tracked file changes after the target; nothing to restore.",
@@ -1642,6 +1658,10 @@ var en = {
   "popover.impact.delete": "Delete {path}",
   "popover.confirm": "Confirm rewind",
   "popover.back": "Back",
+  "popover.retract.title": "Rewind to this pending message",
+  "popover.retract.target": "Pending \xB7 {preview}",
+  "popover.retract.hint": "Retracts this pending message and the ones after it, without interrupting the run",
+  "popover.cancel": "Cancel",
   "backup.title": "Snapshot backups",
   "backup.on": "When on, file snapshots are created automatically for file restore.",
   "backup.off": "When off, no file snapshots are created; file changes made while off cannot be restored.",
@@ -1660,16 +1680,11 @@ var en = {
   "cleanup.unavailable": "This plugin is not loaded, so it cannot be configured right now"
 };
 var zh = {
-  "button.aria": "\u56DE\u9000\u5230\u6B64\u6D88\u606F",
   "button.title": "\u56DE\u9000",
+  "button.aria": "\u56DE\u9000\u5230\u6B64\u6D88\u606F",
   "button.retract.aria": "\u56DE\u9000\u5230\u6B64\u63D2\u8BDD\u6D88\u606F",
-  "button.retract.title": "\u56DE\u9000",
   "popover.title": "\u56DE\u9000\u5230\u8FD9\u6761\u6D88\u606F",
   "popover.noText": "\uFF08\u65E0\u6587\u672C\uFF09",
-  "popover.retract.title": "\u56DE\u9000\u5230\u8FD9\u6761\u63D2\u8BDD\u6D88\u606F",
-  "popover.retract.target": "\u63D2\u8BDD\u4E2D \xB7 {preview}",
-  "popover.retract.hint": "\u64A4\u56DE\u8FD9\u6761\u53CA\u4E4B\u540E\u7684\u63D2\u8BDD\u6D88\u606F\uFF0C\u4E0D\u6253\u65AD\u5F53\u524D\u751F\u6210",
-  "popover.retract.confirm": "\u786E\u8BA4\u56DE\u9000",
   "popover.chat": "\u4EC5\u56DE\u9000\u5BF9\u8BDD",
   "popover.chat.hint": "\u4EC5\u56DE\u9000\u4E0A\u4E0B\u6587\uFF0C\u4E0D\u52A8\u5DE5\u4F5C\u533A\u6587\u4EF6",
   "popover.both": "\u56DE\u9000\u5BF9\u8BDD\u548C\u6587\u4EF6",
@@ -1677,7 +1692,6 @@ var zh = {
   "popover.checking": "\u6B63\u5728\u68C0\u67E5\u6587\u4EF6\u53D8\u66F4\u2026",
   "popover.noChanges": "\u65E0\u53EF\u8FD8\u539F\u7684\u6587\u4EF6\u53D8\u66F4",
   "popover.backupDisabled": "\u5FEB\u7167\u5907\u4EFD\u5DF2\u5173\u95ED\uFF0C\u8FD8\u539F\u53EF\u80FD\u4E0D\u5145\u5206",
-  "popover.cancel": "\u53D6\u6D88",
   "popover.impact.loading": "\u6B63\u5728\u83B7\u53D6\u5F71\u54CD\u6E05\u5355\u2026",
   "popover.impact.failed": "\u65E0\u6CD5\u83B7\u53D6\u5F71\u54CD\u6E05\u5355\uFF1A{message}",
   "popover.impact.none": "\u76EE\u6807\u4E4B\u540E\u6CA1\u6709\u8DDF\u8E2A\u5230\u7684\u5199\u7C7B\u53D8\u66F4\uFF0C\u65E0\u9700\u8FD8\u539F\u6587\u4EF6\u3002",
@@ -1685,6 +1699,10 @@ var zh = {
   "popover.impact.delete": "\u5220\u9664 {path}",
   "popover.confirm": "\u786E\u8BA4\u56DE\u9000",
   "popover.back": "\u8FD4\u56DE",
+  "popover.retract.title": "\u56DE\u9000\u5230\u8FD9\u6761\u63D2\u8BDD\u6D88\u606F",
+  "popover.retract.target": "\u63D2\u8BDD\u4E2D \xB7 {preview}",
+  "popover.retract.hint": "\u64A4\u56DE\u8FD9\u6761\u53CA\u4E4B\u540E\u7684\u63D2\u8BDD\u6D88\u606F\uFF0C\u4E0D\u6253\u65AD\u5F53\u524D\u751F\u6210",
+  "popover.cancel": "\u53D6\u6D88",
   "backup.title": "\u5FEB\u7167\u5907\u4EFD",
   "backup.on": "\u5F00\u542F\u540E\u81EA\u52A8\u521B\u5EFA\u6587\u4EF6\u5FEB\u7167\uFF0C\u7528\u4E8E\u6587\u4EF6\u8FD8\u539F\u3002",
   "backup.off": "\u5173\u95ED\u540E\u4E0D\u518D\u521B\u5EFA\u6587\u4EF6\u5FEB\u7167\uFF1B\u5173\u95ED\u671F\u95F4\u7684\u6587\u4EF6\u6539\u52A8\u65E0\u6CD5\u8FD8\u539F\u3002",
@@ -1703,16 +1721,11 @@ var zh = {
   "cleanup.unavailable": "\u8BE5\u63D2\u4EF6\u5F53\u524D\u672A\u52A0\u8F7D\uFF0C\u6682\u65F6\u65E0\u6CD5\u914D\u7F6E"
 };
 var ja = {
-  "button.aria": "\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u307E\u3067\u5DFB\u304D\u623B\u3059",
   "button.title": "\u5DFB\u304D\u623B\u3057",
+  "button.aria": "\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u307E\u3067\u5DFB\u304D\u623B\u3059",
   "button.retract.aria": "\u3053\u306E\u4FDD\u7559\u4E2D\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u307E\u3067\u5DFB\u304D\u623B\u3059",
-  "button.retract.title": "\u5DFB\u304D\u623B\u3057",
   "popover.title": "\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u307E\u3067\u5DFB\u304D\u623B\u3059",
   "popover.noText": "\uFF08\u30C6\u30AD\u30B9\u30C8\u306A\u3057\uFF09",
-  "popover.retract.title": "\u3053\u306E\u4FDD\u7559\u4E2D\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u307E\u3067\u5DFB\u304D\u623B\u3059",
-  "popover.retract.target": "\u4FDD\u7559\u4E2D \xB7 {preview}",
-  "popover.retract.hint": "\u3053\u306E\u4FDD\u7559\u4E2D\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3068\u305D\u308C\u4EE5\u964D\u3092\u64A4\u56DE\u3057\u307E\u3059\u3002\u73FE\u5728\u306E\u751F\u6210\u306F\u4E2D\u65AD\u3057\u307E\u305B\u3093",
-  "popover.retract.confirm": "\u5DFB\u304D\u623B\u3057\u3092\u5B9F\u884C",
   "popover.chat": "\u4F1A\u8A71\u306E\u307F\u5DFB\u304D\u623B\u3059",
   "popover.chat.hint": "\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306E\u307F\u5BFE\u8C61\u3067\u3001\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306F\u5909\u66F4\u3057\u307E\u305B\u3093",
   "popover.both": "\u4F1A\u8A71\u3068\u30D5\u30A1\u30A4\u30EB\u3092\u5DFB\u304D\u623B\u3059",
@@ -1720,7 +1733,6 @@ var ja = {
   "popover.checking": "\u30D5\u30A1\u30A4\u30EB\u306E\u5909\u66F4\u3092\u78BA\u8A8D\u4E2D\u2026",
   "popover.noChanges": "\u5FA9\u5143\u3067\u304D\u308B\u30D5\u30A1\u30A4\u30EB\u306E\u5909\u66F4\u306F\u3042\u308A\u307E\u305B\u3093",
   "popover.backupDisabled": "\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u304C\u7121\u52B9\u306A\u305F\u3081\u3001\u5FA9\u5143\u304C\u4E0D\u5B8C\u5168\u306B\u306A\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059",
-  "popover.cancel": "\u30AD\u30E3\u30F3\u30BB\u30EB",
   "popover.impact.loading": "\u5F71\u97FF\u30EA\u30B9\u30C8\u3092\u53D6\u5F97\u4E2D\u2026",
   "popover.impact.failed": "\u5F71\u97FF\u30EA\u30B9\u30C8\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF1A{message}",
   "popover.impact.none": "\u5BFE\u8C61\u3088\u308A\u5F8C\u306B\u8FFD\u8DE1\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u5909\u66F4\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u5FA9\u5143\u3059\u308B\u3082\u306E\u306F\u3042\u308A\u307E\u305B\u3093\u3002",
@@ -1728,6 +1740,10 @@ var ja = {
   "popover.impact.delete": "{path} \u3092\u524A\u9664",
   "popover.confirm": "\u5DFB\u304D\u623B\u3057\u3092\u5B9F\u884C",
   "popover.back": "\u623B\u308B",
+  "popover.retract.title": "\u3053\u306E\u4FDD\u7559\u4E2D\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u307E\u3067\u5DFB\u304D\u623B\u3059",
+  "popover.retract.target": "\u4FDD\u7559\u4E2D \xB7 {preview}",
+  "popover.retract.hint": "\u3053\u306E\u4FDD\u7559\u4E2D\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3068\u305D\u308C\u4EE5\u964D\u3092\u64A4\u56DE\u3057\u307E\u3059\u3002\u73FE\u5728\u306E\u751F\u6210\u306F\u4E2D\u65AD\u3057\u307E\u305B\u3093",
+  "popover.cancel": "\u30AD\u30E3\u30F3\u30BB\u30EB",
   "backup.title": "\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u306E\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7",
   "backup.on": "\u6709\u52B9\u306B\u3059\u308B\u3068\u3001\u30D5\u30A1\u30A4\u30EB\u5FA9\u5143\u7528\u306E\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u304C\u81EA\u52D5\u3067\u4F5C\u6210\u3055\u308C\u307E\u3059\u3002",
   "backup.off": "\u7121\u52B9\u306B\u3059\u308B\u3068\u3001\u30D5\u30A1\u30A4\u30EB\u306E\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u306F\u4F5C\u6210\u3055\u308C\u307E\u305B\u3093\u3002\u7121\u52B9\u306A\u9593\u306E\u30D5\u30A1\u30A4\u30EB\u5909\u66F4\u306F\u5FA9\u5143\u3067\u304D\u307E\u305B\u3093\u3002",
@@ -1746,16 +1762,11 @@ var ja = {
   "cleanup.unavailable": "\u3053\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u73FE\u5728\u8AAD\u307F\u8FBC\u307E\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093"
 };
 var es = {
-  "button.aria": "Rebobinar hasta este mensaje",
   "button.title": "Rebobinar",
+  "button.aria": "Rebobinar hasta este mensaje",
   "button.retract.aria": "Rebobinar hasta este mensaje pendiente",
-  "button.retract.title": "Rebobinar",
   "popover.title": "Rebobinar hasta este mensaje",
   "popover.noText": "(sin texto)",
-  "popover.retract.title": "Rebobinar hasta este mensaje pendiente",
-  "popover.retract.target": "Pendiente \xB7 {preview}",
-  "popover.retract.hint": "Retira este mensaje pendiente y los siguientes, sin interrumpir la ejecuci\xF3n",
-  "popover.retract.confirm": "Confirmar rebobinado",
   "popover.chat": "Rebobinar solo la conversaci\xF3n",
   "popover.chat.hint": "Solo el contexto; el espacio de trabajo no se modifica",
   "popover.both": "Rebobinar conversaci\xF3n y archivos",
@@ -1763,7 +1774,6 @@ var es = {
   "popover.checking": "Comprobando cambios en los archivos\u2026",
   "popover.noChanges": "No hay cambios de archivo restaurables",
   "popover.backupDisabled": "Instant\xE1neas desactivadas; la restauraci\xF3n puede ser incompleta",
-  "popover.cancel": "Cancelar",
   "popover.impact.loading": "Obteniendo la lista de impacto\u2026",
   "popover.impact.failed": "No se pudo obtener la lista de impacto: {message}",
   "popover.impact.none": "No hay cambios de archivo rastreados despu\xE9s del destino; no hay nada que restaurar.",
@@ -1771,6 +1781,10 @@ var es = {
   "popover.impact.delete": "Eliminar {path}",
   "popover.confirm": "Confirmar rebobinado",
   "popover.back": "Atr\xE1s",
+  "popover.retract.title": "Rebobinar hasta este mensaje pendiente",
+  "popover.retract.target": "Pendiente \xB7 {preview}",
+  "popover.retract.hint": "Retira este mensaje pendiente y los siguientes, sin interrumpir la ejecuci\xF3n",
+  "popover.cancel": "Cancelar",
   "backup.title": "Copias de seguridad de instant\xE1neas",
   "backup.on": "Si est\xE1 activado, se crean instant\xE1neas de archivos autom\xE1ticamente para la restauraci\xF3n.",
   "backup.off": "Si est\xE1 desactivado, no se crean instant\xE1neas de archivos; los cambios hechos mientras est\xE1 desactivado no se pueden restaurar.",
@@ -1789,16 +1803,11 @@ var es = {
   "cleanup.unavailable": "Este plugin no est\xE1 cargado, por lo que no se puede configurar ahora"
 };
 var fr = {
-  "button.aria": "Rembobiner jusqu\u2019\xE0 ce message",
   "button.title": "Rembobiner",
+  "button.aria": "Rembobiner jusqu\u2019\xE0 ce message",
   "button.retract.aria": "Rembobiner jusqu\u2019\xE0 ce message en attente",
-  "button.retract.title": "Rembobiner",
   "popover.title": "Rembobiner jusqu\u2019\xE0 ce message",
   "popover.noText": "(sans texte)",
-  "popover.retract.title": "Rembobiner jusqu\u2019\xE0 ce message en attente",
-  "popover.retract.target": "En attente \xB7 {preview}",
-  "popover.retract.hint": "Retire ce message en attente et les suivants, sans interrompre l\u2019ex\xE9cution",
-  "popover.retract.confirm": "Confirmer le rembobinage",
   "popover.chat": "Rembobiner la conversation uniquement",
   "popover.chat.hint": "Contexte uniquement ; l\u2019espace de travail reste intact",
   "popover.both": "Rembobiner la conversation et les fichiers",
@@ -1806,7 +1815,6 @@ var fr = {
   "popover.checking": "V\xE9rification des modifications de fichiers\u2026",
   "popover.noChanges": "Aucune modification de fichier restaurable",
   "popover.backupDisabled": "Instantan\xE9s d\xE9sactiv\xE9s ; la restauration peut \xEAtre incompl\xE8te",
-  "popover.cancel": "Annuler",
   "popover.impact.loading": "R\xE9cup\xE9ration de la liste d\u2019impact\u2026",
   "popover.impact.failed": "Impossible de r\xE9cup\xE9rer la liste d\u2019impact : {message}",
   "popover.impact.none": "Aucune modification de fichier suivie apr\xE8s la cible ; rien \xE0 restaurer.",
@@ -1814,6 +1822,10 @@ var fr = {
   "popover.impact.delete": "Supprimer {path}",
   "popover.confirm": "Confirmer le rembobinage",
   "popover.back": "Retour",
+  "popover.retract.title": "Rembobiner jusqu\u2019\xE0 ce message en attente",
+  "popover.retract.target": "En attente \xB7 {preview}",
+  "popover.retract.hint": "Retire ce message en attente et les suivants, sans interrompre l\u2019ex\xE9cution",
+  "popover.cancel": "Annuler",
   "backup.title": "Sauvegardes d\u2019instantan\xE9s",
   "backup.on": "Lorsque cette option est activ\xE9e, des instantan\xE9s de fichiers sont cr\xE9\xE9s automatiquement pour la restauration.",
   "backup.off": "Lorsque cette option est d\xE9sactiv\xE9e, aucun instantan\xE9 de fichier n\u2019est cr\xE9\xE9 ; les modifications effectu\xE9es pendant cette p\xE9riode ne peuvent pas \xEAtre restaur\xE9es.",
@@ -1832,16 +1844,11 @@ var fr = {
   "cleanup.unavailable": "Ce plugin n\u2019est pas charg\xE9, il ne peut donc pas \xEAtre configur\xE9 pour le moment"
 };
 var de = {
-  "button.aria": "Bis zu dieser Nachricht zur\xFCckspulen",
   "button.title": "Zur\xFCckspulen",
+  "button.aria": "Bis zu dieser Nachricht zur\xFCckspulen",
   "button.retract.aria": "Bis zu dieser ausstehenden Nachricht zur\xFCckspulen",
-  "button.retract.title": "Zur\xFCckspulen",
   "popover.title": "Bis zu dieser Nachricht zur\xFCckspulen",
   "popover.noText": "(kein Text)",
-  "popover.retract.title": "Bis zu dieser ausstehenden Nachricht zur\xFCckspulen",
-  "popover.retract.target": "Ausstehend \xB7 {preview}",
-  "popover.retract.hint": "Zieht diese ausstehende Nachricht und alle folgenden zur\xFCck, ohne den Lauf zu unterbrechen",
-  "popover.retract.confirm": "Zur\xFCckspulen best\xE4tigen",
   "popover.chat": "Nur Unterhaltung zur\xFCckspulen",
   "popover.chat.hint": "Nur Kontext; Arbeitsbereich bleibt unver\xE4ndert",
   "popover.both": "Unterhaltung und Dateien zur\xFCckspulen",
@@ -1849,7 +1856,6 @@ var de = {
   "popover.checking": "Datei\xE4nderungen werden gepr\xFCft\u2026",
   "popover.noChanges": "Keine wiederherstellbaren Datei\xE4nderungen",
   "popover.backupDisabled": "Snapshots deaktiviert; die Wiederherstellung kann unvollst\xE4ndig sein",
-  "popover.cancel": "Abbrechen",
   "popover.impact.loading": "Auswirkungsliste wird abgerufen\u2026",
   "popover.impact.failed": "Auswirkungsliste konnte nicht abgerufen werden: {message}",
   "popover.impact.none": "Keine erfassten Datei\xE4nderungen nach dem Ziel; nichts wiederherzustellen.",
@@ -1857,6 +1863,10 @@ var de = {
   "popover.impact.delete": "{path} l\xF6schen",
   "popover.confirm": "Zur\xFCckspulen best\xE4tigen",
   "popover.back": "Zur\xFCck",
+  "popover.retract.title": "Bis zu dieser ausstehenden Nachricht zur\xFCckspulen",
+  "popover.retract.target": "Ausstehend \xB7 {preview}",
+  "popover.retract.hint": "Zieht diese ausstehende Nachricht und alle folgenden zur\xFCck, ohne den Lauf zu unterbrechen",
+  "popover.cancel": "Abbrechen",
   "backup.title": "Snapshot-Sicherungen",
   "backup.on": "Wenn aktiviert, werden automatisch Datei-Snapshots f\xFCr die Wiederherstellung erstellt.",
   "backup.off": "Wenn deaktiviert, werden keine Datei-Snapshots erstellt; \xC4nderungen aus dieser Zeit k\xF6nnen nicht wiederhergestellt werden.",
@@ -1875,16 +1885,11 @@ var de = {
   "cleanup.unavailable": "Dieses Plugin ist nicht geladen und kann daher gerade nicht konfiguriert werden"
 };
 var ru = {
-  "button.aria": "\u041E\u0442\u043A\u0430\u0442\u0438\u0442\u044C \u043A \u044D\u0442\u043E\u043C\u0443 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044E",
   "button.title": "\u041E\u0442\u043A\u0430\u0442\u0438\u0442\u044C",
+  "button.aria": "\u041E\u0442\u043A\u0430\u0442\u0438\u0442\u044C \u043A \u044D\u0442\u043E\u043C\u0443 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044E",
   "button.retract.aria": "\u041E\u0442\u043A\u0430\u0442\u0438\u0442\u044C \u043A \u044D\u0442\u043E\u043C\u0443 \u043E\u0436\u0438\u0434\u0430\u044E\u0449\u0435\u043C\u0443 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044E",
-  "button.retract.title": "\u041E\u0442\u043A\u0430\u0442\u0438\u0442\u044C",
   "popover.title": "\u041E\u0442\u043A\u0430\u0442\u0438\u0442\u044C \u043A \u044D\u0442\u043E\u043C\u0443 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044E",
   "popover.noText": "(\u043D\u0435\u0442 \u0442\u0435\u043A\u0441\u0442\u0430)",
-  "popover.retract.title": "\u041E\u0442\u043A\u0430\u0442\u0438\u0442\u044C \u043A \u044D\u0442\u043E\u043C\u0443 \u043E\u0436\u0438\u0434\u0430\u044E\u0449\u0435\u043C\u0443 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044E",
-  "popover.retract.target": "\u041E\u0436\u0438\u0434\u0430\u0435\u0442 \xB7 {preview}",
-  "popover.retract.hint": "\u041E\u0442\u0437\u044B\u0432\u0430\u0435\u0442 \u044D\u0442\u043E \u043E\u0436\u0438\u0434\u0430\u044E\u0449\u0435\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u0438 \u043F\u043E\u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0435, \u043D\u0435 \u043F\u0440\u0435\u0440\u044B\u0432\u0430\u044F \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435",
-  "popover.retract.confirm": "\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044C \u043E\u0442\u043A\u0430\u0442",
   "popover.chat": "\u041E\u0442\u043A\u0430\u0442\u0438\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u0431\u0435\u0441\u0435\u0434\u0443",
   "popover.chat.hint": "\u0422\u043E\u043B\u044C\u043A\u043E \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442; \u0440\u0430\u0431\u043E\u0447\u0430\u044F \u043E\u0431\u043B\u0430\u0441\u0442\u044C \u043D\u0435 \u0438\u0437\u043C\u0435\u043D\u044F\u0435\u0442\u0441\u044F",
   "popover.both": "\u041E\u0442\u043A\u0430\u0442\u0438\u0442\u044C \u0431\u0435\u0441\u0435\u0434\u0443 \u0438 \u0444\u0430\u0439\u043B\u044B",
@@ -1892,7 +1897,6 @@ var ru = {
   "popover.checking": "\u041F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439 \u0444\u0430\u0439\u043B\u043E\u0432\u2026",
   "popover.noChanges": "\u041D\u0435\u0442 \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u043C\u044B\u0445 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439 \u0444\u0430\u0439\u043B\u043E\u0432",
   "popover.backupDisabled": "\u0421\u043D\u0438\u043C\u043A\u0438 \u043E\u0442\u043A\u043B\u044E\u0447\u0435\u043D\u044B; \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043D\u0435\u043F\u043E\u043B\u043D\u044B\u043C",
-  "popover.cancel": "\u041E\u0442\u043C\u0435\u043D\u0430",
   "popover.impact.loading": "\u041F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u0435 \u0441\u043F\u0438\u0441\u043A\u0430 \u0432\u043B\u0438\u044F\u043D\u0438\u044F\u2026",
   "popover.impact.failed": "\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u0441\u043F\u0438\u0441\u043E\u043A \u0432\u043B\u0438\u044F\u043D\u0438\u044F: {message}",
   "popover.impact.none": "\u041F\u043E\u0441\u043B\u0435 \u0446\u0435\u043B\u0438 \u043D\u0435\u0442 \u043E\u0442\u0441\u043B\u0435\u0436\u0438\u0432\u0430\u0435\u043C\u044B\u0445 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439 \u0444\u0430\u0439\u043B\u043E\u0432; \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u0430\u0432\u043B\u0438\u0432\u0430\u0442\u044C \u043D\u0435\u0447\u0435\u0433\u043E.",
@@ -1900,6 +1904,10 @@ var ru = {
   "popover.impact.delete": "\u0423\u0434\u0430\u043B\u0438\u0442\u044C {path}",
   "popover.confirm": "\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044C \u043E\u0442\u043A\u0430\u0442",
   "popover.back": "\u041D\u0430\u0437\u0430\u0434",
+  "popover.retract.title": "\u041E\u0442\u043A\u0430\u0442\u0438\u0442\u044C \u043A \u044D\u0442\u043E\u043C\u0443 \u043E\u0436\u0438\u0434\u0430\u044E\u0449\u0435\u043C\u0443 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044E",
+  "popover.retract.target": "\u041E\u0436\u0438\u0434\u0430\u0435\u0442 \xB7 {preview}",
+  "popover.retract.hint": "\u041E\u0442\u0437\u044B\u0432\u0430\u0435\u0442 \u044D\u0442\u043E \u043E\u0436\u0438\u0434\u0430\u044E\u0449\u0435\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u0438 \u043F\u043E\u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0435, \u043D\u0435 \u043F\u0440\u0435\u0440\u044B\u0432\u0430\u044F \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435",
+  "popover.cancel": "\u041E\u0442\u043C\u0435\u043D\u0430",
   "backup.title": "\u0420\u0435\u0437\u0435\u0440\u0432\u043D\u044B\u0435 \u043A\u043E\u043F\u0438\u0438 \u0441\u043D\u0438\u043C\u043A\u043E\u0432",
   "backup.on": "\u0415\u0441\u043B\u0438 \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u043E, \u0441\u043D\u0438\u043C\u043A\u0438 \u0444\u0430\u0439\u043B\u043E\u0432 \u0441\u043E\u0437\u0434\u0430\u044E\u0442\u0441\u044F \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0434\u043B\u044F \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u044F.",
   "backup.off": "\u0415\u0441\u043B\u0438 \u043E\u0442\u043A\u043B\u044E\u0447\u0435\u043D\u043E, \u0441\u043D\u0438\u043C\u043A\u0438 \u0444\u0430\u0439\u043B\u043E\u0432 \u043D\u0435 \u0441\u043E\u0437\u0434\u0430\u044E\u0442\u0441\u044F; \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F, \u0441\u0434\u0435\u043B\u0430\u043D\u043D\u044B\u0435 \u0432 \u044D\u0442\u043E \u0432\u0440\u0435\u043C\u044F, \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u043D\u0435\u043B\u044C\u0437\u044F.",
@@ -1918,16 +1926,11 @@ var ru = {
   "cleanup.unavailable": "\u042D\u0442\u043E\u0442 \u043F\u043B\u0430\u0433\u0438\u043D \u043D\u0435 \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D, \u043F\u043E\u044D\u0442\u043E\u043C\u0443 \u0441\u0435\u0439\u0447\u0430\u0441 \u0435\u0433\u043E \u043D\u0435\u043B\u044C\u0437\u044F \u043D\u0430\u0441\u0442\u0440\u043E\u0438\u0442\u044C"
 };
 var pt = {
-  "button.aria": "Rebobinar at\xE9 esta mensagem",
   "button.title": "Rebobinar",
+  "button.aria": "Rebobinar at\xE9 esta mensagem",
   "button.retract.aria": "Rebobinar at\xE9 esta mensagem pendente",
-  "button.retract.title": "Rebobinar",
   "popover.title": "Rebobinar at\xE9 esta mensagem",
   "popover.noText": "(sem texto)",
-  "popover.retract.title": "Rebobinar at\xE9 esta mensagem pendente",
-  "popover.retract.target": "Pendente \xB7 {preview}",
-  "popover.retract.hint": "Retira esta mensagem pendente e as seguintes, sem interromper a execu\xE7\xE3o",
-  "popover.retract.confirm": "Confirmar rebobinamento",
   "popover.chat": "Rebobinar apenas a conversa",
   "popover.chat.hint": "Apenas o contexto; o espa\xE7o de trabalho n\xE3o \xE9 alterado",
   "popover.both": "Rebobinar conversa e arquivos",
@@ -1935,7 +1938,6 @@ var pt = {
   "popover.checking": "Verificando altera\xE7\xF5es nos arquivos\u2026",
   "popover.noChanges": "Nenhuma altera\xE7\xE3o de arquivo restaur\xE1vel",
   "popover.backupDisabled": "Snapshots desativados; a restaura\xE7\xE3o pode ficar incompleta",
-  "popover.cancel": "Cancelar",
   "popover.impact.loading": "Obtendo a lista de impacto\u2026",
   "popover.impact.failed": "N\xE3o foi poss\xEDvel obter a lista de impacto: {message}",
   "popover.impact.none": "Nenhuma altera\xE7\xE3o de arquivo rastreada ap\xF3s o destino; nada a restaurar.",
@@ -1943,6 +1945,10 @@ var pt = {
   "popover.impact.delete": "Excluir {path}",
   "popover.confirm": "Confirmar rebobinamento",
   "popover.back": "Voltar",
+  "popover.retract.title": "Rebobinar at\xE9 esta mensagem pendente",
+  "popover.retract.target": "Pendente \xB7 {preview}",
+  "popover.retract.hint": "Retira esta mensagem pendente e as seguintes, sem interromper a execu\xE7\xE3o",
+  "popover.cancel": "Cancelar",
   "backup.title": "Backups de snapshots",
   "backup.on": "Quando ativado, snapshots de arquivos s\xE3o criados automaticamente para a restaura\xE7\xE3o.",
   "backup.off": "Quando desativado, nenhum snapshot de arquivo \xE9 criado; altera\xE7\xF5es feitas enquanto desativado n\xE3o podem ser restauradas.",
@@ -1964,7 +1970,7 @@ var CLIENT_DICTS = { en, zh, ja, es, fr, de, ru, pt };
 
 // src/client/settings-card.tsx
 var import_dsh_client_ui_primitives2 = require("@deepseek-ai/dsh-client-ui-primitives");
-var import_jsx_runtime2 = require("react/jsx-runtime");
+var import_jsx_runtime4 = require("react/jsx-runtime");
 var SETTINGS_ENTRY_ID = "dsh-rewind-plugin";
 var DEFAULT_MAX_AGE_DAYS = 30;
 function autoCleanupEnabledField() {
@@ -2013,7 +2019,7 @@ function SettingsCard(props) {
   const disabled = !state.writable || state.saving;
   const checkpointing = state.checkpointingEnabled.text === "true";
   const cleanupEnabled = state.enabled.text === "true";
-  return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
     import_dsh_client_ui_primitives2.SettingsForm,
     {
       labels: formLabels(t),
@@ -2021,10 +2027,10 @@ function SettingsCard(props) {
       onSave: props.save,
       onDiscard: props.discard,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-settings-section", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-settings-toggle-row", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dsh-rewind-settings-toggle-label", children: t("backup.title") }),
-            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "dsh-rewind-settings-section", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "dsh-rewind-settings-toggle-row", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "dsh-rewind-settings-toggle-label", children: t("backup.title") }),
+            /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
               import_dsh_client_ui_primitives2.Switch,
               {
                 checked: checkpointing,
@@ -2036,13 +2042,13 @@ function SettingsCard(props) {
               }
             )
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dsh-rewind-settings-hint", children: t(checkpointing ? "backup.on" : "backup.off") })
+          /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("p", { className: "dsh-rewind-settings-hint", children: t(checkpointing ? "backup.on" : "backup.off") })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "dsh-rewind-settings-divider" }),
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-settings-section", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-settings-toggle-row", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dsh-rewind-settings-toggle-label", children: t("cleanup.auto") }),
-            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "dsh-rewind-settings-divider" }),
+        /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "dsh-rewind-settings-section", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "dsh-rewind-settings-toggle-row", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "dsh-rewind-settings-toggle-label", children: t("cleanup.auto") }),
+            /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
               import_dsh_client_ui_primitives2.Switch,
               {
                 checked: cleanupEnabled,
@@ -2054,9 +2060,9 @@ function SettingsCard(props) {
               }
             )
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dsh-rewind-settings-hint", children: t(cleanupEnabled ? "cleanup.auto.on" : "cleanup.auto.off") })
+          /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("p", { className: "dsh-rewind-settings-hint", children: t(cleanupEnabled ? "cleanup.auto.on" : "cleanup.auto.off") })
         ] }),
-        cleanupEnabled ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+        cleanupEnabled ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
           import_dsh_client_ui_primitives2.SettingsValueField,
           {
             id: "dsh-rewind-cleanup-maxage",
@@ -2094,9 +2100,6 @@ function apply(ctx) {
     yield ctx.locale.register(NS2, CLIENT_DICTS);
     const t = ctx.locale.bind(NS2);
     registerPreviewCall(previewOverApi);
-    yield () => {
-      registerPreviewCall(null);
-    };
     const style = document.createElement("style");
     style.dataset.plugin = PLUGIN_PACKAGE;
     style.textContent = STYLE;
@@ -2211,16 +2214,6 @@ function apply(ctx) {
       cb
     );
     const slots = ctx.slots;
-    yield slots.inject(HEADER_ACTIONS_SLOT, () => slots.register(
-      {
-        name: HEADER_ACTIONS_SLOT,
-        // A distinct list-entry id keeps the bridge from shadowing any other
-        // header action; the entry renders portals only, never header UI.
-        id: "dsh-rewind-portals",
-        order: 1e3
-      },
-      createRewindBridge({ sessionOf, chatOf, isMainViewSession, watchChat, setComposerText, restoreImages, t, subscribeLocale })
-    ));
     try {
       const { store, form } = settingsForm(
         ctx.configForms.get(SETTINGS_ENTRY_ID)
@@ -2293,10 +2286,47 @@ function apply(ctx) {
     for (const name2 of ["rewind", "undo"]) {
       yield commandUi.decorate({ name: name2, ...rewindPopupSpec });
     }
+    const canRewindIn = (sessionId) => {
+      const face = sessionOf(sessionId);
+      return face !== void 0 && !isRewindInertSession(face.getSnapshot());
+    };
+    const openRewindFor = (row, anchor) => {
+      const face = sessionOf(row.sessionId);
+      if (face === void 0) {
+        rewindLog.warn("action", "rewind action clicked with no session binding");
+        return;
+      }
+      openPopover({
+        session: face,
+        seq: row.seq,
+        time: row.time,
+        preview: row.text,
+        anchor,
+        t,
+        onRewind: (mode) => {
+          void runRewindAndFill(face, row.seq, mode, isMainViewSession, chatOf, watchChat, setComposerText, restoreImages);
+        }
+      });
+    };
+    try {
+      yield installRowAction({
+        slots: ctx.slots,
+        render: rewindActionRenderer(t, canRewindIn, openRewindFor)
+      });
+    } catch (error) {
+      rewindLog.error("action", "rewind action mount failed", error);
+    }
+    try {
+      yield slots.inject(HEADER_ACTIONS_SLOT, () => slots.register(
+        { name: HEADER_ACTIONS_SLOT, id: "dsh-rewind-pending", order: 1e3 },
+        createPendingBridge({ sessionOf, setComposerText, restoreImages, t, subscribeLocale })
+      ));
+    } catch (error) {
+      rewindLog.error("retract", "pending retract mount failed", error);
+    }
     const composerSurface2 = () => document.querySelector(COMPOSER_EDITABLE_SELECTOR2);
     yield () => {
       closePopover();
-      style.remove();
     };
   }, "dsh-rewind client lifecycle");
 }