@240xu/dsh-message-ops 0.5.1 → 0.5.2

package/README.md

@@ -243,3 +243,22 @@ MIT
 - 0.4.2 的 dock 重写误删了 `INPUT_DOCK_SLOT/ID` 常量声明——apply() 引用未定义
   标识符导致**整个客户端激活失败**（页面横幅 Failed to load plugins）。
   已恢复常量；新增 vm 冒烟自测路径（见 .e2e/）。
+
+## 0.5.2 · Bug 猎场第一轮修复（P0×1 + P1×3 + P2×6）
+
+- **[P0] activeMarkers 被 0.5.0 误删**（与 INPUT_DOCK 同一 commit，0.5.1 只找回常量）：
+  dock 100% 静默失效（ReferenceError 被 .catch 吞掉）。已恢复函数 + vm 冒烟守卫。
+- **[P1] 工具层未 await async ops**（0.2.1 改 async 后漏同步化）：list/restore 必抛
+  TypeError、export 渲出空 text。switch 全部 await + 回归测试（异步桩）。
+- **[P1] 引用空块**：assistant 消息 fullText 恒 null，回退 `''` 通过 null 检查 →
+  插入空 `> ` 块并报成功。改为按 seq 走新端点 `GET /text` 取单条全文，空串按不可用处理。
+- **[P1] 侧栏菜单卡死**：dispatch 缺 sessionId → 对话框永久「正在读取…」。
+  从 data-row-key 提取 sessionId 一并派发。
+- **[P2] seq 索引缓存投毒**：失败必须 `delete`，否则该会话按钮/dock 到刷新前全失效。
+- **[P2] 索引口径**：同 id 取最早 seq（对齐服务端 buildSeqIndex，不再内联取最大）。
+- **[P2] branch 工具渲染**：读 keptEvents/parentSession（原读不存在的 kept/parentId）。
+- **[P2] dock 标题口径**：改报标记 range 内被遮蔽消息数（原报标记数，严重低报）。
+- **[P2] busy 卡死**：runRevert/restoreRow/对话框 run 全部 `Promise.resolve()` 包裹——
+  同步抛出也落进 finally；restoreRow 补 finally 双保险。
+- **[P2] dock 陈旧**：新增 `dsh-message-ops:changed` 广播，回滚/恢复成功后 dock 自动重拉。
+- **[P3] 删 en 独有死键 dock.shadowedN；GET 端点补 405 方法校验。**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@240xu/dsh-message-ops",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Roll back, branch, and export any DSH conversation — from the UI or straight from the agent via a message_ops tool. Non-destructive: logs stay append-only and recoverable. 消息回滚/删除/分支/导出四合一，内置 message_ops agent 工具；非破坏语义，日志只追加可恢复。",
   "type": "module",
   "license": "MIT",

package/src/client.js

