dsh-rewind-plugin 0.1.6 → 0.1.8

package/README.md

@@ -2,16 +2,16 @@
 
 DeepSeek Harness 插件：**同一会话窗口的 in-place 对话回退**（Claude Code `/rewind` 语义）。主交互为**用户消息旁的「回退」按钮**，点击后选择回退模式；命令仅作辅助。
 
-> 状态：v0.1.5 已实现并发布（`dsh-rewind-plugin`，npm + GitHub Actions Trusted Publishing）。交互以 Claude Code 行为为参考，并贴合 dsh Web 实际 UI（利用现有 DOM 锚点与运行时快照，纯插件、不改仓库核心）。
+> 状态：v0.1.8 已实现并发布（`dsh-rewind-plugin`，npm + GitHub Actions Trusted Publishing）。交互以 Claude Code 行为为参考，并贴合 dsh Web 实际 UI（利用现有 DOM 锚点与运行时快照，纯插件、不改仓库核心）。
 
-## 实现状态（v0.1.5）
+## 实现状态（v0.1.8）
 
 - ✅ host 端 `/rewind` 命令（两步文本引导 + 直接执行 + `preview` 影响清单）
 - ✅ host 端变更台账（`tools/execute` 捕获 before、`tools/post-execute` 提交），按会话隔离
 - ✅ **与其他审批类插件共存**：捕获在 around-dispatch 阶段，`tools/pre-execute` 被 `ask` 短路（如 dsh-edit-approval）后批准仍能记录；被拒绝的调用不留 pending 残留
 - ✅ **路径按会话 cwd 解析**（复刻 `dsh-tool-fs` 的 session-cwd 规则），相对路径台账/还原指向真实文件；台账记录解析后的 display path
 - ✅ **fs 服务动态获取**（`ctx.inject(['fs'])`）：fs 后挂载也不失效，无 fs 部署时命令仍可用
-- ✅ 同窗口 in-place 回退：追加标记节点 + `surfaceOp: replace` 替换目标点之后的 surface（真实 `dsh-session` 集成测试通过）
+- ✅ 同窗口 in-place 回退：追加空内容标记 + `surfaceOp: replace` 替换目标及之后全部 surface（真实 `dsh-session` 集成测试通过）
 - ✅ client 端「回退」按钮（MutationObserver 注入用户消息行操作区）+ 模式选择浮层（含 both 模式影响清单确认）
 - ✅ 测试：纯函数单测 + 真实 `dsh-session` 集成测试 + `verify-host` 端到端（14 项，含审批短路/会话 cwd 场景）
 - ⏳ 二期：快捷键、git-first 快照式文件回退、命令路径的 client 两步浮层接管
@@ -68,14 +68,15 @@ git push --tags      # push v<version> tag → 触发 .github/workflows/publish.
 
 - 每条用户消息 hover 出现「↶ 回退」按钮：点击 → 选择「仅回退对话」或
   「回退对话和代码」（后者先展示影响清单再确认）。
-- **撤回最近消息**：对**最后一条**用户消息回退（按钮或 `/rewind <目标>`），效果是
-  **撤回该消息本身**（发错了立即重发的常见场景）——上下文回到它之前，命令结果
-  提示"已撤回 seq N，可重新发送"。
+- **回退 = 撤回（时间回溯）**：对**任意**用户消息回退（按钮或 `/rewind <目标>`），
+  效果是**撤回该消息及它之后的所有内容**（含 agent 回复、工具调用）——对话界面与
+  Agent 上下文都回到这条消息发送之前；**该消息的文本自动填入输入框（编辑区）**，
+  可直接修改后重发。命令结果提示"已撤回 seq N 及之后内容"。
 - 键盘流：`/rewind` → 选消息 → `/rewind <序号> chat|both`；`/rewind preview <目标>`
   只输出影响清单不执行。
-- **回退后前端与 Agent 一致**：回退/撤回后，client 端自动隐藏回退标记、`/rewind`
-  命令结果以及被回退范围内的消息（含 agent 回复），可见对话回到回退点之前的样子；
-  之后新发的消息正常显示。会话日志（append-only 审计）不受影响。
+- **回退后前端与 Agent 一致**：回退标记是空内容消息（deriveMessages 会跳过，模型
+  上下文无任何标记噪音）；client 端隐藏被撤回范围内的消息行与 `/rewind` 命令结果，
+  可见对话即"撤回点之前的内容"。会话日志（append-only 审计）不受影响。
 
 ## 已知限制（v0.1）
 
@@ -125,7 +126,7 @@ git push --tags      # push v<version> tag → 触发 .github/workflows/publish.
 
 ### 3. 同窗口 in-place 对话回退
 
