opencode-acp 1.17.0-pr.385.132 → 1.17.0-pr.386.133

package/README.md

@@ -581,6 +581,14 @@ Full release history moved to [CHANGELOG.md](./CHANGELOG.md).
 
 ---
 
+## Community
+
+Discussion, help, and updates on QQ — one group covers all three projects (`billion-context`, `billion-context-pi`, `opencode-acp`):
+
+**QQ Group: 1056132097**
+
+---
+
 ## License
 
 AGPL-3.0-or-later -- This project is a fork of [@tarquinen/opencode-dcp](https://github.com/Tarquinen/opencode-dynamic-context-pruning). Original copyright belongs to the original author. Modifications and bug fixes by ranxianglei.

package/README.zh-CN.md

@@ -531,6 +531,14 @@ ACP 是 DCP 的直接替代品。迁移步骤：
 
 ---
 
+## 社区
+
+交流、求助与更新都在 QQ——同一个群覆盖三个项目(`billion-context`、`billion-context-pi`、`opencode-acp`):
+
+**QQ 群:1056132097**
+
+---
+
 ## 许可证
 
 AGPL-3.0-or-later — 本项目是 [@tarquinen/opencode-dcp](https://github.com/Tarquinen/opencode-dynamic-context-pruning) 的分支。原始版权归原始作者所有。修改和错误修复由 ranxianglei 完成。

package/dist/index.js

@@ -2442,9 +2442,6 @@ function countMessageCharacters(msg) {
   }
   return total;
 }
-function estimateAllMessageTokensFast(msg) {
-  return Math.round(countMessageCharacters(msg) / 4);
-}
 
 // lib/prompts/extensions/tool.ts
 var RANGE_FORMAT_EXTENSION = `
@@ -2494,9 +2491,6 @@ var isMessageCompacted = (state, msg) => {
   }
   return false;
 };
-function bumpPruneStructureVersion(messagesState) {
-  messagesState.structureVersion = (messagesState.structureVersion ?? 0) + 1;
-}
 function serializePruneMessagesState(messagesState) {
   return {
     byMessageId: Object.fromEntries(messagesState.byMessageId),
@@ -2814,13 +2808,9 @@ async function writePersistedSessionState(sessionId, state, logger, storageDir)
     totalTokensSaved: state.stats.totalPruneTokens
   });
 }
-var saveQueues = /* @__PURE__ */ new Map();
-function saveQueueKey(sessionId, storageDir) {
-  return `${sessionId}\0${storageDir ?? ""}`;
-}
-function saveSessionState(sessionState, logger, sessionName) {
+async function saveSessionState(sessionState, logger, sessionName) {
   if (!sessionState.sessionId) {
-    return Promise.resolve();
+    return;
   }
   const state = {
     sessionName,
@@ -2851,53 +2841,7 @@ function saveSessionState(sessionState, logger, sessionName) {
     modelProviderID: sessionState.modelProviderID,
     modelID: sessionState.modelID
   };
-  const key = saveQueueKey(sessionState.sessionId, sessionState.storageDir);
-  let queue = saveQueues.get(key);
-  if (!queue) {
-    queue = { pending: [], waiters: [], draining: false };
-    saveQueues.set(key, queue);
-  }
-  const promise = new Promise((resolve2, reject) => {
-    queue.waiters.push({ resolve: resolve2, reject });
-  });
-  queue.pending.push({
-    sessionId: sessionState.sessionId,
-    state,
-    storageDir: sessionState.storageDir,
-    logger
-  });
-  if (!queue.draining) {
-    queue.draining = true;
-    setImmediate(() => drainSaveQueue(key));
-  }
-  return promise;
-}
-function drainSaveQueue(key) {
-  const queue = saveQueues.get(key);
-  if (!queue || queue.pending.length === 0) {
-    if (queue) {
-      queue.draining = false;
-      if (queue.waiters.length === 0) saveQueues.delete(key);
-    }
-    return;
-  }
-  const batch = queue.pending.splice(0, queue.pending.length);
-  const waiters = queue.waiters.splice(0, batch.length);
-  const latest = batch[batch.length - 1];
-  writePersistedSessionState(latest.sessionId, latest.state, latest.logger, latest.storageDir).then(() => {
-    for (const waiter of waiters) waiter.resolve();
-  }).catch((err) => {
-    for (const waiter of waiters) waiter.reject(err);
-  }).finally(() => {
-    const q = saveQueues.get(key);
-    if (!q) return;
-    if (q.pending.length > 0) {
-      drainSaveQueue(key);
-    } else {
-      q.draining = false;
-      if (q.waiters.length === 0) saveQueues.delete(key);
-    }
-  });
+  await writePersistedSessionState(sessionState.sessionId, state, logger, sessionState.storageDir);
 }
 async function loadSessionState(sessionId, logger, storageDir) {
   try {
@@ -3391,7 +3335,6 @@ function applyCompressionState(state, input, selection, anchorMessageId, blockId
   state.stats.pruneTokenCounter += compressedTokens;
   state.stats.totalPruneTokens += state.stats.pruneTokenCounter;
   state.stats.pruneTokenCounter = 0;
-  bumpPruneStructureVersion(messagesState);
   return {
     compressedTokens,
     messageIds: selection.messageIds,
@@ -3505,17 +3448,15 @@ function buildSearchContext(state, rawMessages) {
     }
     summaryByBlockId.set(blockId, block);
   }
-  const context = {
+  return {
     rawMessages,
     rawMessagesById,
     rawIndexById,
     summaryByBlockId
   };
-  context.boundaryLookup = buildBoundaryLookup(context, state);
-  return context;
 }
 function resolveBoundaryIds(context, state, startId, endId, logger) {
-  const lookup = context.boundaryLookup ?? (context.boundaryLookup = buildBoundaryLookup(context, state));
+  const lookup = buildBoundaryLookup(context, state);
   const issues = [];
   const parsedStartId = parseBoundaryId(startId);
   const parsedEndId = parseBoundaryId(endId);
@@ -3715,7 +3656,7 @@ function resolveSelection(context, startReference, endReference) {
       messageIds.push(messageId);
     }
     if (!messageTokenById.has(messageId)) {
-      messageTokenById.set(messageId, estimateAllMessageTokensFast(rawMessage));
+      messageTokenById.set(messageId, countAllMessageTokens(rawMessage));
     }
     const parts = Array.isArray(rawMessage.parts) ? rawMessage.parts : [];
     for (const part of parts) {
@@ -7922,23 +7863,6 @@ var syncCompressionBlocks = (state, logger, messages) => {
     return;
   }
   const messageIds = new Set(messages.map((msg) => msg.info.id));
-  const structureVersion = messagesState.structureVersion ?? 0;
-  if (messagesState.lastSyncedStructureVersion === structureVersion) {
-    const activeBlocks = [...messagesState.activeBlockIds].map((id) => messagesState.blocksById.get(id)).filter((b) => b !== void 0).sort(sortBlocksByCreation);
-    const nextAnchorMap = /* @__PURE__ */ new Map();
-    for (const block of activeBlocks) {
-      if (!messageIds.has(block.anchorMessageId)) continue;
-      nextAnchorMap.set(block.anchorMessageId, block.blockId);
-    }
-    const previous = messagesState.activeByAnchorMessageId;
-    if (previous.size !== nextAnchorMap.size || ![...nextAnchorMap.entries()].every(([anchor, id]) => previous.get(anchor) === id)) {
-      previous.clear();
-      for (const [anchor, id] of nextAnchorMap) {
-        previous.set(anchor, id);
-      }
-    }
-    return;
-  }
   const previousActiveBlockIds = new Set(
     Array.from(messagesState.blocksById.values()).filter((block) => block.active).map((block) => block.blockId)
   );
@@ -8005,7 +7929,6 @@ var syncCompressionBlocks = (state, logger, messages) => {
       reactivatedCount
     });
   }
-  messagesState.lastSyncedStructureVersion = structureVersion;
 };
 
 // lib/host-permissions.ts
@@ -8259,23 +8182,20 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
     state.nudges.lastPerMessageNudgeTokens = currentTokens;
     baselineReEstablished = true;
   }
-  const tierUsageEarly = getTierTokenUsage(state);
-  const tierTriggerPossible = !!suffixMessage && (tierUsageEarly.tier1Tokens >= nudgeGrowthTokens || tierUsageEarly.tier2Tokens >= nudgeGrowthTokens);
-  const needsNudgeAnalysis = nudgeAllowed || emergencyOverride || tierTriggerPossible;
-  const composition = needsNudgeAnalysis ? estimateContextComposition(
+  const composition = estimateContextComposition(
     messages,
     state,
     config.compress.protectedTools,
     config.protectedFilePatterns
-  ) : null;
-  const protectedRefs = needsNudgeAnalysis ? computeProtectedRefs(messages, state, config.compress) : /* @__PURE__ */ new Set();
-  const contextRanges = needsNudgeAnalysis ? buildCompressibleRanges(
+  );
+  const protectedRefs = computeProtectedRefs(messages, state, config.compress);
+  const contextRanges = buildCompressibleRanges(
     messages,
     state,
     config.compress.protectedTools,
     config.protectedFilePatterns,
     protectedRefs
-  ) : { compressible: [], protected: [] };
+  );
   const unprotectedCompressible = excludeProtectedRanges(contextRanges.compressible, protectedRefs);
   const recommendedRanges = filterRecommendedRanges(
     unprotectedCompressible,
@@ -8300,7 +8220,7 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
     baselineReEstablished = true;
   }
   if (suffixMessage && !shouldInject) {
-    const tierUsage = tierUsageEarly;
+    const tierUsage = getTierTokenUsage(state);
     const tierChecks = [
       { triggerTier: 2, targetTier: 1, tokens: tierUsage.tier1Tokens, lastNudge: state.nudges.lastTier2NudgeTokens },
       { triggerTier: 3, targetTier: 2, tokens: tierUsage.tier2Tokens, lastNudge: state.nudges.lastTier3NudgeTokens }
@@ -8427,7 +8347,7 @@ ${rules}`;
   }
   let tipsText = null;
   if (shouldInject) {
-    if (suffixMessage && composition !== null && composition.total > 0) {
+    if (suffixMessage && composition.total > 0) {
       const fmt = (n) => n >= 1e3 ? `${(n / 1e3).toFixed(1)}K` : String(n);
       const pct2 = (n) => n > 0 ? Math.max(1, Math.round(n / composition.total * 100)) : 0;
       const growth = currentTokens !== void 0 && (state.nudges.lastNudgeShownTokens ?? state.nudges.lastPerMessageNudgeTokens) !== void 0 ? currentTokens - (state.nudges.lastNudgeShownTokens ?? state.nudges.lastPerMessageNudgeTokens) : 0;
@@ -8802,9 +8722,6 @@ function deactivateCompressionTarget(messagesState, target, options) {
       }
     }
   }
-  if (target.blocks.length > 0) {
-    bumpPruneStructureVersion(messagesState);
-  }
 }
 function computeRestoredMessages(messagesState, activeMessagesBefore) {
   let restoredMessageCount = 0;
@@ -9186,29 +9103,21 @@ function rewriteCompressInput(part, liveKeys) {
   };
 }
 function hideConsumedCompressCalls(state, messages) {
-  const messagesState = state.prune.messages;
-  const version = messagesState.structureVersion ?? 0;
-  let cached = messagesState.hideConsumedIndex;
-  if (!cached || cached.version !== version) {
-    const allBlockCallIds2 = /* @__PURE__ */ new Set();
-    const liveRangeKeysByCallId2 = /* @__PURE__ */ new Map();
-    const activeCallIds2 = /* @__PURE__ */ new Set();
-    for (const block of messagesState.blocksById.values()) {
-      if (!block.compressCallId) continue;
-      allBlockCallIds2.add(block.compressCallId);
-      if (!isLiveBlock(block)) continue;
-      activeCallIds2.add(block.compressCallId);
-      let keys = liveRangeKeysByCallId2.get(block.compressCallId);
-      if (!keys) {
-        keys = /* @__PURE__ */ new Set();
-        liveRangeKeysByCallId2.set(block.compressCallId, keys);
-      }
-      keys.add(rangeKey(block.startId, block.endId));
-    }
-    cached = { version, allBlockCallIds: allBlockCallIds2, liveRangeKeysByCallId: liveRangeKeysByCallId2, activeCallIds: activeCallIds2 };
-    messagesState.hideConsumedIndex = cached;
-  }
-  const { allBlockCallIds, liveRangeKeysByCallId, activeCallIds } = cached;
+  const allBlockCallIds = /* @__PURE__ */ new Set();
+  const liveRangeKeysByCallId = /* @__PURE__ */ new Map();
+  const activeCallIds = /* @__PURE__ */ new Set();
+  for (const block of state.prune.messages.blocksById.values()) {
+    if (!block.compressCallId) continue;
+    allBlockCallIds.add(block.compressCallId);
+    if (!isLiveBlock(block)) continue;
+    activeCallIds.add(block.compressCallId);
+    let keys = liveRangeKeysByCallId.get(block.compressCallId);
+    if (!keys) {
+      keys = /* @__PURE__ */ new Set();
+      liveRangeKeysByCallId.set(block.compressCallId, keys);
+    }
+    keys.add(rangeKey(block.startId, block.endId));
+  }
   const lastOrphanedCallIds = [];
   for (let i = messages.length - 1; i >= 0 && lastOrphanedCallIds.length < KEEP_LAST_ORPHANED; i--) {
     const parts = Array.isArray(messages[i]?.parts) ? messages[i].parts : [];
@@ -9782,7 +9691,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
 import { join as join4 } from "path";
 import { existsSync as existsSync4 } from "fs";
 import { homedir as homedir3 } from "os";
-var LOG_VERSION = true ? "1.17.0-pr.385.132" : "dev";
+var LOG_VERSION = true ? "1.17.0-pr.386.133" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -11782,7 +11691,6 @@ function mergeMarkedBlocks(state, markedIds, maxMergedLength) {
     0
   );
   const savedTokens = Math.max(0, sourceTokens - newSummaryTokens);
-  bumpPruneStructureVersion(messagesState);
   return { mergedCount: sourceBlocks.length, savedTokens };
 }
 function runBatchCleanup(state, config, logger, messages) {
@@ -12478,7 +12386,7 @@ var server = (async (ctx) => {
   }
   const logger = new Logger(config.debug, config.debug ? "debug" : config.logLevel);
   logger.info("ACP plugin initialized", {
-    version: true ? "1.17.0-pr.385.132" : "dev",
+    version: true ? "1.17.0-pr.386.133" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,