dsh-rewind-plugin 0.17.0 → 0.18.0

package/lib/client.js

@@ -36,7 +36,8 @@ module.exports = __toCommonJS(index_exports);
 
 // src/client/hidden.ts
 var ENGINE_COMMAND = "rewind-plugin";
-var ENGINE_COMMANDS = /* @__PURE__ */ new Set([ENGINE_COMMAND, "rewind"]);
+var LEGACY_ENGINE_COMMAND = "rewind";
+var ENGINE_COMMANDS = /* @__PURE__ */ new Set([ENGINE_COMMAND, LEGACY_ENGINE_COMMAND]);
 function resolveChatWatch(resolveView, sessionId, cb) {
   const view = resolveView(sessionId);
   return view?.subscribe?.(cb) ?? (() => {
@@ -93,15 +94,6 @@ function isExecutedRewindCommand(node, seq) {
   const args = node.args ?? "";
   return new RegExp(`(?:^|\\s)@${seq}(?:\\s|$)`).test(args);
 }
-function hasFileImpact(text) {
-  if (text === void 0) return true;
-  const match = text.match(/impact=(\d+)/);
-  if (match !== null) return Number(match[1]) > 0;
-  return false;
-}
-function hasBackupDisabled(text) {
-  return text !== void 0 && /(?:^|\n)backup=off(?:\n|$)/.test(text);
-}
 function isPreviewCommand(command) {
   return (command.args ?? "").includes("preview");
 }
@@ -167,7 +159,10 @@ function addWithdrawnTurnChrome(snap, cuts, hidden) {
     hidden.add(chrome.anchorSeq);
   }
 }
+var hiddenSeqsMemo = /* @__PURE__ */ new WeakMap();
 function hiddenSeqsOf(snap) {
+  const memo = hiddenSeqsMemo.get(snap);
+  if (memo !== void 0) return new Set(memo);
   const hidden = /* @__PURE__ */ new Set();
   const spans = [];
   for (const key of snap.order) {
@@ -198,6 +193,7 @@ function hiddenSeqsOf(snap) {
     addWithdrawnTurnChrome(snap, cuts, hidden);
   } catch {
   }
+  hiddenSeqsMemo.set(snap, new Set(hidden));
   return hidden;
 }
 
@@ -233,23 +229,6 @@ function rewindCandidatesOf(snap, hidden, limit = DEFAULT_CANDIDATE_LIMIT) {
 function rewindCandidatesOfChat(snap) {
   return rewindCandidatesOf(snap, hiddenSeqsOf(snap));
 }
-var CANDIDATE_LIST_HEADER = "candidates=";
-function rewindCandidatesFromHostText(text) {
-  if (!text.startsWith(CANDIDATE_LIST_HEADER)) return [];
-  const lines = text.split("\n").slice(1);
-  const candidates = [];
-  for (const line of lines) {
-    if (line === "") continue;
-    const parts = line.split("	");
-    if (parts.length !== 3) continue;
-    const seq = Number(parts[0]);
-    const time = Number(parts[1]);
-    const preview = parts[2] ?? "";
-    if (!Number.isSafeInteger(seq) || !Number.isFinite(time)) continue;
-    candidates.push({ seq, time, preview });
-  }
-  return candidates;
-}
 function rewindOptionsFromCandidates(candidates, t) {
   return candidates.map((candidate) => ({
     id: String(candidate.seq),
@@ -258,48 +237,6 @@ function rewindOptionsFromCandidates(candidates, t) {
   }));
 }
 
-// src/client/log.ts
-var NS = "dsh-rewind";
-var DEBUG_KEY = "dsh-rewind.debug";
-var ALWAYS_ON = /* @__PURE__ */ new Set(["error", "warn"]);
-function switchValue() {
-  try {
-    return window.localStorage.getItem(DEBUG_KEY) ?? "";
-  } catch {
-    return "";
-  }
-}
-function matches(value, ns) {
-  for (const entry of value.split(",")) {
-    const part = entry.trim();
-    if (part === "") continue;
-    if (part === "*" || part === `${NS}*`) return true;
-    if (part.endsWith("*")) {
-      if (ns.startsWith(part.slice(0, -1))) return true;
-    } else if (ns === part) {
-      return true;
-    }
-  }
-  return false;
-}
-function tag(scope) {
-  return `[${NS}:${scope}]`;
-}
-function log(level, scope, message, data) {
-  if (ALWAYS_ON.has(level)) {
-    console[level](tag(scope), message, data);
-    return;
-  }
-  if (!matches(switchValue(), `${NS}:${scope}`)) return;
-  console.info(tag(scope), message, data);
-}
-var rewindLog = {
-  error: (scope, message, data) => log("error", scope, message, data),
-  warn: (scope, message, data) => log("warn", scope, message, data),
-  info: (scope, message, data) => log("info", scope, message, data),
-  debug: (scope, message, data) => log("debug", scope, message, data)
-};
-
 // src/client/styles.ts
 var CLASS = {
   button: "dsh-rewind-btn",
@@ -351,10 +288,13 @@ var STYLE = `
   z-index: 1000;
   width: 288px;
   padding: 12px;
-  border: 1px solid var(--dsw-alias-border-l2);
-  border-radius: 12px;
+  border: 0;
+  border-radius: var(--dsw-radius-md);
   background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));
-  box-shadow: var(--dsw-shadow-lv3);
+  backdrop-filter: var(--dsw-menu-backdrop-filter);
+  isolation: isolate;
+  --dsw-elevation-stroke-color: var(--dsw-alias-border-l1);
+  box-shadow: var(--dsw-elevation-prominent);
   font-size: 14px;
   line-height: 20px;
   color: var(--dsw-alias-label-primary);
@@ -466,10 +406,13 @@ var STYLE = `
   z-index: 1000;
   max-width: min(440px, calc(100vw - 24px));
   padding: 8px 12px;
-  border: 1px solid var(--dsw-alias-border-l2);
-  border-radius: 10px;
+  border: 0;
+  border-radius: var(--dsw-radius-md);
   background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));
-  box-shadow: var(--dsw-shadow-lv3);
+  backdrop-filter: var(--dsw-menu-backdrop-filter);
+  isolation: isolate;
+  --dsw-elevation-stroke-color: var(--dsw-alias-border-l1);
+  box-shadow: var(--dsw-elevation-panel);
   font-size: 13px;
   line-height: 18px;
   color: var(--dsw-alias-label-primary);
@@ -540,15 +483,6 @@ function formatTarget(t, seq, time, preview) {
   const previewText = preview.length > 0 ? preview : t("popover.noText");
   return `seq ${seq} \xB7 ${hh}:${mm} \xB7 ${previewText}`;
 }
-function parseImpactList(text) {
-  const restores = [];
-  const deletes = [];
-  for (const line of text.split("\n")) {
-    if (line.startsWith("restore:")) restores.push(line.slice("restore:".length));
-    else if (line.startsWith("delete:")) deletes.push(line.slice("delete:".length));
-  }
-  return { restores, deletes };
-}
 function findCommand(chat, match) {
   if (chat === void 0) return void 0;
   let found;
@@ -595,28 +529,12 @@ function waitForCommand(session, chatOf, match, timeoutMs = 8e3, watch) {
     check();
   });
 }
-function isPreviewFor(node, seq) {
-  const args = node.args ?? "";
-  return node.name !== null && ENGINE_COMMANDS.has(node.name) && args.includes("preview") && new RegExp(`(?:^|\\s)@${seq}(?=\\s|$)`).test(args);
+var previewCall = null;
+function registerPreviewCall(call) {
+  previewCall = call;
 }
-async function previewImpact(session, chatOf, seq, watch) {
-  const known = knownCommandSeqs(session, chatOf, (node) => isPreviewFor(node, seq));
-  let result;
-  try {
-    result = await session.command(`/${ENGINE_COMMAND} preview @${seq} both`);
-  } catch (error) {
-    rewindLog.warn("preview", `preview command threw for @${seq}`, error);
-    return { kind: "error", text: error instanceof Error ? error.message : String(error) };
-  }
-  if (!result.ok) {
-    rewindLog.warn("preview", `preview command rejected for @${seq}`, result.error);
-    return { kind: "error", text: `${result.error.code}: ${result.error.message}` };
-  }
-  if (result.value?.matched !== true) {
-    rewindLog.warn("preview", `preview command was not matched for @${seq}`);
-    return { kind: "error", text: "the rewind command is not registered on this host" };
-  }
-  return waitForCommand(session, chatOf, (node) => isPreviewFor(node, seq) && !known.has(node.seq), 8e3, watch);
+function previewImpact(sessionId, seq) {
+  return previewCall?.(sessionId, seq) ?? Promise.resolve({ kind: "error", text: "host RPC is unavailable" });
 }
 function el(tag2, className, text) {
   const node = document.createElement(tag2);
@@ -667,33 +585,30 @@ function renderImpactStep(root, opts, back, cached) {
   root.replaceChildren(impact, actions);
   focusFirst(root);
   void (async () => {
-    const outcome = cached ?? await previewImpact(session, opts.chatOf, seq, (cb) => opts.watchChat(session.sessionId, cb));
+    const outcome = cached ?? await previewImpact(session.sessionId, seq);
     if (outcome === null) {
-      impact.textContent = t("popover.impact.failed", { message: "preview command failed or timed out" });
+      impact.textContent = t("popover.impact.failed", { message: "preview request timed out" });
       return;
     }
     if (outcome.kind === "error") {
-      impact.textContent = t("popover.impact.failed", { message: outcome.text ?? "unknown error" });
+      impact.textContent = t("popover.impact.failed", { message: outcome.text });
       return;
     }
-    if (outcome.text === void 0) {
+    const restores = outcome.files.filter((file) => file.action === "restore").map((file) => file.path);
+    const deletes = outcome.files.filter((file) => file.action === "delete").map((file) => file.path);
+    if (restores.length === 0 && deletes.length === 0) {
       impact.textContent = t("popover.impact.none");
     } else {
-      const { restores, deletes } = parseImpactList(outcome.text);
-      if (restores.length === 0 && deletes.length === 0) {
-        impact.textContent = t("popover.impact.none");
+      const lines = [
+        ...restores.map((path) => t("popover.impact.restore", { path })),
+        ...deletes.map((path) => t("popover.impact.delete", { path }))
+      ];
+      if (outcome.backupOff) {
+        const list = document.createElement("div");
+        list.textContent = lines.join("\n");
+        impact.replaceChildren(list, el("div", CLASS.popoverNote, t("popover.backupDisabled")));
       } else {
-        const lines = [
-          ...restores.map((path) => t("popover.impact.restore", { path })),
-          ...deletes.map((path) => t("popover.impact.delete", { path }))
-        ];
-        if (hasBackupDisabled(outcome.text)) {
-          const list = document.createElement("div");
-          list.textContent = lines.join("\n");
-          impact.replaceChildren(list, el("div", CLASS.popoverNote, t("popover.backupDisabled")));
-        } else {
-          impact.textContent = lines.join("\n");
-        }
+        impact.textContent = lines.join("\n");
       }
     }
     confirm.disabled = false;
@@ -793,10 +708,10 @@ function openPopover(opts) {
     openRetractPopover(opts);
     return;
   }
-  const { session, seq, time, preview, anchor, t, chatOf } = opts;
+  const { session, seq, time, preview, anchor, t } = opts;
   const onRewind = opts.onRewind;
   if (seq === void 0 || time === void 0 || onRewind === void 0) return;
-  const durableOpts = { session, seq, time, preview, anchor, t, chatOf, watchChat: opts.watchChat, onRewind };
+  const durableOpts = { session, seq, time, preview, anchor, t, onRewind };
   const root = el("div", CLASS.popover);
   root.setAttribute("role", "dialog");
   root.setAttribute("aria-label", t("popover.title"));
@@ -866,12 +781,12 @@ function openPopover(opts) {
   popoverEl = root;
   disposeOutside = shell.dispose;
   void (async () => {
-    const outcome = await previewImpact(session, chatOf, seq, (cb) => opts.watchChat(session.sessionId, cb));
+    const outcome = await previewImpact(session.sessionId, seq);
     impactOutcome = outcome;
     if (outcome !== null && outcome.kind === "success") {
-      bothState = { state: hasFileImpact(outcome.text) ? "hasChanges" : "noChanges" };
+      bothState = { state: outcome.files.length > 0 ? "hasChanges" : "noChanges" };
     } else {
-      bothState = { state: "error", message: outcome?.text ?? "preview command timed out" };
+      bothState = { state: "error", message: outcome?.kind === "error" ? outcome.text : "preview request timed out" };
     }
     renderModes();
     shell.position();
@@ -916,11 +831,11 @@ function matchPendingRows(rows, steering) {
   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);
+    matched.push(item !== void 0 && matches(item, row) ? item.id : null);
   }
   return matched;
 }
-function matches2(item, row) {
+function matches(item, row) {
   if (item.attachments > 0) return row.attachments === item.attachments;
   return row.text === (item.text ?? "");
 }
@@ -930,6 +845,48 @@ function retractSpan(steering, targetId) {
   return steering.slice(index).map((item) => item.id);
 }
 
+// src/client/log.ts
+var NS = "dsh-rewind";
+var DEBUG_KEY = "dsh-rewind.debug";
+var ALWAYS_ON = /* @__PURE__ */ new Set(["error", "warn"]);
+function switchValue() {
+  try {
+    return window.localStorage.getItem(DEBUG_KEY) ?? "";
+  } catch {
+    return "";
+  }
+}
+function matches2(value, ns) {
+  for (const entry of value.split(",")) {
+    const part = entry.trim();
+    if (part === "") continue;
+    if (part === "*" || part === `${NS}*`) return true;
+    if (part.endsWith("*")) {
+      if (ns.startsWith(part.slice(0, -1))) return true;
+    } else if (ns === part) {
+      return true;
+    }
+  }
+  return false;
+}
+function tag(scope) {
+  return `[${NS}:${scope}]`;
+}
+function log(level, scope, message, data) {
+  if (ALWAYS_ON.has(level)) {
+    console[level](tag(scope), message, data);
+    return;
+  }
+  if (!matches2(switchValue(), `${NS}:${scope}`)) return;
+  console.info(tag(scope), message, data);
+}
+var rewindLog = {
+  error: (scope, message, data) => log("error", scope, message, data),
+  warn: (scope, message, data) => log("warn", scope, message, data),
+  info: (scope, message, data) => log("info", scope, message, data),
+  debug: (scope, message, data) => log("debug", scope, message, data)
+};
+
 // src/client/portals.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 function fillComposerEditable(text) {
@@ -1062,6 +1019,13 @@ function showHint(text) {
 var COMPOSER_EDITABLE_SELECTOR = "[data-composer-input]";
 var USER_SEAT_SELECTOR = '[data-chat-flow-kind="user"][data-chat-anchor-key], [data-chat-flow-kind="steering"][data-chat-anchor-key]';
 var CHAT_SEAT_SELECTOR = "[data-chat-anchor-key]";
+var IGNORED_PORTAL_SCOPE = [
+  "[data-composer-seat]",
+  "[data-composer-input]",
+  "[data-sidebar-right-panel]",
+  "[data-sidebar-chat]",
+  "[data-plugin-panel]"
+].join(", ");
 var GROUP_SHELL_SELECTOR = '[data-chat-anchor-key^="group:"]';
 function resolveSeatAnchorSeq(element, chat) {
   if (chat === void 0) return void 0;
@@ -1214,12 +1178,14 @@ function RewindPortals({ sessionId, sessionOf, chatOf, isMainViewSession, watchC
       const chat = chatOf(session);
       const hiddenSeqs = chat === void 0 ? /* @__PURE__ */ new Set() : hiddenSeqsOf(chat);
       for (const element of hidden.current) if (!element.isConnected) hidden.current.delete(element);
-      hideWithdrawnSeats(
-        chat,
-        chat === void 0 ? [] : document.querySelectorAll(CHAT_SEAT_SELECTOR),
-        hiddenSeqs,
-        hidden.current
-      );
+      if (hiddenSeqs.size > 0 || hidden.current.size > 0) {
+        hideWithdrawnSeats(
+          chat,
+          chat === void 0 ? [] : document.querySelectorAll(CHAT_SEAT_SELECTOR),
+          hiddenSeqs,
+          hidden.current
+        );
+      }
       const durable = collectDurableTargets(snapshot, chat, hiddenSeqs);
       const next = [...durable, ...collectPendingTargets(snapshot, steeringItemsOf(inboxOf(session)?.["next-step"]))];
       setTargets((current) => sameTargets(current, next) ? current : next);
@@ -1245,17 +1211,34 @@ function RewindPortals({ sessionId, sessionOf, chatOf, isMainViewSession, watchC
       }
     };
     refresh();
-    const observer = new MutationObserver(queueRefresh);
+    const unsubscribeChat = watchChat(sessionId, queueRefresh);
+    const observer = new MutationObserver((records) => {
+      for (const record of records) {
+        if (record.type === "attributes") {
+          const target = record.target;
+          if (target instanceof HTMLElement && hidden.current.has(target) && target.style.display !== "none") {
+            queueRefresh();
+            return;
+          }
+          continue;
+        }
+        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, attributes: true, attributeFilter: ["style"] });
     return () => {
       active = false;
       observer.disconnect();
+      unsubscribeChat();
       showHiddenSeats(hidden.current);
       unsubscribeInbox?.();
       unsubscribeInbox = void 0;
       inboxOwner = void 0;
     };
-  }, [sessionId, sessionOf]);
+  }, [sessionId, sessionOf, watchChat]);
   return targets.map((target) => (0, import_react_dom.createPortal)(
     target.kind === "pending" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       RetractButton,
@@ -1263,8 +1246,6 @@ function RewindPortals({ sessionId, sessionOf, chatOf, isMainViewSession, watchC
         target,
         sessionId,
         sessionOf,
-        chatOf,
-        watchChat,
         setComposerText,
         t
       },
@@ -1300,8 +1281,6 @@ function RewindButton({ target, sessionId, sessionOf, chatOf, watchChat, isMainV
     if (node === void 0) return;
     openPopover({
       session,
-      chatOf,
-      watchChat,
       seq: node.seq,
       time: node.time,
       preview: messagePreviewOf(node),
@@ -1348,15 +1327,13 @@ async function retractPending(session, itemId, text, setComposerText) {
     setComposerText(session.sessionId, text);
   }
 }
-function RetractButton({ target, sessionId, sessionOf, chatOf, watchChat, setComposerText, t }) {
+function RetractButton({ target, sessionId, sessionOf, setComposerText, t }) {
   const onClick = (event) => {
     event.stopPropagation();
     const session = sessionOf(sessionId);
     if (session === void 0) return;
     openPopover({
       session,
-      chatOf,
-      watchChat,
       preview: target.preview,
       anchor: event.currentTarget,
       t,
@@ -1384,10 +1361,69 @@ function createRewindBridge(deps) {
   };
 }
 
+// src/client/host-rpc.ts
+var CHANNEL = "/dsh-rewind";
+var TIMEOUT_MS = 8e3;
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isImpact(value) {
+  return isRecord(value) && typeof value["path"] === "string" && (value["action"] === "restore" || value["action"] === "delete");
+}
+function isCandidate(value) {
+  return isRecord(value) && Number.isSafeInteger(value["seq"]) && typeof value["time"] === "number" && Number.isFinite(value["time"]) && typeof value["preview"] === "string";
+}
+function isAbort(error) {
+  const name2 = error?.name;
+  return name2 === "AbortError" || name2 === "TimeoutError";
+}
+async function previewOverRpc(connection, sessionId, seq) {
+  if (connection === void 0) return { kind: "error", text: "host RPC is unavailable" };
+  try {
+    const result = await connection.rpc.call(CHANNEL, "preview", { sessionId, seq }, AbortSignal.timeout(TIMEOUT_MS));
+    if (!result.ok) {
+      rewindLog.warn("preview", `RPC preview failed for @${seq}`, result.error);
+      return { kind: "error", text: result.error.message };
+    }
+    const value = result.value;
+    if (!isRecord(value) || typeof value["backupOff"] !== "boolean" || !Array.isArray(value["files"]) || !value["files"].every(isImpact)) {
+      rewindLog.warn("preview", `RPC preview returned an invalid result for @${seq}`);
+      return { kind: "error", text: "invalid preview response" };
+    }
+    return { kind: "success", files: value["files"], backupOff: value["backupOff"] };
+  } catch (error) {
+    if (isAbort(error)) {
+      rewindLog.warn("preview", `RPC preview timed out for @${seq}`);
+      return null;
+    }
+    rewindLog.warn("preview", `RPC preview threw for @${seq}`, error);
+    return { kind: "error", text: error instanceof Error ? error.message : String(error) };
+  }
+}
+async function candidatesOverRpc(connection, sessionId) {
+  if (connection === void 0) return void 0;
+  try {
+    const result = await connection.rpc.call(CHANNEL, "candidates", { sessionId }, AbortSignal.timeout(TIMEOUT_MS));
+    if (!result.ok) {
+      rewindLog.warn("preview", "RPC candidates failed", result.error);
+      return void 0;
+    }
+    const value = result.value;
+    if (!isRecord(value) || !Array.isArray(value["candidates"]) || !value["candidates"].every(isCandidate)) {
+      rewindLog.warn("preview", "RPC candidates returned an invalid result");
+      return void 0;
+    }
+    return value["candidates"];
+  } catch (error) {
+    rewindLog.warn("preview", "RPC candidates threw", error);
+    return void 0;
+  }
+}
+
 // src/client/build-info.ts
-var PLUGIN_VERSION = true ? "0.17.0" : "dev";
+var PLUGIN_VERSION = true ? "0.18.0" : "dev";
 var PLUGIN_PACKAGE = "dsh-rewind-plugin";
-var BUILD_HASH = true ? "bae5081f" : "dev";
+var BUILD_HASH = true ? "18b65dfa" : "dev";
 
 // src/client/locales.ts
 var zh = {
@@ -1599,7 +1635,7 @@ function SettingsCard(props) {
 
 // src/client/index.ts
 var name = "dsh-rewind";
-var inject = ["slots", "sessions", "locale", "commandUi", "configForms"];
+var inject = ["slots", "sessions", "locale", "commandUi", "configForms", "connection"];
 var NS2 = "rewind";
 var HEADER_ACTIONS_SLOT = "conversation.session.header.actions";
 var COMPOSER_EDITABLE_SELECTOR2 = "[data-composer-input]";
@@ -1608,6 +1644,11 @@ function apply(ctx) {
   ctx.effect(function* () {
     yield ctx.locale.register(NS2, { zh, en });
     const t = ctx.locale.bind(NS2);
+    const connection = ctx.get("connection");
+    registerPreviewCall((sessionId, seq) => previewOverRpc(connection, sessionId, seq));
+    yield () => {
+      registerPreviewCall(null);
+    };
     const style = document.createElement("style");
     style.dataset.plugin = PLUGIN_PACKAGE;
     style.textContent = STYLE;
@@ -1746,14 +1787,7 @@ function apply(ctx) {
       const chat = chatOf(face);
       return chat !== void 0 && rewindCandidatesOfChat(chat).length > 0;
     };
-    const fetchHostCandidates = async (face, chatOf2) => {
-      const known = knownCommandSeqs(face, chatOf2, (node) => isCandidateCommand(node));
-      const result = await face.command(`/${ENGINE_COMMAND} __candidates`);
-      if (!result.ok || result.value?.matched !== true) return void 0;
-      const outcome = await waitForCommand(face, chatOf2, (node) => isCandidateCommand(node) && !known.has(node.seq), 8e3, (cb) => watchChat(face.sessionId, cb));
-      if (outcome === null || outcome.kind !== "success" || outcome.text === void 0) return void 0;
-      return rewindCandidatesFromHostText(outcome.text);
-    };
+    const fetchHostCandidates = async (face) => candidatesOverRpc(connection, face.sessionId);
     const hostCandidatesCache = /* @__PURE__ */ new Map();
     const composerAnchor = () => {
       const surface = composerSurface2();
@@ -1771,7 +1805,7 @@ function apply(ctx) {
         options: async (session) => {
           const face = sessionOf(session.sessionId);
           if (face === void 0) return [];
-          const candidates = await fetchHostCandidates(face, chatOf);
+          const candidates = await fetchHostCandidates(face);
           if (candidates !== void 0) hostCandidatesCache.set(session.sessionId, candidates);
           return candidates === void 0 ? [] : rewindOptionsFromCandidates(candidates, t);
         },
@@ -1784,8 +1818,6 @@ function apply(ctx) {
           if (candidate === void 0) return;
           openPopover({
             session: face,
-            chatOf,
-            watchChat,
             seq: candidate.seq,
             time: candidate.time,
             preview: candidate.preview,

package/lib/index.js

@@ -9,15 +9,8 @@ function preferredLocale(preference) {
   return preference.toLowerCase().split("-")[0] === "zh" ? "zh" : "en";
 }
 var en = {
-  "plan.rewinding": "Rewind to seq {targetSeq}, removing {count} node(s) from the model context (conversation log kept).",
-  "plan.affects": "Affects {count} file(s):",
-  "plan.restore": "restore {path}",
-  "plan.delete": "delete {path}",
-  "plan.noChanges": "No restorable changes after the target.",
-  "plan.backupOff": "Snapshot backups are off; this restore may be incomplete.",
   "plan.skip": "  not restored: {path} ({reason})",
   "skipReason.oversized": "over the {limit} backup limit, so the recorded state predates untracked edits",
-  "uncovered.header": "{count} tracked file(s) exceed the {limit} backup limit and are not covered:",
   "error.invalidTarget": 'Cannot parse target "{raw}" (expected <index> or @<seq>)',
   "sep.list": ", ",
   "sep.clause": "; ",
@@ -62,15 +55,8 @@ var en = {
   "cleanup.usage": "Usage:\n  /snapshot-auto-cleanup                 show status\n  /snapshot-auto-cleanup on|off          enable/disable auto-cleanup\n  /snapshot-auto-cleanup max-age <days>  set the idle cutoff\n  /snapshot-auto-cleanup run [--apply]   dry-run, or execute with --apply\n  /snapshot-auto-cleanup run --current [--apply]   dry-run/clear this session's snapshots"
 };
 var zh = {
-  "plan.rewinding": "\u5C06\u56DE\u9000\u5230 seq {targetSeq}\uFF0C\u4ECE\u6A21\u578B\u4E0A\u4E0B\u6587\u79FB\u9664 {count} \u4E2A\u8282\u70B9\uFF08\u5BF9\u8BDD\u65E5\u5FD7\u4FDD\u7559\uFF09\u3002",
-  "plan.affects": "\u5C06\u5F71\u54CD {count} \u4E2A\u6587\u4EF6\uFF1A",
-  "plan.restore": "\u8FD8\u539F {path}",
-  "plan.delete": "\u5220\u9664 {path}",
-  "plan.noChanges": "\u76EE\u6807\u4E4B\u540E\u6CA1\u6709\u9700\u8981\u8FD8\u539F\u7684\u53D8\u66F4\u3002",
-  "plan.backupOff": "\u5FEB\u7167\u5907\u4EFD\u5DF2\u5173\u95ED\uFF1B\u672C\u6B21\u8FD8\u539F\u53EF\u80FD\u4E0D\u5145\u5206\u3002",
   "plan.skip": "  \u672A\u8FD8\u539F\uFF1A{path}\uFF08{reason}\uFF09",
   "skipReason.oversized": "\u5DF2\u8D85\u8FC7 {limit} \u7684\u5907\u4EFD\u4E0A\u9650\uFF0C\u8BB0\u5F55\u7684\u72B6\u6001\u65E9\u4E8E\u672A\u88AB\u8DDF\u8E2A\u7684\u4FEE\u6539",
-  "uncovered.header": "{count} \u4E2A\u5DF2\u8DDF\u8E2A\u6587\u4EF6\u8D85\u8FC7 {limit} \u7684\u5907\u4EFD\u4E0A\u9650\uFF0C\u672A\u7EB3\u5165\u8BB0\u5F55\uFF1A",
   "error.invalidTarget": '\u65E0\u6CD5\u89E3\u6790\u76EE\u6807 "{raw}"\uFF08\u5E94\u4E3A <\u5E8F\u53F7> \u6216 @<seq>\uFF09',
   "sep.list": "\u3001",
   "sep.clause": "\uFF1B",
@@ -182,14 +168,6 @@ function listRewindCandidates(events, surface, limit = DEFAULT_CANDIDATE_LIMIT)
   }
   return candidates;
 }
-var CANDIDATE_LIST_HEADER = "candidates=";
-function formatCandidateList(candidates) {
-  const lines = [`${CANDIDATE_LIST_HEADER}${candidates.length}`];
-  for (const candidate of candidates) {
-    lines.push(`${candidate.seq}	${candidate.time}	${candidate.preview}`);
-  }
-  return lines.join("\n");
-}
 function planRewind(events, surface, target) {
   let targetSeq;
   if (target.kind === "seq") {
@@ -2319,6 +2297,7 @@ function shouldRunAutoSweep(lastAtMs, nowMs, intervalMs = AUTO_SWEEP_INTERVAL_MS
 var name = "dsh-rewind";
 var inject = ["commands", "tools", "settings"];
 var ENGINE_COMMAND = "rewind-plugin";
+var REWIND_RPC_CHANNEL = "/dsh-rewind";
 var DEFAULT_FILE_CHECKPOINTING_ENABLED = true;
 var Config = z.object({
   snapshotDir: z.string().required(false),
@@ -2357,7 +2336,7 @@ function t(key, params) {
 function warnCommandUnavailable(ctx, name2, error) {
   ctx.logger.warn(`[dsh-rewind] command "${name2}" was not registered: ${error instanceof Error ? error.message : String(error)}`);
   if (name2 === ENGINE_COMMAND) {
-    ctx.logger.warn(`[dsh-rewind] the internal "${ENGINE_COMMAND}" engine channel is unavailable; the rewind button and picker will not work.`);
+    ctx.logger.warn(`[dsh-rewind] the internal "${ENGINE_COMMAND}" engine channel is unavailable; rewind execution will not work.`);
   }
 }
 async function discardCapture(capture) {
@@ -2489,31 +2468,6 @@ function formatBytes(bytes) {
   if (bytes >= 1024) return `${Math.round(bytes / 1024)} KiB`;
   return `${bytes} B`;
 }
-function formatPlan(plan, files, uncovered = [], maxFileBytes = 0, checkpointingEnabled = true) {
-  const lines = [
-    t("plan.rewinding", { targetSeq: plan.targetSeq, count: plan.shadowedSeqs.length })
-  ];
-  if (files.length > 0) {
-    lines.push(t("plan.affects", { count: files.length }));
-    for (const file of files) {
-      lines.push(`  ${file.action === "restore" ? t("plan.restore", { path: file.path }) : t("plan.delete", { path: file.path })}`);
-    }
-  } else {
-    lines.push(t("plan.noChanges"));
-  }
-  if (uncovered.length > 0) {
-    lines.push(t("uncovered.header", { count: uncovered.length, limit: formatBytes(maxFileBytes) }));
-    for (const file of uncovered.slice(0, 5)) lines.push(`  ${file.path}`);
-    if (uncovered.length > 5) lines.push("  \u2026");
-  }
-  if (!checkpointingEnabled) lines.push(t("plan.backupOff"));
-  lines.push(`impact=${files.length}`);
-  for (const file of files) {
-    lines.push(`${file.action}:${file.path}`);
-  }
-  if (!checkpointingEnabled) lines.push("backup=off");
-  return lines.join("\n");
-}
 function resolveOrError(events, surface, raw) {
   const target = parseRewindTarget(raw);
   if (target === void 0) {
@@ -2521,6 +2475,54 @@ function resolveOrError(events, surface, raw) {
   }
   return planRewind(events, surface, target);
 }
+async function previewImpact(store, session, seq, checkpointingEnabled) {
+  const plan = resolveOrError(session.snapshotEvents(), session.surface.nodes, `@${seq}`);
+  let impacts;
+  try {
+    impacts = await store.impactsAfter(session.id, plan.targetSeq);
+  } catch (error) {
+    if (!(error instanceof UnknownStoreVersionError)) throw error;
+    throw new Error(t("storeUnsupported", { version: await store.readStoreVersion(session.id) ?? 0 }));
+  }
+  const uncovered = await store.uncoveredPaths(session.id).catch(() => []);
+  return { files: impacts, uncovered, backupOff: !checkpointingEnabled };
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function rpcFailure(code, message) {
+  return { ok: false, error: { code, message, details: {} } };
+}
+function createRewindRpcHandler(store, agentsOf, checkpointingEnabled) {
+  return async (endpoint, payload) => {
+    try {
+      if (!isRecord(payload)) return rpcFailure("rewind/bad-request", "invalid payload");
+      const sessionId = payload["sessionId"];
+      if (typeof sessionId !== "string" || sessionId.length === 0) {
+        return rpcFailure("rewind/bad-request", "sessionId must be a non-empty string");
+      }
+      const agents = agentsOf();
+      if (agents === void 0) return rpcFailure("rewind/agents-unavailable", "agent registry is unavailable");
+      const agent = agents.get(sessionId);
+      if (agent === void 0) return rpcFailure("rewind/session-not-found", `session ${sessionId} is not attached`);
+      const session = agent.session;
+      if (endpoint === "preview") {
+        const seq = payload["seq"];
+        if (!Number.isSafeInteger(seq)) return rpcFailure("rewind/bad-request", "seq must be an integer");
+        return { ok: true, value: await previewImpact(store, session, seq, checkpointingEnabled()) };
+      }
+      if (endpoint === "candidates") {
+        return {
+          ok: true,
+          value: { candidates: listRewindCandidates(session.snapshotEvents(), session.surface.nodes) }
+        };
+      }
+      return rpcFailure("rewind/unknown-endpoint", `unknown endpoint: ${endpoint}`);
+    } catch (error) {
+      return rpcFailure("rewind/failed", error instanceof Error ? error.message : String(error));
+    }
+  };
+}
 function renderFailures(failed) {
   if (failed.length === 0) return "";
   return t("failures.suffix", {
@@ -2678,29 +2680,6 @@ async function handleRewind(ctx, store, fs, invocation, inflight, checkpointingE
     return executeRewind(ctx, store, fs, invocation, `@${candidates[0].seq}`, "chat", inflight, checkpointingEnabled);
   }
   const parts = input.split(/\s+/);
-  if (parts[0] === "preview") {
-    const target2 = parts[1];
-    if (target2 === void 0) return { kind: "error", text: t("engine.rejected") };
-    let plan;
-    try {
-      plan = resolveOrError(session.snapshotEvents(), session.surface.nodes, target2);
-    } catch (error) {
-      return rewindErrorResult(error);
-    }
-    const impacts = await store.impactsAfter(session.id, plan.targetSeq).catch((error) => {
-      if (error instanceof UnknownStoreVersionError) return void 0;
-      throw error;
-    });
-    if (impacts === void 0) {
-      return { kind: "error", text: t("storeUnsupported", { version: await store.readStoreVersion(session.id) ?? 0 }) };
-    }
-    const uncovered = await store.uncoveredPaths(session.id).catch(() => []);
-    return { kind: "success", text: formatPlan(plan, impacts, uncovered, store.fileCapBytes, checkpointingEnabled) };
-  }
-  if (parts[0] === "__candidates") {
-    const candidates = listRewindCandidates(session.snapshotEvents(), session.surface.nodes);
-    return { kind: "success", text: formatCandidateList(candidates) };
-  }
   const target = parts[0];
   const mode = parts[1];
   if (mode !== void 0 && mode !== "chat" && mode !== "both") {
@@ -2978,6 +2957,23 @@ function apply(ctx, config) {
       }
     })();
   }, { global: true });
+  ctx.inject(["connection"], (scope) => {
+    try {
+      const connection = scope.root.connection;
+      if (connection === void 0) return;
+      const dispose = connection.rpc.handle(
+        REWIND_RPC_CHANNEL,
+        createRewindRpcHandler(
+          store,
+          () => scope.get("agents"),
+          () => isFileCheckpointingEnabled(config)
+        )
+      );
+      scope.effect(() => dispose, "dsh-rewind RPC channel");
+    } catch (error) {
+      ctx.logger.warn(`[dsh-rewind] RPC channel registration failed: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  });
   ctx.inject(["fs", "workingDirectory"], (scope) => {
     const fs = scope.fs;
     const workingDirectory = scope.workingDirectory;

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

@@ -75,15 +75,8 @@ export declare function rewindCandidatesOf(snap: CandidateChat, hidden: Readonly
 /** The candidates of a live chat snapshot, withdrawn rows already excluded. */
 export declare function rewindCandidatesOfChat(snap: CandidateChat): RewindCandidate[];
 /**
- * Parse the host's candidate-list encoding (see `formatCandidateList` in
- * src/rewind.ts) into typed candidates. Malformed lines are skipped; a
- * missing/zero header yields an empty list.
- */
-export declare function rewindCandidatesFromHostText(text: string): RewindCandidate[];
-/**
- * Map typed candidates to popupSelect rows (the host-derived path). The
- * popupSelect sources its options from the FULL host surface via the
- * `__candidates` channel instead of the windowed chat snapshot.
+ * Map typed candidates to popupSelect rows. The list comes from the host over
+ * RPC, so it covers the FULL host surface rather than the windowed chat snapshot.
  */
 export declare function rewindOptionsFromCandidates(candidates: readonly RewindCandidate[], t: Translate): SelectOption[];
 export {};

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

@@ -11,11 +11,9 @@ import type { CommandNode } from '@deepseek-ai/dsh-client-ui-conversation/client
  * `ENGINE_COMMAND` in `src/index.ts` — the two bundles share no module.
  */
 export declare const ENGINE_COMMAND = "rewind-plugin";
-/**
- * Recognized engine command names. `rewind` is what sessions written before the
- * engine channel existed contain, so keeping it preserves their withdrawn
- * spans (forward compatibility only: an older client cannot know the new name).
- */
+/** Legacy engine command name. */
+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
@@ -121,7 +119,7 @@ export interface MessageImageRef {
 export declare function messageAttachmentsAt(chat: HiddenChat | undefined, seq: number): readonly MessageImageRef[] | undefined;
 /**
  * Extract the rewind target seq from a `/rewind` command's structured `args`
- * (e.g. `@5 chat`, `preview @5 both`). Locale-independent — never parses the
+ * (e.g. `@5 chat`). Locale-independent — never parses the
  * host's human outcome copy.
  */
 export declare function targetSeqOfArgs(args: string | null | undefined): number | undefined;
@@ -134,28 +132,14 @@ export declare function targetSeqOfArgs(args: string | null | undefined): number
  */
 export declare function isExecutedRewindCommand(node: CommandNode, seq: number): boolean;
 /**
- * Whether a preview outcome reports tracked file changes — the availability
- * of the "rewind conversation and code" option (Claude Code hides the
- * code-restore options when the checkpoint has no tracked changes).
- *
- * 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). 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;
-/** Whether the preview reports that new file checkpoints are disabled. */
-export declare function hasBackupDisabled(text: string | undefined): boolean;
-/**
- * True when an engine command node is the internal candidate-list probe
- * (`__candidates`) the popupSelect runs to fetch the FULL candidate
- * list from the host. Like previews, its flow node never surfaces in the
- * transcript — it only feeds the popup — so it is hidden in every state.
+ * 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 impact-preview flow node (it only
+ * 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.

package/lib/types/client/host-rpc.d.ts

@@ -0,0 +1,45 @@
+/**
+ * The browser half of the rewind RPC channel: the mode popover's impact
+ * preview and the `/rewind` candidate list. Both are read-only host queries,
+ * so they travel over Connection RPC instead of the human command channel.
+ *
+ * @module dsh-rewind/client/host-rpc
+ */
+import type { RewindCandidate } from './candidates.ts';
+/** One file affected by a rewind. */
+export interface PreviewFileImpact {
+    readonly path: string;
+    readonly action: 'restore' | 'delete';
+}
+/** One impact probe resolved, failed, or timed out (`null`). */
+export type PreviewOutcome = {
+    readonly kind: 'success';
+    readonly files: readonly PreviewFileImpact[];
+    readonly backupOff: boolean;
+} | {
+    readonly kind: 'error';
+    readonly text: string;
+} | null;
+/** Fetch one target's impact through the registered RPC call. */
+export type PreviewCall = (sessionId: string, seq: number) => Promise<PreviewOutcome>;
+type RpcResult = {
+    readonly ok: true;
+    readonly value: unknown;
+} | {
+    readonly ok: false;
+    readonly error: {
+        readonly code: string;
+        readonly message: string;
+    };
+};
+/** The slice of the client `connection` service this module reads. */
+export interface ConnectionLike {
+    readonly rpc: {
+        call(channel: string, endpoint: string, payload: unknown, signal?: AbortSignal): Promise<RpcResult>;
+    };
+}
+/** Resolve one target's file impact over RPC. */
+export declare function previewOverRpc(connection: ConnectionLike | undefined, sessionId: string, seq: number): Promise<PreviewOutcome>;
+/** Fetch the full rewind candidate list over RPC. */
+export declare function candidatesOverRpc(connection: ConnectionLike | undefined, sessionId: string): Promise<readonly RewindCandidate[] | undefined>;
+export {};

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

@@ -8,9 +8,9 @@
  * so the plugin imports no conversation UI types and survives harness drift.
  * 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>` / `preview` forms stay internal channels the
- * button and the popover drive. The exported contract is specified in
- * `docs/contract/client-contract.md`.
+ * 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`.
  *
  * @module dsh-rewind/client
  */

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

@@ -1,8 +1,8 @@
 /**
  * The rewind mode-selection popover (plain DOM, no React). Step two of the
  * interaction: the target is already fixed (the clicked message); the popover
- * offers the two modes. Choosing "both" first fetches the impact list through
- * the engine channel's `preview @seq both` command and shows it before confirming.
+ * offers the two modes. Choosing "both" fetches the impact list over the host
+ * RPC channel and shows it before confirming.
  *
  * Keyboard: ↑/↓ move focus across the step's ACTION buttons only (the two
  * modes, or the confirm button on the impact step), Enter activates the
@@ -15,7 +15,8 @@
  */
 import type { SessionFace } from '@deepseek-ai/dsh-api-session-controller/client';
 import type { CommandNode } from '@deepseek-ai/dsh-client-ui-conversation/client';
-import { type ChatOf, type ChatWatch } from './hidden.ts';
+import { type ChatOf } from './hidden.ts';
+import type { PreviewCall } from './host-rpc.ts';
 import type { RewindKey } from './locales.ts';
 type Translate = (key: RewindKey, params?: Record<string, unknown>) => string;
 export interface PopoverOptions {
@@ -32,18 +33,6 @@ export interface PopoverOptions {
     /** Pending variant: executed after the retract confirm closes the popover. */
     readonly onRetract?: () => void;
     readonly preview: string;
-    /**
-     * Chat reader on the `uiConversation` "chat" view: the durable
-     * variant's command probes scan the chat through it. Unused by the
-     * pending-retract variant.
-     */
-    readonly chatOf: ChatOf;
-    /**
-     * Subscribe to one session's live chat-update signal, so a probe waiting on
-     * a command's chat node can be woken when the chat snapshot changes. Passed
-     * straight through to `waitForCommand`.
-     */
-    readonly watchChat: ChatWatch;
     /** The button that opened the popover (outside-click ignore target). */
     readonly anchor: HTMLElement;
     readonly t: Translate;
@@ -64,9 +53,8 @@ export declare function closePopover(): void;
 /**
  * Seqs of the command nodes currently matching `match`. Sample BEFORE issuing
  * a new command of the same shape so the subsequent wait can exclude them: a
- * repeated preview/rewind of the same target must not settle on the previous
- * command's stale outcome (e.g. an older preview that found file changes,
- * after those changes were already restored).
+ * repeated rewind of the same target must not settle on the previous command's
+ * stale outcome.
  */
 export declare function knownCommandSeqs(session: SessionFace, chatOf: ChatOf, match: (node: CommandNode) => boolean): Set<number>;
 /**
@@ -78,6 +66,8 @@ export declare function waitForCommand(session: SessionFace, chatOf: ChatOf, mat
     kind: 'success' | 'error';
     text?: string;
 } | null>;
+/** Register the host RPC preview call (null clears it on unload). */
+export declare function registerPreviewCall(call: PreviewCall | null): void;
 /** Open the mode-selection popover anchored near the given button. */
 export declare function openPopover(opts: PopoverOptions): void;
 export {};

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

@@ -315,13 +315,14 @@ interface RewindPortalsProps extends RewindBridgeDeps {
 /**
  * Session-scoped portal bridge: renders the ↶ button of every user message
  * row of the session the harness mounts it for. The refresh is coalesced
- * (one pass per mutation batch via queueMicrotask) and diffed (setState is
+ * (one pass per microtask window via queueMicrotask) and diffed (setState is
  * skipped when the target set is unchanged), so the plugin never runs a
  * synchronous full-transcript scan inside a commit microtask.
  *
- * The scan is driven by both channels its targets are made of: the DOM (rows and
- * their actions containers) and the session's `inbox` projection (the pending
- * occurrences — see `syncInboxSubscription`).
+ * The refresh is driven by the three inputs its targets are made of: the chat
+ * snapshot (`hiddenSeqsOf`), the session's `inbox` projection (the pending
+ * occurrences — see `syncInboxSubscription`), and the DOM (row/actions mounts,
+ * via the scoped observer).
  */
 export declare function RewindPortals({ sessionId, sessionOf, chatOf, isMainViewSession, watchChat, t, subscribeLocale, setComposerText, restoreImages }: RewindPortalsProps): ReactNode;
 /** The current composer draft: the contenteditable `textContent`.

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: 1px solid var(--dsw-alias-border-l2);\n  border-radius: 12px;\n  background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));\n  box-shadow: var(--dsw-shadow-lv3);\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: 1px solid var(--dsw-alias-border-l2);\n  border-radius: 10px;\n  background: var(--dsw-specific-menu, var(--dsw-alias-bg-layer-3));\n  box-shadow: var(--dsw-shadow-lv3);\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.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";

package/lib/types/locales.d.ts

@@ -15,9 +15,8 @@
  * public read the settings UI and the client's own locale runtime perform.
  *
  * The client half (`src/client/locales.ts`) owns all interactive UI copy via
- * `ctx.locale` + `t()`; the host's human text is a machine channel the client
- * renders through machine tokens (`impact=<n>`, `args` @seq), never by parsing
- * host prose.
+ * `ctx.locale` + `t()`; the client never parses host prose (the popover reads
+ * travel over the RPC channel).
  *
  * DSH localizes only its OWN command descriptions via the client locale — a
  * closed `HOST_FACES` allowlist; third-party plugin descriptions are
@@ -45,15 +44,8 @@ export type HostLocaleId = 'zh' | 'en';
 export declare function preferredLocale(preference: unknown): HostLocaleId;
 /** English dictionary — the key-set source of truth (neutral default). */
 export declare const en: {
-    'plan.rewinding': string;
-    'plan.affects': string;
-    'plan.restore': string;
-    'plan.delete': string;
-    'plan.noChanges': string;
-    'plan.backupOff': string;
     'plan.skip': string;
     'skipReason.oversized': string;
-    'uncovered.header': string;
     'error.invalidTarget': string;
     'sep.list': string;
     'sep.clause': string;

package/lib/types/rewind.d.ts

@@ -106,23 +106,6 @@ export declare function parseRewindTarget(raw: string): RewindTarget | undefined
  * @returns candidates numbered 1..N by recency.
  */
 export declare function listRewindCandidates(events: readonly SessionEvent[], surface: readonly number[], limit?: number): RewindCandidate[];
-/** Header line of the machine-readable candidate list (locale-independent). */
-export declare const CANDIDATE_LIST_HEADER = "candidates=";
-/**
- * Encode a candidate list as the host→client machine channel (the same
- * trailer pattern `formatPlan` uses for `impact=`). The client popupSelect
- * parses this instead of reading the windowed chat snapshot, so the candidate
- * list reflects the FULL host surface — not just the already-loaded history.
- *
- * Lines (each preview is already whitespace-collapsed and tab-free by
- * `messagePreview`):
- *   candidates=<n>
- *   <seq>\t<time>\t<preview>
- *   … (one line per candidate, newest first, matching `listRewindCandidates`)
- *
- * A list with no candidates is just `candidates=0`.
- */
-export declare function formatCandidateList(candidates: readonly RewindCandidate[]): string;
 /**
  * Resolve a target against the session log and surface into a validated plan.
  * @param events - the full session event log.

package/lib/types/snapshot.d.ts

@@ -179,7 +179,7 @@ export interface LinkEntry {
 export type StoredEntry = CheckpointEntry | LinkEntry;
 /** True when an entry is a dedup link (carries `ref`, not `before`). */
 export declare function isLinkEntry(entry: StoredEntry): entry is LinkEntry;
-/** Per-file restore impact preview (`/rewind preview @seq both`). */
+/** Per-file restore impact preview (served by the host RPC channel). */
 export interface FileImpact {
     readonly path: string;
     /** `restore` = write the before content back; `delete` = remove the file. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "In-window conversation rewind with workspace file restore · 同窗口内对话回退并可还原工作区文件",
   "icon": "./assets/icon.svg",
   "keywords": [
@@ -54,6 +54,7 @@
     "client": {
       "inject": [
         "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-ui-commands",
         "@deepseek-ai/dsh-client-ui-conversation",
         "@deepseek-ai/dsh-client-ui-settings"
@@ -74,6 +75,7 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5",
+    "@deepseek-ai/dsh-client-connection": "^0.2.1-rc.1",
     "@deepseek-ai/dsh-client-locale": "^0.2.1-rc.1",
     "@deepseek-ai/dsh-client-ui-commands": "^0.2.1-rc.1",
     "@deepseek-ai/dsh-client-ui-plugin-manager": "^0.2.1-rc.1",
@@ -95,6 +97,9 @@
     "@deepseek-ai/cordis": {
       "optional": true
     },
+    "@deepseek-ai/dsh-client-connection": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-client-locale": {
       "optional": true
     },