dsh-edit-turn 0.5.11 → 0.5.13

package/README.md

@@ -277,6 +277,20 @@ ln -s /path/to/dsh-install/node_modules ./node_modules
 
 ### 更新日志
 
+**0.5.13** —— 打开着的会话直接从内存读事件，不再把整份日志从磁盘重新解码。
+
+- **量出来的瓶颈**：把 `/state` 的每一段单独计时，插件自己的全部计算加起来只有几十毫秒（`foldSurface` 3 ms、`turnIndex` 6 ms、`rollbackLedger` 1 ms、回复列表 29 ms），而**读日志 + 解压**要 **1,408 ms**（15 MB 的会话）。不幸的是这条读路径优先走查询服务 —— 对**宿主已经打开**的会话，那等于把内存里现成的东西从磁盘再解一遍。
+
+- **修法**：活着的会话直接用它自己的内存快照（`snapshotEvents()`），没有活的会话才走查询服务。打开着的会话（用户正在看的那个）因此从"秒级"降到"几十毫秒级"。
+
+**0.5.12** —— `/state` 只折一次表面；临时诊断撤掉。
+
+- **复制已确认修好**（根因是 `/state` 太大太慢：25 MB / 13 秒，那段时间里浏览器半部没有任何编辑条目，按下复制不会被接管）。所以 0.5.10 的自报诊断按计划撤掉。
+
+- **再提速**：`rollbackLedger` 自己又折了一遍表面，而 `stateOf` 已经折过一次 —— 31k 事件的会话等于把整份日志走了两遍，还各自重建了 `bySeq`、`turnIndex`。现在折一次、索引复用，四个遍历共用同一份。实测同一份日志：`editableReplies` 的轻量路径 **2,227 ms → 29 ms**（0.5.11），这一版再省掉重复的那一遍折叠。
+
+- **缓存试过又撤了**：按"会话 + 事件数 + 配置"缓存 state 能把重复打开变成瞬时，但测试里暴露出陈旧风险（状态快照没跟上新事件时，键不变、结果却是旧的）。宁可慢一点，也不要给编辑器一份过期的状态。这条以后要做得从宿主的 seq 严格判定失效。
+
 **0.5.11** —— `/state` 的回复列表加轻量路径：不再为每条回复构建分块。
 
 - 0.5.9 把回复全文从 `/state` 拿掉了，但服务端**仍然为每条回复构建了全部分块**（还要为每条回复遍历它那一整轮的所有事件做合并）。实测一个会话 290 条回复：**2,227 ms、22.4 MB 的中间数据** —— 而 `/state` 只需要身份。

package/lib/client.js

