dsh-rewind-plugin 0.1.4 → 0.1.5

package/README.md

@@ -2,9 +2,9 @@
 
 DeepSeek Harness 插件：**同一会话窗口的 in-place 对话回退**（Claude Code `/rewind` 语义）。主交互为**用户消息旁的「回退」按钮**，点击后选择回退模式；命令仅作辅助。
 
-> 状态：v0.1.4 已实现并发布（`dsh-rewind-plugin`，npm + GitHub Actions Trusted Publishing）。交互以 Claude Code 行为为参考，并贴合 dsh Web 实际 UI（利用现有 DOM 锚点与运行时快照，纯插件、不改仓库核心）。
+> 状态：v0.1.5 已实现并发布（`dsh-rewind-plugin`，npm + GitHub Actions Trusted Publishing）。交互以 Claude Code 行为为参考，并贴合 dsh Web 实际 UI（利用现有 DOM 锚点与运行时快照，纯插件、不改仓库核心）。
 
-## 实现状态（v0.1.4）
+## 实现状态（v0.1.5）
 
 - ✅ host 端 `/rewind` 命令（两步文本引导 + 直接执行 + `preview` 影响清单）
 - ✅ host 端变更台账（`tools/execute` 捕获 before、`tools/post-execute` 提交），按会话隔离
@@ -143,7 +143,8 @@ git push --tags      # push v<version> tag → 触发 .github/workflows/publish.
 
 ### 5. 安全守卫
 
-- agent 运行中拒绝执行（`status !== 'idle'`）。
+- agent 运行中（LLM 思考/输出）执行回退时**自动强制停止**当前回合（`cancel({kind:'user'})`），
+  等待 quiescence 后回退；停止超时/失败则中止并报错。无需先手动停止。
 - 文件还原是破坏性操作：UI 选择「对话和代码」时需经影响清单确认；命令路径用 `preview` 先行查看。
 - 回退本身可再回退（回退动作同样进入台账/日志）。
 

package/lib/index.js

@@ -318,10 +318,22 @@ function renderFailures(failed) {
   if (failed.length === 0) return "";
   return `\uFF1B${failed.length} \u4E2A\u6587\u4EF6\u8FD8\u539F\u5931\u8D25\uFF1A${failed.map((f) => `${f.path}\uFF08${f.message}\uFF09`).join("\u3001")}`;
 }
+async function waitForAgentIdle(agent, signal, timeoutMs = 15e3) {
+  const deadline = Date.now() + timeoutMs;
+  while (agent.status !== "idle") {
+    if (signal.aborted || Date.now() > deadline) return false;
+    await new Promise((resolve) => setTimeout(resolve, 50));
+  }
+  return true;
+}
 async function executeRewind(ctx, ledger, invocation, rawTarget, mode) {
   const { agent } = invocation;
   if (agent.status !== "idle") {
-    return { kind: "error", text: "agent \u6B63\u5728\u8FD0\u884C\u4E2D\uFF0C\u65E0\u6CD5\u56DE\u9000\u3002\u8BF7\u7B49\u5F85\u5F53\u524D\u56DE\u5408\u7ED3\u675F\u540E\u518D\u8BD5\u3002" };
+    agent.cancel({ kind: "user" });
+    const stopped = await waitForAgentIdle(agent, invocation.signal);
+    if (!stopped) {
+      return { kind: "error", text: "\u65E0\u6CD5\u505C\u6B62\u8FD0\u884C\u4E2D\u7684 agent\uFF0C\u56DE\u9000\u5DF2\u53D6\u6D88\u3002\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002" };
+    }
   }
   let plan;
   try {

package/package.json

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

@@ -150,10 +150,20 @@ const bothResult = await call(agent, '@2 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. safety guard: running agent refuses
-const running = { ...agent, status: 'running' }
+// 9. a running agent is force-stopped before the rewind (not refused)
+let cancelled = false
+const running = {
+  ...agent, status: 'running',
+  cancel: () => { cancelled = true; running.status = 'idle' },
+}
 const runningResult = await registered.handler({ commandId: Symbol('cid'), agent: running, rawInput: '@2 chat', signal: aborted() })
-check('running agent refused', runningResult.kind === 'error', runningResult.text)
+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 stuckResult = await registered.handler({ commandId: Symbol('cid'), agent: stuck, rawInput: '@2 chat', signal: aborted() })
+check('stuck agent aborts rewind', stuckResult.kind === 'error', stuckResult.text)
 
 console.log(failures === 0 ? '\nverify-host: all checks passed' : `\nverify-host: ${failures} check(s) FAILED`)
 process.exit(failures === 0 ? 0 : 1)