@infituit/opencode-acp 2.0.0-alpha.5 → 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.
@@ -1 +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;AAMjC,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,CAOhD;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"}
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
@@ -2354,7 +2354,8 @@ function isProtectedUserMessage(_config, message) {
2354
2354
  }
2355
2355
 
2356
2356
  // src/context-usage.ts
2357
- var anthropicCountTokens = _anthropicTokenizer.countTokens ?? _anthropicTokenizer.default?.countTokens;
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 : "",
@@ -4956,7 +4963,7 @@ function rebuildRangeInvocation(state, input, searchContext, invocation, protect
4956
4963
  ]);
4957
4964
  const blockId = allocateBlockId(state);
4958
4965
  const storedSummary = wrapCompressedSummary(blockId, plan.entry.summary);
4959
- const summaryTokens = countTokens2(storedSummary);
4966
+ const summaryTokens = countTokens(storedSummary);
4960
4967
  applyCompressionState(
4961
4968
  state,
4962
4969
  {
@@ -5018,7 +5025,7 @@ function rebuildMessageInvocation(state, input, searchContext, invocation, gcCon
5018
5025
  }
5019
5026
  const blockId = allocateBlockId(state);
5020
5027
  const storedSummary = wrapCompressedSummary(blockId, entry.summary);
5021
- const summaryTokens = countTokens2(storedSummary);
5028
+ const summaryTokens = countTokens(storedSummary);
5022
5029
  applyCompressionState(
5023
5030
  state,
5024
5031
  {
@@ -5519,7 +5526,7 @@ function cacheSystemPromptTokens(state, messages) {
5519
5526
  }
5520
5527
  break;
5521
5528
  }
5522
- const estimatedSystemTokens = Math.max(0, firstInputTokens - countTokens2(firstUserText));
5529
+ const estimatedSystemTokens = Math.max(0, firstInputTokens - countTokens(firstUserText));
5523
5530
  state.systemPromptTokens = estimatedSystemTokens > 0 ? estimatedSystemTokens : void 0;
5524
5531
  }
5525
5532
 
@@ -8404,7 +8411,7 @@ function createCompressRangeTool(factoryCtx) {
8404
8411
  );
8405
8412
  preparedPlan.finalSummary = keepResult.summary;
8406
8413
  const storedSummary = wrapCompressedSummary(blockId, preparedPlan.finalSummary);
8407
- const summaryTokens = countTokens2(storedSummary);
8414
+ const summaryTokens = countTokens(storedSummary);
8408
8415
  const applied = applyCompressionState(
8409
8416
  ctx.state,
8410
8417
  {
@@ -11406,7 +11413,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
11406
11413
  import { join as join5 } from "path";
11407
11414
  import { existsSync as existsSync5 } from "fs";
11408
11415
  import { homedir as homedir3 } from "os";
11409
- var LOG_VERSION = true ? "2.0.0-alpha.5" : "dev";
11416
+ var LOG_VERSION = true ? "2.0.0-alpha.6" : "dev";
11410
11417
  var LEVEL_RANK = {
11411
11418
  debug: 10,
11412
11419
  info: 20,
@@ -12462,7 +12469,7 @@ function truncateLargeToolOutputs(state, config, logger, messages) {
12462
12469
  if (content === void 0) continue;
12463
12470
  if (content === "[Old tool result content cleared]") continue;
12464
12471
  if (content.includes(TRUNCATION_MARKER)) continue;
12465
- const tokens = countTokens2(content);
12472
+ const tokens = countTokens(content);
12466
12473
  if (tokens < MIN_OUTPUT_TOKENS) continue;
12467
12474
  candidates.push({ part, content, tokens });
12468
12475
  }
@@ -12483,7 +12490,7 @@ function truncateLargeToolOutputs(state, config, logger, messages) {
12483
12490
 
12484
12491
  ` + suffix;
12485
12492
  part.state.output = truncated;
12486
- savedTokens += tokens - countTokens2(truncated);
12493
+ savedTokens += tokens - countTokens(truncated);
12487
12494
  truncatedCount++;
12488
12495
  }
12489
12496
  if (truncatedCount > 0) {
@@ -12637,7 +12644,7 @@ function enforceContextBudget(state, config, logger, messages) {
12637
12644
  const content = extractCompletedToolOutput(part);
12638
12645
  if (content === void 0) continue;
12639
12646
  if (content === COMPACTED_TOOL_OUTPUT_PLACEHOLDER) continue;
12640
- const tokens = countTokens2(content);
12647
+ const tokens = countTokens(content);
12641
12648
  if (tokens <= 0) continue;
12642
12649
  candidates.push({ part, content, tokens, index: mi });
12643
12650
  }
@@ -12659,20 +12666,20 @@ function enforceContextBudget(state, config, logger, messages) {
12659
12666
  ` + suffix;
12660
12667
  if (truncated.length >= c.content.length) continue;
12661
12668
  c.part.state.output = truncated;
12662
- saved += c.tokens - countTokens2(truncated);
12669
+ saved += c.tokens - countTokens(truncated);
12663
12670
  truncatedCount++;
12664
12671
  }
12665
12672
  if (estimatedTokens - saved > budget) {
12666
12673
  const clearable = candidates.filter((c) => {
12667
12674
  const out = extractCompletedToolOutput(c.part);
12668
- 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;
12669
12676
  }).sort((a, b) => a.index - b.index);
12670
12677
  for (const c of clearable) {
12671
12678
  if (estimatedTokens - saved <= budget) break;
12672
12679
  const current = extractCompletedToolOutput(c.part);
12673
12680
  if (current === void 0 || current === COMPACTED_TOOL_OUTPUT_PLACEHOLDER) continue;
12674
12681
  c.part.state.output = COMPACTED_TOOL_OUTPUT_PLACEHOLDER;
12675
- saved += countTokens2(current) - countTokens2(COMPACTED_TOOL_OUTPUT_PLACEHOLDER);
12682
+ saved += countTokens(current) - countTokens(COMPACTED_TOOL_OUTPUT_PLACEHOLDER);
12676
12683
  clearedCount++;
12677
12684
  }
12678
12685
  }
@@ -13083,7 +13090,7 @@ function mergeMarkedBlocks(state, markedIds, maxMergedLength) {
13083
13090
  const mergedRaw = bodies.join("\n---\n");
13084
13091
  const mergedBody = truncateMergedSummary(mergedRaw, maxMergedLength);
13085
13092
  const newSummary = wrapCompressedSummary(newBlockId, mergedBody);
13086
- const newSummaryTokens = countTokens2(newSummary);
13093
+ const newSummaryTokens = countTokens(newSummary);
13087
13094
  const oldest = sourceBlocks[0];
13088
13095
  const newest = sourceBlocks[sourceBlocks.length - 1];
13089
13096
  const effectiveMessageIds = /* @__PURE__ */ new Set();
@@ -13161,7 +13168,7 @@ function mergeMarkedBlocks(state, markedIds, maxMergedLength) {
13161
13168
  bumpPruneStructureVersion(messagesState);
13162
13169
  return { mergedCount: sourceBlocks.length, savedTokens };
13163
13170
  }
13164
- function runBatchCleanup(state, config, logger, messages) {
13171
+ function runBatchCleanup(state, config, logger, messages, prePruneTokens) {
13165
13172
  const noop = {
13166
13173
  tier: 0,
13167
13174
  action: "none",
@@ -13172,7 +13179,7 @@ function runBatchCleanup(state, config, logger, messages) {
13172
13179
  if (!effective) {
13173
13180
  return noop;
13174
13181
  }
13175
- const currentTokens = getCurrentTokenUsage(state, messages);
13182
+ const currentTokens = prePruneTokens ?? getCurrentTokenUsage(state, messages);
13176
13183
  if (currentTokens < effective.limit) {
13177
13184
  return noop;
13178
13185
  }
@@ -13361,15 +13368,21 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
13361
13368
  saveSessionState(state, logger).catch(() => {
13362
13369
  });
13363
13370
  }
13364
- checkpoint("batchCleanup");
13371
+ checkpoint("prePruneTokens");
13365
13372
  buildToolIdList(state, output.messages);
13366
- 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
+ );
13367
13382
  if (batchResult.mergedCount > 0) {
13368
13383
  saveSessionState(state, logger).catch(() => {
13369
13384
  });
13370
13385
  }
13371
- checkpoint("prePruneTokens");
13372
- const prePruneTokens = getCurrentTokenUsage(state, output.messages);
13373
13386
  checkpoint("prune");
13374
13387
  const candidateMessages = config.compress.candidates === true ? output.messages.slice() : void 0;
13375
13388
  prune(state, logger, config, output.messages);
@@ -13582,10 +13595,10 @@ function analyzeTokens(state, messages) {
13582
13595
  breakdown.toolsInContextCount = toolsInContextCount;
13583
13596
  breakdown.prunedToolCount = prunedToolIds.size;
13584
13597
  breakdown.prunedMessageCount = prunedMessageCount;
13585
- const firstUserTokens = countTokens2(firstUserText);
13586
- breakdown.user = countTokens2(userTextParts.join("\n"));
13587
- const toolInputTokens = countTokens2(toolInputParts.join("\n"));
13588
- 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"));
13589
13602
  if (firstAssistant) {
13590
13603
  const firstInput = (firstAssistant.tokens?.input || 0) + (firstAssistant.tokens?.cache?.read || 0) + (firstAssistant.tokens?.cache?.write || 0);
13591
13604
  breakdown.system = Math.max(0, firstInput - firstUserTokens);