@infituit/opencode-acp 2.0.0-alpha.4 → 2.0.0-alpha.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (36) hide show
  1. package/README.md +4 -0
  2. package/dist/{token-utils.d.ts → context-usage.d.ts} +1 -2
  3. package/dist/context-usage.d.ts.map +1 -0
  4. package/dist/gc/merge.d.ts +1 -1
  5. package/dist/gc/merge.d.ts.map +1 -1
  6. package/dist/index.js +47 -100
  7. package/dist/index.js.map +1 -1
  8. package/dist/state/index.d.ts +0 -1
  9. package/dist/state/index.d.ts.map +1 -1
  10. package/dist/state/state.d.ts.map +1 -1
  11. package/dist/state/types.d.ts +0 -10
  12. package/dist/state/types.d.ts.map +1 -1
  13. package/dist/state/utils.d.ts.map +1 -1
  14. package/dist/{hooks → v2/hooks}/command.d.ts +4 -4
  15. package/dist/v2/hooks/command.d.ts.map +1 -0
  16. package/dist/{hooks → v2/hooks}/event.d.ts +2 -2
  17. package/dist/v2/hooks/event.d.ts.map +1 -0
  18. package/dist/v2/hooks/messages.d.ts +10 -0
  19. package/dist/v2/hooks/messages.d.ts.map +1 -0
  20. package/dist/{hooks → v2/hooks}/system.d.ts +4 -4
  21. package/dist/v2/hooks/system.d.ts.map +1 -0
  22. package/dist/{hooks → v2/hooks}/text.d.ts +2 -2
  23. package/dist/v2/hooks/text.d.ts.map +1 -0
  24. package/dist/v2/hooks.d.ts.map +1 -0
  25. package/package.json +2 -2
  26. package/dist/hooks/command.d.ts.map +0 -1
  27. package/dist/hooks/event.d.ts.map +0 -1
  28. package/dist/hooks/messages.d.ts +0 -10
  29. package/dist/hooks/messages.d.ts.map +0 -1
  30. package/dist/hooks/system.d.ts.map +0 -1
  31. package/dist/hooks/text.d.ts.map +0 -1
  32. package/dist/hooks.d.ts.map +0 -1
  33. package/dist/state/tool-cache.d.ts +0 -13
  34. package/dist/state/tool-cache.d.ts.map +0 -1
  35. package/dist/token-utils.d.ts.map +0 -1
  36. /package/dist/{hooks.d.ts → v2/hooks.d.ts} +0 -0
package/README.md CHANGED
@@ -199,6 +199,10 @@ ACP 暴露六个可编辑的 prompt:
199
199
 
200
200
  **维护原则:不继承历史债务。** 不会为了维持历史兼容性而保留已知问题或延续不合理设计;必要时接受不兼容变更。
201
201
 
202
+ ## 开发与维护
203
+
204
+ - [依赖管理政策](./docs/developer/dependency-management.md):人工升级、Dependabot 边界、验证与回滚要求。
205
+
202
206
  ## 许可证
203
207
 
204
208
  本项目采用 AGPL-3.0-or-later 许可证,见 [LICENSE](./LICENSE)。历史作者及第三方组件的版权和许可声明予以保留,见 [LICENSE](./LICENSE) 和 [NOTICE](./NOTICE)。
@@ -27,7 +27,6 @@ export declare const COMPACTED_TOOL_OUTPUT_PLACEHOLDER = "[Old tool result conte
27
27
  export declare function extractCompletedToolOutput(part: any): string | undefined;
28
28
  export declare function extractToolContent(part: any): string[];
29
29
  export declare function countToolTokens(part: any): number;
30
- export declare function getTotalToolTokens(state: SessionState, toolIds: string[]): number;
31
30
  export declare function countMessageTextTokens(msg: WithParts): number;
32
31
  export declare function countAllMessageTokens(msg: WithParts): number;
33
32
  export declare function countMessageCharacters(msg: WithParts): number;