@@ -45,7 +45,7 @@ window.__ModuleLoader__.load({
     const RERUN_PREFIX = '/dsh-rerun-turn'
 
     /** Keep in sync with package.json and lib/index.js. */
-    const PLUGIN_VERSION = '0.5.11'
+    const PLUGIN_VERSION = '0.5.13'
 
     // --- copy -----------------------------------------------------------------
 
@@ -2001,24 +2001,6 @@ window.__ModuleLoader__.load({
     })()
     const rowCopyText = copyRegistry.text
 
-    // TEMP DIAG (删除时机：复制修好后). 复制按下没被接管时，把原因写进标签页标题：
-    // 不污染剪贴板、不改页面内容，用户念一眼标题即可；成功接管时自动恢复原标题。
-    const copyDiag = (page) => {
-      try {
-        if (page.__dshetTitle === undefined) page.__dshetTitle = document.title
-        const base = String(page.__dshetTitle ?? '')
-        const show = (reason) => {
-          document.title = `[复制诊断] ${reason}${base === '' ? '' : ' · ' + base}`
-        }
-        const clear = () => {
-          if (String(document.title).startsWith('[复制诊断]')) document.title = base
-        }
-        return { show, clear }
-      } catch {
-        return { show: () => {}, clear: () => {} }
-      }
-    }
-    const titleDiag = typeof globalThis !== 'undefined' ? copyDiag(globalThis) : { show: () => {}, clear: () => {} }
     const rowHostText = copyRegistry.host
 
     /**
@@ -2150,11 +2132,6 @@ window.__ModuleLoader__.load({
       const native = clipboard.writeText.bind(clipboard)
       const wrapped = (value) => {
         const rewritten = rewriteCopiedText(String(value ?? ''))
-        if (rewritten === null && rowCopyText.size > 0) {
-          titleDiag.show(`写入没匹配上（登记 ${rowCopyText.size} 行，长度 ${String(value ?? '').length}）`)
-        } else if (rewritten !== null) {
-          titleDiag.clear()
-        }
         return rewritten === null ? native(value) : native(rewritten)
       }
       wrapped[CLIPBOARD_WRAPPED] = true
@@ -4995,15 +4972,11 @@ window.__ModuleLoader__.load({
           // Our own buttons sit in the same bar: theirs is not this press.
           if (pluginOwned(button)) return
           const row = button.closest('[data-chat-flow-key]')
-          if (row === null) { titleDiag.show('按钮不在行内'); return }
+          if (row === null) return
           const key = row.getAttribute('data-chat-flow-key')
-          if (typeof key !== 'string' || key === '') { titleDiag.show('行没有 key'); return }
+          if (typeof key !== 'string' || key === '') return
           const text = rowCopyText.get(key)
-          if (typeof text !== 'string') {
-            titleDiag.show(`这一行没登记文本（登记 ${rowCopyText.size} 行）`)
-            return
-          }
-          titleDiag.clear()
+          if (typeof text !== 'string') return
           const write = primitives !== null && primitives !== undefined && typeof primitives.writeClipboard === 'function'
             ? primitives.writeClipboard
             : null

package/lib/index.js

@@ -78,7 +78,7 @@ export const PLUGIN_ID = 'dsh-edit-turn'
 export const name = PLUGIN_ID
 
 /** Keep in sync with package.json and lib/client.js. */
-export const PLUGIN_VERSION = '0.5.11'
+export const PLUGIN_VERSION = '0.5.13'
 
 // A ring of the last few requests, answering "did the browser half even ask, and
 // what did it get?" without needing its console. Read-only diagnostics: the
@@ -699,10 +699,13 @@ function copyBlock(block) {
  * @returns `{ hidden, edits }`: one hidden entry per shadowed seq, and one
  *   record per landed rollback.
  */
-export function rollbackLedger(events) {
-  const folded = foldSurface(events)
-  const bySeq = new Map(events.map((event) => [event.seq, event]))
-  const turnOf = turnIndex(events)
+export function rollbackLedger(events, options = {}) {
+  // A caller that already folded the surface (the state route does) hands it in:
+  // folding twice over a long session is the single most expensive thing this
+  // route did - 31k events, and every fold walks all of them.
+  const folded = options.folded ?? foldSurface(events)
+  const bySeq = options.bySeq ?? new Map(events.map((event) => [event.seq, event]))
+  const turnOf = options.turnOf ?? turnIndex(events)
   const hidden = []
   const edits = []
   for (const replacement of folded.replacements) {
@@ -1244,8 +1247,8 @@ export function buildReplayWrites(events, plan, baseTurn, replayId, startSeq, pr
  * @returns one entry per editable prompt, in conversation order.
  */
 export function editableTurns(events, surfaceNodes, options = {}) {
-  const eventBySeq = new Map(events.map((event) => [event.seq, event]))
-  const turnOf = turnIndex(events)
+  const eventBySeq = options.bySeq ?? new Map(events.map((event) => [event.seq, event]))
+  const turnOf = options.turnOf ?? turnIndex(events)
   const head = surfaceNodes[0]
   const out = []
   // Surface order, not log order: a prompt rewritten in place travels as a
@@ -1301,7 +1304,7 @@ export function editableTurns(events, surfaceNodes, options = {}) {
  */
 export function editableReplies(events, surfaceNodes, options = {}) {
   const nodeIndex = new Map(surfaceNodes.map((seq, index) => [seq, index]))
-  const turnOf = turnIndex(events)
+  const turnOf = options.turnOf ?? turnIndex(events)
   const head = surfaceNodes[0]
   const patches = options.patches instanceof Map ? options.patches : new Map()
   const patch = options.patch === true
@@ -1481,6 +1484,13 @@ function eventsFromLive(session) {
 // Live-preferred read through the public query service; the live session's own
 // snapshot is the fallback when the service is absent.
 async function readEvents(ctx, sessionId) {
+  // A session the host has open answers from memory. Going through the query
+  // service instead makes the route re-decode the whole log from disk first:
+  // measured 1.4 s for a 15 MB log, while every computation this route does on
+  // top of it adds up to a few tens of milliseconds. That read was the entire
+  // reason the edit entry took seconds to appear.
+  const live = eventsFromLive(findLiveSession(ctx, sessionId))
+  if (live !== undefined && live.length > 0) return live
   const query = ctx.get('sessionQuery')
   if (query && typeof query.readSession === 'function') {
     try {
@@ -1769,7 +1779,9 @@ async function stateOf(ctx, sessionId, config) {
     }
   }
   const folded = foldSurface(events)
-  const ledger = rollbackLedger(events)
+  const bySeq = new Map(events.map((event) => [event.seq, event]))
+  const turnOf = turnIndex(events)
+  const ledger = rollbackLedger(events, { folded, bySeq, turnOf })
   const patches = patchesOf(events)
   // A patch whose target has been retired (a later rerun shadowed it) is inert:
   // the projection skips it and no row can show it. Reporting it in /state made
@@ -1783,8 +1795,8 @@ async function stateOf(ctx, sessionId, config) {
   // now, so a store that is unmounted (or not yet mounted) cannot leave the
   // editor promising to keep blocks the host would have to drop.
   const store = resolveAttachmentStore(ctx)
-  const turns = editableTurns(events, folded.nodes, { preview: canPreviewAttachments(store) })
-  const replies = editableReplies(events, folded.nodes, { patches, patch: config.patch === true, light: true }).map(lightReply)
+  const turns = editableTurns(events, folded.nodes, { preview: canPreviewAttachments(store), bySeq, turnOf })
+  const replies = editableReplies(events, folded.nodes, { patches, patch: config.patch === true, light: true, bySeq, turnOf }).map(lightReply)
   noteRequest({
     kind: 'state',
     sessionId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-edit-turn",
-  "version": "0.5.11",
+  "version": "0.5.13",
   "description": "Edit any message in DeepSeek Harness in place: a prompt is replaced where it stands; a model reply block (answer text or reasoning) is patched through a plugin record and a message projection, so the turn stays where it is, later turns are untouched and the log grows by one small record. Falls back to the replay splice on hosts without the projection API. The append-only session log is never rewritten.",
   "type": "module",
   "main": "lib/index.js",
@@ -45,14 +45,17 @@
     "verify:ui": "node tools/verify-live-ui.mjs"
   },
   "dependencies": {
+    "@deepseek-ai/cordis": "^4.0.5",
+    "@deepseek-ai/dsh-scope": "^0.2.1-rc.5",
     "@deepseek-ai/schemastery": "^3.18.1"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-session": "^0.2.1-rc.2"
+    "@deepseek-ai/dsh-session": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-session-format-catalog": "^0.2.1-rc.5"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.7 || ^0.1.1-rc.2 || ^0.1.2-alpha.2 || ^0.1.3-alpha.2 || ^0.1.5-alpha.1 || ^0.2.0-rc.1",
-    "@deepseek-ai/dsh-session": "^0.2.0-rc.1 || ^0.2.1-rc.2"
+    "@deepseek-ai/dsh-session": "^0.2.0-rc.1 || ^0.2.1-rc.2",
+    "@deepseek-ai/dsh-settings": "^0.1.0-rc.7 || ^0.1.1-rc.2 || ^0.1.2-alpha.2 || ^0.1.3-alpha.2 || ^0.1.5-alpha.1 || ^0.2.0-rc.1"
   },
   "dsh": {
     "bundle": {