dsh-session-pages 0.5.6 → 0.5.7

package/README.md

@@ -4,6 +4,21 @@ DeepSeek Harness 的第四个对话视图标签：**窗口**（在「对话 /
 
 会话按**压缩（compaction）分界**切成若干窗口：第一窗从会话开头起算，之后每次压缩的 checkpoint 开头即新一窗。
 
+## 设置前缀不算一窗
+
+被 `dsh-log-trim` 裁剪过的日志开头是一段纯设置前缀（系统提示词、预设、权限等），没有对话。若按 checkpoint 切分，它会被当成「第 1 窗」，于是「保留 2 窗」显示成 3 窗。
+
+规则：
+
+| 情况 | 结果 |
+| --- | --- |
+| 首窗有 checkpoint | 是真正的对话窗，保留 |
+| 首窗无 checkpoint，但含 user/assistant 消息 | 裁剪没清掉它，保留 |
+| 首窗无 checkpoint，且只有设置事件 | **并入**后面第一个带 checkpoint 的窗，不计入窗数 |
+| 全程没有 checkpoint | 仍然是 1 窗 |
+
+并入后，那个窗自己持有系统提示词与工具声明（`inherited: false`），不再显示「沿用上一窗」。
+
 ## 每一窗画两层
 
 一个窗口**就是**两层，所以视图也分两层画：

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-session-pages",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "Fourth conversation view for DeepSeek Harness: the session split into windows at every compaction, each window headed by its checkpoint summary.",
   "type": "module",
   "main": "src/index.js",

package/src/client.js