-- `Session.append('user/message', marker, { surfaceOp: { op:'replace', start, end }, sourceEventSeqs })`：在当前会话日志内追加回退标记节点，把目标点之后的所有 surface 节点从模型上下文替换掉。
+- `Session.append('assistant/message', { turn, step, message: 空标记 }, { surfaceOp: { op:'replace', start, end }, sourceEventSeqs })`：追加**空内容**标记（deriveMessages 跳过 → 模型上下文无噪音），把目标及其之后的所有 surface 节点从模型上下文替换掉。
 - 效果：当前窗口上下文从目标点重新开始；**不产生新会话、不切换窗口**；原始日志完整保留（append-only 审计不变），仅不再进入模型上下文。
 - 依赖：`@deepseek-ai/dsh-session`（`Session.append`、`foldSurface`）、`@deepseek-ai/dsh-llm`（`createUserMessage`）、`@deepseek-ai/dsh-commands`（命令注册）、`@deepseek-ai/dsh-agent`（`Agent.status` idle 守卫）。
 

package/lib/client.js

@@ -387,7 +387,7 @@ var NS = "rewind";
 var USER_SEAT_SELECTOR = '[data-chat-flow-kind="user"]';
 var CHAT_SEAT_SELECTOR = "[data-chat-anchor-key]";
 var ACTIONS_ROOT_SELECTOR = "[data-time-hover-root]";
-var MARKER_TEXT = "__DSH_REWIND__";
+var COMPOSER_SELECTOR = "[data-input-scroll] textarea, textarea[data-phase]";
 function targetOfOutcome(text) {
   if (text === void 0) return void 0;
   const match = text.match(/seq (\d+)/);
@@ -405,6 +405,7 @@ function hiddenSeqsOf(session) {
     if (node === void 0 || node.kind !== "command") continue;
     const command = node.data;
     if (command.name !== "rewind") continue;
+    if (command.outcome?.kind !== "success") continue;
     hidden.add(command.seq);
     const marker = command.outcome?.sourceEventSeq;
     const target = targetOfOutcome(command.outcome?.text);
@@ -417,27 +418,31 @@ function hiddenSeqsOf(session) {
       const node = snap.chat.nodes.get(key);
       if (node === void 0) continue;
       const anchor = node.anchorSeq;
-      if (anchor > latest.target && anchor <= latest.marker) hidden.add(anchor);
+      if (anchor >= latest.target && anchor <= latest.marker) hidden.add(anchor);
     }
   }
   return hidden;
 }
