billion-context-dsh 0.2.17 → 0.2.19

package/README.en.md

@@ -3,7 +3,7 @@
 [English](./README.en.md) | [中文](./README.md)
 
 > **⚠️ Beta notice — not for production use**
-> This project (**v0.2.17**) is a work-in-progress beta. The [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) itself is also in **public beta**. **Do not use either in engineering / production environments** — expect breaking changes and rough edges.
+> This project (**v0.2.19**) is a work-in-progress beta. The [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) itself is also in **public beta**. **Do not use either in engineering / production environments** — expect breaking changes and rough edges.
 
 <p align="center">
 <strong>Built with gratitude on top of these projects</strong> — please give them a ⭐:
@@ -68,15 +68,24 @@ The command installs the package and automatically layers this package's bundle
 
 Restart `dsh` afterwards (bundle layers are composed at startup), open a new session, and verify: ask the model to call `acp_status`, or run `/acp status`. Shipped presets (standard / code / cordis) keep their realm-local `compaction-basic` fallback (automatic pressure compression still runs there; the ACP tools and nudge coexist); minimal and presets without a compaction realm use this engine directly.
 
-> **DSH version compatibility.** The package declares the peer range
-> `^0.1.0-rc.6 || ^0.1.1-rc.1` for `@deepseek-ai/dsh-compaction`, covering both the
-> `0.1.0-rc.x` and `0.1.1-rc.x` release lines (including the current DSH release;
-> the seam's `src/` is unchanged from `0.1.0-rc.6` to `0.1.1-rc.2`, so the public
-> API is identical). The range is two `||` clauses **on purpose**: npm
+> **DSH version compatibility.** The package declares all four runtime seam
+> packages (`dsh-compaction` / `dsh-session` / `dsh-llm` / `dsh-tools`) as peer
+> dependencies, sharing the range
+> `^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.4`,
+> covering the `0.1.0-rc.x` and `0.1.1-rc.x` release lines (including the current
+> DSH release; the seam's `src/` is unchanged from `0.1.0-rc.6` to `0.1.1-rc.2`, so the public
+> API is identical) and the `0.1.2-alpha.x` line (which removed the
+> `Session.events` getter in favour of `snapshotEvents()` / `eventAt()`; this
+> engine feature-detects both shapes, so one build runs on either seam). The
+> range is multiple `||` clauses **on purpose**: npm
 > (node-semver) only lets a prerelease version satisfy a range that carries a
 > comparator on the SAME `[major, minor, patch]` tuple as the candidate, so a lone
