dsh-as-aistudio 0.5.3 → 0.5.4

package/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ## 中文
 
+**0.5.4** —— 跟进 dsh-log-trim 0.6.0（裁剪统计账本）。
+
+- 内嵌的 log-trim 升到 0.6.0：每次改写记一笔窗口/事件/字节账，写在 `~/.dsh/dsh-log-trim/ledger.json`，
+  并暴露 `GET /api/dsh-log-trim/ledger` 给其它插件读。
+
 **0.5.3** —— 跟进四个组件：设置卡只挂在包自己的页面上。
 
 - edit 0.5.16 / rerun 0.2.9 / delete 0.2.2 / log-trim 0.5.2：去掉 `plugins.row.config`，只保留 `plugins.bundle.config`。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-as-aistudio",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "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, and render sent prompts as Markdown. Self-contained: the plugin list shows this one row, and the four components are vendored inside it - installing the studio installs nothing else.",
   "type": "module",
   "main": "src/index.js",

package/src/client.js

@@ -9577,7 +9577,7 @@ window.__ModuleLoader__.load({
     const react = require('react')
     const { jsx, jsxs } = require('react/jsx-runtime')
 
-    const PLUGIN_VERSION = '0.5.2'
+    const PLUGIN_VERSION = '0.6.0'
     const ROUTE_PREFIX = '/api/dsh-log-trim'
 
     /** The knobs this card edits, in the order they are drawn. */
@@ -9619,6 +9619,12 @@ window.__ModuleLoader__.load({
         suffix: '条',
       },
       { key: 'minRatio', label: '最少可丢占比', hint: '占整份日志的比例，默认 0.2（20%）', min: 0, max: 1, step: 0.05, kind: 'ratio' },
+      {
+        key: 'recordLedger',
+        label: '记录裁剪统计',
+        hint: '每次改写日志记一笔（窗口数 / 事件数 / 字节），写到 ~/.dsh/dsh-log-trim/ledger.json；dsh-session-pages 会读它显示，其它插件也能读。关掉就不记',
+        kind: 'toggle',
+      },
       { key: 'minBytes', label: '最小日志体积', hint: '小于它就根本不读，默认 1 MB', min: 0, max: 200, step: 1, kind: 'mb' },
       {
         key: 'backupKeep',
@@ -10082,7 +10088,7 @@ window.__ModuleLoader__.load({
     const NS = 'dsh-as-aistudio'
 
     /** Keep in sync with package.json and src/components.js. */
-    const PLUGIN_VERSION = '0.5.3'
+    const PLUGIN_VERSION = '0.5.4'
 
     /** 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.3'
+export const STUDIO_VERSION = '0.5.4'
 
 /**
  * The AI Studio action strip this studio composes, in the order the user meets

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.5.2, sha256 3aa1fdcbb120ab06)
+// Source: ../dsh-log-trim/lib/flatten.js  (v0.6.0, 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.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.5.2, sha256 5ebed01988b5bfcf)
+// Source: ../dsh-log-trim/lib/host-libs.mjs  (v0.6.0, 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.5.2, sha256 00bb7354aa5fb45d)
+// Source: ../dsh-log-trim/lib/index.js  (v0.6.0, sha256 1ef6710b85f69330)
 // 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
@@ -37,12 +37,13 @@ import { discoverRoots, isCurrentLog, listLegacy } from './dsh-log-trim.roots.js
 import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
-import { applyTrim, foldSurface, isSessionLocked, keepLastWindows, readLog, renumber } from './dsh-log-trim.vendor.compact-session.mjs'
+import { applyTrim, foldSurface, isSessionLocked, keepLastWindows, readLog, renumber, windowsOf } from './dsh-log-trim.vendor.compact-session.mjs'
 import { applyFlatten, applyLossless, applyStreamOnly, planLossless, applyRebuild } from './dsh-log-trim.lossless.js'
+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.5.2'
+export const PLUGIN_VERSION = '0.6.0'
 export const ROUTE_PREFIX = '/api/dsh-log-trim'
 
 /**
@@ -118,6 +119,36 @@ export function writeSavedConfig(config) {
  * @param {number} backupKeep - how many backups to keep afterwards.
  * @returns {Promise<object>} what happened.
  */
+
+/**
+ * 窗口裁剪写完之后记一笔账：窗口数、事件数、字节数都来自这次操作本身。
+ *
+ * @param {string} logFile - 日志路径。
+ * @param {object} result - `applyTrim` 的返回。
+ * @param {boolean} record - 是否记录（配置项）。
+ */
+function noteWindowTrim(logFile, result, record) {
+  if (record === false) return
+  try {
+    let windowsAfter = null
+    try {
+      windowsAfter = windowsOf(readLog(logFile).events).length
+    } catch {
+      windowsAfter = null
+    }
+    recordFor(logFile, 'window', [], [], {
+      windowsBefore: result?.before?.windows,
+      windowsAfter: windowsAfter === null ? undefined : windowsAfter,
+      eventsBefore: result?.before?.events,
+      eventsAfter: result?.after?.events,
+      bytesBefore: result?.before?.bytes,
+      bytesAfter: result?.after?.bytes,
+    })
+  } catch {
+    // 记账失败不影响裁剪本身。
+  }
+}
+
 export async function trimOne(logFile, config) {
   if (isSessionLocked(logFile)) {
     throw new Error('这个会话正被宿主打开着（session.lock）。先切到别的对话或重启 DSH，再压缩它')
@@ -130,6 +161,7 @@ export async function trimOne(logFile, config) {
     result = await applyFlatten(logFile, config)
   } else if (config.mode === 'window') {
     result = await applyTrim(logFile, config.keepWindows, { streamKeepTurns: 0 })
+    noteWindowTrim(logFile, result, config.recordLedger)
   } else {
     const plan = planLossless(logFile, config)
     if (!plan.should) throw new Error(plan.reason)
@@ -419,6 +451,8 @@ export const DEFAULTS = {
   streamOnBoot: true,
   // 每次扫描先把 edit/rerun/delete 的载体折叠掉（重启即自动执行）。
   flattenOnBoot: false,
+  // 每次改写过日志就记一笔统计（账本文件，别的插件可读）；关掉就不记。
+  recordLedger: true,
   // 启动时是否裁剪窗口（关掉就只剩折叠/清理）。
   trimOnBoot: true,
   // 只在开启时清理“已被 replace 盖住、界面早就不显示”的事件（要重编号，默认关）。
@@ -496,6 +530,10 @@ export function resolveConfig(raw = {}) {
       if (typeof value === 'boolean') merged.streamOnBoot = value
       continue
     }
+    if (key === 'recordLedger') {
+      if (typeof value === 'boolean') merged.recordLedger = value
+      continue
+    }
     if (key === 'losslessOnBoot') {
       if (typeof value === 'boolean') merged.losslessOnBoot = value
       continue
@@ -992,6 +1030,7 @@ export async function runScan(config, logger = {}) {
     }
     try {
       const result = config.mode === 'window' ? await applyTrim(logFile, config.keepWindows) : await applyLossless(logFile, config, lossless)
+      if (config.mode === 'window') noteWindowTrim(logFile, result, config.recordLedger)
       const pruned = pruneBackups(logFile, config.backupKeep)
       summary.savedBytes += Math.max(0, result.before.bytes - result.after.bytes)
       summary.trimmed.push({
@@ -1095,7 +1134,10 @@ export function apply(ctx, config = {}) {
         }
         if (live.mode === 'window') {
           const plan = planTrim(report, live)
-          if (plan.should) await applyTrim(logFile, live.keepWindows, { streamKeepTurns: 0 })
+          if (plan.should) {
+            const done = await applyTrim(logFile, live.keepWindows, { streamKeepTurns: 0 })
+            noteWindowTrim(logFile, done, live.recordLedger)
+          }
           else await applyRebuild(logFile, live)
           return
         }
@@ -1363,6 +1405,29 @@ export function apply(ctx, config = {}) {
 
     // Where the backups are, and a way to open the folder holding them. The card
     // shows the paths; the button hands them to the system file manager.
+    // 裁剪统计账本：别的插件（如 dsh-session-pages）直接读这个接口，
+    // 不必依赖本包；不带 sessionId 时返回全量，带时只返回那一个会话。
+    fiber.effect(() =>
+      webServer.register({
+        kind: 'exact',
+        path: `${ROUTE_PREFIX}/ledger`,
+        handler: (req, res) => {
+          if (!isLoopback(req)) return sendJson(res, 403, { ok: false, error: 'loopback only' })
+          if (req.method !== 'GET') return sendJson(res, 405, { ok: false, error: 'GET only' })
+          let sessionId = null
+          try {
+            sessionId = new URL(req.url, 'http://127.0.0.1').searchParams.get('sessionId')
+          } catch {
+            sessionId = null
+          }
+          const ledger = readLedger()
+          if (sessionId === null || sessionId === '') return sendJson(res, 200, { ok: true, ...ledger })
+          const entry = ledger.sessions[sessionId] ?? null
+          return sendJson(res, 200, { ok: true, sessionId, trim: entry })
+        },
+      }),
+    )
+
     fiber.effect(() =>
       webServer.register({
         kind: 'exact',

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

@@ -0,0 +1,131 @@
+// 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.6.0, sha256 1b391592e0cc0fbf)
+// 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
+// studio installs with no runtime dependency on the component package.
+/**
+ * 裁剪统计账本：每改写过一次日志就记一条，按会话累计。
+ *
+ * 放在 `~/.dsh/dsh-log-trim/ledger.json`——**谁能读谁就能显示**：
+ * `dsh-session-pages` 之类的插件直接读文件即可，不需要依赖本包；
+ * 本插件另外用 `/api/dsh-log-trim/ledger` 把它暴露出来。
+ *
+ * 账本只增不减（除了用户显式清空）：裁剪本身会删日志内容，统计不能跟着丢。
+ */
+
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { windowsOf } from './dsh-log-trim.vendor.compact-session.mjs'
+
+/** 账本版本；结构变了就加一，读者据此决定要不要认。 */
+export const LEDGER_VERSION = 1
+
+/** 账本文件路径。 */
+export function ledgerPath(home = os.homedir()) {
+  return path.join(home, '.dsh', 'dsh-log-trim', 'ledger.json')
+}
+
+/**
+ * 读账本；不存在或坏掉时返回一个空账本（读取永远不该让插件起不来）。
+ *
+ * @param {string} [home] - 家目录（测试用）。
+ * @returns {{ version: number, sessions: Record<string, object> }} 账本。
+ */
+export function readLedger(home = os.homedir()) {
+  const empty = { version: LEDGER_VERSION, sessions: {} }
+  let raw
+  try {
+    raw = fs.readFileSync(ledgerPath(home), 'utf8')
+  } catch {
+    return empty
+  }
+  try {
+    const parsed = JSON.parse(raw)
+    if (parsed === null || typeof parsed !== 'object') return empty
+    const sessions = parsed.sessions !== null && typeof parsed.sessions === 'object' ? parsed.sessions : {}
+    return { version: LEDGER_VERSION, sessions }
+  } catch {
+    return empty
+  }
+}
+
+/**
+ * 把一次改写记进账本。
+ *
+ * @param {object} entry - 记录。
+ * @param {string} entry.sessionId - 会话 id。
+ * @param {'window'|'flatten'|'stream'|'lossless'|'restore'} entry.mode - 做了什么。
+ * @param {object[]} entry.before - 改写前的事件。
+ * @param {object[]} entry.after - 改写后的事件。
+ * @param {number} [entry.bytesBefore] - 改写前字节数。
+ * @param {number} [entry.bytesAfter] - 改写后字节数。
+ * @param {string} [home] - 家目录（测试用）。
+ * @returns {object|null} 该会话的新累计；写不进去时返回 null。
+ */
+export function recordTrim(entry, home = os.homedir()) {
+  const ledger = readLedger(home)
+  const before = Array.isArray(entry.before) ? entry.before : []
+  const after = Array.isArray(entry.after) ? entry.after : []
+  // 窗口模式不一定留得下事件数组（裁剪是整份重写），允许直接传数字。
+  const windowsBefore = Number.isSafeInteger(entry.windowsBefore) ? entry.windowsBefore : windowsOf(before).length
+  const windowsAfter = Number.isSafeInteger(entry.windowsAfter) ? entry.windowsAfter : windowsOf(after).length
+  const record = {
+    at: new Date().toISOString(),
+    mode: entry.mode,
+    windowsBefore,
+    windowsAfter,
+    windowsRemoved: Math.max(0, windowsBefore - windowsAfter),
+    eventsBefore: Number.isSafeInteger(entry.eventsBefore) ? entry.eventsBefore : before.length,
+    eventsAfter: Number.isSafeInteger(entry.eventsAfter) ? entry.eventsAfter : after.length,
+    eventsRemoved: Math.max(0, (Number.isSafeInteger(entry.eventsBefore) ? entry.eventsBefore : before.length) - (Number.isSafeInteger(entry.eventsAfter) ? entry.eventsAfter : after.length)),
+    bytesBefore: typeof entry.bytesBefore === 'number' ? entry.bytesBefore : null,
+    bytesAfter: typeof entry.bytesAfter === 'number' ? entry.bytesAfter : null,
+  }
+  const current = ledger.sessions[entry.sessionId] ?? { trims: [], totals: { trims: 0, windowsRemoved: 0, eventsRemoved: 0, bytesSaved: 0, lastAt: null } }
+  const trims = [...(Array.isArray(current.trims) ? current.trims : []), record].slice(-200)
+  const totals = {
+    trims: (current.totals?.trims ?? 0) + 1,
+    windowsRemoved: (current.totals?.windowsRemoved ?? 0) + record.windowsRemoved,
+    eventsRemoved: (current.totals?.eventsRemoved ?? 0) + record.eventsRemoved,
+    bytesSaved: (current.totals?.bytesSaved ?? 0) + Math.max(0, (record.bytesBefore ?? 0) - (record.bytesAfter ?? 0)),
+    lastAt: record.at,
+  }
+  ledger.sessions[entry.sessionId] = { trims, totals }
+  try {
+    const file = ledgerPath(home)
+    fs.mkdirSync(path.dirname(file), { recursive: true })
+    fs.writeFileSync(file, JSON.stringify(ledger))
+  } catch {
+    return null
+  }
+  return totals
+}
+
+/** 清空账本（用户显式要求时）。 */
+export function clearLedger(home = os.homedir()) {
+  try {
+    fs.rmSync(ledgerPath(home), { force: true })
+    return true
+  } catch {
+    return false
+  }
+}
+
+/**
+ * 按日志路径记一笔：sessionId 就是日志所在目录名。
+ *
+ * @param {string} logFile - 日志路径。
+ * @param {string} mode - window / flatten / stream / lossless / rebuild。
+ * @param {object[]} before - 改写前事件。
+ * @param {object[]} after - 改写后事件。
+ * @param {{ bytesBefore?: number, bytesAfter?: number, record?: boolean, home?: string }} [options] - 附加信息。
+ * @returns {object|null} 新累计；没记或记不进去返回 null。
+ */
+export function recordFor(logFile, mode, before, after, options = {}) {
+  if (options.record === false) return null
+  const sessionId = path.basename(path.dirname(logFile))
+  return recordTrim({ sessionId, mode, before, after, bytesBefore: options.bytesBefore, bytesAfter: options.bytesAfter }, options.home)
+}

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.5.2, sha256 adf9bf5d79aa41b0)
+// Source: ../dsh-log-trim/lib/lossless.js  (v0.6.0, sha256 a35a99d4fe824689)
 // 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
@@ -24,6 +24,7 @@
  */
 
 import fs from 'node:fs'
+import { recordFor } from './dsh-log-trim.ledger.js'
 import { commitTrim, derivedHistory, dropOrphanCompactions, encodeLog, foldSurface, readLog, renumber, seededHeaderFor, textLengthOf } from './dsh-log-trim.vendor.compact-session.mjs'
 
 /**
@@ -224,6 +225,7 @@ export async function applyLossless(logFile, config, plan, options = {}) {
   }
 
   const summary = commitTrim({ staging, backup }, logFile)
+  recordFor(logFile, 'lossless', original.events, renamed.events, { bytesBefore: original.compressedBytes, bytesAfter: summary.after.bytes, record: config?.recordLedger !== false })
   return {
     ...summary,
     mode: 'lossless',
@@ -254,6 +256,7 @@ export async function applyRebuild(logFile, config) {
   }
   const beforeBytes = fs.statSync(staging).size
   commitTrim({ staging, backup }, logFile)
+  recordFor(logFile, 'rebuild', original.events, rebuilt, { bytesBefore: original.compressedBytes, bytesAfter: beforeBytes, record: config?.recordLedger !== false })
   return {
     mode: 'rebuild',
     before: { events: original.events.length, bytes: original.compressedBytes, windows: 0 },
@@ -271,7 +274,7 @@ export async function applyRebuild(logFile, config) {
  * @param {number} keepTurns - 保留最近几轮。
  * @returns {Promise<object|null>} 摘要；没有可清的就返回 null。
  */
-export async function applyStreamOnly(logFile, keepTurns) {
+export async function applyStreamOnly(logFile, keepTurns, options = {}) {
   const { stripOldStreams } = await import('./dsh-log-trim.vendor.compact-session.mjs')
   const original = readLog(logFile)
   const stripped = stripOldStreams(original.events, keepTurns)
@@ -288,6 +291,11 @@ export async function applyStreamOnly(logFile, keepTurns) {
   }
   const beforeBytes = fs.statSync(staging).size
   commitTrim({ staging, backup }, logFile)
+  recordFor(logFile, 'stream', original.events, stripped.events, {
+    bytesBefore: original.compressedBytes,
+    bytesAfter: beforeBytes,
+    record: options.record !== false,
+  })
   return { events: stripped.stripped, before: original.compressedBytes, after: beforeBytes, backup: backup.slice(backup.lastIndexOf('.precompact-') + 1) }
 }
 
@@ -327,6 +335,7 @@ export async function applyFlatten(logFile, config) {
   }
   const beforeBytes = fs.statSync(staging).size
   commitTrim({ staging, backup }, logFile)
+  recordFor(logFile, 'flatten', original.events, folded, { bytesBefore: original.compressedBytes, bytesAfter: beforeBytes, record: config?.recordLedger !== false })
   return {
     mode: 'flatten',
     before: { events: original.events.length, bytes: original.compressedBytes, windows: 0 },

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.5.2, sha256 028d9c12a395aaab)
+// Source: ../dsh-log-trim/lib/roots.js  (v0.6.0, 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.5.2, sha256 2c1c819e732c9649)
+// Source: ../dsh-log-trim/lib/vendor.compact-session.mjs  (v0.6.0, sha256 2c1c819e732c9649)
 // 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.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.5.2, sha256 6a0527e8483fb252)
+// Source: ../dsh-log-trim/lib/verify-session-log.mjs  (v0.6.0, sha256 6a0527e8483fb252)
 // 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

@@ -3,5 +3,5 @@
   "dsh-rerun-turn": "0.2.9",
   "dsh-delete-turn": "0.2.2",
   "dsh-markdown-bubble": "0.1.5",
-  "dsh-log-trim": "0.5.2"
+  "dsh-log-trim": "0.6.0"
 }