dsh-rewind-plugin 0.12.1 → 0.12.2

package/README.en.md

@@ -57,8 +57,8 @@ dsh plugin --profile web add dsh-rewind-plugin@<version>
 
 - Rewinds can be repeated — with no limit on stage or count.
 - A rewind itself **cannot be undone**, but the withdrawn content stays in the session log.
-- **Interruptions rewind too** — a `steering` interruption message the model hasn't read yet is also a valid rewind target.
-- **A rewind interrupts the running turn** — to ensure the rewind runs safely.
+- **Interruptions rewind too** — a `steering` message the model hasn't read yet is also a valid rewind target, and withdrawing it does not interrupt the current run.
+- **Rewinding a read message interrupts the running turn** — to ensure the rewind runs safely.
 
 </details>
 

package/README.md

@@ -56,8 +56,8 @@ dsh plugin --profile web add dsh-rewind-plugin@<版本>
 
 - 回退可以反复进行——没有阶段或次数限制。
 - 回退本身**无法撤销**，但被撤回的内容仍保留在会话日志中。
-- **插话也能回退**——模型尚未读取的 `steering` 插话消息，同样可作为回退目标。
-- **回退会打断当前正在运行的回合**——确保回退的安全执行。
+- **插话也能回退**——模型尚未读取的 `steering` 插话消息，同样可作为回退目标，不会打断当前生成。
+- **回退已读消息会打断当前正在运行的回合**——确保回退的安全执行。
 
 </details>
 

package/lib/client.js

@@ -1323,13 +1323,22 @@ function composerText() {
   return surface.textContent ?? "";
 }
 async function retractPending(session, itemId, text, setComposerText) {
-  await session.cancel();
   const queue = session.getSnapshot().queue;
   const steering = queue.filter((item) => item.placement === "steering");
+  let removedTarget = false;
   for (const id of retractSpan(steering, itemId)) {
-    await session.updateQueue(id, { kind: "remove" });
+    let accepted = false;
+    try {
+      const result = await session.updateQueue(id, { kind: "remove" });
+      accepted = result.ok;
+      if (!result.ok) rewindLog.info("retract", `pending retract lost the race for ${id}`, result.error);
+    } catch (error) {
+      rewindLog.warn("retract", `pending retract remove threw for ${id}`, error);
+    }
+    if (!accepted) break;
+    if (id === itemId) removedTarget = true;
   }
-  if (text !== null && text !== "" && composerText().trim() === "") {
+  if (removedTarget && text !== null && text !== "" && composerText().trim() === "") {
     setComposerText(session.sessionId, text);
   }
 }
@@ -1370,8 +1379,8 @@ function createRewindBridge(deps) {
 }
 
 // src/client/build-info.ts
-var PLUGIN_VERSION = true ? "0.12.1" : "dev";
-var BUILD_HASH = true ? "248f750a" : "dev";
+var PLUGIN_VERSION = true ? "0.12.2" : "dev";
+var BUILD_HASH = true ? "c9f4bb5f" : "dev";
 
 // src/client/locales.ts
 var zh = {
@@ -1383,7 +1392,7 @@ var zh = {
   "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.hint": "\u64A4\u56DE\u8FD9\u6761\u53CA\u4E4B\u540E\u7684\u63D2\u8BDD\u6D88\u606F\uFF0C\u4E0D\u6253\u65AD\u5F53\u524D\u751F\u6210",
   "popover.retract.confirm": "\u786E\u8BA4\u56DE\u9000",
   "popover.chat": "\u4EC5\u56DE\u9000\u5BF9\u8BDD",
   "popover.chat.hint": "\u53EA\u56DE\u9000\u6A21\u578B\u4E0A\u4E0B\u6587\uFF0C\u4E0D\u52A8\u5DE5\u4F5C\u533A\u6587\u4EF6",
@@ -1426,7 +1435,7 @@ var en = {
   "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.hint": "Retracts this pending message and the ones after it, without interrupting the run",
   "popover.retract.confirm": "Confirm rewind",
   "popover.chat": "Rewind conversation only",
   "popover.chat.hint": "Cut the model context only; workspace files stay untouched",

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

@@ -212,6 +212,30 @@ export declare function RewindPortals({ sessionId, sessionOf, chatOf, currentSes
  * Empty when the composer is absent. Exported as a test seam (the
  * empty-composer guard in `retractPending`). */
 export declare function composerText(): string;
+/**
+ * Withdraw one pre-sent (pending steering) message and every steering message
+ * after it (the rollback point's "future"), WITHOUT interrupting the run.
+ *
+ * The message is still in the agent's next-step inbox, so the loop has not
+ * claimed it into any request: removing it cannot change what the model is
+ * generating. Stopping the run first (the durable-rewind rule) would throw
+ * away in-flight work — a long tool call, a partial answer — for an edit the
+ * model can never observe (SiriLee/dsh-rewind#27). Only the durable rewind
+ * needs a stop, because it cuts the model-visible surface.
+ *
+ * 1. Remove the target and its future (steering only; queued stays) through
+ *    the session's own `updateQueue` channel, oldest first.
+ * 2. Put the target's text back in the composer ONLY when the target was
+ *    actually removed and the composer is empty (Claude Code's auto-restore
+ *    guard, so a draft the user is typing is never clobbered).
+ *
+ * The realistic failure is `queue-item-not-found`: a step boundary claimed
+ * the whole next-step batch a moment ago, so the message is now durable and
+ * the durable row's regular rewind button takes over with no gap. Nothing is
+ * removed then, and the composer is NOT refilled — refilling would invite a
+ * duplicate send of a message the model has already received.
+ */
+export declare function retractPending(session: SessionFace, itemId: string, text: string | null, setComposerText: (sessionId: string, text: string) => boolean): Promise<void>;
 /**
  * Build the slot-entry component for the plugin apply(): a tiny bridge that
  * injects the apply-time capabilities (session resolution, locale, rewind

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "DSH 插件：真正便捷无感的同窗口内对话回退，从不新建分支；自带轻量工作区备份，可一并还原文件（完整 Claude Code /rewind 语义）。 · DSH plugin: genuinely effortless in-window conversation rewind — never forking a new session; ships a lightweight workspace backup that restores files together with the rewind (full Claude Code /rewind semantics).",
   "keywords": [
     "deepseek-harness",