acp-kernel 0.0.73-pr.302.168 → 0.0.73-pr.303.169

package/dist/compress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkC,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAgBhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAUvD,OAAO,EAGL,KAAK,YAAY,EAGlB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,EAEhB,MAAM,EAEN,WAAW,EAGX,iBAAiB,EAEjB,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,KAAK;IACpB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACxC;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAC;IACxD,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,sBAAsB,CAAC;IACvE,YAAY,IAAI,YAAY,EAAE,CAAC;IAC/B,UAAU,CACR,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,GAAG,SAAS,CAAC;IAChC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IACnE,MAAM,CACJ,KAAK,EAAE,gBAAgB,EACvB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,YAAY,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,EAAE,CAAC;IACJ,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnC;AA2DD,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CA+U7D;AA0lCD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkC,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAgBhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAUvD,OAAO,EAGL,KAAK,YAAY,EAElB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,EAEhB,MAAM,EAEN,WAAW,EAGX,iBAAiB,EAEjB,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,KAAK;IACpB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACxC;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAC;IACxD,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,sBAAsB,CAAC;IACvE,YAAY,IAAI,YAAY,EAAE,CAAC;IAC/B,UAAU,CACR,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,GAAG,SAAS,CAAC;IAChC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IACnE,MAAM,CACJ,KAAK,EAAE,gBAAgB,EACvB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,YAAY,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,EAAE,CAAC;IACJ,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnC;AA2DD,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CAyU7D;AA4iCD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,wBAAgB,aAAa,CAC3B,iBAAiB,EAAE,MAAM,EACzB,SAAS,GAAE,OAAO,CAAC,MAAM,CAAM,GAC9B,MAAM,CA+CR;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CA8DvD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,wBAAgB,aAAa,CAC3B,iBAAiB,EAAE,MAAM,EACzB,SAAS,GAAE,OAAO,CAAC,MAAM,CAAM,GAC9B,MAAM,CA+CR;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAuDvD"}

package/dist/index.js

@@ -296,7 +296,6 @@ function syncBlocks(messages, state) {
     nudge: { ...state.nudge, anchors: { ...state.nudge.anchors } },
     stats: { ...state.stats },
     absorbed: (state.absorbed ?? []).map((record) => ({ ...record })),
-    terminalStreak: state.terminalStreak,
     nextBlockId: state.nextBlockId,
     nextRunId: state.nextRunId
   };
@@ -354,7 +353,7 @@ function defaultConfig(modelContextLimit, overrides = {}) {
       tier2GrowthMultiplier: 1.5
     },
     promotionThreshold: 5,