-> `^0.1.0-rc.6` can never match `0.1.1-rc.x` (issue #68) — older releases fail to
-> install on DSH 0.1.1-rc.x; upgrade to a release containing this fix.
+> `^0.1.0-rc.6` can never match `0.1.1-rc.x` (issue #68) or `0.1.2-alpha.x` —
+> older releases fail to install on DSH 0.1.1-rc.x / 0.1.2-alpha.x; upgrade to a
+> release containing this fix. Declaring all four seam packages as peers (not
+> just `dsh-compaction`) ensures that, even under pnpm's
+> hoisted/linked layout, installations resolve them to the **host's own** copy
+> rather than a stale nested copy inconsistent with the host.
 
 **Path B: plain `npm install` (package only — a composition row is required).**
 
@@ -89,7 +98,7 @@ This only installs the package into your project/global store; it does **not** t
 **Install from the git source (`github:` spec — the form the plugin store shows).** The prebuilt `dist/` artifacts are committed to this repository, so a git-source install also works out of the box — **no build step needed**, and pnpm 11's default build-script blocking (`allowBuilds`) never applies to this package:
 
 ```bash
-dsh plugin --profile web add github:Tyan66666/billion-context-dsh#v0.2.17
+dsh plugin --profile web add github:Tyan66666/billion-context-dsh#v0.2.19
 ```
 
 Prefer a `#<tag>` ref to get artifacts identical to that npm release; without a ref you get the latest default-branch build. Only building the repo yourself (`npm run build`) requires approving build scripts. Background and trade-offs: [docs/git-source-install-design.md](docs/git-source-install-design.md) (issue #92).

package/README.md

@@ -3,7 +3,7 @@
 [中文](./README.md) | [English](./README.en.md)
 
 > **⚠️ 测试版声明——请勿用于生产环境**
-> 本项目（**v0.2.17**）仍处于开发中的测试版。[DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 本身也处于**公开测试版**阶段。**请勿将两者用于工程化 / 生产环境**——预期会有破坏性变更与粗糙之处。
+> 本项目（**v0.2.19**）仍处于开发中的测试版。[DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 本身也处于**公开测试版**阶段。**请勿将两者用于工程化 / 生产环境**——预期会有破坏性变更与粗糙之处。
 
 <p align="center">
 <strong>衷心感谢以下项目——请给它们一个 ⭐：</strong>
@@ -71,14 +71,20 @@ dsh plugin --profile web add billion-context-dsh
 
 装完**重启 `dsh`**（bundle 层在启动时组合），新开会话即可用——让模型调用 `acp_status` 或执行 `/acp status` 自证。shipped 预设（standard / code / cordis）内部的 realm 级 `compaction-basic` 自动压缩兜底仍然保留（这些模式里"自动摘要"照旧，ACP 工具与 nudge 并存）；minimal 等不带 compaction realm 的预设直接使用本引擎。
 
-> **与 DSH 版本的兼容性。** 包声明 peer 依赖 `@deepseek-ai/dsh-compaction` 为
-> `^0.1.0-rc.6 || ^0.1.1-rc.1`，同时覆盖 `0.1.0-rc.x` 与 `0.1.1-rc.x` 两条 rc 线
-> （含当前最新 DSH release；从 `0.1.0-rc.6` 到 `0.1.1-rc.2`，seam 的 `src/` 源码
-> 零改动，公开 API 完全一致）。范围写成两个并集子句是**有意为之**：npm
-> （node-semver）的预发布匹配规则要求 range 里存在与候选版本**相同
+> **与 DSH 版本的兼容性。** 包把四个运行期 seam 包（`dsh-compaction` /
+> `dsh-session` / `dsh-llm` / `dsh-tools`）都声明为 peer 依赖，共享同一个
+> 范围 `^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.4`，同时覆盖 `0.1.0-rc.x`、
+> `0.1.1-rc.x` 两条 rc 线与 `0.1.2-alpha.x` 线（从 `0.1.0-rc.6` 到 `0.1.1-rc.2`，
+> seam 的 `src/` 源码零改动，公开 API 完全一致；`0.1.2-alpha` 移除了
+> `Session.events` getter，改为 `snapshotEvents()` / `eventAt()`，本引擎对两种
+> 形态做了特性探测，单一构建两端通用）。范围写成多个并集子句是**有意为之**：
+> npm （node-semver）的预发布匹配规则要求 range 里存在与候选版本**相同
 > `[major, minor, patch]` 元组**的比较器，单一 `^0.1.0-rc.6` 永远匹配不了
-> `0.1.1-rc.x`（issue #68）——因此旧发布的包在 DSH 0.1.1-rc.x 上装不上，
-> 升级到含本次修复的新版本即可。
+> `0.1.1-rc.x`（issue #68），也匹配不了 `0.1.2-alpha.x`——因此旧发布的包在
+> DSH 0.1.1-rc.x / 0.1.2-alpha.x 上装不上，升级到含本次修复的新版本即可。
+> 把这四个 seam 包一并声明为 peer（而不只是 `dsh-compaction`），是为了让
+> 安装在 pnpm 的集成/封存布局下仍能把它们解析到**宿主自己的副本**，而不是
+> 某个与宿主不一致的陈旧嵌套副本。
 
 **方式二：纯 `npm install`（只装包，需要手写组合行）。**
 
@@ -91,7 +97,7 @@ npm install billion-context-dsh
 **git 源安装（`github:` 规格，插件商店展示的形态）。** 预构建产物 `dist/` 已提交到仓库，从 git 源安装同样开箱即用——**无需任何构建步骤**，pnpm 11 默认拦截构建脚本（`allowBuilds`）的机制对这个包不构成障碍：
 
 ```bash
-dsh plugin --profile web add github:Tyan66666/billion-context-dsh#v0.2.17
+dsh plugin --profile web add github:Tyan66666/billion-context-dsh#v0.2.19
 ```
 
 建议带 `#<tag>` 安装，拿到与对应 npm 版本完全一致的产物；不带 ref 则装默认分支的最新构建。只有 clone 仓库自行从源码构建（`npm run build`）才需要放行构建。背景与方案取舍见 [docs/git-source-install-design.md](docs/git-source-install-design.md)（issue #92）。

package/dist/index.js

@@ -2645,6 +2645,18 @@ import {
 } from "@deepseek-ai/dsh-compaction";
 import { createAssistantMessage, createUserMessage } from "@deepseek-ai/dsh-llm";
 
+// src/session-events.ts
+function sessionEventsOf(session) {
+  const snapshot = session.snapshotEvents?.();
+  if (snapshot !== void 0) return snapshot;
+  return session.events;
+}
+function eventAtOf(session, seq) {
+  const eventAt = session.eventAt;
+  if (typeof eventAt === "function") return eventAt.call(session, seq);
+  return session.events[seq];
+}
+
 // src/messages.ts
 function extractText(content) {
   if (typeof content === "string") return content;
@@ -2757,10 +2769,10 @@ function eventsToCoreMessages(events, toolNames) {
   return out;
 }
 function surfaceEventsOf(session) {
-  return session.surface.nodes.map((seq) => session.events[seq]).filter((event) => event !== void 0);
+  return session.surface.nodes.map((seq) => eventAtOf(session, seq)).filter((event) => event !== void 0);
 }
 function allLogMessages(session) {
-  return eventsToCoreMessages(session.events);
+  return eventsToCoreMessages(sessionEventsOf(session));
 }
 function extractEventText(event) {
   switch (event.type) {
@@ -2826,7 +2838,7 @@ function hostPriceEvent(event) {
 function shadowedHostTokens(session, seqs) {
   let total = 0;
   for (const seq of seqs) {
-    const event = session.events[seq];
+    const event = eventAtOf(session, seq);
     if (event !== void 0) total += hostPriceEvent(event);
   }
   return total;
@@ -2869,11 +2881,11 @@ function assertNoActiveCompaction(events) {
     else if (event.type === "compaction/end") active = false;
   }
   if (active) {
-    throw new Error("billion-context-dsh: another compaction is already active for this session");
+    console.warn("billion-context-dsh: clearing stale compaction flag \u2014 found a compaction/start with no matching compaction/end");
   }
 }
 function hasPlainRef(session, seq) {
-  const event = session.events[seq];
+  const event = eventAtOf(session, seq);
   if (event === void 0) return false;
   switch (event.type) {
     case "user/message":
@@ -2906,14 +2918,14 @@ var AlreadyCompressedRangeError = class extends Error {
   coveringBlockIds;
 };
 function recoverStaleRange(session, start, end) {
-  if (session.events[start] === void 0 || session.events[end] === void 0) {
-    const failedEdge = session.events[start] === void 0 ? start : end;
+  if (eventAtOf(session, start) === void 0 || eventAtOf(session, end) === void 0) {
+    const failedEdge = eventAtOf(session, start) === void 0 ? start : end;
     return { kind: "unresolvable", failedEdge };
   }
   const liveInside = session.surface.nodes.filter((seq) => seq >= start && seq <= end).sort((a, b) => a - b);
-  const plain = liveInside.filter((seq) => !isCheckpointNode(session.events[seq]));
+  const plain = liveInside.filter((seq) => !isCheckpointNode(eventAtOf(session, seq)));
   if (plain.length === 0) {
-    const coveringBlockIds = rebuildBlockLedger(session.events).filter((entry) => entry.shadowedSeqs.some((seq) => seq >= start && seq <= end)).map((entry) => entry.blockId);
+    const coveringBlockIds = rebuildBlockLedger(sessionEventsOf(session)).filter((entry) => entry.shadowedSeqs.some((seq) => seq >= start && seq <= end)).map((entry) => entry.blockId);
     return { kind: "already-compressed", coveringBlockIds };
   }
   return { kind: "ok", start: plain[0], end: plain[plain.length - 1] };
@@ -2996,35 +3008,53 @@ function readCompactionSummary(event) {
   return event.data;
 }
 function runCompactionTransaction(session, input) {
-  assertNoActiveCompaction(session.events);
-  const turn = findOpenTurn(session.events);
+  assertNoActiveCompaction(sessionEventsOf(session));
+  const turn = findOpenTurn(sessionEventsOf(session));
   const compactionId = CompactionId(randomUUID());
   const seqs = [];
-  seqs.push(session.append("compaction/start", { compactionId, turn }).seq);
-  seqs.push(session.append("compaction/summary", {
-    compactionId,
-    summary: input.summary,
-    shadowedRange: { start: input.start, end: input.end },
-    shadowedSeqs: [...input.shadowedSeqs],
-    shadowedTokenCount: input.shadowedTokenCount,
-    provider: input.provider,
-    model: input.model,
-    tier: input.tier ?? 1,
-    ...input.kernelBlockId === void 0 ? {} : { kernelBlockId: input.kernelBlockId },
-    ...input.topic === void 0 ? {} : { topic: input.topic },
-    ...input.parentBlockIds === void 0 || input.parentBlockIds.length === 0 ? {} : { parentBlockIds: [...input.parentBlockIds] },
-    ...input.directMessageIds === void 0 ? {} : { directMessageIds: [...input.directMessageIds] },
-    ...input.effectiveMessageIds === void 0 ? {} : { effectiveMessageIds: [...input.effectiveMessageIds] }
-  }).seq);
-  const message = createUserMessage({
-    content: input.summary,
-    source: compactCheckpointSource(compactionId)
-  });
-  seqs.push(session.append("user/message", message, {
-    surfaceOp: { op: "replace", start: input.start, end: input.end },
-    sourceEventSeqs: [...input.shadowedSeqs]
-  }).seq);
-  seqs.push(session.append("compaction/end", { compactionId, turn }).seq);
+  if (input.start > input.end) {
+    throw new Error(`billion-context-dsh: reversed range ${input.start}..${input.end}`);
+  }
+  if (eventAtOf(session, input.start) === void 0 || eventAtOf(session, input.end) === void 0) {
+    const failedEdge = eventAtOf(session, input.start) === void 0 ? input.start : input.end;
+    throw new Error(
+      `billion-context-dsh: seq ${input.start}..${input.end} not in the current surface \u2014 edge seq ${failedEdge} is not in this session's log. Surface seqs are sparse message nodes (only user/message, assistant/message, tool/result events); consult acp_status for the current surface range`
+    );
+  }
+  try {
+    seqs.push(session.append("compaction/start", { compactionId, turn }).seq);
+    seqs.push(session.append("compaction/summary", {
+      compactionId,
+      summary: input.summary,
+      shadowedRange: { start: input.start, end: input.end },
+      shadowedSeqs: [...input.shadowedSeqs],
+      shadowedTokenCount: input.shadowedTokenCount,
+      provider: input.provider,
+      model: input.model,
+      tier: input.tier ?? 1,
+      ...input.kernelBlockId === void 0 ? {} : { kernelBlockId: input.kernelBlockId },
+      ...input.topic === void 0 ? {} : { topic: input.topic },
+      ...input.parentBlockIds === void 0 || input.parentBlockIds.length === 0 ? {} : { parentBlockIds: [...input.parentBlockIds] },
+      ...input.directMessageIds === void 0 ? {} : { directMessageIds: [...input.directMessageIds] },
+      ...input.effectiveMessageIds === void 0 ? {} : { effectiveMessageIds: [...input.effectiveMessageIds] }
+    }).seq);
+    const message = createUserMessage({
+      content: input.summary,
+      source: compactCheckpointSource(compactionId)
+    });
+    seqs.push(session.append("user/message", message, {
+      surfaceOp: { op: "replace", start: input.start, end: input.end },
+      sourceEventSeqs: [...input.shadowedSeqs]
+    }).seq);
+    seqs.push(session.append("compaction/end", { compactionId, turn }).seq);
+  } catch (error) {
+    try {
+      session.append("compaction/end", { compactionId, turn });
+    } catch (compensateError) {
+      console.warn("billion-context-dsh: failed to write a compensating compaction/end", compensateError);
+    }
+    throw error;
+  }
   return { compactionId, seqs };
 }
 function summarySeqOfCompaction(events, compactionId) {
@@ -3111,7 +3141,7 @@ function hideSurfaceSeqs(session, seqs, provider, model, text, priceEvent = host
   const end = seqs[seqs.length - 1];
   let shadowedTokenCount = 0;
   for (const seq of seqs) {
-    const event = session.events[seq];
+    const event = eventAtOf(session, seq);
     if (event !== void 0) shadowedTokenCount += priceEvent(event);
   }
   session.append("compaction/prune", {
@@ -3130,7 +3160,7 @@ function hideSurfaceSeqs(session, seqs, provider, model, text, priceEvent = host
     return;
   }
   session.append("assistant/message", {
-    turn: findOpenTurn(session.events) ?? 0,
+    turn: findOpenTurn(sessionEventsOf(session)) ?? 0,
     step: 0,
     message: createAssistantMessage({ content: [], source: { provider, model } })
   }, {
@@ -3140,7 +3170,8 @@ function hideSurfaceSeqs(session, seqs, provider, model, text, priceEvent = host
 }
 function hideCompressToolPair(session, callId, resultSeq) {
   let callSeq = null;
-  for (const event of session.events) {
+  const events = sessionEventsOf(session);
+  for (const event of events) {
     if (event.type !== "assistant/message") continue;
     if (toolCallIdsOfEvent(event).includes(callId)) {
       callSeq = event.seq;
@@ -3148,11 +3179,11 @@ function hideCompressToolPair(session, callId, resultSeq) {
     }
   }
   if (callSeq === null) return false;
-  const callNodeIds = toolCallIdsOfEvent(session.events[callSeq]);
+  const callNodeIds = toolCallIdsOfEvent(events[callSeq]);
   if (callNodeIds.length !== 1 || callNodeIds[0] !== callId) return false;
   let resolvedResultSeq = resultSeq ?? null;
   if (resolvedResultSeq === null) {
-    for (const event of session.events) {
+    for (const event of events) {
       if (event.type === "tool/result" && toolCallIdOfResultEvent(event) === callId) {
         resolvedResultSeq = event.seq;
         break;
@@ -3164,8 +3195,8 @@ function hideCompressToolPair(session, callId, resultSeq) {
   const startIdx = nodes.indexOf(callSeq);
   const endIdx = nodes.indexOf(resolvedResultSeq);
   if (startIdx < 0 || endIdx < 0 || endIdx - startIdx !== 1) return false;
-  const { provider, model } = assistantProviderModel(session.events[callSeq]);
-  const resultEvent = session.events[resolvedResultSeq];
+  const { provider, model } = assistantProviderModel(events[callSeq]);
+  const resultEvent = events[resolvedResultSeq];
   const resultText = resultEvent === void 0 ? "" : extractEventText(resultEvent);
   hideSurfaceSeqs(session, [callSeq, resolvedResultSeq], provider, model, resultText.trim().length > 0 ? resultText : void 0);
   return true;
@@ -3178,7 +3209,7 @@ function stripOrphanedSurfaceToolMessages(session, inFlightCallIds = /* @__PURE_
   const brokenResults = /* @__PURE__ */ new Map();
   for (let index = 0; index < nodes.length; index += 1) {
     const seq = nodes[index];
-    const event = session.events[seq];
+    const event = eventAtOf(session, seq);
     if (event === void 0) continue;
     if (event.type === "assistant/message") {
       const ids = toolCallIdsOfEvent(event);
@@ -3200,7 +3231,7 @@ function stripOrphanedSurfaceToolMessages(session, inFlightCallIds = /* @__PURE_
       if (callNodeIds !== void 0) {
         adjacent = true;
         for (let mid = call.index + 1; mid < index; mid += 1) {
-          const midEvent = session.events[nodes[mid]];
+          const midEvent = eventAtOf(session, nodes[mid]);
           if (midEvent === void 0 || midEvent.type !== "tool/result") {
             adjacent = false;
             break;
@@ -3218,7 +3249,7 @@ function stripOrphanedSurfaceToolMessages(session, inFlightCallIds = /* @__PURE_
   }
   const brokenIdsByCallSeq = /* @__PURE__ */ new Map();
   for (const [resultSeq, callSeq] of brokenResults) {
-    const id = toolCallIdOfResultEvent(session.events[resultSeq]);
+    const id = toolCallIdOfResultEvent(eventAtOf(session, resultSeq));
     if (id !== null) {
       const list = brokenIdsByCallSeq.get(callSeq) ?? [];
       list.push(id);
@@ -3235,7 +3266,7 @@ function stripOrphanedSurfaceToolMessages(session, inFlightCallIds = /* @__PURE_
   const hidden = [...hiddenSet].sort((a, b) => a - b);
   let count = 0;
   for (const seq of hidden) {
-    const event = session.events[seq];
+    const event = eventAtOf(session, seq);
     if (event === void 0) continue;
     const { provider, model } = assistantProviderModel(event);
     hideSurfaceSeqs(session, [seq], provider, model);
@@ -3246,7 +3277,7 @@ function stripOrphanedSurfaceToolMessages(session, inFlightCallIds = /* @__PURE_
 function openToolCallIds(session) {
   const open = /* @__PURE__ */ new Set();
   for (const seq of session.surface.nodes) {
-    const event = session.events[seq];
+    const event = eventAtOf(session, seq);
     if (event === void 0) continue;
     if (event.type === "assistant/message") {
       for (const id of toolCallIdsOfEvent(event)) open.add(id);
@@ -3275,7 +3306,7 @@ function buildCompressibleSeqRanges(session, opts = {}) {
     for (const seq of nodes.slice(-preserve)) protectedSeqs.add(seq);
   }
   for (let index = nodes.length - 1; index >= 0; index -= 1) {
-    const event = session.events[nodes[index]];
+    const event = eventAtOf(session, nodes[index]);
     if (event?.type === "user/message" && !isCheckpointNode(event)) {
       protectedSeqs.add(nodes[index]);
       break;
@@ -3288,7 +3319,7 @@ function buildCompressibleSeqRanges(session, opts = {}) {
     cur = null;
   };
   for (const seq of nodes) {
-    const event = session.events[seq];
+    const event = eventAtOf(session, seq);
     if (event === void 0 || protectedSeqs.has(seq) || isCheckpointNode(event)) {
       flush();
       continue;
@@ -3335,7 +3366,7 @@ function surfaceSummary(session) {
   return `${nodes.length} nodes, seqs ${first}..${last}`;
 }
 function blockRegistry(session) {
-  const ledger = rebuildBlockLedger(session.events);
+  const ledger = rebuildBlockLedger(sessionEventsOf(session));
   const kernelIdOf = /* @__PURE__ */ new Map();
   const raw = [];
   let next = 1;
@@ -3369,7 +3400,7 @@ function blockRegistry(session) {
   }));
 }
 function blockRefForSummarySeq(session, seq) {
-  const event = session.events[seq];
+  const event = eventAtOf(session, seq);
   if (event?.type !== "user/message") return null;
   const source = event.data.source;
   if (source?.plugin !== "compact" || source.compactionId === void 0) return null;
@@ -3399,7 +3430,7 @@ function checkpointBlockIdOf(events, seq) {
   return source.compactionId;
 }
 function expandShadowedSeqs(session, blockId) {
-  const ledger = rebuildBlockLedger(session.events);
+  const ledger = rebuildBlockLedger(sessionEventsOf(session));
   const byId = new Map(ledger.map((entry) => [entry.blockId, entry]));
   const root = byId.get(blockId);
   if (root === void 0) return [];
@@ -3409,7 +3440,7 @@ function expandShadowedSeqs(session, blockId) {
     if (seen.has(entry.blockId)) return;
     seen.add(entry.blockId);
     for (const seq of entry.shadowedSeqs) {
-      const childId = checkpointBlockIdOf(session.events, seq);
+      const childId = checkpointBlockIdOf(sessionEventsOf(session), seq);
       const child = childId === null ? void 0 : byId.get(childId);
       if (child !== void 0) visit(child);
       else out.push(seq);
@@ -3486,9 +3517,10 @@ var AcpStateStore = class {
     const existing = this.states.get(id);
     if (existing !== void 0) return existing;
     const state = createInitialState();
-    if (session.events.some((event) => event.type === "compaction/summary")) {
-      state.blocks = rebuildKernelBlocks(session.events);
-      state.nextBlockId = nextBlockIdAfter(session.events);
+    const events = sessionEventsOf(session);
+    if (events.some((event) => event.type === "compaction/summary")) {
+      state.blocks = rebuildKernelBlocks(events);
+      state.nextBlockId = nextBlockIdAfter(events);
     }
     this.states.set(id, state);
     return state;
@@ -3707,7 +3739,7 @@ function buildNudge(agent, env, lastNudgeTurn) {
   const nudge = turn.nudge;
   if (nudge === void 0 || !nudge.shouldInject) return null;
   const emergency = nudge.breakdown?.emergencyOverride === 1;
-  const turnNumber = findOpenTurn(session.events) ?? 0;
+  const turnNumber = findOpenTurn(sessionEventsOf(session)) ?? 0;
   const alreadyShown = !emergency && lastNudgeTurn.get(session.id) === turnNumber;
   if (alreadyShown) return null;
   lastNudgeTurn.set(session.id, turnNumber);
@@ -4126,7 +4158,7 @@ var decompressParameters = {
 function resolveBlockId(session, arg) {
   const byKernelRef = blockIdOfKernelRef(session, arg);
   if (byKernelRef !== null) return byKernelRef;
-  const ledger = rebuildBlockLedger(session.events);
+  const ledger = rebuildBlockLedger(sessionEventsOf(session));
   const byPrefix = ledger.find((entry) => entry.blockId.startsWith(arg));
   return byPrefix?.blockId ?? null;
 }
@@ -4137,14 +4169,14 @@ function handleDecompress(_env, rawArgs, exec) {
   if (blockId === null) {
     return { text: `decompress: block "${args.blockId}" not found (see acp_status for the block list)` };
   }
-  const ledger = rebuildBlockLedger(session.events);
+  const ledger = rebuildBlockLedger(sessionEventsOf(session));
   const block = ledger.find((entry) => entry.blockId === blockId);
   if (block === void 0) {
     return { text: `decompress: block "${args.blockId}" not found (see acp_status for the block list)` };
   }
   const parts = [];
   for (const seq of expandShadowedSeqs(session, block.blockId)) {
-    const event = session.events[seq];
+    const event = eventAtOf(session, seq);
     const text = event === void 0 ? "" : extractEventText(event);
     if (text.length > 0) parts.push(`[seq ${seq}] ${text}`);
   }
@@ -4172,7 +4204,7 @@ function roleOfEvent(event) {
   }
 }
 function buildSearchDocs(session) {
-  const ledger = rebuildBlockLedger(session.events);
+  const ledger = rebuildBlockLedger(sessionEventsOf(session));
   const docs = [];
   const claimed = /* @__PURE__ */ new Set();
   for (const block of ledger) {
@@ -4188,7 +4220,7 @@ function buildSearchDocs(session) {
     for (const seq of expandShadowedSeqs(session, block.blockId)) {
       if (claimed.has(seq)) continue;
       claimed.add(seq);
-      const event = session.events[seq];
+      const event = eventAtOf(session, seq);
       if (event === void 0) continue;
       const role = roleOfEvent(event);
       const text = extractEventText(event);
@@ -4367,7 +4399,7 @@ async function detectContextWindow(agent, provider, model) {
 // src/commands.ts
 async function statusText(env, agent) {
   const session = agent.session;
-  const ledger = rebuildBlockLedger(session.events);
+  const ledger = rebuildBlockLedger(sessionEventsOf(session));
   const totalTokens = ledger.reduce((sum, block) => sum + block.shadowedTokenCount, 0);
   const coreMessages = allLogMessages(session);
   const surfaceMessages = eventsToCoreMessages(surfaceEventsOf(session));
@@ -4435,10 +4467,10 @@ function decompressText(_env, agent, args) {
   if (args.length < 1) return "/acp decompress <blockId>";
   const session = agent.session;
   const blockId = blockIdOfKernelRef(session, args[0]);
-  const ledger = rebuildBlockLedger(session.events);
+  const ledger = rebuildBlockLedger(sessionEventsOf(session));
   const block = blockId === null ? ledger.find((entry) => entry.blockId.startsWith(args[0])) : ledger.find((entry) => entry.blockId === blockId);
   if (block === void 0) return `block "${args[0]}" not found (see /acp status)`;
-  const parts = expandShadowedSeqs(session, block.blockId).map((seq) => extractEventText(session.events[seq])).filter((text) => text.length > 0);
+  const parts = expandShadowedSeqs(session, block.blockId).map((seq) => extractEventText(eventAtOf(session, seq))).filter((text) => text.length > 0);
   return `Block ${block.blockId} \u2014 ${block.summary}
 
 ${parts.join("\n\n") || "(no recoverable content)"}`;