nolo-cli 0.97.0-alpha.2 → 0.97.1

package/{chunk-ASQYTZTR.js → chunk-6ZWMH6TJ.js}

@@ -1,18 +1,15 @@
 import {
   estimateTokenCount
 } from "./chunk-PSCNXBYA.js";
-import {
-  compactWhitespace
-} from "./chunk-DWLEOOGR.js";
 import {
   addContentAction
-} from "./chunk-V4MJDUSR.js";
+} from "./chunk-RSEEDUMS.js";
 import {
   upload
-} from "./chunk-H62HCIUP.js";
+} from "./chunk-HYZIYH2H.js";
 import {
   getRuntimeServerContext
-} from "./chunk-UKWGR5SS.js";
+} from "./chunk-WIWM4FE3.js";
 import {
   API_ENDPOINTS
 } from "./chunk-LCBAMY2M.js";
@@ -367,6 +364,7 @@ var truncateToolOutputForContext = (text, contextWindow) => {
 // packages/ai/context/planCompression.ts
 var MIN_COMPRESS_COUNT = 5;
 var ACTIVE_SUMMARY_TAIL_KEEP_COUNT = 2;
+var COMPACTION_RETENTION_CUSHION_RATIO = 0.18;
 var MIN_TRIGGER_PENDING_COUNT = MIN_COMPRESS_COUNT + ACTIVE_SUMMARY_TAIL_KEEP_COUNT;
 var getMessageTokenCount = (msg) => {
   const content = serializeMessageContent(msg.content) || "";
@@ -465,15 +463,42 @@ function calculateCompressCount(pendingMsgs, rawMessageBudget, opts) {
   }
   return pendingMsgs.length - keepCount;
 }
+function resolveEffectiveCompactionBudgets(args) {
+  const {
+    contextWindow,
+    triggerRatio,
+    historyBudget,
+    rawMessageBudget,
+    summaryTokens,
+    cushionRatio = COMPACTION_RETENTION_CUSHION_RATIO
+  } = args;
+  const maxRetainedRatio = Math.max(
+    0.2,
+    Number((triggerRatio - cushionRatio).toFixed(4))
+  );
+  const maxRetainedHistoryBudget = Math.floor(contextWindow * maxRetainedRatio);
+  const effectiveHistoryBudget = Math.min(historyBudget, maxRetainedHistoryBudget);
+  const effectiveRawMessageBudget = Math.min(
+    rawMessageBudget,
+    Math.max(0, effectiveHistoryBudget - summaryTokens)
+  );
+  return {
+    effectiveHistoryBudget,
+    effectiveRawMessageBudget,
+    maxRetainedRatio
+  };
+}
 function guardToolChainBoundary(pendingMsgs, compressCount) {
   let count = compressCount;
-  while (count > 0 && count < pendingMsgs.length && pendingMsgs[count].role === "tool") {
-    count--;
+  while (count < pendingMsgs.length && pendingMsgs[count].role === "tool") {
+    count++;
   }
-  if (count > 0) {
-    const lastCompressed = pendingMsgs[count - 1];
-    if (hasOpenEndedToolCall(lastCompressed)) {
+  while (count > 0 && hasOpenEndedToolCall(pendingMsgs[count - 1])) {
+    if (count < pendingMsgs.length && pendingMsgs[count].role === "tool") {
+      count++;
+    } else {
       count--;
+      break;
     }
   }
   return count;
@@ -548,11 +573,22 @@ function planCompression(input) {
       emptyReason: "not-triggered"
     });
   }
-  let compressCount = calculateCompressCount(pendingMsgs, rawMessageBudget, {
-    keepTailCount: shouldRunActiveSummary || triggeredByRealUsage || triggeredByColdResume,
-    totalUsed,
-    historyBudget
+  const { effectiveHistoryBudget, effectiveRawMessageBudget } = resolveEffectiveCompactionBudgets({
+    contextWindow,
+    triggerRatio,
+    historyBudget,
+    rawMessageBudget,
+    summaryTokens
   });
+  let compressCount = calculateCompressCount(
+    pendingMsgs,
+    effectiveRawMessageBudget,
+    {
+      keepTailCount: shouldRunActiveSummary || triggeredByRealUsage || triggeredByColdResume,
+      totalUsed,
+      historyBudget: effectiveHistoryBudget
+    }
+  );
   compressCount = guardToolChainBoundary(pendingMsgs, compressCount);
   if (compressCount < MIN_COMPRESS_COUNT) {
     return emptyPlan(startIndex, {
@@ -576,7 +612,7 @@ function planCompression(input) {
 }
 
 // packages/ai/context/compactionShared.ts
-var COMPACTION_SUMMARY_SCHEMA_VERSION = 1;
+var COMPACTION_SUMMARY_SCHEMA_VERSION = 2;
 var COMPACTION_SUMMARY_SYSTEM_PROMPT = `\u4F60\u662F\u5BF9\u8BDD\u4E0A\u4E0B\u6587\u538B\u7F29\u5668\u3002\u6839\u636E\u3010\u73B0\u6709\u8BB0\u5FC6\u3011\u548C\u3010\u65B0\u589E\u5BF9\u8BDD\u3011\uFF0C\u8F93\u51FA\u53EF\u66FF\u4EE3\u539F\u59CB\u6D88\u606F\u7684\u4E8B\u5B9E\u6027\u8981\u70B9\uFF0C\u4F9B\u540E\u7EED\u5BF9\u8BDD\u76F4\u63A5\u4F7F\u7528\u3002
 
 \u4E25\u683C\u53EA\u8F93\u51FA\u4E0B\u9762\u4E09\u90E8\u5206\uFF0C\u6807\u9898\u5FC5\u987B\u5B8C\u5168\u4E00\u81F4\uFF1A
@@ -589,10 +625,16 @@ var COMPACTION_SUMMARY_SYSTEM_PROMPT = `\u4F60\u662F\u5BF9\u8BDD\u4E0A\u4E0B\u65
 
 \u8981\u6C42\uFF1A
 1) \u4F7F\u7528\u5BF9\u8BDD\u4E3B\u8BED\u8A00\uFF1B\u6DF7\u5408\u8BED\u8A00\u65F6\u4F18\u5148\u7528\u6237\u4E3B\u8981\u8BED\u8A00\uFF1B\u4E13\u6709\u540D\u8BCD\u3001\u6587\u4EF6\u8DEF\u5F84\u3001\u6807\u8BC6\u7B26\u3001\u547D\u4EE4\u4FDD\u7559\u539F\u6587\uFF0C\u4E0D\u8981\u7FFB\u8BD1\u6216\u8F6C\u8FF0\u3002
-2) \u5173\u952E\u4E8B\u5B9E\u6863\u6848\u53EA\u4FDD\u7559\u4E4B\u540E\u7EE7\u7EED\u5BF9\u8BDD\u4ECD\u6709\u4EF7\u503C\u7684\u4FE1\u606F\uFF1A\u7528\u6237\u76EE\u6807/\u504F\u597D\u3001\u7EA6\u675F\u3001\u6280\u672F\u6808\u3001\u786E\u5B9A\u7684\u6587\u4EF6\u8DEF\u5F84\u3001\u6838\u5FC3\u51B3\u7B56\u3001\u672A\u5B8C\u6210\u5F85\u529E\u3002\u4FDD\u7559\u786E\u5207\u503C\uFF08\u7AEF\u53E3\u53F7\u3001\u7248\u672C\u53F7\u3001\u8DEF\u5F84\u3001\u53D8\u91CF\u540D\u3001\u9519\u8BEF\u4FE1\u606F\u539F\u6587\uFF09\uFF0C\u4E0D\u8981\u6982\u62EC\u6210"\u67D0\u4E2A\u7AEF\u53E3"\u6216"\u67D0\u4E2A\u6587\u4EF6"\u6216"\u67D0\u62A5\u9519"\u3002
+2) \u5173\u952E\u4E8B\u5B9E\u6863\u6848\u7684**\u524D\u4E24\u9879\u56FA\u5B9A\u662F**\uFF1A
+   - \u300C\u539F\u59CB\u76EE\u6807\u300D\uFF1A\u7528\u6237\u6700\u521D\u4E3A\u4EC0\u4E48\u5F00\u8FD9\u6BB5\u5BF9\u8BDD\uFF08\u5C3D\u91CF\u4FDD\u7559\u4ED6\u7684\u539F\u8BDD\u4E0E\u7528\u8BCD\uFF0C\u4E0D\u8981\u6539\u5199\u6210\u4EFB\u52A1\u6E05\u5355\uFF09\u3002
+     \u589E\u91CF\u66F4\u65B0\u65F6\u6CBF\u7528\u3010\u73B0\u6709\u8BB0\u5FC6\u3011\u91CC\u5DF2\u6709\u7684\u300C\u539F\u59CB\u76EE\u6807\u300D\uFF0C\u4E0D\u8981\u88AB\u65B0\u589E\u5BF9\u8BDD\u6539\u5199\u2014\u2014\u5B83\u662F\u7A33\u5B9A\u5B57\u6BB5\uFF1B
+     \u4EC5\u5F53\u65B0\u5BF9\u8BDD\u660E\u786E\u8868\u660E\u539F\u6587\u6709\u4E8B\u5B9E\u6027\u9519\u8BEF\u65F6\u624D\u4FEE\u6B63\uFF0C\u5E76\u5728\u300C\u76EE\u6807\u6F14\u5316\u300D\u91CC\u6CE8\u660E\u3002
+   - \u300C\u76EE\u6807\u6F14\u5316\u300D\uFF1A\u82E5\u4E2D\u9014\u8F6C\u5411\uFF0C\u5199\u6E05\u8F6C\u5411\u4E86\u4EC0\u4E48\u3001\u56E0\u4E3A\u4EC0\u4E48\uFF1B\u6CA1\u6709\u8F6C\u5411\u5C31\u5199\u300C\u65E0\u8F6C\u5411\u300D\u6216\u7701\u7565\u8FD9\u4E00\u9879\uFF0C\u4E0D\u8981\u786C\u51D1\u3002
+   \u88AB\u540E\u7EED\u5DE5\u4F5C\u53D6\u4EE3\u7684\u662F"\u65B9\u6848"\uFF0C\u4E0D\u662F"\u7528\u6237\u7684\u521D\u59CB\u610F\u56FE"\u2014\u2014\u521D\u59CB\u610F\u56FE\u4E0D\u5F97\u7701\u7565\u3002
+   \u5176\u540E\u624D\u662F\uFF1A\u7528\u6237\u504F\u597D\u3001\u7EA6\u675F\u3001\u6280\u672F\u6808\u3001\u786E\u5B9A\u7684\u6587\u4EF6\u8DEF\u5F84\u3001\u6838\u5FC3\u51B3\u7B56\u3001\u672A\u5B8C\u6210\u5F85\u529E\u3002\u4FDD\u7559\u786E\u5207\u503C\uFF08\u7AEF\u53E3\u53F7\u3001\u7248\u672C\u53F7\u3001\u8DEF\u5F84\u3001\u53D8\u91CF\u540D\u3001\u9519\u8BEF\u4FE1\u606F\u539F\u6587\uFF09\uFF0C\u4E0D\u8981\u6982\u62EC\u6210"\u67D0\u4E2A\u7AEF\u53E3"\u6216"\u67D0\u4E2A\u6587\u4EF6"\u6216"\u67D0\u62A5\u9519"\u3002
 3) \u5BF9\u8BDD\u8FDB\u5C55\u4E0E\u5F85\u529E\u4EE5\u7B2C\u4E00\u4EBA\u79F0\u7EED\u4F5C\u7B14\u8BB0\u7684\u53E3\u543B\u5199\uFF08"\u6211\u505A\u4E86\u2026""\u7528\u6237\u8981\u6C42\u2026""\u4E0B\u4E00\u6B65\u6211\u9700\u8981\u2026"\uFF09\uFF0C\u4E0D\u8981\u5199\u6210\u7B2C\u4E09\u65B9\u89C2\u5BDF\u62A5\u544A\u3002\u5148\u6781\u7B80\u6982\u62EC\u65E7\u4E0A\u4E0B\u6587\uFF0C\u518D\u66F4\u8BE6\u7EC6\u8BB0\u5F55\u6700\u8FD1\u8FDB\u5C55\u3001\u7ED3\u8BBA\u3001\u5206\u6B67\u4E0E\u4E0B\u4E00\u6B65\u3002\u5BF9\u4E8E\u58F0\u79F0\u5DF2\u5B8C\u6210\u4F46\u5C1A\u672A\u9A8C\u8BC1\u7684\u5DE5\u4F5C\uFF08\u5982\u5DE5\u5177\u8C03\u7528\u8FD4\u56DE\u6210\u529F\u4F46\u7ED3\u679C\u672A\u4EBA\u5DE5\u786E\u8BA4\uFF09\uFF0C\u660E\u786E\u6807\u6CE8"\uFF08\u5F85\u9A8C\u8BC1\uFF09"\u2014\u2014\u4E0D\u8981\u9ED8\u8BA4\u4FE1\u4EFB\u5DE5\u5177\u8FD4\u56DE\u503C\u3002
 4) \u6587\u4EF6\u64CD\u4F5C\u6E05\u5355\uFF1A\u5217\u51FA\u672C\u6B21\u538B\u7F29\u8303\u56F4\u5185\u8BFB\u53D6\u3001\u5199\u5165\u3001\u7F16\u8F91\u8FC7\u7684\u6587\u4EF6\u8DEF\u5F84\u53CA\u64CD\u4F5C\u7C7B\u578B\uFF08\u5982: - \u8BFB\u53D6: path/to/file\uFF1B\u82E5\u672A\u6D89\u53CA\u6587\u4EF6\u64CD\u4F5C\u5199"\u65E0"\uFF09\u3002
-5) \u5FFD\u7565\u5BD2\u6684\u3001\u91CD\u590D\u5C1D\u8BD5\u3001\u5DF2\u653E\u5F03\u65B9\u6848\u548C\u65E0\u4EF7\u503C\u5E9F\u8BDD\u3002
+5) \u5FFD\u7565\u5BD2\u6684\u3001\u91CD\u590D\u5C1D\u8BD5\u548C\u65E0\u4EF7\u503C\u5E9F\u8BDD\uFF1B**\u5DF2\u653E\u5F03\u7684\u65B9\u6848/\u5C1D\u8BD5**\u53EF\u4EE5\u7701\u7565\uFF0C\u4F46\u7528\u6237\u5F53\u521D\u7684\u610F\u56FE\u4E0E\u7406\u7531\u4E0D\u53EF\u7701\u7565\uFF08\u89C1\u7B2C 2 \u6761\uFF09\u3002
 6) \u4E0D\u8981\u7F16\u9020\u672A\u51FA\u73B0\u7684\u4FE1\u606F\uFF1B\u4E0D\u8981\u5F00\u573A\u767D\u3001\u7ED3\u675F\u8BED\u3001markdown \u4EE3\u7801\u5757\u6216\u989D\u5916\u7AE0\u8282\uFF1B\u4E0D\u8981\u8C03\u7528\u4EFB\u4F55\u5DE5\u5177\u3002`;
 function formatMessageContentFallback(msg) {
   const content = serializeMessageContent(msg.content);
@@ -728,14 +770,6 @@ function formatCompactionMetricsLog(metrics) {
   return `[Compaction] reason=${metrics.reason} compressed=${metrics.compressedCount}->${metrics.retainedCount} msgs, tokens=${totalBefore}->${totalAfter} (ratio=${ratio})${llmInfo}`;
 }
 
-// packages/core/clipCompactText.ts
-function clipCompactText(value, max, ellipsis = "...") {
-  const compact = compactWhitespace(value);
-  if (compact.length <= max) return compact;
-  if (max <= ellipsis.length) return compact.slice(0, max);
-  return `${compact.slice(0, max - ellipsis.length)}${ellipsis}`;
-}
-
 // packages/ai/token/providerCallTiming.ts
 var defaultNow = () => {
   const perf = globalThis.performance;
@@ -807,7 +841,14 @@ var isMeaningfulResponsesOutput = (event) => {
 };
 
 export {
-  clipCompactText,
+  normalizeTimingMs,
+  createProviderCallTimingTracker,
+  observeMeaningfulProviderResponseAt,
+  observeMeaningfulProviderResponse,
+  finalizeProviderCallTiming,
+  withProviderCallTimingFields,
+  isMeaningfulChatCompletionOutput,
+  isMeaningfulResponsesOutput,
   planContextUsage,
   buildDatabaseFileContentUrl,
   serializeMessageContent,
@@ -821,13 +862,5 @@ export {
   formatFileOperationsFromMessages,
   formatMessagesForSummaryWithTruncation,
   buildCompactionMetricsFromPlan,
-  formatCompactionMetricsLog,
-  normalizeTimingMs,
-  createProviderCallTimingTracker,
-  observeMeaningfulProviderResponseAt,
-  observeMeaningfulProviderResponse,
-  finalizeProviderCallTiming,
-  withProviderCallTimingFields,
-  isMeaningfulChatCompletionOutput,
-  isMeaningfulResponsesOutput
+  formatCompactionMetricsLog
 };

package/{chunk-ABQYVJBJ.js → chunk-7CHC4W22.js}

@@ -1,7 +1,7 @@
 import {
   getRuntimeServerContext,
   scheduleDeleteReplication
-} from "./chunk-UKWGR5SS.js";
+} from "./chunk-WIWM4FE3.js";
 import {
   fetchFromClientDb
 } from "./chunk-QOKAKDPE.js";

package/{chunk-GQBOR3G6.js → chunk-7KVZ5LDQ.js}

@@ -1,11 +1,11 @@
 import {
   getModelConfig
-} from "./chunk-OIVSQH2O.js";
+} from "./chunk-3BXNTXYI.js";
 import {
   isPlatformHostedDeepseekModel,
   isPlatformHostedOpenAIImageModel,
   resolvePlatformHostedRouting
-} from "./chunk-Q67DOFOO.js";
+} from "./chunk-Y3PMXGLH.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";