dsh-as-aistudio 0.5.16 → 0.5.18

package/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 ## 中文
 
+**0.5.18** —— 跟进 dsh-log-trim 0.7.5（裁掉被检查点遮蔽的前缀，窗口数真的降下来）。
+
+**0.5.17** —— 跟进 dsh-log-trim 0.7.4（启动立即扫描、最近日志优先、解锁后补裁）。
+
 **0.5.16** —— 跟进 dsh-log-trim 0.7.3（迟到 tool/result 归位，窗口裁剪不再被校验挡住）。
 
 **0.5.15** —— 跟进 dsh-log-trim 0.7.2（重建可用：标题 / 工具通知 / seq 引用全部重映射）。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-as-aistudio",
-  "version": "0.5.16",
+  "version": "0.5.18",
   "description": "Google-AI-Studio-style turn controls for DeepSeek Harness, in one install: edit a prompt and re-run it, re-run a reply in place, delete a turn from the model context, render sent prompts as Markdown, and trim idle session logs on boot. Self-contained: the plugin list shows this one row, and the five components (four actions + one maintenance) are vendored inside it - installing the studio installs nothing else.",
   "type": "module",
   "main": "src/index.js",

package/src/client.js

@@ -9642,7 +9642,7 @@ window.__ModuleLoader__.load({
     const react = require('react')
     const { jsx, jsxs } = require('react/jsx-runtime')
 
-    const PLUGIN_VERSION = '0.7.3'
+    const PLUGIN_VERSION = '0.7.5'
     const ROUTE_PREFIX = '/api/dsh-log-trim'
 
     /** The knobs this card edits, in the order they are drawn. */
@@ -10168,7 +10168,7 @@ window.__ModuleLoader__.load({
     const NS = 'dsh-as-aistudio'
 
     /** Keep in sync with package.json and src/components.js. */
-    const PLUGIN_VERSION = '0.5.16'
+    const PLUGIN_VERSION = '0.5.18'
 
     /** Presence marker the live verifier reads. */
     const DEBUG_KEY = '__DSH_AS_AISTUDIO__'

package/src/components.js

@@ -26,7 +26,7 @@
 export const STUDIO_ID = 'dsh-as-aistudio'
 
 /** Keep in sync with package.json and src/client.js. */
-export const STUDIO_VERSION = '0.5.16'
+export const STUDIO_VERSION = '0.5.18'
 
 /**
  * The AI Studio action strip this studio composes, in the order the user meets

package/src/vendor/host/dsh-edit-turn.js

@@ -1,6 +1,6 @@
 // dsh-edit-turn host half (dsh-edit-turn.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-edit-turn/lib/index.js  (v0.5.20, sha256 2e006e68f0591665)
+// Source: ../dsh-edit-turn/lib/index.js  (v0.5.21, sha256 1502010fdd847526)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the
@@ -85,7 +85,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.20'
+export const PLUGIN_VERSION = '0.5.21'
 
 // 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

package/src/vendor/host/dsh-edit-turn.patch.js

@@ -1,6 +1,6 @@
 // dsh-edit-turn host half (dsh-edit-turn.patch.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-edit-turn/lib/patch.js  (v0.5.20, sha256 5e1e8cce1d168f6c)
+// Source: ../dsh-edit-turn/lib/patch.js  (v0.5.21, sha256 5e1e8cce1d168f6c)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.flatten.js

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.flatten.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/flatten.js  (v0.7.3, sha256 3aa1fdcbb120ab06)
+// Source: ../dsh-log-trim/lib/flatten.js  (v0.7.5, sha256 3aa1fdcbb120ab06)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.goal-repair.js

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.goal-repair.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/goal-repair.js  (v0.7.3, sha256 0801a28f35667ee7)
+// Source: ../dsh-log-trim/lib/goal-repair.js  (v0.7.5, sha256 0801a28f35667ee7)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.host-libs.mjs

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.host-libs.mjs), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/host-libs.mjs  (v0.7.3, sha256 5ebed01988b5bfcf)
+// Source: ../dsh-log-trim/lib/host-libs.mjs  (v0.7.5, sha256 5ebed01988b5bfcf)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.js

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/index.js  (v0.7.3, sha256 e35a3a2d18c9a4fa)
+// Source: ../dsh-log-trim/lib/index.js  (v0.7.5, sha256 a32940b526c93896)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the
@@ -44,7 +44,7 @@ import { readLedger, recordFor } from './dsh-log-trim.ledger.js'
 
 export const name = 'dsh-log-trim'
 export const PLUGIN_ID = name
-export const PLUGIN_VERSION = '0.7.3'
+export const PLUGIN_VERSION = '0.7.5'
 export const ROUTE_PREFIX = '/api/dsh-log-trim'
 
 /**
@@ -62,7 +62,12 @@ const LEGACY_MEMORY_FILE = 'dsh-session-compact/scan-memory.json'
 /** Where the settings card's values are kept. */
 const CONFIG_FILE = 'dsh-log-trim/config.json'
 /** 开机扫描先等一下界面：第一屏还没拿到会话列表时不该跟它抢线程池。 */
-const BOOT_SCAN_DELAY_MS = 3000
+// 启动扫描的延迟。worker 扫描不占主线程，所以越早越好：宿主会在启动后很快
+// 打开上次的会话并持有 session.lock，晚一步就永远轮不到那个会话。
+const BOOT_SCAN_DELAY_MS = 0
+// 被锁住的会话多久后再试一次；试满 20 次（10 分钟）就放弃，等下次启动。
+const LOCKED_RETRY_MS = 30000
+const LOCKED_RETRIES = 20
 /** 重命名前的目录，只读兜底。 */
 const LEGACY_CONFIG_FILE = 'dsh-session-compact/config.json'
 
@@ -162,6 +167,50 @@ async function noteWindowTrim(logFile, result, record, beforeEvents = [], afterE
   }
 }
 
+
+/**
+ * 被宿主打开的会话先记下来，每隔 30 秒看一次锁还在不在；一解锁就单独裁它。
+ *
+ * 启动扫描唯一的空窗是「宿主还没打开会话」，而 DSH 会在启动后很快恢复上次的会话。
+ * 赶不上就退而求其次：等用户切走、宿主释放 session.lock 之后再补一刀。
+ *
+ * @param {object[]} locked - 带 logFile 的被锁会话。
+ * @param {object} config - 解析后的配置。
+ * @param {object} ctx - 插件上下文（只用 logger）。
+ * @param {boolean} cancelled - 启动扫描是否已被取消。
+ * @param {() => boolean} isCancelled - 重新读取取消状态。
+ */
+function watchUnlocked(locked, config, ctx, cancelled, isCancelled) {
+  let remaining = [...locked]
+  let attempts = 0
+  const timer = setInterval(() => {
+    attempts += 1
+    if (cancelled === true || isCancelled() === true || attempts > LOCKED_RETRIES) {
+      clearInterval(timer)
+      return
+    }
+    void (async () => {
+      const next = []
+      for (const item of remaining) {
+        if (isSessionLocked(item.logFile)) {
+          next.push(item)
+          continue
+        }
+        try {
+          await trimOne(item.logFile, config)
+        } catch (error) {
+          if (typeof ctx.logger?.warn === 'function') {
+            ctx.logger.warn(`[dsh-log-trim] 解锁后裁剪失败（${item.sessionId}）：${error instanceof Error ? error.message : String(error)}`)
+          }
+        }
+      }
+      remaining = next
+      if (remaining.length === 0) clearInterval(timer)
+    })()
+  }, LOCKED_RETRY_MS)
+  if (typeof timer.unref === 'function') timer.unref()
+}
+
 export async function trimOne(logFile, config) {
   if (isSessionLocked(logFile)) {
     throw new Error('这个会话正被宿主打开着（session.lock）。先切到别的对话或重启 DSH，再压缩它')
@@ -921,7 +970,15 @@ export async function runScan(config, logger = {}) {
   summary.roots = roots
   const legacy = roots.flatMap((root) => listLegacy(root))
   summary.legacy = { files: legacy.length, bytes: legacy.reduce((sum, item) => sum + item.bytes, 0) }
-  const allLogs = roots.flatMap((root) => listLogs(root))
+  // 最近改过的日志先扫：宿主启动后最先打开的正是它们，早一步就有机会在
+  // session.lock 出现之前把窗口裁掉。
+  const allLogs = roots.flatMap((root) => listLogs(root)).sort((left, right) => {
+    try {
+      return fs.statSync(right).mtimeMs - fs.statSync(left).mtimeMs
+    } catch {
+      return 0
+    }
+  })
   for (const logFile of allLogs) {
     // 每个会话之间让出一次事件循环：宿主还要应答界面和工具调用，
     // 一轮扫描（162 个会话）不该把它按住。
@@ -929,7 +986,7 @@ export async function runScan(config, logger = {}) {
     summary.scanned += 1
     const sessionId = path.basename(path.dirname(logFile))
     if (isSessionLocked(logFile)) {
-      summary.skipped.push({ sessionId, reason: '正被宿主打开（session.lock）' })
+      summary.skipped.push({ sessionId, logFile, reason: '正被宿主打开（session.lock）' })
       continue
     }
     // A log the host cannot load is worse than a big log: the session vanishes
@@ -1374,7 +1431,11 @@ export function apply(ctx, config = {}) {
           // 先等界面第一屏拿完数据再干活：开机那几秒是宿主最要紧的窗口。
           await new Promise((resolve) => setTimeout(resolve, BOOT_SCAN_DELAY_MS))
           if (cancelled) return
-          await run()
+          const summary = await run()
+          if (!cancelled && summary && Array.isArray(summary.skipped)) {
+            const locked = summary.skipped.filter((item) => typeof item?.logFile === 'string' && String(item.reason ?? '').includes('session.lock'))
+            if (locked.length > 0) watchUnlocked(locked, resolved, ctx, cancelled, () => cancelled)
+          }
         } catch (error) {
           if (!cancelled && typeof ctx.logger?.warn === 'function') {
             ctx.logger.warn(`[dsh-log-trim] 扫描失败：${error instanceof Error ? error.message : String(error)}`)

package/src/vendor/host/dsh-log-trim.ledger.js

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.ledger.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/ledger.js  (v0.7.3, sha256 5ca2460b42a3a776)
+// Source: ../dsh-log-trim/lib/ledger.js  (v0.7.5, sha256 5ca2460b42a3a776)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.lossless.js

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.lossless.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/lossless.js  (v0.7.3, sha256 7e8478a2fd2ec10b)
+// Source: ../dsh-log-trim/lib/lossless.js  (v0.7.5, sha256 7e8478a2fd2ec10b)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.roots.js

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.roots.js), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/roots.js  (v0.7.3, sha256 028d9c12a395aaab)
+// Source: ../dsh-log-trim/lib/roots.js  (v0.7.5, sha256 028d9c12a395aaab)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.vendor.compact-session.mjs

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.vendor.compact-session.mjs), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/vendor.compact-session.mjs  (v0.7.3, sha256 1b0499e0c4c11122)
+// Source: ../dsh-log-trim/lib/vendor.compact-session.mjs  (v0.7.5, sha256 f0c5dcc018253ea4)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the
@@ -2142,17 +2142,70 @@ export function repairLateToolResults(events) {
   return { events: list, moved, dropped }
 }
 
+
+/**
+ * 被 checkpoint 的 `replace` 区间盖住的前缀：模型与界面都看不到，留着只是占空间，
+ * 窗口页还会把它算成一窗。
+ *
+ * 不逐行删（会切坏 step/turn 括号），而是把保留区改成「连续尾巴 + frame」：
+ * 从最后一个存活 checkpoint 的 replace 末尾之后、对齐到轮次起点开始保留，
+ * 再加系统提示词与设置事件。这样结构始终是自洽的。
+ *
+ * @param {object[]} events - 候选保留事件（keepLastWindows 的结果）。
+ * @returns {{ events: object[], dropped: number }} 结果。
+ */
+function dropShadowedPrefix(events) {
+  const checkpoints = events.filter((event) => event.type === 'user/message' && event.data?.source?.kind === 'compact-checkpoint')
+  const last = checkpoints[checkpoints.length - 1]
+  const shadowEnd = last !== undefined && typeof last.surfaceOp?.endSeq === 'number' ? last.surfaceOp.endSeq : null
+  if (shadowEnd === null) return { events, dropped: 0 }
+  const aligned = events.find((event) => event.seq > shadowEnd && event.type === 'turn/start')
+  if (aligned === undefined) return { events, dropped: 0 }
+  const liveStart = aligned.seq
+  const frame = new Set()
+  const visible = foldSurface(events).visible
+  const system = visible.map((seq) => events.find((event) => event.seq === seq)).find((event) => event !== undefined && (event.type === 'system/message' || event.type === 'developer/message'))
+  if (system !== undefined) frame.add(system.seq)
+  for (const type of ['agent-preset/selected', 'permission/preset', 'sandbox/mode', 'approval/policy', 'session/title', 'session/end-seed']) {
+    const hit = events.filter((event) => event.type === type && event.seq < liveStart).pop()
+    if (hit !== undefined) frame.add(hit.seq)
+  }
+  // 结构性事件不受“前缀”限制：compaction 组、seeded 标记、inbox 拼接都是按顺序
+  // 重放的记账，丢掉半组会让整份日志装不上；它们不占模型视图，留着也便宜。
+  const structural = (event) =>
+    String(event.type).startsWith('compaction/') ||
+    String(event.type).startsWith('session/') ||
+    event.type === 'agent/inbox/spliced'
+  const out = events.filter((event) => event.seq >= liveStart || frame.has(event.seq) || structural(event))
+  // compaction 是一组（start / summary / end 同一个 compactionId）：end 落在尾巴里而
+  // start/summary 落在被丢的前缀里时，宿主要求「成功的 compaction/end 必须有一条 summary」。
+  // 只要有同组的行留下，就把整组补回来（都是记账行，不影响模型视图）。
+  const compactionIds = new Set()
+  for (const event of out) {
+    if (typeof event.data?.compactionId === 'string') compactionIds.add(event.data.compactionId)
+  }
+  if (compactionIds.size > 0) {
+    for (const event of events) {
+      if (typeof event.data?.compactionId === 'string' && compactionIds.has(event.data.compactionId) && !out.includes(event)) out.push(event)
+    }
+    out.sort((left, right) => left.seq - right.seq)
+  }
+  return { events: out, dropped: events.length - out.length }
+}
+
 export async function stageTrim(logFile, keep, options = {}) {
   if (isSessionLocked(logFile)) {
     throw new Error('会话正被宿主持有（session.lock 被打开），拒绝改动；请先关掉该会话或重启宿主')
   }
   const original = await readLogAsync(logFile)
   const trimmed = keepLastWindows(original.events, keep)
-  if (trimmed.cutSeq === null) throw new Error(`只有 ${trimmed.windows} 个窗口，不需要裁`)
   // 旧回合的流式回放记录：与 data.message.content 逐块重复，留最近几轮就够。
   const streamKeepTurns = options.streamKeepTurns === undefined ? Infinity : options.streamKeepTurns
-  const stripped = stripOldStreams(trimmed.events, streamKeepTurns)
+  // 先丢掉被 checkpoint 遮蔽的前缀（连续尾巴 + frame），再清流式回放。
+  const shadowed = options.shadowPrefix === false ? { events: trimmed.events, dropped: 0 } : dropShadowedPrefix(trimmed.events)
+  const stripped = stripOldStreams(shadowed.events, streamKeepTurns)
   assertNoGoalEventsDropped(original.events, stripped.events)
+  if (trimmed.cutSeq === null && shadowed.dropped === 0) throw new Error(`只有 ${trimmed.windows} 个窗口，不需要裁`)
   let renamed = renumber(stripped.events)
   const repaired = repairLateToolResults(renamed.events)
   if (repaired.moved > 0 || repaired.dropped > 0) {
@@ -2186,7 +2239,7 @@ export async function stageTrim(logFile, keep, options = {}) {
       backup,
       before: { events: original.events.length, bytes: original.compressedBytes, windows: trimmed.windows },
       after: { events: renamed.events.length, bytes: (await fs.promises.stat(staging)).size },
-      dropped: trimmed.dropped,
+      dropped: trimmed.dropped + shadowed.dropped,
       refsFixed: renamed.refsFixed,
       titlesDropped: renamed.titlesDropped,
       compactionDropped: renamed.compactionDropped,
@@ -2224,7 +2277,7 @@ export async function commitTrim(staged, logFile) {
  * @returns {Promise<object>} 结果摘要。
  */
 export async function applyTrim(logFile, keep, options = {}) {
-  const staged = await stageTrim(logFile, keep, options)
+  let staged = await stageTrim(logFile, keep, options)
   if (options.verify !== false) {
     let result
     try {
@@ -2236,6 +2289,20 @@ export async function applyTrim(logFile, keep, options = {}) {
     }
     if (!result.ok) {
       fs.rmSync(staged.staging, { force: true })
+      // 丢掉「被 checkpoint 遮蔽的前缀」是收益、不是前提：这份日志上它可能撞到
+      // compaction / 标题 / inbox 的结构约束。退回不丢前缀的老做法再验一次，
+      // 两次都不过才真的失败。
+      if (options.shadowPrefix !== false) {
+        staged = await stageTrim(logFile, keep, { ...options, shadowPrefix: false })
+        const retried = await (async () => {
+          const { verifyLog } = await import('./dsh-log-trim.verify-session-log.mjs')
+          return verifyLog(staged.staging)
+        })()
+        if (retried.ok) return commitTrim(staged, logFile)
+        fs.rmSync(staged.staging, { force: true })
+        const bad = retried.checks.filter((check) => !check.ok).map((check) => `${check.name} ${check.detail}`).join('；')
+        throw new Error(`裁剪结果没通过宿主校验，未写入：${bad}`)
+      }
       const bad = result.checks.filter((check) => !check.ok).map((check) => `${check.name} ${check.detail}`).join('；')
       throw new Error(`裁剪结果没通过宿主校验，未写入：${bad}`)
     }

package/src/vendor/host/dsh-log-trim.verify-session-log.mjs

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.verify-session-log.mjs), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/verify-session-log.mjs  (v0.7.3, sha256 7cf835c053942961)
+// Source: ../dsh-log-trim/lib/verify-session-log.mjs  (v0.7.5, sha256 7cf835c053942961)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/host/dsh-log-trim.worker.mjs

@@ -1,6 +1,6 @@
 // dsh-log-trim host half (dsh-log-trim.worker.mjs), VENDORED by tools/vendor.mjs - DO NOT EDIT.
 //
-// Source: ../dsh-log-trim/lib/worker.mjs  (v0.7.3, sha256 675a759a767b7e38)
+// Source: ../dsh-log-trim/lib/worker.mjs  (v0.7.5, sha256 675a759a767b7e38)
 // Regenerate with `npm run vendor`; test/sync.test.js fails when this is stale.
 //
 // src/shell.js imports the copy named after the component, which is why the

package/src/vendor/versions.json

@@ -1,7 +1,7 @@
 {
-  "dsh-edit-turn": "0.5.20",
+  "dsh-edit-turn": "0.5.21",
   "dsh-rerun-turn": "0.2.11",
   "dsh-delete-turn": "0.2.4",
   "dsh-markdown-bubble": "0.1.5",
-  "dsh-log-trim": "0.7.3"
+  "dsh-log-trim": "0.7.5"
 }