billion-context-dsh 0.2.1 → 0.2.2

package/README.en.md

@@ -3,7 +3,7 @@
 [English](./README.en.md) | [中文](./README.md)
 
 > **⚠️ Beta notice — not for production use**
-> This project (**v0.2.1**) 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.2**) 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 ⭐:

package/README.md

@@ -3,7 +3,7 @@
 [中文](./README.md) | [English](./README.en.md)
 
 > **⚠️ 测试版声明——请勿用于生产环境**
-> 本项目（**v0.2.1**）仍处于开发中的测试版。[DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 本身也处于**公开测试版**阶段。**请勿将两者用于工程化 / 生产环境**——预期会有破坏性变更与粗糙之处。
+> 本项目（**v0.2.2**）仍处于开发中的测试版。[DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 本身也处于**公开测试版**阶段。**请勿将两者用于工程化 / 生产环境**——预期会有破坏性变更与粗糙之处。
 
 <p align="center">
 <strong>衷心感谢以下项目——请给它们一个 ⭐：</strong>

package/dist/index.d.ts

@@ -40,7 +40,7 @@ export { makeTools, type ToolEnvironment } from './tools.ts';
 export { acpCommand } from './commands.ts';
 export { buildNudge, resolveTokenCount, type NudgeEnvironment, type NudgeOutcome } from './nudge.ts';
 export { DEFAULT_CONTEXT_WINDOW, detectContextWindow, windowSourceLabel, type AcpWindow, } from './window.ts';
-export { AlreadyCompressedRangeError, rebuildBlockLedger, resolveSurfaceRange, runCompactionTransaction, shadowedSeqsOf, findOpenTurn, assertNoActiveCompaction, blockRegistry, blockRefForSummarySeq, compactionIdsOfKernelBlocks, summarySeqOfKernelBlock, expandShadowedSeqs, type AcpBlockLedgerEntry, type CompactionTransactionInput, type ResolvedSurfaceRange, } from './region.ts';
+export { AlreadyCompressedRangeError, rebuildBlockLedger, resolveSurfaceRange, runCompactionTransaction, shadowedSeqsOf, findOpenTurn, assertNoActiveCompaction, blockRegistry, blockRefForSummarySeq, compactionIdsOfKernelBlocks, summarySeqOfKernelBlock, expandShadowedSeqs, hideCompressToolPair, stripOrphanedSurfaceToolMessages, type AcpBlockLedgerEntry, type CompactionTransactionInput, type ResolvedSurfaceRange, } from './region.ts';
 export { eventsToCoreMessages, projectEvent, surfaceEventsOf, extractEventText } from './messages.ts';
 export interface AcpConfig {
     /**
@@ -108,6 +108,8 @@ export declare class AcpCompactionEngine extends CompactionEngine {
     /** Resolved prompt templates (validated at construction — fail-fast on template typos). */
     readonly prompts: ResolvedPrompts;
     private readonly lastNudgeTurn;
+    /** Successful compress call ids awaiting their tool/result so the pair can be hidden. */
+    private readonly compressCallIdsToHide;
     /** Per provider/model route the resolved window (probe failures cached too). */
     private readonly windowCache;
     constructor(ctx: Context, config?: Partial<AcpConfig>);

package/dist/index.js

@@ -16,7 +16,7 @@ import {
   toolPairingBalancedAfter,
   toolPairingBalancedBefore
 } from "@deepseek-ai/dsh-compaction";
-import { createUserMessage } from "@deepseek-ai/dsh-llm";
+import { createAssistantMessage, createUserMessage } from "@deepseek-ai/dsh-llm";
 import { defaultCountTokens } from "acp-kernel";
 
 // src/messages.ts
@@ -347,7 +347,198 @@ function isCheckpointNode(event) {
   const source = event.data.source;
   return source?.plugin === "compact";
 }
+function toolCallIdsOfEvent(event) {
+  if (event.type !== "assistant/message") return [];
+  const content = event.data.message?.content;
+  if (!Array.isArray(content)) return [];
+  const ids = [];
+  for (const block of content) {
+    if (block === null || typeof block !== "object") continue;
+    const b = block;
+    if (b.type === "tool-call" && typeof b.id === "string") ids.push(b.id);
+  }
+  return ids;
+}
+function toolCallIdOfResultEvent(event) {
+  if (event.type !== "tool/result") return null;
+  const message = event.data.message;
+  const block = Array.isArray(message?.content) ? message.content.find((candidate) => candidate?.type === "tool-result") : void 0;
+  const id = block?.toolCallId ?? message?.source?.callId;
+  return typeof id === "string" ? id : null;
+}
+function assistantProviderModel(event) {
+  if (event.type === "assistant/message") {
+    const message = event.data.message;
+    return {
+      provider: typeof message?.source?.provider === "string" ? message.source.provider : "billion-context-dsh",
+      model: typeof message?.source?.model === "string" ? message.source.model : "surface-prune"
+    };
+  }
+  return { provider: "billion-context-dsh", model: "surface-prune" };
+}
+function hideSurfaceSeqs(session, seqs, provider, model, text) {
+  if (seqs.length === 0) return;
+  const start = seqs[0];
+  const end = seqs[seqs.length - 1];
+  let shadowedTokenCount = 0;
+  for (const seq of seqs) {
+    const event = session.events[seq];
+    if (event !== void 0) shadowedTokenCount += defaultCountTokens(extractEventText(event));
+  }
+  session.append("compaction/prune", {
+    shadowedRange: { start, end },
+    shadowedSeqs: [...seqs],
+    shadowedTokenCount
+  });
+  if (text !== void 0) {
+    session.append("user/message", createUserMessage({
+      content: [{ type: "text", text }],
+      source: { kind: "plugin", plugin: "billion-context-dsh" }
+    }), {
+      surfaceOp: { op: "replace", start, end },
+      sourceEventSeqs: [...seqs]
+    });
+    return;
+  }
+  session.append("assistant/message", {
+    turn: findOpenTurn(session.events) ?? 0,
+    step: 0,
+    message: createAssistantMessage({ content: [], source: { provider, model } })
+  }, {
+    surfaceOp: { op: "replace", start, end },
+    sourceEventSeqs: [...seqs]
+  });
+}
+function hideCompressToolPair(session, callId, resultSeq) {
+  let callSeq = null;
+  for (const event of session.events) {
+    if (event.type !== "assistant/message") continue;
+    if (toolCallIdsOfEvent(event).includes(callId)) {
+      callSeq = event.seq;
+      break;
+    }
+  }
+  if (callSeq === null) return false;
+  const callNodeIds = toolCallIdsOfEvent(session.events[callSeq]);
+  if (callNodeIds.length !== 1 || callNodeIds[0] !== callId) return false;
+  let resolvedResultSeq = resultSeq ?? null;
+  if (resolvedResultSeq === null) {
+    for (const event of session.events) {
+      if (event.type === "tool/result" && toolCallIdOfResultEvent(event) === callId) {
+        resolvedResultSeq = event.seq;
+        break;
+      }
+    }
+  }
+  if (resolvedResultSeq === null) return false;
+  const nodes = session.surface.nodes;
+  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 resultText = resultEvent === void 0 ? "" : extractEventText(resultEvent);
+  hideSurfaceSeqs(session, [callSeq, resolvedResultSeq], provider, model, resultText.trim().length > 0 ? resultText : void 0);
+  return true;
+}
+function stripOrphanedSurfaceToolMessages(session, inFlightCallIds = /* @__PURE__ */ new Set()) {
+  const nodes = session.surface.nodes;
+  const callIdsBySeq = /* @__PURE__ */ new Map();
+  const open = /* @__PURE__ */ new Map();
+  const orphanResultSeqs = [];
+  const brokenResults = /* @__PURE__ */ new Map();
+  for (let index = 0; index < nodes.length; index += 1) {
+    const seq = nodes[index];
+    const event = session.events[seq];
+    if (event === void 0) continue;
+    if (event.type === "assistant/message") {
+      const ids = toolCallIdsOfEvent(event);
+      if (ids.length === 0) continue;
+      callIdsBySeq.set(seq, ids);
+      for (const id of ids) {
+        if (!open.has(id)) open.set(id, { seq, index });
+      }
+    } else if (event.type === "tool/result") {
+      const id = toolCallIdOfResultEvent(event);
+      if (id === null) continue;
+      const call = open.get(id);
+      if (call === void 0) {
+        orphanResultSeqs.push(seq);
+        continue;
+      }
+      const callNodeIds = callIdsBySeq.get(call.seq);
+      let adjacent = false;
+      if (callNodeIds !== void 0) {
+        adjacent = true;
+        for (let mid = call.index + 1; mid < index; mid += 1) {
+          const midEvent = session.events[nodes[mid]];
+          if (midEvent === void 0 || midEvent.type !== "tool/result") {
+            adjacent = false;
+            break;
+          }
+          const midId = toolCallIdOfResultEvent(midEvent);
+          if (midId === null || !callNodeIds.includes(midId)) {
+            adjacent = false;
+            break;
+          }
+        }
+      }
+      open.delete(id);
+      if (!adjacent) brokenResults.set(seq, call.seq);
+    }
+  }
+  const brokenIdsByCallSeq = /* @__PURE__ */ new Map();
+  for (const [resultSeq, callSeq] of brokenResults) {
+    const id = toolCallIdOfResultEvent(session.events[resultSeq]);
+    if (id !== null) {
+      const list = brokenIdsByCallSeq.get(callSeq) ?? [];
+      list.push(id);
+      brokenIdsByCallSeq.set(callSeq, list);
+    }
+  }
+  const hiddenSet = new Set(orphanResultSeqs);
+  for (const resultSeq of brokenResults.keys()) hiddenSet.add(resultSeq);
+  for (const [callSeq, ids] of callIdsBySeq) {
+    const brokenIds = brokenIdsByCallSeq.get(callSeq);
+    const allUnpaired = !ids.some((candidate) => inFlightCallIds.has(candidate)) && ids.every((candidate) => open.has(candidate) || brokenIds?.includes(candidate) === true);
+    if (allUnpaired) hiddenSet.add(callSeq);
+  }
+  const hidden = [...hiddenSet].sort((a, b) => a - b);
+  let count = 0;
+  for (const seq of hidden) {
+    const event = session.events[seq];
+    if (event === void 0) continue;
+    const { provider, model } = assistantProviderModel(event);
+    hideSurfaceSeqs(session, [seq], provider, model);
+    count += 1;
+  }
+  return count;
+}
+function openToolCallIds(session) {
+  const open = /* @__PURE__ */ new Set();
+  for (const seq of session.surface.nodes) {
+    const event = session.events[seq];
+    if (event === void 0) continue;
+    if (event.type === "assistant/message") {
+      for (const id of toolCallIdsOfEvent(event)) open.add(id);
+    } else if (event.type === "tool/result") {
+      const id = toolCallIdOfResultEvent(event);
+      if (id !== null) open.delete(id);
+    }
+  }
+  return open;
+}
+function deferCompressPairHide(session, callId, resultSeq, onError) {
+  queueMicrotask(() => {
+    try {
+      hideCompressToolPair(session, callId, resultSeq);
+    } catch (error) {
+      onError?.(error);
+    }
+  });
+}
 function buildCompressibleSeqRanges(session, opts = {}) {
+  stripOrphanedSurfaceToolMessages(session);
   const nodes = session.surface.nodes;
   const preserve = opts.preserveRecent ?? 5;
   const protectedSeqs = /* @__PURE__ */ new Set();
@@ -989,6 +1180,7 @@ function unwrapCompressArgs(args) {
 async function handleCompress(env, args, exec) {
   const agent = requireAgent(exec);
   const session = agent.session;
+  stripOrphanedSurfaceToolMessages(session, openToolCallIds(session));
   const state = env.store.stateFor(session);
   const coreMessages = allLogMessages(session);
   const surfaceMessages = eventsToCoreMessages(surfaceEventsOf(session));
@@ -1059,10 +1251,13 @@ async function handleCompress(env, args, exec) {
     // non-block-covered messages as the visible feed, so default behavior is
     // preserved. Any 'Excluded N protected message(s)' warning is surfaced.
   });
-  if (applied.result.errors.length > 0) {
+  if (applied.result.errors.length > 0 && applied.result.blocksCreated === 0) {
     return { text: `compress failed: ${applied.result.errors.join("; ")}` };
   }
   env.store.set(session, applied.state);
+  if (applied.result.blocksCreated > 0) {
+    env.compressCallIdsToHide?.add(exec.callId);
+  }
   const previousIds = new Set(turn.state.blocks.map((block) => block.blockId));
   const newBlocks = applied.state.blocks.filter((block) => !previousIds.has(block.blockId));
   const blockByRangeKey = new Map(newBlocks.map((block) => [`${block.startRef}::${block.endRef}`, block]));
@@ -1125,8 +1320,9 @@ async function handleCompress(env, args, exec) {
   }
   const summaryLine = `Compressed ${applied.result.blocksCreated} block(s), ~${applied.result.tokensCompressed} tokens reclaimed.`;
   const totalSkipped = skippedRanges + alreadyCompressedNotes.length;
-  const warningLines = [...freeWarnings.map((warning) => `  ${warning}`), ...alreadyCompressedNotes, ...lines];
-  const footer = totalSkipped > 0 ? `  (${totalSkipped} range(s) skipped \u2014 see warnings above)` : "";
+  const failedLines = applied.result.errors.map((error) => `  ${error}`);
+  const warningLines = [...freeWarnings.map((warning) => `  ${warning}`), ...failedLines, ...alreadyCompressedNotes, ...lines];
+  const footer = totalSkipped > 0 ? `  (${totalSkipped} range(s) skipped or failed \u2014 see above)` : "";
   return { text: `${summaryLine}
 ${[...warningLines, footer].filter((line) => line !== "").join("\n")}` };
 }
@@ -1360,6 +1556,8 @@ var AcpCompactionEngine = class extends CompactionEngine {
   /** Resolved prompt templates (validated at construction — fail-fast on template typos). */
   prompts;
   lastNudgeTurn = /* @__PURE__ */ new Map();
+  /** Successful compress call ids awaiting their tool/result so the pair can be hidden. */
+  compressCallIdsToHide = /* @__PURE__ */ new Set();
   /** Per provider/model route the resolved window (probe failures cached too). */
   windowCache = /* @__PURE__ */ new Map();
   constructor(ctx, config = {}) {
@@ -1379,7 +1577,8 @@ var AcpCompactionEngine = class extends CompactionEngine {
       nudgeEmergencyThresholdPct: this.config.nudgeEmergencyThresholdPct,
       coreOverrides: this.config.coreOverrides,
       windowFor: (agent) => this.windowFor(agent),
-      prompts: this.prompts
+      prompts: this.prompts,
+      compressCallIdsToHide: this.compressCallIdsToHide
     };
     const tools = ctx.get("tools");
     if (tools !== void 0) {
@@ -1413,16 +1612,27 @@ var AcpCompactionEngine = class extends CompactionEngine {
         if (name === "commands") registerCommand();
       });
     }
-    if (this.config.autoNudge) {
-      ctx.on("agent/pre-step", async (payload, next) => {
-        const decision = await next();
-        if (decision.kind === "reject") return decision;
-        const window = await this.windowFor(payload.agent);
-        const outcome = buildNudge(payload.agent, { ...env, modelContextLimit: window.limit }, this.lastNudgeTurn);
-        if (outcome === null) return decision;
-        return { kind: "enter", messages: [...decision.messages, outcome.message] };
+    ctx.on("session/event", (session, event) => {
+      if (event.type !== "tool/result") return;
+      const message = event.data.message;
+      const block = message.content[0];
+      const callId = block?.toolCallId ?? message.source.callId;
+      if (typeof callId !== "string" || !this.compressCallIdsToHide.has(callId)) return;
+      this.compressCallIdsToHide.delete(callId);
+      deferCompressPairHide(session, callId, event.seq, (error) => {
+        ctx.logger.warn(`billion-context-dsh: hide compress call/result pair failed: ${String(error)}`);
       });
-    }
+    });
+    ctx.on("agent/pre-step", async (payload, next) => {
+      stripOrphanedSurfaceToolMessages(payload.agent.session);
+      if (!this.config.autoNudge) return next();
+      const decision = await next();
+      if (decision.kind === "reject") return decision;
+      const window = await this.windowFor(payload.agent);
+      const outcome = buildNudge(payload.agent, { ...env, modelContextLimit: window.limit }, this.lastNudgeTurn);
+      if (outcome === null) return decision;
+      return { kind: "enter", messages: [...decision.messages, outcome.message] };
+    });
     const systemPrompt = ctx.get("systemPrompt");
     if (systemPrompt !== void 0) {
       systemPrompt.section({
@@ -1519,6 +1729,7 @@ export {
   expandShadowedSeqs,
   extractEventText,
   findOpenTurn,
+  hideCompressToolPair,
   kernelConfigFor,
   makeTools,
   projectEvent,
@@ -1531,6 +1742,7 @@ export {
   resolveTokenCount,
   runCompactionTransaction,
   shadowedSeqsOf,
+  stripOrphanedSurfaceToolMessages,
   summarySeqOfKernelBlock,
   surfaceEventsOf,
   windowSourceLabel