dsh-as-aistudio 0.5.18 → 0.5.19

package/CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ## 中文
 
+**0.5.19** —— 跟进 dsh-log-trim 0.7.6（扫描会计入遮蔽前缀，窗口数真的降下来）。
+
 **0.5.18** —— 跟进 dsh-log-trim 0.7.5（裁掉被检查点遮蔽的前缀，窗口数真的降下来）。
 
 **0.5.17** —— 跟进 dsh-log-trim 0.7.4（启动立即扫描、最近日志优先、解锁后补裁）。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-as-aistudio",
-  "version": "0.5.18",
+  "version": "0.5.19",
   "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.5'
+    const PLUGIN_VERSION = '0.7.6'
     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.18'
+    const PLUGIN_VERSION = '0.5.19'
 
     /** 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.18'
+export const STUDIO_VERSION = '0.5.19'
 
 /**
  * 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.21, sha256 1502010fdd847526)
+// Source: ../dsh-edit-turn/lib/index.js  (v0.5.22, sha256 c91f351013c90495)
 // 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.21'
+export const PLUGIN_VERSION = '0.5.22'
 
 // 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.21, sha256 5e1e8cce1d168f6c)
+// Source: ../dsh-edit-turn/lib/patch.js  (v0.5.22, 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.5, sha256 3aa1fdcbb120ab06)
+// Source: ../dsh-log-trim/lib/flatten.js  (v0.7.6, 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.5, sha256 0801a28f35667ee7)
+// Source: ../dsh-log-trim/lib/goal-repair.js  (v0.7.6, 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.5, sha256 5ebed01988b5bfcf)
+// Source: ../dsh-log-trim/lib/host-libs.mjs  (v0.7.6, 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.5, sha256 a32940b526c93896)
+// Source: ../dsh-log-trim/lib/index.js  (v0.7.6, sha256 78ee6ff182ff4b93)
 // 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,14 +37,14 @@ 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, commitTrim, encodeLogAsync, foldSurface, isSessionLocked, keepLastWindows, readLogAsync, renumber, windowsOf } from './dsh-log-trim.vendor.compact-session.mjs'
+import { applyTrim, commitTrim, dropShadowedPrefix, encodeLogAsync, foldSurface, isSessionLocked, keepLastWindows, readLogAsync, renumber, windowsOf } from './dsh-log-trim.vendor.compact-session.mjs'
 import { applyFlatten, applyLossless, applyStreamOnly, planLossless, applyRebuild } from './dsh-log-trim.lossless.js'
 import { orphanGoalRounds, stripOrphanGoalSources } from './dsh-log-trim.goal-repair.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.7.5'
+export const PLUGIN_VERSION = '0.7.6'
 export const ROUTE_PREFIX = '/api/dsh-log-trim'
 
 /**
@@ -893,13 +893,17 @@ export async function estimate(logFile, keepWindows) {
   // that the host then accepted verbatim.
   const after =
     trimmed.cutSeq === null ? before : foldSurface(renumber(trimmed.events).events).visible.length
+  // 只丢被遮蔽的前缀不改表面，模型视图必须逐条不变。
+  // 「窗口不用裁」不等于「没活干」：最后一窗的 checkpoint 会把前面一整段历史遮蔽掉，
+  // 那些行模型和界面都看不到，丢掉它们同样是裁剪（窗口页还会把它算成一窗）。
+  const shadowed = trimmed.cutSeq === null ? dropShadowedPrefix(trimmed.events) : { dropped: 0 }
   return {
     title: titleOf(log.events),
     events: log.events.length,
     bytes: log.compressedBytes,
     windows: trimmed.windows,
     cutSeq: trimmed.cutSeq,
-    droppable: trimmed.dropped,
+    droppable: trimmed.dropped + shadowed.dropped,
     modelBefore: before,
     modelAfter: after,
     sessionId: log.header?.id ?? path.basename(path.dirname(logFile)),

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.5, sha256 5ca2460b42a3a776)
+// Source: ../dsh-log-trim/lib/ledger.js  (v0.7.6, 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.5, sha256 7e8478a2fd2ec10b)
+// Source: ../dsh-log-trim/lib/lossless.js  (v0.7.6, 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.5, sha256 028d9c12a395aaab)
+// Source: ../dsh-log-trim/lib/roots.js  (v0.7.6, 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.5, sha256 f0c5dcc018253ea4)
+// Source: ../dsh-log-trim/lib/vendor.compact-session.mjs  (v0.7.6, sha256 3df242c4e94bd6d9)
 // 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
@@ -2154,7 +2154,7 @@ export function repairLateToolResults(events) {
  * @param {object[]} events - 候选保留事件（keepLastWindows 的结果）。
  * @returns {{ events: object[], dropped: number }} 结果。
  */
-function dropShadowedPrefix(events) {
+export 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

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.5, sha256 7cf835c053942961)
+// Source: ../dsh-log-trim/lib/verify-session-log.mjs  (v0.7.6, 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.5, sha256 675a759a767b7e38)
+// Source: ../dsh-log-trim/lib/worker.mjs  (v0.7.6, 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.21",
+  "dsh-edit-turn": "0.5.22",
   "dsh-rerun-turn": "0.2.11",
   "dsh-delete-turn": "0.2.4",
   "dsh-markdown-bubble": "0.1.5",
-  "dsh-log-trim": "0.7.5"
+  "dsh-log-trim": "0.7.6"
 }