@@ -39,4 +38,4 @@ export declare function countMessageCharacters(msg: WithParts): number;
39
38
  * draft ranges; these counters feed heuristic stats/gates, not billing.
40
39
  */
41
40
  export declare function estimateAllMessageTokensFast(msg: WithParts): number;
42
- //# sourceMappingURL=token-utils.d.ts.map
41
+ //# sourceMappingURL=context-usage.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"context-usage.d.ts","sourceRoot":"","sources":["../src/context-usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAEjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AASjC,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CA6CvF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CA2BxE;AAED,wBAAgB,gBAAgB,CAC5B,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,SAAS,EAAE,EACrB,MAAM,EAAE,MAAM,GACf;IACC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;CAC9B,CAkBA;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAchD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAG3D;AAED,eAAO,MAAM,iCAAiC,sCAAsC,CAAA;AAMpF,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS,CAcxE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,EAAE,CAmBtD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CAGjD;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,CAU7D;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,CAY5D;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,CAa7D;AAED;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,CAEnE"}
@@ -13,5 +13,5 @@ export interface BatchCleanupResult {
13
13
  nudgeText?: string;
14
14
  }
15
15
  export declare function mergeMarkedBlocks(state: SessionState, markedIds: number[], maxMergedLength: number): MergeMarkedResult;
16
- export declare function runBatchCleanup(state: SessionState, config: PluginConfig, logger: Logger, messages: WithParts[]): BatchCleanupResult;
16
+ export declare function runBatchCleanup(state: SessionState, config: PluginConfig, logger: Logger, messages: WithParts[], prePruneTokens?: number): BatchCleanupResult;
17
17
  //# sourceMappingURL=merge.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/gc/merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAWvC,MAAM,WAAW,iBAAiB;IAC9B,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACnB,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAA;IAClC,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB;AA+CD,wBAAgB,iBAAiB,CAC7B,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM,EAAE,EACnB,eAAe,EAAE,MAAM,GACxB,iBAAiB,CAoHnB;AAED,wBAAgB,eAAe,CAC3B,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,SAAS,EAAE,GACtB,kBAAkB,CAkDpB"}
1
+ {"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/gc/merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAWvC,MAAM,WAAW,iBAAiB;IAC9B,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACnB,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAA;IAClC,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB;AA+CD,wBAAgB,iBAAiB,CAC7B,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM,EAAE,EACnB,eAAe,EAAE,MAAM,GACxB,iBAAiB,CAoHnB;AAED,wBAAgB,eAAe,CAC3B,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,SAAS,EAAE,EACrB,cAAc,CAAC,EAAE,MAAM,GACxB,kBAAkB,CAkDpB"}
package/dist/index.js CHANGED
@@ -2209,7 +2209,7 @@ function resolveToolContext(factoryCtx, sessionID) {
2209
2209
  };
2210
2210
  }
2211
2211
 
2212
- // src/token-utils.ts
2212
+ // src/context-usage.ts
2213
2213
  import * as _anthropicTokenizer from "@anthropic-ai/tokenizer";
2214
2214
 
2215
2215
  // src/messages/shape.ts
@@ -2353,8 +2353,9 @@ function isProtectedUserMessage(_config, message) {
2353
2353
  return false;
2354
2354
  }
2355
2355
 
2356
- // src/token-utils.ts
2357
- var anthropicCountTokens = _anthropicTokenizer.countTokens ?? _anthropicTokenizer.default?.countTokens;
2356
+ // src/context-usage.ts
2357
+ var getAnthropicTokenizer = _anthropicTokenizer.getTokenizer ?? _anthropicTokenizer.default?.getTokenizer;
2358
+ var tokenizer;
2358
2359
  function getCurrentTokenUsage(state, messages) {
2359
2360
  for (let i = messages.length - 1; i >= 0; i--) {
2360
2361
  const msg = messages[i];
@@ -2406,7 +2407,7 @@ function estimateSystemPromptTokens(messages) {
2406
2407
  }
2407
2408
  if (firstUserText) break;
2408
2409
  }
2409
- return Math.max(0, firstInput - countTokens2(firstUserText));
2410
+ return Math.max(0, firstInput - countTokens(firstUserText));
2410
2411
  }