@@ -26,6 +26,9 @@ window.__ModuleLoader__.load({
     const INPUT_DOCK_ID = 'message-ops-revert-dock'
     const DIALOG_ID = 'message-ops-dialog'
     const EVENT = 'dsh-message-ops:open'
+    // 0.5.2（P2）：回滚/恢复成功后广播 → RevertDock 重拉标记（否则 dock 只在切会话时刷新）
+    const CHANGED_EVENT = 'dsh-message-ops:changed'
+    const emitChanged = () => { try { window.dispatchEvent(new CustomEvent(CHANGED_EVENT)) } catch { /* noop */ } }
     const NS = 'dsh-message-ops'
 
     const zhDict = {
@@ -386,11 +389,12 @@ window.__ModuleLoader__.load({
         }
         const path = mode === 'restore' ? 'restore' : mode
         const body = { sessionId: target.sessionId, seq: picked }
-        fetch('/api/message-ops/' + path, {
-          method: 'POST',
-          headers: { 'content-type': 'application/json' },
-          body: JSON.stringify(body),
-        })
+        Promise.resolve()
+          .then(() => fetch('/api/message-ops/' + path, {
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify(body),
+          }))
           .then(async (res) => {
             let data = {}
             try { data = await res.json() } catch { /* keep {} */ }
@@ -410,6 +414,7 @@ window.__ModuleLoader__.load({
             setBusyMsg('')
             setState('done')
             notifyDone(okMsg)
+            emitChanged()
           })
           .catch((reason) => {
             setBusyMsg('')
@@ -641,12 +646,14 @@ window.__ModuleLoader__.load({
         else if (cached) resolve(cached)
         else {
           const p = fetch('/api/message-ops/messages?sessionId=' + encodeURIComponent(sessionId))
-            .then((r) => (r.ok ? r.json() : { messages: [] }))
+            .then((r) => (r.ok ? r.json() : Promise.reject(new Error('HTTP ' + r.status))))
             .then((data) => {
               const index = new Map()
               const full = new Map()
               for (const m of (data && data.messages) || []) {
-                if (m && m.id != null) index.set(String(m.id), m.seq)
+                // 0.5.2（P2）：同 id 取**最早** seq——与服务端 buildSeqIndex 口径一致
+                // （重试链取最早可见节点；此前内联 set 覆盖=取最大，双实现分裂）
+                if (m && m.id != null && !index.has(String(m.id))) index.set(String(m.id), m.seq)
                 if (m && m.id != null && m.fullText) full.set(String(m.id), m.fullText)
               }
               __seqIndexCache.set(sessionId, index)
@@ -654,7 +661,9 @@ window.__ModuleLoader__.load({
               return index
             })
           __seqIndexCache.set(sessionId, p)
-          p.then(resolve).catch(() => {})
+          // 0.5.2（P2）：失败必须清缓存——否则 rejected promise 被永久缓存，
+          // 该会话按钮/dock 到刷新页面为止全部失效
+          p.then(resolve).catch(() => { __seqIndexCache.delete(sessionId) })
         }
         return () => { alive = false }
       }, [messageId, sessionId])
@@ -689,16 +698,20 @@ window.__ModuleLoader__.load({
       const runRevert = () => {
         if (busy || seq == null || running) return
         setBusy('revert')
-        fetch('/api/message-ops/revert', {
-          method: 'POST', headers: { 'content-type': 'application/json' },
-          body: JSON.stringify({ sessionId, seq }),
-        })
+        // 0.5.2（P2）：Promise.resolve 包裹——fetch/stringify 同步抛出也转为
+        // rejection 落进 finally，busy 永不卡死
+        Promise.resolve()
+          .then(() => fetch('/api/message-ops/revert', {
+            method: 'POST', headers: { 'content-type': 'application/json' },
+            body: JSON.stringify({ sessionId, seq }),
+          }))
           .then(async (res) => {
             let data = {}
             try { data = await res.json() } catch { /* keep {} */ }
             if (!res.ok || !data.ok) throw new Error(data.error || ('HTTP ' + res.status))
             notifyDone(t('done.revert'))
             revealSession()
+            emitChanged()
           })
           .catch((reason) => {
             notifyDone(t('errorPrefix') + (reason && reason.message ? reason.message : String(reason)), 'error')
@@ -714,11 +727,18 @@ window.__ModuleLoader__.load({
             return
           }
           const span = inputActions.captureInsertion()
-          const text = fullText != null ? fullText : (summary && summary.title ? '' : null)
-          if (text == null) { notifyDone(t('quote.unavailable'), 'warn'); return }
-          const quoted = text.split('\n').map((l) => '> ' + l).join('\n') + '\n\n'
-          const ok = inputActions.insertText(quoted, span)
-          notifyDone(ok ? t('quote.done') : t('quote.unavailable'), ok ? 'ok' : 'warn')
+          const insertQuote = (text) => {
+            if (text == null || text === '') { notifyDone(t('quote.unavailable'), 'warn'); return }
+            const quoted = text.split('\n').map((l) => '> ' + l).join('\n') + '\n\n'
+            const ok = inputActions.insertText(quoted, span)
+            notifyDone(ok ? t('quote.done') : t('quote.unavailable'), ok ? 'ok' : 'warn')
+          }
+          // assistant 消息 fullText 恒 null（列表不携带）→ 按 seq 向服务端取单条全文
+          if (fullText != null && fullText !== '') { insertQuote(fullText); return }
+          fetch('/api/message-ops/text?sessionId=' + encodeURIComponent(sessionId) + '&seq=' + encodeURIComponent(seq))
+            .then((r) => (r.ok ? r.json() : null))
+            .then((d) => insertQuote(d && d.ok && typeof d.text === 'string' ? d.text : null))
+            .catch(() => insertQuote(null))
         } catch (e) {
           notifyDone(t('errorPrefix') + (e && e.message ? e.message : String(e)), 'error')
         }
@@ -740,6 +760,16 @@ window.__ModuleLoader__.load({
       )
     }
 
+    // 0.4.2 引入（恢复的标记自动离开活跃列表 = opencode clear 语义）。
+    // 0.5.0 脚本化编辑曾误删本函数 → dock 100% 静默失效（P0，0.5.2 恢复）。
+    function activeMarkers(msgs) {
+      const restored = new Set()
+      for (const m of msgs || []) {
+        if (m && typeof m.restoresSeq === 'number') restored.add(m.restoresSeq)
+      }
+      return (msgs || []).filter((m) => m.marker && m.sourceKind !== 'compact-checkpoint' && !restored.has(m.seq))
+    }
+
     function RevertDock(props) {
       const { sessionId, useSessions, inputActions } = props
       const t = (props && props.t) || __t
@@ -750,6 +780,7 @@ window.__ModuleLoader__.load({
       const running = summary ? summary.running === true : false
       const [open, setOpen] = useState(false)
       const [markers, setMarkers] = useState(null) // 活跃回撤标记（已恢复的自动消失）
+      const [shadowCount, setShadowCount] = useState(0) // 标记 range 内被遮蔽消息数（标题口径）
       const [restoring, setRestoring] = useState(null)
       const [styleInjected, setStyleInjected] = useState(false)
 
@@ -784,15 +815,28 @@ window.__ModuleLoader__.load({
 
       useEffect(() => {
         let alive = true
+        const onChange = () => load()
+        window.addEventListener(CHANGED_EVENT, onChange)
         const load = () => fetch('/api/message-ops/messages?sessionId=' + encodeURIComponent(sessionId))
           .then((r) => (r.ok ? r.json() : null))
           .then((data) => {
             if (!alive || !data || !data.ok) return
-            setMarkers(activeMarkers(data.messages || []))
+            const msgs = data.messages || []
+            setMarkers(activeMarkers(msgs))
+            // 0.5.2（P2）：标题口径 = 标记 range 内 visible=false 的去重 seq 数
+            const seen = new Set()
+            for (const mk of activeMarkers(msgs)) {
+              const start = mk.range && typeof mk.range.start === 'number' ? mk.range.start : mk.seq
+              const end = mk.range && typeof mk.range.end === 'number' ? mk.range.end : start
+              for (const m of msgs) {
+                if (m && m.visible === false && typeof m.seq === 'number' && m.seq >= start && m.seq <= end) seen.add(m.seq)
+              }
+            }
+            setShadowCount(seen.size)
           })
           .catch(() => {})
         load()
-        return () => { alive = false }
+        return () => { alive = false; window.removeEventListener(CHANGED_EVENT, onChange) }
       }, [sessionId])
 
       // items 变化自动折叠（opencode createEffect 同款；必须在早退之前——Hooks 规则）
@@ -802,10 +846,11 @@ window.__ModuleLoader__.load({
       const restoreRow = (row) => {
         if (restoring != null || running) return
         setRestoring(row.seq)
-        fetch('/api/message-ops/restore', {
-          method: 'POST', headers: { 'content-type': 'application/json' },
-          body: JSON.stringify({ sessionId, seq: row.seq }),
-        })
+        Promise.resolve()
+          .then(() => fetch('/api/message-ops/restore', {
+            method: 'POST', headers: { 'content-type': 'application/json' },
+            body: JSON.stringify({ sessionId, seq: row.seq }),
+          }))
           .then(async (res) => {
             let data = {}
             try { data = await res.json() } catch { /* keep {} */ }
@@ -821,13 +866,15 @@ window.__ModuleLoader__.load({
           })
           .catch((reason) => {
             notifyDone(t('errorPrefix') + (reason && reason.message ? reason.message : String(reason)), 'error')
-            setRestoring(null)
           })
+          .finally(() => setRestoring(null))
       }
 
 
       const headerKbd = (e) => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); setOpen((v) => !v) } }
-      const label = t('dock.title', { n: String(markers.length) })
+      // 0.5.2（P2）：标题报「被遮蔽消息数」而非标记数——一个 revert 可遮蔽数百条，
+      // 用标记数会严重低报（0.4.2 文案引入的错口径）；无 range 数据时回退标记数
+      const label = t('dock.title', { n: String(shadowCount || markers.length) })
       const preview = markers[0] && markers[0].snippet ? markers[0].snippet : ''
 
       const rowEl = (row) => React.createElement('div', { key: row.seq, className: 'mopsRdRow' },
@@ -899,7 +946,11 @@ window.__ModuleLoader__.load({
         var titleEl = row.querySelector('[class*=title]')
         var title = titleEl ? String(titleEl.innerText || '').trim() : ''
         if (!title) return
-        window.dispatchEvent(new CustomEvent(EVENT, { detail: { title: title } }))
+        // 0.5.2（P1）：必须带 sessionId——否则对话框加载 effect 早退，永久卡「正在读取…」
+        var sid = ''
+        var rk = row.getAttribute && row.getAttribute('data-row-key')
+        if (rk && rk.indexOf('session:') === 0) sid = rk.slice(8)
+        window.dispatchEvent(new CustomEvent(EVENT, { detail: { title: title, sessionId: sid || undefined } }))
       })
       var sep = document.createElement('div')
       sep.style.cssText = 'height:1px;margin:4px 8px;background:var(--dsw-alias-border-l1,rgba(128,128,128,.2))'

package/src/index.js

@@ -20,7 +20,7 @@
  * @module dsh-message-ops
  */
 
-import { isSessionId, sessionIdVariants, findSessionDirs, readSessionFile, readSessionFileAsync, listMessages, computeShadowed } from "./session-file.js";
+import { isSessionId, sessionIdVariants, findSessionDirs, readSessionFile, readSessionFileAsync, listMessages, computeShadowed, messageText } from "./session-file.js";
 import { applyBranch } from "./branch.js";
 import {
   OpsError, planRevert, planDelete, planRestore, applyRestore, applySurfaceReplace, exportMarkdown,
@@ -250,15 +250,20 @@ export function createMessageOpsTool({ defineTool, ops, ctx }) {
       const sessionId = String(args.sessionId || "").trim();
       try {
         let result;
+        // 0.5.2（P1）：ops 自 0.2.1 起为 async——不 await 会把 Promise 直接送进 renderResult，
+        // list/restore 必抛 TypeError、export 渲出空 text（测试桩曾是同步的故漏检）。
         switch (action) {
-          case "list": result = ops.list(ctx, sessionId); break;
-          case "revert": result = ops.revert(ctx, sessionId, args.seq); break;
-          case "delete": result = ops.delete(ctx, sessionId, args.seq); break;
-          case "branch": result = ops.branch(ctx, sessionId, args.upToSeq); break;
-          case "restore": result = ops.restore(ctx, sessionId, args.seq); break;
-          case "export": result = ops.export(ctx, sessionId, args.seq); break;
+          case "list": result = await ops.list(ctx, sessionId); break;
+          case "revert": result = await ops.revert(ctx, sessionId, args.seq); break;
+          case "delete": result = await ops.delete(ctx, sessionId, args.seq); break;
+          case "branch": result = await ops.branch(ctx, sessionId, args.upToSeq); break;
+          case "restore": result = await ops.restore(ctx, sessionId, args.seq); break;
+          case "export": result = await ops.export(ctx, sessionId, args.seq); break;
           default: throw new OpsError(`unknown action: ${action}`, 400);
         }
+        if (action === "branch" && result && typeof result === "object" && result.parentSession == null) {
+          result.parentSession = sessionId; // renderResult 需要原始会话 id（branch 返回值不含/可为 undefined）
+        }
         return renderResult(action, result);
       } catch (e) {
         return `${action} failed: ${e && e.message ? e.message : e}`;
@@ -284,7 +289,7 @@ function renderResult(action, r) {
     case "delete":
       return `${r.mode} ok: shadowed ${r.shadowedCount} node(s) from seq ${r.seq}; marker event seq ${r.eventSeq}`;
     case "branch":
-      return `branch ok: new session ${r.newId} (parent ${r.parentId ?? "n/a"}), kept ${r.kept ?? "?"} event(s)`;
+      return `branch ok: new session ${r.newId} (parent ${r.parentSession ?? "n/a"}), kept ${r.keptEvents ?? "?"} event(s)`;
     case "restore":
       return `restore ok: replayed ${r.restoredCount} message(s) from range ${r.range.startSeq}..${r.range.endSeq} (${r.skipped} skipped); appended event seqs ${r.eventSeqs.join(", ")}`;
     case "export":
@@ -333,6 +338,7 @@ export function apply(ctx) {
       kind: "exact",
       path: "/api/message-ops/messages",
       handler: async (req, res) => {
+        if (req.method !== "GET") return sendJson(res, 405, { ok: false, error: "method not allowed" });
         if (!fence(req, res)) return;
         try {
           const url = new URL(req.url, "http://localhost");
@@ -343,6 +349,31 @@ export function apply(ctx) {
       },
     }), "dsh-message-ops: messages route");
 
+    // --- GET /api/message-ops/text：单条消息全文（0.5.2 引用按钮按需取） ----------
+    // assistant 消息的 fullText 不在 messages 列表里（载荷控制），quote 点击时单取。
+    targetCtx.effect(() => host.register({
+      kind: "exact",
+      path: "/api/message-ops/text",
+      handler: async (req, res) => {
+        if (req.method !== "GET") return sendJson(res, 405, { ok: false, error: "method not allowed" });
+        if (!fence(req, res)) return;
+        try {
+          const url = new URL(req.url, "http://localhost");
+          const sessionId = url.searchParams.get("sessionId") || "";
+          const seq = Number.parseInt(url.searchParams.get("seq") || "", 10);
+          if (!isSessionId(sessionId)) throw new OpsError("invalid sessionId", 400);
+          if (!Number.isSafeInteger(seq) || seq < 0) throw new OpsError("invalid seq", 400);
+          const { logPath } = pickSessionDir(sessionId);
+          const { events } = await readSessionFileAsync(logPath);
+          const ev = events.find((e) => e && e.seq === seq);
+          if (!ev) throw new OpsError("seq not found", 404);
+          return sendJson(res, 200, { ok: true, seq, text: messageText(ev) });
+        } catch (err) {
+          return sendJson(res, err instanceof OpsError ? err.status : 500, { ok: false, error: String(err && err.message ? err.message : err) });
+        }
+      },
+    }), "dsh-message-ops: text route");
+
     // --- POST revert / delete：live-session surface replace ------------------
     const commitHandler = (mode) => async (req, res) => {
       if (req.method !== "POST") return sendJson(res, 405, { ok: false, error: "method not allowed" });

package/test/ops-core.test.js

@@ -190,7 +190,7 @@ test('apply：无 webServer、无 tools 时走 inject 等待，不抛错', () =>
   assert.equal(ctx.registrations.length, 0)
 })
 
-test('apply：webServer 存在时注册全部 6 条路由；tools 缺失走 inject 等待', () => {
+test('apply：webServer 存在时注册全部 7 条路由；tools 缺失走 inject 等待', () => {
   const ctx = mockCtx({ webServer: { register: (route) => ctx.registrations.push(route) } })
   assert.doesNotThrow(() => apply(ctx))
   const paths = ctx.registrations.map((r) => r.path).sort()
@@ -201,6 +201,7 @@ test('apply：webServer 存在时注册全部 6 条路由；tools 缺失走 inje
     '/api/message-ops/messages',
     '/api/message-ops/restore',
     '/api/message-ops/revert',
+    '/api/message-ops/text',
   ])
   // tools 缺失 → 容错等待而非 fatal
   assert.ok(ctx.injects.some(([deps]) => deps[0] === 'tools'))
@@ -214,3 +215,39 @@ test('apply：tools 服务存在时直接进入注册路径（包缺失时 catch
   // 但绝不能让插件 apply 抛错；异步分支也不能产生未处理拒绝。
   assert.equal(registered.length, 0)
 })
+
+// ── 0.5.2 回归：工具层必须 await async ops（0.2.1 改 async 后曾漏同步化，
+//    list/restore 抛 TypeError、export 渲出空 text；旧桩是同步的故漏检）──────
+test('工具 execute：async ops 被 await（list/branch/restore/export 全路径）', async () => {
+  let def
+  const defineTool = (d) => { def = d; return d }
+  const asyncOps = {
+    list: async () => ({ session: { id: 'session-abc', parentSession: null }, running: false, total: 1, visibleCount: 1,
+      messages: [{ seq: 10, role: 'user', visible: true, snippet: 'hello' }] }),
+    revert: async () => ({ mode: 'revert', shadowedCount: 2, seq: 10, eventSeq: 99 }),
+    delete: async () => ({ mode: 'delete', shadowedCount: 1, seq: 10, eventSeq: 98 }),
+    branch: async () => ({ newId: 'session-child', keptEvents: 42, parentSession: undefined }),
+    restore: async () => ({ restoredCount: 1, skipped: 0, range: { startSeq: 5, endSeq: 6 }, eventSeqs: [7, 8] }),
+    export: async () => ({ markdown: '# md' }),
+  }
+  createMessageOpsTool({ defineTool, ops: asyncOps, ctx: {} })
+  assert.ok(def, 'tool defined')
+  const outList = await def.execute({ action: 'list', sessionId: 'session-abc' })
+  assert.match(String(outList), /session session-abc/)
+  assert.doesNotMatch(String(outList), /failed:/)
+  const outBranch = await def.execute({ action: 'branch', sessionId: 'session-abc', upToSeq: 10 })
+  // 0.5.2 P2：branch 渲染读 keptEvents + parentSession（注入自入参），不再读不存在的 kept/parentId
+  assert.match(String(outBranch), /kept 42 event/)
+  assert.match(String(outBranch), /parent session-abc/)
+  const outRestore = await def.execute({ action: 'restore', sessionId: 'session-abc', seq: 6 })
+  assert.match(String(outRestore), /replayed 1 message/)
+  const outExport = await def.execute({ action: 'export', sessionId: 'session-abc' })
+  assert.equal(String(outExport), '# md')
+  // 同步抛出的 ops 仍走错误文案路径
+  const errTool = await (async () => {
+    let d2
+    createMessageOpsTool({ defineTool: (x) => { d2 = x }, ops: { list: () => { throw new Error('boom') } }, ctx: {} })
+    return d2.execute({ action: 'list', sessionId: 'session-abc' })
+  })()
+  assert.match(String(errTool), /list failed: boom/)
+})