-function hideMarkerRows(hidden) {
-  const walker = document.createTreeWalker(document.body, NodeFilter.SHOW_TEXT);
-  const rows = [];
-  while (walker.nextNode()) {
-    const text = walker.currentNode.textContent ?? "";
-    if (!text.includes(MARKER_TEXT)) continue;
-    let el2 = walker.currentNode.parentElement;
-    while (el2 !== null && el2 !== document.body && el2.dataset?.chatAnchorKey === void 0 && el2.dataset?.chatFlowKind === void 0 && !el2.classList.contains("dsh-rewind-popover")) {
-      el2 = el2.parentElement;
+function userTextAt(session, seq) {
+  const snap = session.getSnapshot();
+  for (const key of snap.chat.order) {
+    const node = snap.chat.nodes.get(key);
+    if (node === void 0 || node.kind !== "user") continue;
+    const user = node.data;
+    if (user.seq === seq) {
+      return user.content.map((block) => block.type === "text" && typeof block.text === "string" ? block.text : "").join("");
     }
-    if (el2 !== null && el2 !== document.body && !hidden.has(el2)) rows.push(el2);
-  }
-  for (const row of rows) {
-    row.style.display = "none";
-    hidden.add(row);
   }
+  return void 0;
+}
+function fillComposer(text) {
+  const textarea = document.querySelector(COMPOSER_SELECTOR);
+  if (textarea === null) return false;
+  const setter = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, "value")?.set;
+  setter?.call(textarea, text);
+  textarea.dispatchEvent(new Event("input", { bubbles: true }));
+  textarea.focus();
+  return true;
 }
 function apply(ctx) {
   ctx.effect(function* () {
@@ -510,12 +515,12 @@ function apply(ctx) {
           seat.style.display = "none";
           hidden.add(seat);
           hiddenCount += 1;
-        } else if (hidden.has(seat) && !seat.textContent?.includes(MARKER_TEXT)) {
+        } else if (hidden.has(seat)) {
           seat.style.display = "";
           hidden.delete(seat);
         }
       }
-      hideMarkerRows(hidden);
+      if (session !== void 0) fillComposerForRewind(session, filledTargets);
       if (hiddenSeqs.size > 0 || hiddenCount > 0) {
         console.info(
           `[dsh-rewind] hiding: ${hiddenCount} rows, seqs [${[...hiddenSeqs].slice(0, 20).join(", ")}${hiddenSeqs.size > 20 ? "\u2026" : ""}]`
@@ -525,6 +530,21 @@ function apply(ctx) {
         if (!hidden.has(seat)) attach(seat);
       }
     };
+    const filledTargets = /* @__PURE__ */ new Set();
+    const fillComposerForRewind = (session, filled) => {
+      const snap = session.getSnapshot();
+      for (const key of snap.chat.order) {
+        const node = snap.chat.nodes.get(key);
+        if (node === void 0 || node.kind !== "command") continue;
+        const command = node.data;
+        if (command.name !== "rewind" || command.outcome?.kind !== "success") continue;
+        const target = targetOfOutcome(command.outcome.text);
+        if (target === void 0 || filled.has(target)) continue;
+        const text = userTextAt(session, target);
+        if (text === void 0 || text === "") continue;
+        if (fillComposer(text)) filled.add(target);
+      }
+    };
     observer = new MutationObserver(scan);
     observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ["style"] });
     scan();

package/lib/index.js

@@ -1,5 +1,5 @@
 // src/index.ts
-import { createUserMessage } from "@deepseek-ai/dsh-llm";
+import { createAssistantMessage } from "@deepseek-ai/dsh-llm";
 import { unlink } from "node:fs/promises";
 
 // src/session-cwd.ts
@@ -169,16 +169,7 @@ function planRewind(events, surface, target) {
       `user message at seq ${targetSeq} is no longer in the model context (shadowed by compaction)`
     );
   }
-  if (targetIndex === surface.length - 1) {
-    return {
-      targetSeq,
-      targetIndex,
-      shadowedSeqs: [targetSeq],
-      surfaceStart: targetSeq,
-      surfaceEnd: targetSeq
-    };
-  }
-  const shadowedSeqs = surface.slice(targetIndex + 1);
+  const shadowedSeqs = surface.slice(targetIndex);
   return {
     targetSeq,
     targetIndex,
@@ -280,16 +271,21 @@ async function commitEntry(fs, ledgerFor, pending, exec, result) {
     after
   });
 }
-function buildMarker(targetSeq) {
-  return createUserMessage({
-    content: [{
-      type: "text",
-      text: `__DSH_REWIND__:{"target":${targetSeq}}
-[\u56DE\u9000\u6807\u8BB0 / rewind marker] \u5BF9\u8BDD\u5DF2\u56DE\u9000\u5230 seq ${targetSeq}\uFF0C\u6B64\u6807\u8BB0\u4E4B\u540E\u7684\u5386\u53F2\u5DF2\u4ECE\u6A21\u578B\u4E0A\u4E0B\u6587\u4E2D\u79FB\u9664\u3002\u8BF7\u5FFD\u7565\u6B64\u6807\u8BB0\u672C\u8EAB\uFF0C\u7B49\u5F85\u7528\u6237\u7684\u4E0B\u4E00\u6761\u6D88\u606F\u3002`
-    }],
-    source: { kind: "user" }
+function buildMarker() {
+  return createAssistantMessage({
+    content: [],
+    source: { provider: "dsh-rewind", model: "rewind-marker" }
   });
 }
+function nextTurnOf(session) {
+  let max = -1;
+  for (const event of session.events) {
+    if (event.type === "turn/start" || event.type === "turn/end" || event.type === "assistant/message") {
+      if (event.data.turn > max) max = event.data.turn;
+    }
+  }
+  return max + 1;
+}
 function describeTarget(target) {
   return target.kind === "seq" ? `seq ${target.seq}` : `\u7B2C ${target.index} \u6761\u6D88\u606F`;
 }
@@ -341,10 +337,10 @@ async function executeRewind(ctx, ledger, invocation, rawTarget, mode) {
   } catch (error) {
     return rewindErrorResult(error);
   }
-  const marker = buildMarker(plan.targetSeq);
+  const marker = buildMarker();
   let event;
   try {
-    event = agent.session.append("user/message", marker, {
+    event = agent.session.append("assistant/message", { turn: nextTurnOf(agent.session), step: 0, message: marker }, {
       surfaceOp: { op: "replace", start: plan.surfaceStart, end: plan.surfaceEnd },
       sourceEventSeqs: [...plan.shadowedSeqs]
     });
@@ -369,10 +365,9 @@ async function executeRewind(ctx, ledger, invocation, rawTarget, mode) {
       restore = `\uFF1B\u8FD8\u539F ${outcome.restored.length} \u4E2A\u6587\u4EF6\u3001\u5220\u9664 ${outcome.deleted.length} \u4E2A\u6587\u4EF6${renderFailures(outcome.failed)}`;
     }
   }
-  const withdrewLatest = plan.shadowedSeqs[0] === plan.targetSeq;
   return {
     kind: "success",
-    text: withdrewLatest ? `\u5DF2\u64A4\u56DE seq ${plan.targetSeq}\uFF08\u6700\u8FD1\u4E00\u6761\u6D88\u606F\uFF09\uFF0C\u53EF\u91CD\u65B0\u53D1\u9001${restore}\u3002` : `\u5DF2\u56DE\u9000\u5230 seq ${plan.targetSeq}\uFF0C\u79FB\u9664 ${plan.shadowedSeqs.length} \u6761\u4E0A\u4E0B\u6587\uFF08\u65E5\u5FD7\u4FDD\u7559\uFF09${restore}\u3002`,
+    text: `\u5DF2\u64A4\u56DE seq ${plan.targetSeq} \u53CA\u4E4B\u540E\u5185\u5BB9\uFF08\u5BF9\u8BDD\u5DF2\u56DE\u5230\u6B64\u524D\uFF09${restore}\u3002`,
     sourceEventSeq: event.seq
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-rewind-plugin",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "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",

package/scripts/verify-host.mjs

@@ -90,12 +90,12 @@ check('command registered', typeof registered?.handler === 'function' && registe
 const listResult = await call(agent, '')
 check('bare /rewind lists candidates', listResult.kind === 'success' && listResult.text.includes('second question') && listResult.text.includes('first question'), listResult.text)
 
-// 3. /rewind @2 chat cuts the surface in place
+// 3. /rewind @2 chat withdraws the target (seq 2) and everything after it
 const before = [...session.surface.nodes]
 const chatResult = await call(agent, '@2 chat')
 const after = [...session.surface.nodes]
 check('rewind chat succeeds', chatResult.kind === 'success', chatResult.text)
-check('surface cut to [0,1,2,marker]', after.length === 4 && after[0] === 0 && after[1] === 1 && after[2] === 2 && after[3] > 3, `before ${JSON.stringify(before)} -> after ${JSON.stringify(after)}`)
+check('surface cut to [0,1,marker] (target withdrawn)', after.length === 3 && after[0] === 0 && after[1] === 1 && after[2] > 3, `before ${JSON.stringify(before)} -> after ${JSON.stringify(after)}`)
 check('log stays append-only (5 events)', session.events.length === 5, `events=${session.events.length}`)
 
 const writeExec = (callId, filePath, content) => ({
@@ -141,27 +141,29 @@ const writeExec = (callId, filePath, content) => ({
   check('both restores cwd-resolved file', both.kind === 'success' && fs.files.get('/workspace/rel.txt') === 'relative original', both.text)
 }
 
-// 7. preview reports the impact (rewind to seq 2 reverts the anchor-2 write)
-const previewResult = await call(agent, 'preview @2 both')
+// 7. preview reports the impact (rewind to seq 0 — still on the surface after
+//    the earlier withdraw — reverts the anchor-0 write)
+const previewResult = await call(agent, 'preview @0 both')
 check('preview shows file impact', previewResult.kind === 'success' && previewResult.text.includes('/workspace/a.txt'), previewResult.text)
 
 // 8. both mode restores the file
-const bothResult = await call(agent, '@2 both')
+const bothResult = await call(agent, '@0 both')
 check('rewind both restores file', bothResult.kind === 'success' && bothResult.text.includes('还原 1 个文件'), bothResult.text)
 check('file content restored', fs.files.get('/workspace/a.txt') === 'original content', fs.files.get('/workspace/a.txt'))
 
 // 9. a running agent is force-stopped before the rewind (not refused)
-let cancelled = false
+const runningSession = buildSession('verify-running')
 const running = {
-  ...agent, status: 'running',
+  ...{ id: runningSession.id, session: runningSession, status: 'idle' }, status: 'running',
   cancel: () => { cancelled = true; running.status = 'idle' },
 }
+let cancelled = false
 const runningResult = await registered.handler({ commandId: Symbol('cid'), agent: running, rawInput: '@2 chat', signal: aborted() })
 check('running agent is cancelled first', cancelled === true, `cancelled=${cancelled}`)
 check('rewind succeeds after stop', runningResult.kind === 'success', runningResult.text)
 
 // 9b. a cancel that never quiesces aborts the rewind (timeout path)
-const stuck = { ...agent, status: 'running', cancel: () => {} }
+const stuck = { ...{ id: runningSession.id, session: runningSession, status: 'idle' }, status: 'running', cancel: () => {} }
 const stuckResult = await registered.handler({ commandId: Symbol('cid'), agent: stuck, rawInput: '@2 chat', signal: aborted() })
 check('stuck agent aborts rewind', stuckResult.kind === 'error', stuckResult.text)