@@ -22,7 +22,7 @@ window.__ModuleLoader__.load({
     const react = require('react')
 
     const NS = 'dsh-session-pages'
-    const VERSION = '0.5.6'
+    const VERSION = '0.5.7'
     const ROUTE_PREFIX = '/dsh-session-pages'
     const VIEW_ID = 'windows'
     const VIEW_ORDER = 30

package/src/index.js

@@ -129,12 +129,21 @@ function timeAtStart(page, events) {
 }
 
 function stateFromProjection(projection, events, options) {
-  const pages = projection.pages.map((page) => {
+  // A trimmed log opens with a settings-only prefix; it is not a window. Same
+  // rule as the fold: keep it only when it actually holds dialogue.
+  const first = projection.pages.length > 1 ? projection.pages[0] : undefined
+  const folded = first !== undefined && first.compactionId === null && (first.dialogue || 0) === 0
+  const source = folded
+    ? projection.pages.slice(1).map((page, index) => ({ ...page, index: index + 1 }))
+    : projection.pages
+  const pages = source.map((page, position) => {
     const context = {}
     if (page.systemChars > 0) {
       context.system = {
         present: true,
-        inherited: page.systemInherited === true,
+        // The window that now opens the list owns the frame, even though the
+        // events carrying it sat in the dropped prefix.
+        inherited: folded === true && position === 0 ? false : page.systemInherited === true,
         chars: page.systemChars,
         preview: clipText(page.systemText, options.clipChars).text,
         full: page.systemText,

package/src/logic.js

@@ -23,7 +23,7 @@
 //   * it replaces the older range and is FOLLOWED by the retained recent units.
 
 export const PLUGIN_ID = 'dsh-session-pages'
-export const VERSION = '0.5.6'
+export const VERSION = '0.5.7'
 export const ROUTE_PREFIX = '/dsh-session-pages'
 export const VIEW_ID = 'windows'
 export const VIEW_ORDER = 30
@@ -133,6 +133,42 @@ export function isCheckpoint(event) {
   return source !== null && source !== undefined && source.kind === CHECKPOINT_KIND
 }
 
+
+/** True when the window holds at least one visible dialogue message. */
+function windowHasDialogue(sorted, page) {
+  const from = page.startSeq
+  const to = page.endSeq === null ? Number.POSITIVE_INFINITY : page.endSeq
+  for (const event of sorted) {
+    const seq = Number(event.seq) || 0
+    if (seq < from) continue
+    if (seq > to) break
+    if (event.type === 'assistant/message') return true
+    if (event.type === 'user/message' && isHumanUserMessage(event)) return true
+  }
+  return false
+}
+
+/**
+ * Drop a leading window that holds nothing but settings.
+ *
+ * A trimmed log starts with a prefix of system/settings events and no dialogue.
+ * Splitting windows at checkpoints would count that prefix as "window 1", so
+ * "2 windows kept" reads as 3. The rule:
+ *
+ *   - fewer than two windows          -> keep as is (a fresh session is 1 window);
+ *   - first window has a checkpoint   -> it IS a conversation window, keep it;
+ *   - prefix holds visible dialogue   -> the trim did not clear it, keep it;
+ *   - otherwise                       -> drop it, renumber, and let the first
+ *                                        checkpoint window carry the frame.
+ */
+export function collapseLeadingSettingsPrefix(sorted, pages) {
+  if (pages.length < 2) return pages
+  const first = pages[0]
+  if (first.compactionId !== null) return pages
+  if (windowHasDialogue(sorted, first) === true) return pages
+  return pages.slice(1).map((page, index) => ({ ...page, index: index + 1 }))
+}
+
 export function isHumanUserMessage(event) {
   if (event === null || typeof event !== 'object' || event.type !== 'user/message' || isCheckpoint(event)) return false
   const source = event.data === null || event.data === undefined ? undefined : event.data.source
@@ -401,10 +437,29 @@ export function buildPages(events, options = {}) {
     }
   }
 
+  // 2b. A settings-only prefix is not a window of its own.
+  const withoutPrefix = collapseLeadingSettingsPrefix(sorted, pages)
+  let floorSeq = 0
+  if (withoutPrefix !== pages) {
+    pages.length = 0
+    for (const page of withoutPrefix) pages.push(page)
+    // The prefix's system prompt and tool roster now belong to this window, so
+    // it no longer inherits them from a window that is not shown.
+    if (pages[0].context.system !== null && pages[0].context.system.present === true) {
+      pages[0].context.system.inherited = false
+    }
+    if (pages[0].context.tools !== null && pages[0].context.tools.count > 0) {
+      pages[0].context.tools.inherited = false
+    }
+    floorSeq = pages[0].startSeq
+  }
+
   // 3. The window's own timeline.
   let dropped = 0
   for (const event of sorted) {
     const seq = Number(event.seq) || 0
+    // Events before the first shown window belong to the dropped prefix.
+    if (seq < floorSeq) continue
     const page = pageForSeq(seq)
     const time = Number(event.time)
     if (Number.isFinite(time)) {

package/src/projection.js

@@ -27,6 +27,9 @@ const FIRST_PAGE = () => ({
   systemText: '',
   systemInherited: false,
   toolNames: null,
+  // Visible dialogue rows (~user/assistant). Settings-only prefixes stay 0 and
+  // are folded into the first checkpoint window by the reader.
+  dialogue: 0,
   turnFrom: null,
   turnTo: null,
   steps: 0,
@@ -117,8 +120,10 @@ export const windowProjection = {
       // rows are rows, not messages, except the checkpoint above.
       // The fold draws a row only when there is text to draw; a message that
       // carries nothing but an attachment still counts as a message, not a row.
-      const rendered = textOfMessage(messageOf(event)).length > 0 ? 1 : 0
+      const text = textOfMessage(messageOf(event))
+      const rendered = text.length > 0 ? 1 : 0
       const page = addToPage(last, {
+        dialogue: last.dialogue + (rendered > 0 && (kind === 'user' || kind === undefined) ? 1 : 0),
         itemCount: last.itemCount + rendered,
         messages: last.messages + 1,
       })
@@ -138,6 +143,7 @@ export const windowProjection = {
       const text = textOfMessage(message)
       const page = {
         ...last,
+        dialogue: last.dialogue + 1,
         steps: last.steps + 1,
         messages: last.messages + 1,
         toolCalls: last.toolCalls + toolCalls,

package/test/client.test.js

@@ -38,7 +38,7 @@ function loadClient() {
 test('the bundle registers the windows view beside chat and trajectory', async () => {
   const exports = await loadClient()
   assert.equal(typeof exports.apply, 'function')
-  assert.equal(exports.version, '0.5.6')
+  assert.equal(exports.version, '0.5.7')
 
   const registered = []
   const slots = {

package/test/logic.test.js

@@ -209,3 +209,75 @@ test('session ids are validated', () => {
   assert.equal(isSessionId('1234abcd'), false)
   assert.equal(isSessionId('session-'), false)
 })
+
+// --- a trimmed log must not count its settings prefix as a window -----------
+
+test('a settings-only prefix is folded into the first checkpoint window', () => {
+  // Trimmed shape: settings + two checkpoints, no dialogue before the first one.
+  const events = [
+    at(1, 1001, 'permission/preset', { preset: 'standard' }),
+    at(2, 1002, 'sandbox/mode', { mode: 'workspace-write' }),
+    injection(3, 'runtime-context', 'Current runtime context.'),
+    checkpoint(10, 'cmp-1', 'first summary', { op: 'replace', startSeq: 4, endSeq: 9 }),
+    at(11, 1011, 'system/message', { role: 'system', content: [{ type: 'text', text: 'You are an agent.' }] }),
+    human(12, 1, 'hello'),
+    at(20, 1020, 'assistant/message', {
+      role: 'assistant', turn: 1, step: 1,
+      content: [{ type: 'text', text: 'hi' }],
+      usage: { totalTokens: 100 },
+    }),
+    checkpoint(30, 'cmp-2', 'second summary', { op: 'replace', startSeq: 10, endSeq: 29 }),
+    human(31, 2, 'again'),
+    at(40, 1040, 'assistant/message', {
+      role: 'assistant', turn: 2, step: 1,
+      content: [{ type: 'text', text: 'yes' }],
+      usage: { totalTokens: 120 },
+    }),
+  ]
+  const result = buildPages(events)
+  assert.equal(result.pages.length, 2)
+  assert.equal(result.totals.pages, 2)
+  // The window that opens the list carries the frame itself.
+  assert.equal(result.pages[0].context.system.present, true)
+  assert.equal(result.pages[0].context.system.inherited, false)
+  assert.equal(result.pages[0].index, 1)
+  assert.equal(result.pages[1].index, 2)
+})
+
+test('a prefix that still holds dialogue stays a window of its own', () => {
+  const events = [
+    injection(1, 'runtime-context', 'Current runtime context.'),
+    human(2, 1, 'still here'),
+    at(3, 1003, 'assistant/message', {
+      role: 'assistant', turn: 1, step: 1,
+      content: [{ type: 'text', text: 'ok' }],
+      usage: { totalTokens: 50 },
+    }),
+    checkpoint(10, 'cmp-1', 'summary', { op: 'replace', startSeq: 4, endSeq: 9 }),
+    human(11, 2, 'after'),
+    at(12, 1012, 'assistant/message', {
+      role: 'assistant', turn: 2, step: 1,
+      content: [{ type: 'text', text: 'yep' }],
+      usage: { totalTokens: 60 },
+    }),
+  ]
+  const result = buildPages(events)
+  assert.equal(result.pages.length, 2)
+  assert.equal(result.pages[0].compactionId, null)
+})
+
+test('a session with no checkpoint is still one window', () => {
+  const events = [
+    at(1, 1001, 'permission/preset', { preset: 'standard' }),
+    injection(2, 'runtime-context', 'Current runtime context.'),
+    human(3, 1, 'first'),
+    at(4, 1004, 'assistant/message', {
+      role: 'assistant', turn: 1, step: 1,
+      content: [{ type: 'text', text: 'reply' }],
+      usage: { totalTokens: 10 },
+    }),
+  ]
+  const result = buildPages(events)
+  assert.equal(result.pages.length, 1)
+  assert.equal(result.totals.pages, 1)
+})