dsh-rewind-plugin 0.3.1 → 0.3.3

package/lib/client.js

@@ -53,6 +53,9 @@ function hasFileImpact(text) {
 function isPreviewCommand(command) {
   return (command.args ?? "").includes("preview");
 }
+function isCandidateCommand(command) {
+  return (command.args ?? "").includes("__candidates");
+}
 function hiddenSeqsOf(snap) {
   const hidden = /* @__PURE__ */ new Set();
   const spans = [];
@@ -61,7 +64,7 @@ function hiddenSeqsOf(snap) {
     if (node === void 0 || node.kind !== "command") continue;
     const command = node.data;
     if (command.name !== "rewind") continue;
-    if (isPreviewCommand(command)) {
+    if (isPreviewCommand(command) || isCandidateCommand(command)) {
       hidden.add(command.seq);
       continue;
     }
@@ -87,6 +90,7 @@ function hiddenSeqsOf(snap) {
 
 // src/client/candidates.ts
 var PREVIEW_CHARS = 80;
+var DEFAULT_CANDIDATE_LIMIT = 50;
 function messagePreviewOf(message) {
   const text = message.content.map((block) => block.type === "text" && typeof block.text === "string" ? block.text : "").join("").replace(/\s+/g, " ").trim();
   return text.length <= PREVIEW_CHARS ? text : `${text.slice(0, PREVIEW_CHARS - 1)}\u2026`;
@@ -97,7 +101,7 @@ function formatCandidateTime(time) {
   const mm = String(d.getMinutes()).padStart(2, "0");
   return `${hh}:${mm}`;
 }
-function rewindCandidatesOf(snap, hidden, limit = 10) {
+function rewindCandidatesOf(snap, hidden, limit = DEFAULT_CANDIDATE_LIMIT) {
   const candidates = [];
   for (let i = snap.order.length - 1; i >= 0 && candidates.length < limit; i--) {
     const key = snap.order[i];
@@ -116,16 +120,30 @@ function rewindCandidatesOf(snap, hidden, limit = 10) {
 function rewindCandidatesOfChat(snap) {
   return rewindCandidatesOf(snap, hiddenSeqsOf(snap));
 }
-function rewindOptionsOf(snap, t) {
-  return rewindCandidatesOfChat(snap).map((candidate) => ({
+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),
     label: candidate.preview || t("popover.noText"),
     detail: formatCandidateTime(candidate.time)
   }));
 }
-function candidateBySeq(snap, seq) {
-  return rewindCandidatesOfChat(snap).find((candidate) => candidate.seq === seq);
-}
 
 // src/client/styles.ts
 var CLASS = {
@@ -449,9 +467,96 @@ function renderImpactStep(root, opts, back, cached) {
     impact.textContent = t("popover.impact.failed", { message: "unexpected error" });
   });
 }
+function mountShell(root, anchor, onKeyDown) {
+  const position = () => {
+    const rect = anchor.getBoundingClientRect();
+    const gap = 4;
+    const height = root.offsetHeight;
+    const top = rect.bottom + gap + height <= window.innerHeight - 8 ? rect.bottom + gap : Math.max(8, rect.top - gap - height);
+    root.style.top = `${Math.round(top)}px`;
+    root.style.left = `${Math.round(Math.min(rect.right, window.innerWidth - 8 - root.offsetWidth))}px`;
+  };
+  const onPointerDown = (event) => {
+    const target = event.target;
+    if (root.contains(target) || anchor.contains(target)) return;
+    closePopover();
+  };
+  const deferred = setTimeout(() => {
+    document.addEventListener("pointerdown", onPointerDown);
+    document.addEventListener("keydown", onKeyDown, true);
+  }, 0);
+  const dispose = () => {
+    clearTimeout(deferred);
+    document.removeEventListener("pointerdown", onPointerDown);
+    document.removeEventListener("keydown", onKeyDown, true);
+  };
+  document.body.append(root);
+  position();
+  return { position, dispose };
+}
+function openRetractPopover(opts) {
+  closePopover();
+  const { preview, anchor, t, retract, onRetract } = opts;
+  if (retract === void 0 || onRetract === void 0) return;
+  const root = el("div", CLASS.popover);
+  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 (event.key === "Escape") {
+      event.preventDefault();
+      event.stopPropagation();
+      closePopover();
+    }
+  };
+  const previewText = preview.length > 0 ? preview : t("popover.noText");
+  const actions = el("div", CLASS.popoverActions);
+  const confirm = document.createElement("button");
+  confirm.type = "button";
+  confirm.className = CLASS.popoverPrimary;
+  confirm.textContent = t("popover.retract.confirm");
+  confirm.addEventListener("click", () => {
+    closePopover();
+    onRetract();
+  });
+  const cancel = document.createElement("button");
+  cancel.type = "button";
+  cancel.className = CLASS.popoverGhost;
+  cancel.textContent = t("popover.cancel");
+  cancel.addEventListener("click", closePopover);
+  actions.append(confirm, cancel);
+  root.replaceChildren(
+    el("div", CLASS.popoverTitle, t("popover.retract.title")),
+    el("div", CLASS.popoverTarget, t("popover.retract.target", { preview: previewText })),
+    el("div", CLASS.popoverImpact, t("popover.retract.hint")),
+    actions
+  );
+  const shell = mountShell(root, anchor, onKeyDown);
+  popoverEl = root;
+  disposeOutside = shell.dispose;
+  focusFirst(root);
+}
 function openPopover(opts) {
   closePopover();
+  if (opts.retract !== void 0) {
+    openRetractPopover(opts);
+    return;
+  }
   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, onRewind };
   const root = el("div", CLASS.popover);
   root.setAttribute("role", "dialog");
   root.setAttribute("aria-label", t("popover.title"));
@@ -465,7 +570,7 @@ function openPopover(opts) {
       el("div", CLASS.popoverTarget, formatTarget(t, seq, time, preview)),
       modeOption(t("popover.chat"), t("popover.chat.hint"), () => {
         closePopover();
-        opts.onRewind("chat");
+        durableOpts.onRewind("chat");
       })
     ];
     if (bothState.state === "noChanges") {
@@ -492,38 +597,7 @@ function openPopover(opts) {
   };
   const renderImpact = () => {
     step = "impact";
-    renderImpactStep(root, opts, renderModes, impactOutcome);
-  };
-  const position = () => {
-    const rect = anchor.getBoundingClientRect();
-    const gap = 4;
-    const height = root.offsetHeight;
-    const top = rect.bottom + gap + height <= window.innerHeight - 8 ? rect.bottom + gap : Math.max(8, rect.top - gap - height);
-    root.style.top = `${Math.round(top)}px`;
-    root.style.left = `${Math.round(Math.min(rect.right, window.innerWidth - 8 - root.offsetWidth))}px`;
-  };
-  renderModes();
-  document.body.append(root);
-  position();
-  focusFirst(root);
-  void (async () => {
-    const outcome = await previewImpact(session, seq);
-    impactOutcome = outcome;
-    if (outcome !== null && outcome.kind === "success") {
-      bothState = { state: hasFileImpact(outcome.text) ? "hasChanges" : "noChanges" };
-    }
-    renderModes();
-    position();
-  })().catch(() => {
-    bothState = { state: "hasChanges" };
-    renderModes();
-    position();
-  });
-  popoverEl = root;
-  const onPointerDown = (event) => {
-    const target = event.target;
-    if (root.contains(target) || anchor.contains(target)) return;
-    closePopover();
+    renderImpactStep(root, durableOpts, renderModes, impactOutcome);
   };
   const onKeyDown = (event) => {
     if (event.key === "ArrowDown") {
@@ -545,20 +619,50 @@ function openPopover(opts) {
       else closePopover();
     }
   };
-  const deferred = setTimeout(() => {
-    document.addEventListener("pointerdown", onPointerDown);
-    document.addEventListener("keydown", onKeyDown, true);
-  }, 0);
-  disposeOutside = () => {
-    clearTimeout(deferred);
-    document.removeEventListener("pointerdown", onPointerDown);
-    document.removeEventListener("keydown", onKeyDown, true);
-  };
+  renderModes();
+  const shell = mountShell(root, anchor, onKeyDown);
+  popoverEl = root;
+  disposeOutside = shell.dispose;
+  void (async () => {
+    const outcome = await previewImpact(session, seq);
+    impactOutcome = outcome;
+    if (outcome !== null && outcome.kind === "success") {
+      bothState = { state: hasFileImpact(outcome.text) ? "hasChanges" : "noChanges" };
+    }
+    renderModes();
+    shell.position();
+  })().catch(() => {
+    bothState = { state: "hasChanges" };
+    renderModes();
+    shell.position();
+  });
 }
 
 // src/client/portals.tsx
 var import_react = require("react");
 var import_react_dom = require("react-dom");
+
+// src/client/pending.ts
+function matchPendingRows(rows, steering) {
+  const matched = [];
+  for (let i = 0; i < rows.length; i++) {
+    const row = rows[i];
+    const item = steering[i];
+    if (item !== void 0 && row.text === (item.text ?? "")) {
+      matched.push(item.id);
+    } else {
+      matched.push(null);
+    }
+  }
+  return matched;
+}
+function retractSpan(steering, targetId) {
+  const index = steering.findIndex((item) => item.id === targetId);
+  if (index === -1) return [];
+  return steering.slice(index).map((item) => item.id);
+}
+
+// src/client/portals.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 function userTextAt(session, seq) {
   const snap = session.getSnapshot();
@@ -601,6 +705,7 @@ var COMPOSER_SELECTOR = "[data-input-scroll] textarea, textarea[data-phase]";
 var USER_SEAT_SELECTOR = '[data-chat-flow-kind="user"][data-chat-anchor-key], [data-chat-flow-kind="steering"][data-chat-anchor-key]';
 var CHAT_SEAT_SELECTOR = "[data-chat-anchor-key]";
 var ACTIONS_ROOT_SELECTOR = "[data-time-hover-root]";
+var PENDING_SEAT_SELECTOR = "[data-pending-steering][data-time-hover-root]";
 function collectTargets(chat, hiddenSeqs) {
   const rows = /* @__PURE__ */ new Map();
   for (const element of document.querySelectorAll(USER_SEAT_SELECTOR)) {
@@ -617,14 +722,51 @@ function collectTargets(chat, hiddenSeqs) {
     const messageRoot = row?.querySelector(ACTIONS_ROOT_SELECTOR);
     const actions = messageRoot?.lastElementChild;
     if (!(actions instanceof HTMLElement) || actions.querySelector("button") === null) continue;
-    targets.push({ key, container: actions, seq: user.seq, time: user.time, preview: messagePreviewOf(user) });
+    targets.push({ kind: "durable", key, container: actions, seq: user.seq, time: user.time, preview: messagePreviewOf(user) });
+  }
+  return targets;
+}
+function bubbleTextOf(row) {
+  const clone = row.cloneNode(true);
+  clone.lastElementChild?.remove();
+  return clone.textContent ?? "";
+}
+function collectPendingTargets(snapshot) {
+  if (snapshot.subagent !== null) return [];
+  const steering = snapshot.queue.filter((item) => item.placement === "steering");
+  if (steering.length === 0) return [];
+  const rows = Array.from(document.querySelectorAll(PENDING_SEAT_SELECTOR));
+  const matched = matchPendingRows(
+    rows.map((row) => ({ text: bubbleTextOf(row) })),
+    steering.map((item) => ({ id: item.id, text: item.text }))
+  );
+  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 messageRoot = row.matches(ACTIONS_ROOT_SELECTOR) ? row : row.querySelector(ACTIONS_ROOT_SELECTOR);
+    const actions = messageRoot?.lastElementChild;
+    if (!(actions instanceof HTMLElement) || actions.querySelector("button") === null) 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];
-    return other !== void 0 && target.key === other.key && target.container === other.container && target.seq === other.seq;
+    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, currentSessionId, t, subscribeLocale }) {
@@ -644,7 +786,8 @@ function RewindPortals({ sessionId, sessionOf, currentSessionId, t, subscribeLoc
         setTargets([]);
         return;
       }
-      const chat = session.getSnapshot().chat;
+      const snapshot = session.getSnapshot();
+      const chat = snapshot.chat;
       const hiddenSeqs = hiddenSeqsOf(chat);
       let hiddenCount = 0;
       for (const seat of document.querySelectorAll(CHAT_SEAT_SELECTOR)) {
@@ -666,7 +809,7 @@ function RewindPortals({ sessionId, sessionOf, currentSessionId, t, subscribeLoc
           `[dsh-rewind] hiding: ${hiddenCount} rows, seqs [${[...hiddenSeqs].slice(0, 20).join(", ")}${hiddenSeqs.size > 20 ? "\u2026" : ""}]`
         );
       }
-      const next = collectTargets(chat, hiddenSeqs);
+      const next = [...collectTargets(chat, hiddenSeqs), ...collectPendingTargets(snapshot)];
       setTargets((current) => sameTargets(current, next) ? current : next);
     };
     const queueRefresh = () => {
@@ -686,7 +829,16 @@ function RewindPortals({ sessionId, sessionOf, currentSessionId, t, subscribeLoc
     };
   }, [sessionId, sessionOf]);
   return targets.map((target) => (0, import_react_dom.createPortal)(
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    target.kind === "pending" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      RetractButton,
+      {
+        target,
+        sessionId,
+        sessionOf,
+        t
+      },
+      target.key
+    ) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       RewindButton,
       {
         target,
@@ -735,6 +887,49 @@ function RewindButton({ target, sessionId, sessionOf, currentSessionId, t }) {
     }
   );
 }
+function composerText() {
+  const textarea = document.querySelector(COMPOSER_SELECTOR);
+  return textarea === null ? "" : textarea.value;
+}
+async function retractPending(session, itemId, text) {
+  await session.cancel();
+  const queue = session.getSnapshot().queue;
+  const steering = queue.filter((item) => item.placement === "steering");
+  for (const id of retractSpan(steering, itemId)) {
+    await session.updateQueue(id, { kind: "remove" });
+  }
+  if (text !== null && text !== "" && composerText().trim() === "") {
+    fillComposer(text);
+  }
+}
+function RetractButton({ target, sessionId, sessionOf, t }) {
+  const onClick = (event) => {
+    event.stopPropagation();
+    const session = sessionOf(sessionId);
+    if (session === void 0) return;
+    openPopover({
+      session,
+      preview: target.preview,
+      anchor: event.currentTarget,
+      t,
+      retract: { itemId: target.itemId, text: target.text },
+      onRetract: () => {
+        void retractPending(session, target.itemId, target.text);
+      }
+    });
+  };
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    "button",
+    {
+      type: "button",
+      className: CLASS.button,
+      "aria-label": t("button.retract.aria"),
+      title: t("button.retract.title"),
+      onClick,
+      dangerouslySetInnerHTML: { __html: REWIND_ICON_SVG }
+    }
+  );
+}
 function createRewindBridge(deps) {
   return function RewindBridge({ sessionId }) {
     return (0, import_react.createElement)(RewindPortals, { sessionId, ...deps });
@@ -745,8 +940,14 @@ function createRewindBridge(deps) {
 var zh = {
   "button.aria": "\u56DE\u9000\u5230\u6B64\u6D88\u606F",
   "button.title": "\u56DE\u9000",
+  "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": "\u5C06\u505C\u6B62\u5F53\u524D\u751F\u6210\uFF0C\u5E76\u56DE\u9000\u5230\u8BE5\u6D88\u606F\u4E4B\u524D",
+  "popover.retract.confirm": "\u786E\u8BA4\u56DE\u9000",
   "popover.chat": "\u4EC5\u56DE\u9000\u5BF9\u8BDD",
   "popover.chat.hint": "\u53EA\u56DE\u9000\u6A21\u578B\u4E0A\u4E0B\u6587\uFF0C\u4E0D\u52A8\u5DE5\u4F5C\u533A\u6587\u4EF6",
   "popover.both": "\u56DE\u9000\u5BF9\u8BDD\u548C\u4EE3\u7801",
@@ -766,8 +967,14 @@ var zh = {
 var en = {
   "button.aria": "Rewind to this message",
   "button.title": "Rewind",
+  "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": "Stops the current run and rewinds to before this message",
+  "popover.retract.confirm": "Confirm rewind",
   "popover.chat": "Rewind conversation only",
   "popover.chat.hint": "Cut the model context only; workspace files stay untouched",
   "popover.both": "Rewind conversation and code",
@@ -823,6 +1030,15 @@ function apply(ctx) {
       const chat = chatOf(sessionId);
       return chat !== void 0 && rewindCandidatesOfChat(chat).length > 0;
     };
+    const fetchHostCandidates = async (face) => {
+      const known = knownCommandSeqs(face, (node) => isCandidateCommand(node));
+      const result = await face.command("/rewind __candidates");
+      if (!result.ok || result.value?.matched !== true) return void 0;
+      const outcome = await waitForCommand(face, (node) => isCandidateCommand(node) && !known.has(node.seq));
+      if (outcome === null || outcome.kind !== "success" || outcome.text === void 0) return void 0;
+      return rewindCandidatesFromHostText(outcome.text);
+    };
+    const hostCandidatesCache = /* @__PURE__ */ new Map();
     const composerAnchor = () => {
       const textarea = composerTextarea();
       const card = textarea?.closest("[data-composer-card]");
@@ -837,15 +1053,20 @@ function apply(ctx) {
       available: (session) => hasCandidates(session.sessionId),
       ui: {
         kind: "popupSelect",
-        options: (session) => {
-          const chat = chatOf(session.sessionId);
-          return Promise.resolve(chat === void 0 ? [] : rewindOptionsOf(chat, t));
+        options: async (session) => {
+          const face = sessionOf(session.sessionId);
+          if (face === void 0) return [];
+          const candidates = await fetchHostCandidates(face);
+          if (candidates !== void 0) hostCandidatesCache.set(session.sessionId, candidates);
+          return candidates === void 0 ? [] : rewindOptionsFromCandidates(candidates, t);
         },
         onSelect: (option, session) => {
           const face = sessionOf(session.sessionId);
-          const chat = chatOf(session.sessionId);
-          const candidate = chat !== void 0 ? candidateBySeq(chat, Number(option.id)) : void 0;
-          if (face === void 0 || candidate === void 0) return;
+          if (face === void 0) return;
+          const candidate = hostCandidatesCache.get(session.sessionId)?.find(
+            (candidate2) => candidate2.seq === Number(option.id)
+          );
+          if (candidate === void 0) return;
           openPopover({
             session: face,
             seq: candidate.seq,

package/lib/index.js

@@ -80,6 +80,7 @@ var RewindError = class extends Error {
   code;
 };
 var CANDIDATE_PREVIEW_CHARS = 80;
+var DEFAULT_CANDIDATE_LIMIT = 50;
 function markerTurnOf(events) {
   let lastStarted = 0;
   for (const event of events) {
@@ -92,6 +93,9 @@ function markerTurnOf(events) {
 function isUserMessageEvent(event) {
   return event.type === "user/message";
 }
+function isHumanUserMessageEvent(event) {
+  return isUserMessageEvent(event) && event.data.source.kind === "user";
+}
 function messagePreview(message) {
   const text = message.content.map((block) => block.type === "text" && typeof block.text === "string" ? block.text : "").join("").replace(/\s+/g, " ").trim();
   return text.length <= CANDIDATE_PREVIEW_CHARS ? text : `${text.slice(0, CANDIDATE_PREVIEW_CHARS - 1)}\u2026`;
@@ -106,13 +110,13 @@ function parseRewindTarget(raw) {
   const index = Number(token);
   return Number.isSafeInteger(index) && index >= 1 ? { kind: "index", index } : void 0;
 }
-function listRewindCandidates(events, surface, limit = 10) {
+function listRewindCandidates(events, surface, limit = DEFAULT_CANDIDATE_LIMIT) {
   const surfaceIndexes = /* @__PURE__ */ new Map();
   for (let i = 0; i < surface.length; i++) surfaceIndexes.set(surface[i], i);
   const candidates = [];
   for (let i = events.length - 1; i >= 0 && candidates.length < limit; i--) {
     const event = events[i];
-    if (!isUserMessageEvent(event)) continue;
+    if (!isHumanUserMessageEvent(event)) continue;
     if (!surfaceIndexes.has(event.seq)) continue;
     candidates.push({
       seq: event.seq,
@@ -123,6 +127,14 @@ function listRewindCandidates(events, surface, limit = 10) {
   }
   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") {
@@ -138,10 +150,10 @@ function planRewind(events, surface, target) {
   if (targetEvent === void 0) {
     throw new RewindError("not-a-user-message", `no session event at seq ${targetSeq}`);
   }
-  if (!isUserMessageEvent(targetEvent)) {
+  if (!isHumanUserMessageEvent(targetEvent)) {
     throw new RewindError(
       "not-a-user-message",
-      `session event at seq ${targetSeq} is not a user message (${targetEvent.type})`
+      `session event at seq ${targetSeq} is not a human user message (${targetEvent.type})`
     );
   }
   const targetIndex = surface.indexOf(targetSeq);
@@ -641,6 +653,11 @@ async function waitForAgentIdle(agent, signal, timeoutMs = 15e3) {
     if (onAbort !== void 0) signal.removeEventListener("abort", onAbort);
   }
 }
+function dropPendingSteering(agent) {
+  for (const message of [...agent.inbox.nextStep]) {
+    agent.inbox.remove(message.id);
+  }
+}
 async function executeRewind(ctx, store, fs, invocation, rawTarget, mode, inflight) {
   const { agent } = invocation;
   const sessionId = agent.session.id;
@@ -650,12 +667,13 @@ async function executeRewind(ctx, store, fs, invocation, rawTarget, mode, inflig
   inflight.add(sessionId);
   try {
     if (agent.status !== "idle") {
-      agent.cancel({ kind: "user" });
+      agent.cancel({ kind: "user" }, { keepInbox: true });
       const stopped = await waitForAgentIdle(agent, invocation.signal);
       if (!stopped) {
         return { kind: "error", text: t("stopFailed") };
       }
     }
+    dropPendingSteering(agent);
     if (invocation.signal.aborted) {
       return { kind: "error", text: t("cancelled") };
     }
@@ -733,6 +751,10 @@ async function handleRewind(ctx, store, fs, invocation, inflight) {
     const impacts = await store.impactsAfter(session.id, plan.targetSeq);
     return { kind: "success", text: formatPlan(plan, impacts) };
   }
+  if (parts[0] === "__candidates") {
+    const candidates = listRewindCandidates(session.events, 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") {

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

@@ -15,6 +15,14 @@ import type { RewindKey } from './locales.ts';
 type Translate = (key: RewindKey, params?: Record<string, unknown>) => string;
 /** Preview length cap for candidate rows (matches the host's candidate list). */
 export declare const PREVIEW_CHARS = 80;
+/**
+ * Default cap on how many user messages the rewind picker lists (newest kept).
+ *
+ * A fixed 10 made long sessions look "incomplete" (only the newest 10 shown).
+ * 50 keeps the picker scrollable/searchable via the popupSelect shell while
+ * covering far longer sessions; callers can still pass an explicit `limit`.
+ */
+export declare const DEFAULT_CANDIDATE_LIMIT = 50;
 /** One selectable rewind target. */
 export interface RewindCandidate {
     /** Absolute log seq of the `user/message` event. */
@@ -73,4 +81,21 @@ export declare function rewindCandidatesOfChat(snap: CandidateChat): RewindCandi
 export declare function rewindOptionsOf(snap: CandidateChat, t: Translate): SelectOption[];
 /** Resolve one candidate by log seq (the mode popover's re-entry after a pick). */
 export declare function candidateBySeq(snap: CandidateChat, seq: number): RewindCandidate | undefined;
+/**
+ * Parse the host's candidate-list encoding (see `formatCandidateList` in
+ * src/rewind.ts) into typed candidates. Malformed lines are skipped; a
+ * 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.
+ */
+export declare function rewindOptionsFromCandidates(candidates: readonly RewindCandidate[], t: Translate): SelectOption[];
+/**
+ * Parse the host's candidate-list encoding (see `formatCandidateList` in
+ * src/rewind.ts) into popupSelect rows.
+ */
+export declare function rewindOptionsFromHostText(text: string, t: Translate): SelectOption[];
 export {};

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

@@ -38,6 +38,13 @@ export declare function isExecutedRewindCommand(node: CommandNode, seq: number):
  * always-show so a working option is never hidden on a failed probe.
  */
 export declare function hasFileImpact(text: string | undefined): boolean;
+/**
+ * True when a `/rewind` command node is the internal candidate-list probe
+ * (`/rewind __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.
+ */
+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

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

@@ -3,8 +3,14 @@
 export declare const zh: {
     'button.aria': string;
     'button.title': string;
+    'button.retract.aria': string;
+    'button.retract.title': string;
     'popover.title': string;
     'popover.noText': string;
+    'popover.retract.title': string;
+    'popover.retract.target': string;
+    'popover.retract.hint': string;
+    'popover.retract.confirm': string;
     'popover.chat': string;
     'popover.chat.hint': string;
     'popover.both': string;
@@ -33,8 +39,14 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
 export declare const en: {
     'button.aria': string;
     'button.title': string;
+    'button.retract.aria': string;
+    'button.retract.title': string;
     'popover.title': string;
     'popover.noText': string;
+    'popover.retract.title': string;
+    'popover.retract.target': string;
+    'popover.retract.hint': string;
+    'popover.retract.confirm': string;
     'popover.chat': string;
     'popover.chat.hint': string;
     'popover.both': string;

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

@@ -0,0 +1,54 @@
+/**
+ * Pure pending-message matching: pairs the rendered pending-steering bubble
+ * rows with the session's transient queue mirror rows (`placement === 'steering'`).
+ *
+ * Both sides derive from the host's next-step inbox order — the ChatView
+ * renders `pendingSteering` in array order and the queue mirror keeps the same
+ * host order — so index-primary matching is reliable. Text equality is still
+ * verified as a per-row cross-check, and a row that fails (or a row with no
+ * mirror item, or a mirror item with no row) is skipped INDIVIDUALLY: one bad
+ * row never takes down the other rows' buttons. The matching text is the
+ * bubble's message text WITHOUT its actions container — the harness copy
+ * button's Tooltip mounts a label bubble inside that container on hover, so
+ * the full row textContent would flip between "message" and "message+Copy"
+ * with the mouse, flickering the button (see `bubbleTextOf` in portals.tsx).
+ *
+ * The browser half lives in `portals.tsx`; this module stays DOM-free so the
+ * matching contract is unit-testable in a plain node environment.
+ *
+ * @module dsh-rewind/client/pending
+ */
+/** One rendered pending-steering bubble row (only the fields matching reads). */
+export interface PendingRow {
+    /** The bubble's message text, excluding the actions container (see module doc). */
+    readonly text: string;
+}
+/** One steering occurrence from the session queue mirror. */
+export interface PendingSteeringItem {
+    readonly id: string;
+    /** Complete editable text; null when the message contains non-text blocks. */
+    readonly text: string | null;
+}
+/**
+ * Pair rows to steering items by index, verifying text equality per row.
+ * @param rows - pending bubble rows in DOM order (== render order).
+ * @param steering - steering queue items in host order (== render order).
+ * @returns the item id for each row, or null for rows that cannot be matched
+ *   safely (missing counterpart, text mismatch). A bad row never affects the
+ *   other rows.
+ */
+export declare function matchPendingRows(rows: readonly PendingRow[], steering: readonly PendingSteeringItem[]): readonly (string | null)[];
+/**
+ * The pending-steering ids a "rewind to this pre-sent message" retracts: the
+ * target occurrence and every steering message after it, in inbox (FIFO)
+ * order. Queued (next-turn) messages are deliberately NOT included — the
+ * harness QueueDock already offers the user per-item edit/remove, so a rewind
+ * must not silently drop messages the user may still want to send.
+ * @param steering - steering queue items in host order (== render order).
+ * @param targetId - the rewind target's inbox occurrence id.
+ * @returns the ids to remove, oldest-first; empty when the target is no
+ *   longer pending (already claimed/consumed).
+ */
+export declare function retractSpan(steering: readonly {
+    readonly id: string;
+}[], targetId: string): readonly string[];

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

@@ -19,8 +19,17 @@ import type { RewindKey } from './locales.ts';
 type Translate = (key: RewindKey, params?: Record<string, unknown>) => string;
 export interface PopoverOptions {
     readonly session: SessionFace;
-    readonly seq: number;
-    readonly time: number;
+    /** Durable variant: the target message seq (mode-selection flow). */
+    readonly seq?: number;
+    /** Durable variant: the target message time. */
+    readonly time?: number;
+    /** Pending variant: retract a pre-sent steering message (single-confirm flow). */
+    readonly retract?: {
+        readonly itemId: string;
+        readonly text: string | null;
+    };
+    /** Pending variant: executed after the retract confirm closes the popover. */
+    readonly onRetract?: () => void;
     readonly preview: string;
     /** The button that opened the popover (outside-click ignore target). */
     readonly anchor: HTMLElement;
@@ -30,7 +39,7 @@ export interface PopoverOptions {
      * the callback owns the command + composer-refill lifecycle (see
      * runRewindAndFill in index.ts).
      */
-    readonly onRewind: (mode: 'chat' | 'both') => void;
+    readonly onRewind?: (mode: 'chat' | 'both') => void;
 }
 /** Close the current popover, if any. */
 export declare function closePopover(): void;

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

@@ -26,6 +26,28 @@ import { type ReactNode } from 'react';
 import type { SessionFace } from '@deepseek-ai/dsh-client-runtime/client';
 import type { RewindKey } from './locales.ts';
 type Translate = (key: RewindKey, params?: Record<string, unknown>) => string;
+/** One portal target: the actions row of a user/steering seat + its durable node. */
+export type PortalTarget = {
+    readonly kind: 'durable';
+    /** The seat's chat node key (React reconciliation + diff identity). */
+    readonly key: string;
+    /** The row's actions container (React portal target). */
+    readonly container: HTMLElement;
+    readonly seq: number;
+    readonly time: number;
+    readonly preview: string;
+} | {
+    readonly kind: 'pending';
+    /** `pending:${itemId}` — stable per inbox occurrence. */
+    readonly key: string;
+    /** The row's actions container (React portal target). */
+    readonly container: HTMLElement;
+    /** The host inbox occurrence the retract button addresses. */
+    readonly itemId: string;
+    /** Complete editable text; null when the message contains non-text blocks. */
+    readonly text: string | null;
+    readonly preview: string;
+};
 /** Capabilities the session-scoped bridge receives from the plugin apply(). */
 export interface RewindBridgeDeps {
     readonly sessionOf: (sessionId: string) => SessionFace | undefined;

package/lib/types/rewind.d.ts

@@ -60,6 +60,12 @@ export interface RewindPlan {
 }
 /** Preview length cap for candidate listings. */
 export declare const CANDIDATE_PREVIEW_CHARS = 80;
+/**
+ * Default cap on how many user messages a candidate listing returns (newest
+ * kept). Raised from 10 so long sessions don't look incomplete; callers can
+ * still pass an explicit `limit`.
+ */
+export declare const DEFAULT_CANDIDATE_LIMIT = 50;
 /**
  * Turn number for the rewind marker.
  *
@@ -85,6 +91,18 @@ export declare const CANDIDATE_PREVIEW_CHARS = 80;
 export declare function markerTurnOf(events: readonly SessionEvent[]): number;
 /** Narrow an event to a user message. */
 export declare function isUserMessageEvent(event: SessionEvent): event is SessionEvent<'user/message'>;
+/**
+ * True for a HUMAN user message event — one whose `source.kind` is `'user'`.
+ *
+ * The surface can carry `user/message` events whose source is NOT the user:
+ * plugin/system context injection (including compaction checkpoints) and
+ * tool-result backfill all arrive as `user/message` with a non-`'user'`
+ * source, and the client renders those as `context` nodes, never as a user
+ * bubble. Only genuine user messages (and user steering during a running
+ * turn, which keeps `source.kind: 'user'`) are valid rewind targets — a
+ * rewind boundary must land on a human prompt, not on injected context.
+ */
+export declare function isHumanUserMessageEvent(event: SessionEvent): event is SessionEvent<'user/message'>;
 /** Join the text blocks of a message into one plain string. */
 export declare function messagePreview(message: UserMessage): string;
 /**
@@ -104,6 +122,23 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "DeepSeek Harness plugin: in-place conversation rewind in the same session window (Claude Code /rewind semantics) with optional workspace file restore",
   "keywords": [
     "deepseek-harness",