dsh-retrace 0.4.6 → 0.4.8

package/lib/dynamic-host.js

@@ -121,9 +121,13 @@ return {
         content: [],
         source: { kind: 'model', provider: model.provider, model: model.model },
       }
+      // R2 路径一（2026-08-30 事故闭环）：有打开的 step（回合中编辑）时，marker 携带
+      // 该 step 的 turn/step —— token-meter 配对通过，不产生 T1 违规、不刷屏。
+      // 无打开 step（轮次间编辑，常态）才回退 turn:null（配合 markerT1Broken 标注）。
+      const openStep = findOpenStep(session)
       const data = {
-        turn: null,
-        step: null,
+        turn: openStep ? openStep.turn : null,
+        step: openStep ? openStep.step : null,
         message: marker,
         editor: {
           targetSeq,
@@ -142,6 +146,24 @@ return {
       return session.append('assistant/message', data, { surfaceOp, sourceEventSeqs })
     }
     
+    /**
+     * 找当前打开的 step（最近一次未闭合的 step/start 的 turn/step）。
+     * 扫描 session.events：step/start 开、step/end 关；末尾仍开即返回。
+     * 无打开 step 返回 null（轮次间编辑）。
+     */
+    function findOpenStep(session) {
+      const events = Array.isArray(session?.events) ? session.events : []
+      let open = null
+      for (const event of events) {
+        if (event?.type === 'step/start') {
+          open = { turn: event.data?.turn, step: event.data?.step }
+        } else if (event?.type === 'step/end') {
+          open = null
+        }
+      }
+      return open
+    }
+    
     function createEditorApi(ctx, sessions, agents, log = () => {}, hooks = {}) {
       /** One in-flight op per session; later ops wait for the earlier one. */
       const locks = new Map()
@@ -165,13 +187,34 @@ return {
         return session
       }
     
-      function requireIdle(agent) {
-        if (agent && typeof agent.status === 'string' && agent.status === 'running') {
-          throw editorError(
-            'agent-busy',
-            'The agent is still responding. Stop the current reply before recalling or editing.',
-          )
+      /**
+       * 确保 agent 空闲（2026-08-30 事故闭环，用户方案落地）：agent 正在响应时，
+       * **不拒绝**——自动请求停止（`agent.cancel`）并等待其干净收尾（`whenIdle`）。
+       *
+       * 为什么必须等停止：编辑/重发发生在 agent 还开着 step 时，DSH 的 resend 机制
+       * 会把旧 step 的 assistant/chunk 全部引用进新 assistant/message 的
+       * `sourceEventSeqs`（526f1835 seq 936047：引用跨 turn 54 的 step 7/8/9），
+       * token-meter 对跨 step 引用抛 `belongs to another step`（dsh-token-meter
+       * lib/index.js:645）→ 同样刷屏压垮 host。先停止 → step 干净关闭 → 编辑在
+       * 轮次边界执行，不再触发跨 step 引用。
+       *
+       * agent 无 cancel/whenIdle（headless/测试桩）时回退为抛 agent-busy（原行为）。
+       */
+      async function ensureIdle(agent) {
+        if (!agent || typeof agent.status !== 'string' || agent.status !== 'running') return
+        if (typeof agent.cancel === 'function' && typeof agent.whenIdle === 'function') {
+          try {
+            agent.cancel({ kind: 'plugin-retrace-edit' })
+            await agent.whenIdle()
+            return
+          } catch (error) {
+            throw editorError('agent-stop-failed', `Failed to stop the running reply before editing: ${String(error)}`)
+          }
         }
+        throw editorError(
+          'agent-busy',
+          'The agent is still responding. Stop the current reply before recalling or editing.',
+        )
       }
     
       /** Locate the durable seq of a user/assistant message by its stable message id. */
@@ -306,7 +349,7 @@ return {
         const sessionId = String(args?.sessionId ?? '')
         const messageId = String(args?.messageId ?? '')
         const session = requireSession(sessionId)
-        requireIdle(agents.get(sessionId))
+        await ensureIdle(agents.get(sessionId))
         const seq = findMessageSeq(session, messageId)
         if (seq === -1) throw editorError('message-not-found', 'Message not found in this session.')
         const span = roundSpanFrom(session, seq)
@@ -336,7 +379,7 @@ return {
         const fromScratch = args?.fromScratch === true
         const session = requireSession(sessionId)
         const agent = agents.get(sessionId)
-        requireIdle(agent)
+        await ensureIdle(agent)
         const seq = findMessageSeq(session, messageId)
         if (seq === -1) throw editorError('message-not-found', 'Message not found in this session.')
         const event = session.events[seq]
@@ -377,7 +420,7 @@ return {
         const messageId = String(args?.messageId ?? '')
         const session = requireSession(sessionId)
         const agent = agents.get(sessionId)
-        requireIdle(agent)
+        await ensureIdle(agent)
         const seq = findMessageSeq(session, messageId)
         if (seq === -1) throw editorError('message-not-found', 'Message not found in this session.')
         const event = session.events[seq]

package/lib/host-core.js

@@ -112,9 +112,13 @@ export async function appendEditorMarker(session, span, op, targetSeq, originalT
     content: [],
     source: { kind: 'model', provider: model.provider, model: model.model },
   }
+  // R2 路径一（2026-08-30 事故闭环）：有打开的 step（回合中编辑）时，marker 携带
+  // 该 step 的 turn/step —— token-meter 配对通过，不产生 T1 违规、不刷屏。
+  // 无打开 step（轮次间编辑，常态）才回退 turn:null（配合 markerT1Broken 标注）。
+  const openStep = findOpenStep(session)
   const data = {
-    turn: null,
-    step: null,
+    turn: openStep ? openStep.turn : null,
+    step: openStep ? openStep.step : null,
     message: marker,
     editor: {
       targetSeq,
@@ -133,6 +137,24 @@ export async function appendEditorMarker(session, span, op, targetSeq, originalT
   return session.append('assistant/message', data, { surfaceOp, sourceEventSeqs })
 }
 
+/**
+ * 找当前打开的 step（最近一次未闭合的 step/start 的 turn/step）。
+ * 扫描 session.events：step/start 开、step/end 关；末尾仍开即返回。
+ * 无打开 step 返回 null（轮次间编辑）。
+ */
+export function findOpenStep(session) {
+  const events = Array.isArray(session?.events) ? session.events : []
+  let open = null
+  for (const event of events) {
+    if (event?.type === 'step/start') {
+      open = { turn: event.data?.turn, step: event.data?.step }
+    } else if (event?.type === 'step/end') {
+      open = null
+    }
+  }
+  return open
+}
+
 export function createEditorApi(ctx, sessions, agents, log = () => {}, hooks = {}) {
   /** One in-flight op per session; later ops wait for the earlier one. */
   const locks = new Map()
@@ -156,13 +178,34 @@ export function createEditorApi(ctx, sessions, agents, log = () => {}, hooks = {
     return session
   }
 
-  function requireIdle(agent) {
-    if (agent && typeof agent.status === 'string' && agent.status === 'running') {
-      throw editorError(
-        'agent-busy',
-        'The agent is still responding. Stop the current reply before recalling or editing.',
-      )
+  /**
+   * 确保 agent 空闲（2026-08-30 事故闭环，用户方案落地）：agent 正在响应时，
+   * **不拒绝**——自动请求停止（`agent.cancel`）并等待其干净收尾（`whenIdle`）。
+   *
+   * 为什么必须等停止：编辑/重发发生在 agent 还开着 step 时，DSH 的 resend 机制
+   * 会把旧 step 的 assistant/chunk 全部引用进新 assistant/message 的
+   * `sourceEventSeqs`（526f1835 seq 936047：引用跨 turn 54 的 step 7/8/9），
+   * token-meter 对跨 step 引用抛 `belongs to another step`（dsh-token-meter
+   * lib/index.js:645）→ 同样刷屏压垮 host。先停止 → step 干净关闭 → 编辑在
+   * 轮次边界执行，不再触发跨 step 引用。
+   *
+   * agent 无 cancel/whenIdle（headless/测试桩）时回退为抛 agent-busy（原行为）。
+   */
+  async function ensureIdle(agent) {
+    if (!agent || typeof agent.status !== 'string' || agent.status !== 'running') return
+    if (typeof agent.cancel === 'function' && typeof agent.whenIdle === 'function') {
+      try {
+        agent.cancel({ kind: 'plugin-retrace-edit' })
+        await agent.whenIdle()
+        return
+      } catch (error) {
+        throw editorError('agent-stop-failed', `Failed to stop the running reply before editing: ${String(error)}`)
+      }
     }
+    throw editorError(
+      'agent-busy',
+      'The agent is still responding. Stop the current reply before recalling or editing.',
+    )
   }
 
   /** Locate the durable seq of a user/assistant message by its stable message id. */
@@ -297,7 +340,7 @@ export function createEditorApi(ctx, sessions, agents, log = () => {}, hooks = {
     const sessionId = String(args?.sessionId ?? '')
     const messageId = String(args?.messageId ?? '')
     const session = requireSession(sessionId)
-    requireIdle(agents.get(sessionId))
+    await ensureIdle(agents.get(sessionId))
     const seq = findMessageSeq(session, messageId)
     if (seq === -1) throw editorError('message-not-found', 'Message not found in this session.')
     const span = roundSpanFrom(session, seq)
@@ -327,7 +370,7 @@ export function createEditorApi(ctx, sessions, agents, log = () => {}, hooks = {
     const fromScratch = args?.fromScratch === true
     const session = requireSession(sessionId)
     const agent = agents.get(sessionId)
-    requireIdle(agent)
+    await ensureIdle(agent)
     const seq = findMessageSeq(session, messageId)
     if (seq === -1) throw editorError('message-not-found', 'Message not found in this session.')
     const event = session.events[seq]
@@ -368,7 +411,7 @@ export function createEditorApi(ctx, sessions, agents, log = () => {}, hooks = {
     const messageId = String(args?.messageId ?? '')
     const session = requireSession(sessionId)
     const agent = agents.get(sessionId)
-    requireIdle(agent)
+    await ensureIdle(agent)
     const seq = findMessageSeq(session, messageId)
     if (seq === -1) throw editorError('message-not-found', 'Message not found in this session.')
     const event = session.events[seq]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-retrace",
   "description": "Retrace · 回溯 — Recall, edit-and-resend, regenerate, and conversation/artifact versioning (timeline, rollback, fork map) for DeepSeek Harness — Web and Desktop",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",