-    truncate: { threshold: 0.95, terminalEscapeAfter: 3 },
+    truncate: { threshold: 0.95 },
     compress: {
       minCompressRange: 5e3,
       maxSummaryLength: 2e4,
@@ -406,9 +405,6 @@ function validateConfig(config) {
   if (config.truncate.threshold <= 0 || config.truncate.threshold > 1) {
     errors.push("truncate.threshold must be in (0, 1]");
   }
-  if (config.truncate.terminalEscapeAfter !== void 0 && (!Number.isInteger(config.truncate.terminalEscapeAfter) || config.truncate.terminalEscapeAfter < 0)) {
-    errors.push("truncate.terminalEscapeAfter must be an integer >= 0");
-  }
   for (const tier of [config.tiers.tier2Trigger, config.tiers.tier3Trigger]) {
     if (tier < 1) errors.push("tier triggers must be >= 1");
   }
@@ -658,69 +654,47 @@ var DEFAULTS = {
 };
 function truncateLargeToolOutputs(messages, tokenCount, config, countTokens, options = {}) {
   const opts = { ...DEFAULTS, ...options };
-  const limit = config.modelContextLimit;
-  if (limit <= 0 || tokenCount < config.truncate.threshold * limit) {
-    return { messages, truncatedCount: 0, savedTokens: 0, candidatesFound: 0 };
-  }
+  if (config.modelContextLimit <= 0) return { messages, truncatedCount: 0, savedTokens: 0 };
+  const threshold = config.truncate.threshold * config.modelContextLimit;
+  if (tokenCount < threshold) return { messages, truncatedCount: 0, savedTokens: 0 };
   const protectedIndex = messages.length - opts.protectRecentMessages;
-  const findCandidates = (predicate) => {
-    const found = [];
-    for (let i = 0; i < protectedIndex; i++) {
-      const message = messages[i];
-      if (!predicate(message)) continue;
-      const text = message.text ?? "";
-      if (text.length === 0 || text.includes(TRUNCATION_MARKER)) continue;
-      if (countTokens(text) < opts.minOutputTokens) continue;
-      found.push(message);
-    }
-    return found.sort(
-      (a, b) => countTokens(b.text ?? "") - countTokens(a.text ?? "")
-    );
-  };
-  const toolResults = findCandidates((m) => m.contentType === "tool-result");
-  const textMessages = options.includeTextMessages ? findCandidates(
-    (m) => m.contentType === "text" && (m.role === "user" || m.role === "assistant") && !isRenderedSummaryMessage(m) && !m.text?.startsWith(SUMMARY_HEADER)
-  ) : [];
-  const candidatesFound = toolResults.length + textMessages.length;
-  let truncatedCount = 0;
+  const candidates = [];
+  for (let index = 0; index < messages.length; index++) {
+    if (index >= protectedIndex) break;
+    const message = messages[index];
+    if (message.contentType !== "tool-result") continue;
+    const text = message.text ?? "";
+    if (text.length === 0 || text.includes(TRUNCATION_MARKER)) continue;
+    const tokens = countTokens(text);
+    if (tokens < opts.minOutputTokens) continue;
+    candidates.push({ index, tokens });
+  }
+  if (candidates.length === 0) return { messages, truncatedCount: 0, savedTokens: 0 };
+  candidates.sort((left, right) => right.tokens - left.tokens);
+  const targetTokens = threshold * 0.9;
   let savedTokens = 0;
-  let remaining = tokenCount;
-  const targetTokens = config.truncate.threshold * limit * 0.9;
-  const replacements = /* @__PURE__ */ new Map();
-  const applyTo = (candidates) => {
-    for (const candidate of candidates) {
-      if (remaining <= targetTokens) break;
-      const original = candidate.text ?? "";
-      const tokens = countTokens(original);
-      if (original.length <= opts.keepPrefixChars + opts.keepSuffixChars) {
-        continue;
-      }
-      const prefix = original.slice(0, opts.keepPrefixChars);
-      const suffix = original.slice(-opts.keepSuffixChars);
-      const replacement = `${prefix}
+  const edits = /* @__PURE__ */ new Map();
+  let truncatedCount = 0;
+  for (const candidate of candidates) {
+    if (tokenCount - savedTokens <= targetTokens) break;
+    const original = messages[candidate.index].text ?? "";
+    if (original.length <= opts.keepPrefixChars + opts.keepSuffixChars) continue;
+    const prefix = original.slice(0, opts.keepPrefixChars);
+    const suffix = original.slice(-opts.keepSuffixChars);
+    const replacement = prefix + `
 
-...${TRUNCATION_MARKER} \u2014 original ~${tokens} tokens]...
+...${TRUNCATION_MARKER} \u2014 original ~${candidate.tokens} tokens]...
 
-${suffix}`;
-      replacements.set(candidate.id, replacement);
-      truncatedCount++;
-      remaining -= tokens - countTokens(replacement);
-      savedTokens += tokens - countTokens(replacement);
-    }
-  };
-  applyTo(toolResults);
-  applyTo(textMessages);
-  if (replacements.size === 0) {
-    return { messages, truncatedCount: 0, savedTokens: 0, candidatesFound };
-  }
-  return {
-    messages: messages.map(
-      (m) => replacements.has(m.id) ? { ...m, text: replacements.get(m.id) } : m
-    ),
-    truncatedCount,
-    savedTokens,
-    candidatesFound
-  };
+` + suffix;
+    edits.set(candidate.index, replacement);
+    savedTokens += candidate.tokens - countTokens(replacement);
+    truncatedCount++;
+  }
+  if (truncatedCount === 0) return { messages, truncatedCount: 0, savedTokens: 0 };
+  const updated = messages.map(
+    (message, index) => edits.has(index) ? { ...message, text: edits.get(index) } : message
+  );
+  return { messages: updated, truncatedCount, savedTokens };
 }
 
 // src/hide-consumed.ts
@@ -2349,7 +2323,6 @@ function createCore(ports = {}) {
       state.nudge.lastPerMessageNudgeTokens = 0;
       state.nudge.lastNudgeShownTokens = 0;
       state.nudge.lastShownByTier = {};
-      state.terminalStreak = 0;
     }
     return {
       state,
@@ -2379,9 +2352,7 @@ function createCore(ports = {}) {
     return {
       messages: result.messages,
       state: result.state,
-      nudge: result.effects.nudge,
-      terminalEscape: result.effects.terminalEscape,
-      truncationSkipped: result.effects.truncationSkipped
+      nudge: result.effects.nudge
     };
   }
   function decompress(blockId, state) {
@@ -2574,49 +2545,18 @@ var emergencyTruncateNode = {
   name: "emergency-truncate",
   run(io, ctx) {
     const usage = ctx.config.modelContextLimit > 0 ? ctx.tokenCount / ctx.config.modelContextLimit : 0;
-    const prevStreak = io.state.terminalStreak ?? 0;
-    if (usage < ctx.config.truncate.threshold) {
-      return prevStreak > 0 ? { ...io, state: { ...io.state, terminalStreak: 0 } } : io;
-    }
+    if (usage < ctx.config.truncate.threshold) return io;
     const trunc = truncateLargeToolOutputs(
       io.messages,
       ctx.tokenCount,
       ctx.config,
       ctx.countTokens,
-      {
-        protectRecentMessages: ctx.config.preserveRecentMessages,
-        includeTextMessages: true
-      }
+      { protectRecentMessages: ctx.config.preserveRecentMessages }
     );
-    const nudge = io.effects.nudge;
-    const minBenefit = nudge?.breakdown.minPressureBenefit ?? 0;
-    const maxPending = nudge?.breakdown.maxPending ?? 0;
-    const noViableCompression = nudge !== void 0 && (minBenefit > 0 ? maxPending < minBenefit : maxPending <= 0);
-    const stuck = noViableCompression && trunc.savedTokens <= 0;
-    const streak = stuck ? prevStreak + 1 : 0;
-    const escapeAfter = ctx.config.truncate.terminalEscapeAfter ?? 3;
-    const triggered = stuck && escapeAfter > 0 && streak >= escapeAfter;
-    const effects = {
-      ...io.effects,
-      truncatedCount: trunc.truncatedCount
-    };
-    if (trunc.savedTokens <= 0) {
-      effects.truncationSkipped = trunc.candidatesFound === 0 ? `emergency-truncate ran at ${Math.round(usage * 100)}% usage but found no truncatable content (no oversized tool-result or text message outside the last ${ctx.config.preserveRecentMessages} messages)` : `emergency-truncate found ${trunc.candidatesFound} candidate(s) at ${Math.round(usage * 100)}% usage but none were large enough to save tokens`;
-    }
-    if (triggered) {
-      effects.terminalEscape = {
-        message: `Usage at ${Math.round(usage * 100)}% (${ctx.tokenCount}/${ctx.config.modelContextLimit} tokens) persists with nothing compressible above the benefit floor and no truncatable content: compression cannot reduce this context below the limit. Start a new session or use native compaction.`,
-        usage,
-        tokenCount: ctx.tokenCount,
-        modelContextLimit: ctx.config.modelContextLimit,
-        stuckEvents: streak
-      };
-    }
     return {
       ...io,
       messages: trunc.messages,
-      state: { ...io.state, terminalStreak: streak },
-      effects
+      effects: { ...io.effects, truncatedCount: trunc.truncatedCount }
     };
   }
 };
@@ -2709,8 +2649,7 @@ function applySingleRange(input) {
     for (const m of input.messages) {
       if (!m.id) continue;
       if (m.contentType === "reasoning") reasoningIds.add(m.id);
-      if (m.role === "assistant" && m.contentType === "tool-call")
-        callIds.add(m.id);
+      if (m.role === "assistant" && m.contentType === "tool-call") callIds.add(m.id);
     }
     const withdrawIds = /* @__PURE__ */ new Set();
     let splitTurnCount = 0;
@@ -2981,7 +2920,6 @@ function decideNudge(input) {
   const t1Eff = tiers[1]?.pending ?? 0;
   const t2Pen = tiers[2]?.pending ?? 0;
   const t3Pen = tiers[3]?.pending ?? 0;
-  const maxPending = Math.max(0, t1Eff, t2Pen, t3Pen);
   const firstSightMassReady = state.nudge.lastNudgeShownTokens === 0 && baseline === 0 && usage >= config.nudge.minContextLimitPct && Math.max(t1Eff, t2Pen, t3Pen) >= nudgeGrowthTokens;
   const growthReady = firstSightMassReady || growthSinceReference >= growthFloor;
   const t2Count = tiers[2]?.targetBlocks.length ?? 0;
@@ -3054,6 +2992,10 @@ function decideNudge(input) {
       (t) => ((tiers[t]?.pending ?? 0) >= nudgeGrowthTokens || countReady(t)) && (state.nudge.lastShownByTier[t] ?? 0) > 0 && tokenCount - (state.nudge.lastShownByTier[t] ?? 0) < growthFloor
     ).map((t) => `T${t} (cadence)`);
     const blockedHint = blocked.length > 0 ? `, blocked: ${blocked.join(", ")}` : "";
+    const maxPending = Math.max(
+      0,
+      ...Object.values(tiers).map((t) => t.pending)
+    );
     const pendingShort = maxPending < nudgeGrowthTokens;
     const growthShort = growthSinceReference < growthFloor;
     const parts = [];
@@ -3097,8 +3039,7 @@ function decideNudge(input) {
       minPressureBenefit,
       pendingT1: tiers[1].pending,
       pendingT2: tiers[2].pending,
-      pendingT3: tiers[3].pending,
-      maxPending
+      pendingT3: tiers[3].pending
     },
     contextBreakdown: ctxBreakdown
   };
@@ -3138,7 +3079,6 @@ function cloneState(state) {
     nudge: { ...state.nudge, anchors: { ...state.nudge.anchors } },
     stats: { ...state.stats },
     absorbed: (state.absorbed ?? []).map((record) => ({ ...record })),
-    terminalStreak: state.terminalStreak,
     nextBlockId: state.nextBlockId,
     nextRunId: state.nextRunId
   };