2411
2412
  function getCurrentParams(state, messages, logger) {
2412
2413
  const userMsg = getLastUserMessage(messages);
@@ -2426,17 +2427,23 @@ function getCurrentParams(state, messages, logger) {
2426
2427
  const variant = userInfo.model.variant;
2427
2428
  return { providerId, modelId, agent, variant };
2428
2429
  }
2429
- function countTokens2(text) {
2430
+ function countTokens(text) {
2430
2431
  if (!text) return 0;
2431
2432
  try {
2432
- return anthropicCountTokens(text);
2433
+ tokenizer ??= getAnthropicTokenizer();
2434
+ return tokenizer.encode(text.normalize("NFKC"), "all").length;
2433
2435
  } catch {
2436
+ try {
2437
+ tokenizer?.free();
2438
+ } catch {
2439
+ }
2440
+ tokenizer = void 0;
2434
2441
  return Math.round(text.length / 4);
2435
2442
  }
2436
2443
  }
2437
2444
  function estimateTokensBatch(texts) {
2438
2445
  if (texts.length === 0) return 0;
2439
- return countTokens2(texts.join(" "));
2446
+ return countTokens(texts.join(" "));
2440
2447
  }
2441
2448
  var COMPACTED_TOOL_OUTPUT_PLACEHOLDER = "[Old tool result content cleared]";
2442
2449
  function stringifyToolContent(value) {
@@ -2674,7 +2681,7 @@ function loadPruneMessagesState(persisted) {
2674
2681
  deactivatedByUser: block.deactivatedByUser === true,
2675
2682
  deactivatedByUserDeep: block.deactivatedByUserDeep === true ? true : void 0,
2676
2683
  compressedTokens: typeof block.compressedTokens === "number" && Number.isFinite(block.compressedTokens) ? Math.max(0, block.compressedTokens) : 0,
2677
- summaryTokens: typeof block.summaryTokens === "number" && Number.isFinite(block.summaryTokens) ? Math.max(0, block.summaryTokens) : typeof block.summary === "string" ? countTokens2(block.summary) : 0,
2684
+ summaryTokens: typeof block.summaryTokens === "number" && Number.isFinite(block.summaryTokens) ? Math.max(0, block.summaryTokens) : typeof block.summary === "string" ? countTokens(block.summary) : 0,
2678
2685
  durationMs: typeof block.durationMs === "number" && Number.isFinite(block.durationMs) ? Math.max(0, block.durationMs) : 0,
2679
2686
  mode: block.mode === "range" || block.mode === "message" ? block.mode : void 0,
2680
2687
  topic: typeof block.topic === "string" ? block.topic : "",
@@ -2790,7 +2797,6 @@ function getTierTokenUsage(state) {
2790
2797
  return { tier1Tokens, tier2Tokens, tier3Tokens };
2791
2798
  }
2792
2799
  function resetOnCompaction(state) {
2793
- state.toolParameters.clear();
2794
2800
  state.nudges = {
2795
2801
  contextLimitAnchors: /* @__PURE__ */ new Set(),
2796
2802
  turnNudgeAnchors: /* @__PURE__ */ new Set(),
@@ -4957,7 +4963,7 @@ function rebuildRangeInvocation(state, input, searchContext, invocation, protect
4957
4963
  ]);
4958
4964
  const blockId = allocateBlockId(state);
4959
4965
  const storedSummary = wrapCompressedSummary(blockId, plan.entry.summary);
4960
- const summaryTokens = countTokens2(storedSummary);
4966
+ const summaryTokens = countTokens(storedSummary);
4961
4967
  applyCompressionState(
4962
4968
  state,
4963
4969
  {
@@ -5019,7 +5025,7 @@ function rebuildMessageInvocation(state, input, searchContext, invocation, gcCon
5019
5025
  }
5020
5026
  const blockId = allocateBlockId(state);
5021
5027
  const storedSummary = wrapCompressedSummary(blockId, entry.summary);
5022
- const summaryTokens = countTokens2(storedSummary);
5028
+ const summaryTokens = countTokens(storedSummary);
5023
5029
  applyCompressionState(
5024
5030
  state,
5025
5031
  {
@@ -5236,7 +5242,6 @@ function createSessionState() {
5236
5242
  startsByCallId: /* @__PURE__ */ new Map(),
5237
5243
  pendingByCallId: /* @__PURE__ */ new Map()
5238
5244
  },
5239
- toolParameters: /* @__PURE__ */ new Map(),
5240
5245
  toolIdList: [],
5241
5246
  messageIds: {
5242
5247
  byRawId: /* @__PURE__ */ new Map(),
@@ -5282,7 +5287,6 @@ function resetSessionState(state) {
5282
5287
  pruneTokenCounter: 0,
5283
5288
  totalPruneTokens: 0
5284
5289
  };
5285
- state.toolParameters.clear();
5286
5290
  state.toolIdList = [];
5287
5291
  state.messageIds = {
5288
5292
  byRawId: /* @__PURE__ */ new Map(),
@@ -5448,67 +5452,6 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
5448
5452
  await saveSessionState(state, logger);
5449
5453
  }
5450
5454
 
5451
- // src/state/tool-cache.ts
5452
- var MAX_TOOL_CACHE_SIZE = 1e3;
5453
- function syncToolCache(state, config, logger, messages) {
5454
- try {
5455
- logger.info("Syncing tool parameters from OpenCode messages");
5456
- let turnCounter = 0;
5457
- for (const msg of messages) {
5458
- if (isMessageCompacted(state, msg)) {
5459
- continue;
5460
- }
5461
- const parts = Array.isArray(msg.parts) ? msg.parts : [];
5462
- for (const part of parts) {
5463
- if (part.type === "step-start") {
5464
- turnCounter++;
5465
- continue;
5466
- }
5467
- if (part.type !== "tool" || !part.callID) {
5468
- continue;
5469
- }
5470
- if (state.toolParameters.has(part.callID)) {
5471
- continue;
5472
- }
5473
- const contents = extractToolContent(part);
5474
- const rawLength = contents.reduce((sum, s) => sum + (s?.length ?? 0), 0);
5475
- const tokenCount = Math.round(rawLength / 4);
5476
- state.toolParameters.set(part.callID, {
5477
- tool: part.tool,
5478
- parameters: part.state?.input ?? {},
5479
- status: part.state.status,
5480
- error: part.state.status === "error" ? part.state.error : void 0,
5481
- turn: turnCounter,
5482
- tokenCount
5483
- });
5484
- logger.info(
5485
- `Cached tool id: ${part.callID} (turn ${turnCounter}${tokenCount !== void 0 ? `, ${tokenCount} tokens` : ""})`
5486
- );
5487
- }
5488
- }
5489
- logger.info(
5490
- `Synced cache - size: ${state.toolParameters.size}, currentTurn: ${state.currentTurn}`
5491
- );
5492
- trimToolParametersCache(state);
5493
- } catch (error) {
5494
- logger.warn("Failed to sync tool parameters from OpenCode", {
5495
- error: error instanceof Error ? error.message : String(error)
5496
- });
5497
- }
5498
- }
5499
- function trimToolParametersCache(state) {
5500
- if (state.toolParameters.size <= MAX_TOOL_CACHE_SIZE) {
5501
- return;
5502
- }
5503
- const keysToRemove = Array.from(state.toolParameters.keys()).slice(
5504
- 0,
5505
- state.toolParameters.size - MAX_TOOL_CACHE_SIZE
5506
- );
5507
- for (const key of keysToRemove) {
5508
- state.toolParameters.delete(key);
5509
- }
5510
- }
5511
-
5512
5455
  // src/ui/utils.ts
5513
5456
  function formatAge(createdAt2) {
5514
5457
  const elapsed = Date.now() - createdAt2;
@@ -5583,7 +5526,7 @@ function cacheSystemPromptTokens(state, messages) {
5583
5526
  }
5584
5527
  break;
5585
5528
  }
5586
- const estimatedSystemTokens = Math.max(0, firstInputTokens - countTokens2(firstUserText));
5529
+ const estimatedSystemTokens = Math.max(0, firstInputTokens - countTokens(firstUserText));
5587
5530
  state.systemPromptTokens = estimatedSystemTokens > 0 ? estimatedSystemTokens : void 0;
5588
5531
  }
5589
5532
 
@@ -8468,7 +8411,7 @@ function createCompressRangeTool(factoryCtx) {
8468
8411
  );
8469
8412
  preparedPlan.finalSummary = keepResult.summary;
8470
8413
  const storedSummary = wrapCompressedSummary(blockId, preparedPlan.finalSummary);
8471
- const summaryTokens = countTokens2(storedSummary);
8414
+ const summaryTokens = countTokens(storedSummary);
8472
8415
  const applied = applyCompressionState(
8473
8416
  ctx.state,
8474
8417
  {
@@ -11470,7 +11413,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
11470
11413
  import { join as join5 } from "path";
11471
11414
  import { existsSync as existsSync5 } from "fs";
11472
11415
  import { homedir as homedir3 } from "os";
11473
- var LOG_VERSION = true ? "2.0.0-alpha.4" : "dev";
11416
+ var LOG_VERSION = true ? "2.0.0-alpha.6" : "dev";
11474
11417
  var LEVEL_RANK = {
11475
11418
  debug: 10,
11476
11419
  info: 20,
@@ -12403,7 +12346,7 @@ function renderSystemPrompt(prompts, protectedToolsExtension, subagent) {
12403
12346
  return [prompts.system.trim(), ...extensions].filter(Boolean).join("\n\n").replace(/\n([ \t]*\n)+/g, "\n\n").trim();
12404
12347
  }
12405
12348
 
12406
- // src/hooks/system.ts
12349
+ // src/v2/hooks/system.ts
12407
12350
  var INTERNAL_AGENT_SIGNATURES = [
12408
12351
  "You are a title generator",
12409
12352
  "You are a helpful AI assistant tasked with summarizing conversations",
@@ -12526,7 +12469,7 @@ function truncateLargeToolOutputs(state, config, logger, messages) {
12526
12469
  if (content === void 0) continue;
12527
12470
  if (content === "[Old tool result content cleared]") continue;
12528
12471
  if (content.includes(TRUNCATION_MARKER)) continue;
12529
- const tokens = countTokens2(content);
12472
+ const tokens = countTokens(content);
12530
12473
  if (tokens < MIN_OUTPUT_TOKENS) continue;
12531
12474
  candidates.push({ part, content, tokens });
12532
12475
  }
@@ -12547,7 +12490,7 @@ function truncateLargeToolOutputs(state, config, logger, messages) {
12547
12490
 
12548
12491
  ` + suffix;
12549
12492
  part.state.output = truncated;
12550
- savedTokens += tokens - countTokens2(truncated);
12493
+ savedTokens += tokens - countTokens(truncated);
12551
12494
  truncatedCount++;
12552
12495
  }
12553
12496
  if (truncatedCount > 0) {
@@ -12701,7 +12644,7 @@ function enforceContextBudget(state, config, logger, messages) {
12701
12644
  const content = extractCompletedToolOutput(part);
12702
12645
  if (content === void 0) continue;
12703
12646
  if (content === COMPACTED_TOOL_OUTPUT_PLACEHOLDER) continue;
12704
- const tokens = countTokens2(content);
12647
+ const tokens = countTokens(content);
12705
12648
  if (tokens <= 0) continue;
12706
12649
  candidates.push({ part, content, tokens, index: mi });
12707
12650
  }
@@ -12723,20 +12666,20 @@ function enforceContextBudget(state, config, logger, messages) {
12723
12666
  ` + suffix;
12724
12667
  if (truncated.length >= c.content.length) continue;
12725
12668
  c.part.state.output = truncated;
12726
- saved += c.tokens - countTokens2(truncated);
12669
+ saved += c.tokens - countTokens(truncated);
12727
12670
  truncatedCount++;
12728
12671
  }
12729
12672
  if (estimatedTokens - saved > budget) {
12730
12673
  const clearable = candidates.filter((c) => {
12731
12674
  const out = extractCompletedToolOutput(c.part);
12732
- return out !== void 0 && out !== COMPACTED_TOOL_OUTPUT_PLACEHOLDER && countTokens2(out) > MIN_CLEAR_TOKENS;
12675
+ return out !== void 0 && out !== COMPACTED_TOOL_OUTPUT_PLACEHOLDER && countTokens(out) > MIN_CLEAR_TOKENS;
12733
12676
  }).sort((a, b) => a.index - b.index);
12734
12677
  for (const c of clearable) {
12735
12678
  if (estimatedTokens - saved <= budget) break;
12736
12679
  const current = extractCompletedToolOutput(c.part);
12737
12680
  if (current === void 0 || current === COMPACTED_TOOL_OUTPUT_PLACEHOLDER) continue;
12738
12681
  c.part.state.output = COMPACTED_TOOL_OUTPUT_PLACEHOLDER;
12739
- saved += countTokens2(current) - countTokens2(COMPACTED_TOOL_OUTPUT_PLACEHOLDER);
12682
+ saved += countTokens(current) - countTokens(COMPACTED_TOOL_OUTPUT_PLACEHOLDER);
12740
12683
  clearedCount++;
12741
12684
  }
12742
12685
  }
@@ -13147,7 +13090,7 @@ function mergeMarkedBlocks(state, markedIds, maxMergedLength) {
13147
13090
  const mergedRaw = bodies.join("\n---\n");
13148
13091
  const mergedBody = truncateMergedSummary(mergedRaw, maxMergedLength);
13149
13092
  const newSummary = wrapCompressedSummary(newBlockId, mergedBody);
13150
- const newSummaryTokens = countTokens2(newSummary);
13093
+ const newSummaryTokens = countTokens(newSummary);
13151
13094
  const oldest = sourceBlocks[0];
13152
13095
  const newest = sourceBlocks[sourceBlocks.length - 1];
13153
13096
  const effectiveMessageIds = /* @__PURE__ */ new Set();
@@ -13225,7 +13168,7 @@ function mergeMarkedBlocks(state, markedIds, maxMergedLength) {
13225
13168
  bumpPruneStructureVersion(messagesState);
13226
13169
  return { mergedCount: sourceBlocks.length, savedTokens };
13227
13170
  }
13228
- function runBatchCleanup(state, config, logger, messages) {
13171
+ function runBatchCleanup(state, config, logger, messages, prePruneTokens) {
13229
13172
  const noop = {
13230
13173
  tier: 0,
13231
13174
  action: "none",
@@ -13236,7 +13179,7 @@ function runBatchCleanup(state, config, logger, messages) {
13236
13179
  if (!effective) {
13237
13180
  return noop;
13238
13181
  }
13239
- const currentTokens = getCurrentTokenUsage(state, messages);
13182
+ const currentTokens = prePruneTokens ?? getCurrentTokenUsage(state, messages);
13240
13183
  if (currentTokens < effective.limit) {
13241
13184
  return noop;
13242
13185
  }
@@ -13265,7 +13208,7 @@ function runBatchCleanup(state, config, logger, messages) {
13265
13208
  };
13266
13209
  }
13267
13210
 
13268
- // src/hooks/messages.ts
13211
+ // src/v2/hooks/messages.ts
13269
13212
  var INTERNAL_AGENT_NAMES = /* @__PURE__ */ new Set(["title", "summary", "compaction"]);
13270
13213
  function isInternalAgentRequest(messages) {
13271
13214
  const lastUserMessage = getLastUserMessage(messages);
@@ -13425,17 +13368,21 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
13425
13368
  saveSessionState(state, logger).catch(() => {
13426
13369
  });
13427
13370
  }
13428
- checkpoint("syncToolCache");
13429
- syncToolCache(state, config, logger, output.messages);
13430
- checkpoint("batchCleanup");
13371
+ checkpoint("prePruneTokens");
13431
13372
  buildToolIdList(state, output.messages);
13432
- const batchResult = runBatchCleanup(state, config, logger, output.messages);
13373
+ const prePruneTokens = getCurrentTokenUsage(state, output.messages);
13374
+ checkpoint("batchCleanup");
13375
+ const batchResult = runBatchCleanup(
13376
+ state,
13377
+ config,
13378
+ logger,
13379
+ output.messages,
13380
+ prePruneTokens
13381
+ );
13433
13382
  if (batchResult.mergedCount > 0) {
13434
13383
  saveSessionState(state, logger).catch(() => {
13435
13384
  });
13436
13385
  }
13437
- checkpoint("prePruneTokens");
13438
- const prePruneTokens = getCurrentTokenUsage(state, output.messages);
13439
13386
  checkpoint("prune");
13440
13387
  const candidateMessages = config.compress.candidates === true ? output.messages.slice() : void 0;
13441
13388
  prune(state, logger, config, output.messages);
@@ -13648,10 +13595,10 @@ function analyzeTokens(state, messages) {
13648
13595
  breakdown.toolsInContextCount = toolsInContextCount;
13649
13596
  breakdown.prunedToolCount = prunedToolIds.size;
13650
13597
  breakdown.prunedMessageCount = prunedMessageCount;
13651
- const firstUserTokens = countTokens2(firstUserText);
13652
- breakdown.user = countTokens2(userTextParts.join("\n"));
13653
- const toolInputTokens = countTokens2(toolInputParts.join("\n"));
13654
- const toolOutputTokens = countTokens2(toolOutputParts.join("\n"));
13598
+ const firstUserTokens = countTokens(firstUserText);
13599
+ breakdown.user = countTokens(userTextParts.join("\n"));
13600
+ const toolInputTokens = countTokens(toolInputParts.join("\n"));
13601
+ const toolOutputTokens = countTokens(toolOutputParts.join("\n"));
13655
13602
  if (firstAssistant) {
13656
13603
  const firstInput = (firstAssistant.tokens?.input || 0) + (firstAssistant.tokens?.cache?.read || 0) + (firstAssistant.tokens?.cache?.write || 0);
13657
13604
  breakdown.system = Math.max(0, firstInput - firstUserTokens);
@@ -14047,7 +13994,7 @@ async function sendExportNotice(client, sessionId, ctx, text) {
14047
13994
  await sendIgnoredMessage(client, sessionId, text, {}, ctx.logger);
14048
13995
  }
14049
13996
 
14050
- // src/hooks/command.ts
13997
+ // src/v2/hooks/command.ts
14051
13998
  function buildHelpText() {
14052
13999
  return [
14053
14000
  "[ACP] Available commands:",
@@ -14098,7 +14045,7 @@ function createCommandExecuteHandler(client, registry4, logger, config, workingD
14098
14045
  };
14099
14046
  }
14100
14047
 
14101
- // src/hooks/event.ts
14048
+ // src/v2/hooks/event.ts
14102
14049
  function createEventHandler(registry4, logger) {
14103
14050
  return async (input) => {
14104
14051
  if (input.event?.type === "session.idle" || input.event?.type === "session.deleted") {