From d86a101a9d33079f49761c86e9d922ab7be745ac Mon Sep 17 00:00:00 2001 From: ci-check Date: Fri, 20 Nov 2026 10:07:44 +0800 Subject: [PATCH 1/4] fix: add min-benefit floor to model-initiated compress (Part 1 of #7333) MODEL-FACING TEXT CHANGE: new refusal receipt for below-min-benefit folds. A model-initiated compress that would reclaim fewer than compress.minFoldBenefitTokens (default 4096) is now refused below the pressure band. Each committed fold rewrites the context prefix and re-bills the prompt-cache tail, so a burst of tiny folds re-bills the tail for almost no reclaim. - Add compress.minFoldBenefitTokens (int >= 0; 0 = legacy any-positive-shrink) to CompressSettings, mergeCompress, ResolvedKernelConfig, resolveCompress. - Generalize the #2748 no-net-shrink gate in applyRanges: netDelta < floor (floor = 1 in pressure band/emergency, 1 for preflight lane loopTracking:false, else max(1, minFoldBenefitTokens)). - New refusal reason gate:below-min-benefit with a model-facing receipt that teaches the model to batch ranges into ONE compress call. - The no-net-shrink receipt (netDelta <= 0) is byte-identical to before. - Preflight lane (loopTracking:false) is exempt from the floor: bili's own overflow folds are never gated by the benefit floor. Regression tests: tests/issue7333-min-fold-benefit.test.ts (7 tests: below-floor refused, no-net-shrink byte-identical, above-floor commits, pressure-band exemption, emergency exemption, minFoldBenefitTokens=0 legacy, preflight lane ungated). Also enlarge fold sizes in 4 existing test files (issue2360, issue847, issue2146, issue5683) and loop-compress.test.ts to stay above the new 4096 floor (the folds were 2460-3733 tokens, below the floor). Closes #7333 (Part 1; Part 2 = per-nudge fold budget, separate decision). --- src/compress-settings.ts | 8 +- src/config.ts | 15 ++ src/stream.ts | 61 ++++++- tests/issue2146-compress-loop-breaker.test.ts | 18 +- tests/issue2360-compress-receipt.test.ts | 5 +- ...sue5683-forbid-unprompted-compress.test.ts | 7 +- tests/issue7333-min-fold-benefit.test.ts | 164 ++++++++++++++++++ .../issue847-compress-failure-guards.test.ts | 4 +- tests/loop-compress.test.ts | 36 ++-- 9 files changed, 285 insertions(+), 33 deletions(-) create mode 100644 tests/issue7333-min-fold-benefit.test.ts diff --git a/src/compress-settings.ts b/src/compress-settings.ts index 8fccde8f36..d8b0dc89c2 100644 --- a/src/compress-settings.ts +++ b/src/compress-settings.ts @@ -74,6 +74,7 @@ export function mergeCompress( emergencyThresholdPercent: pick("emergencyThresholdPercent"), nudgeGrowthTokens: pick("nudgeGrowthTokens"), minPressureBenefitTokens: pick("minPressureBenefitTokens"), + minFoldBenefitTokens: pick("minFoldBenefitTokens"), requireUsageSampleForPressure: pick("requireUsageSampleForPressure"), maxEstimateHoldRounds: pick("maxEstimateHoldRounds"), tierNudgeTokens: tierNudgeLevels.length > 0 ? Object.assign({}, ...tierNudgeLevels) : undefined, @@ -298,7 +299,7 @@ export function hasCompressSettings(s: CompressSettings): boolean { // built and typed here regardless of the installed kernel's Config so both // release windows compile identically. Older kernels ignore the extra key // (validateConfig does not flag unknown keys). -export type ResolvedKernelConfig = Config & { preserveRecentTools?: string[]; externalSummary?: ExternalSummarySettings }; +export type ResolvedKernelConfig = Config & { preserveRecentTools?: string[]; externalSummary?: ExternalSummarySettings; minFoldBenefitTokens?: number }; // Single source of truth for raw->resolved absorb: applyCompressSettings and the // plugin-lane base stamp (#1359) both go through this or they drift apart. @@ -400,6 +401,11 @@ export function applyCompressSettings(base: Config, limit: number, s: CompressSe // HERE, at resolve time — the executor still receives a fully // expanded ExternalSummarySettings and never sees references. externalSummary: s.externalSummary !== undefined ? expandExternalSummaryChainTolerant(s.externalSummary, recipes) : (base as ResolvedKernelConfig).externalSummary, + // #7333: host-only min-benefit floor for the model-initiated compress + // commit gate (applyRanges) — never on the raw kernel Config, carried + // like externalSummary. Absent (undefined) = the gate's default + // (AUTO_FOLD_MIN_BENEFIT_TOKENS) applies. + minFoldBenefitTokens: s.minFoldBenefitTokens ?? (base as ResolvedKernelConfig).minFoldBenefitTokens, ...(absorb !== undefined ? { absorb } : {}), // #5765: one-switch opt-in — absent `s.blockOps` leaves base untouched // (off); a present block normalizes enabled (absent/false = off). diff --git a/src/config.ts b/src/config.ts index 31c4c0cd00..5986bcb627 100644 --- a/src/config.ts +++ b/src/config.ts @@ -264,6 +264,21 @@ export type CompressSettings = { * level wins PER FIELD across global → provider → model, like every * other compress field. */ minPressureBenefitTokens?: number; + /** #7333: minimum net-reclaim (tokens) a model-initiated compress must + * achieve to be committed, BELOW the pressure band. Every committed fold + * rewrites the context prefix and re-bills the prompt-cache tail, so a + * burst of tiny model-initiated folds (one nudge → many small folds) + * re-bills the tail repeatedly for almost no reclaim. This floor refuses + * such sub-benefit folds with a teaching receipt (batch the listed ranges + * into ONE call, or continue) instead of committing them. At/above + * `maxContextLimit` or in emergency the floor drops to 1 — survival folds + * are never blocked. Default: `AUTO_FOLD_MIN_BENEFIT_TOKENS` (4096) — the + * same bar bili's own auto-fold producer already applies (#3444), so both + * fold producers share one benefit floor. Set 0 to restore the legacy + * any-positive-shrink gate. Host-side only (the model-initiated + * `applyRanges` commit gate); does NOT map to a kernel `nudge.*` field. + * Deepest level wins PER FIELD, like every other compress field. */ + minFoldBenefitTokens?: number; /** Phantom-pressure guard: when the decision meter for this round is a * LOCAL ESTIMATE rather than a billing sample (the host passed no usage * report — e.g. right after an aborted turn or a short cache TTL that diff --git a/src/stream.ts b/src/stream.ts index b074b1d456..c5021a9858 100644 --- a/src/stream.ts +++ b/src/stream.ts @@ -20,6 +20,8 @@ import { attachSubagentSessions, subagentSessionNote, subagentSessionsOf, syncSu import { METADATA_DRIFT_ESCALATED } from "./fold-reconcile.js"; import { safePrefix, safeSuffix, scrubLoneSurrogates } from "./text-safe.js"; import { applyConfiguredCompression } from "./external-summary-compress.js"; +import type { ResolvedKernelConfig } from "./compress-settings.js"; +import { AUTO_FOLD_MIN_BENEFIT_TOKENS } from "./external-summary-settings.js"; import { NUDGE_CREDIT_ROUNDS, unpromptedGateOf } from "./unprompted-gate.js"; import { describeUncoveredRuns, shortTokenCount, uncoveredHistoryRuns } from "./uncovered.js"; @@ -1158,6 +1160,27 @@ function outOfRecommendedRanges(ranges: ParsedRange[], ctx: RewriteCtx): string[ return offending; } +/** #7333: is this request in the pressure band (usage ≥ maxContextLimit) or + * emergency (usage ≥ emergencyThreshold)? Mirrors the kernel's own check + * (kernel/src/nudge-text.ts: `!!breakdown?.emergencyOverride || + * !!breakdown?.overLimit`). The min-benefit floor drops to 1 in-band so + * survival folds are never blocked. Fails safe to "not in band" (apply the + * floor) when the prepare-time nudge is absent — a band fold is typically + * large, and `minFoldBenefitTokens = 0` is the escape hatch. */ +function inPressureBandOrEmergency(ctx: RewriteCtx): boolean { + const b = ctx.lastNudge?.breakdown; + return !!b?.emergencyOverride || !!b?.overLimit; +} + +/** #7333: the minimum net-reclaim (tokens) a model-initiated compress must + * achieve to commit, below the pressure band. Default + * AUTO_FOLD_MIN_BENEFIT_TOKENS (4096) — the same bar bili's own auto-fold + * producer applies (#3444), so both fold producers share one benefit floor. + * 0 restores the legacy any-positive-shrink gate (the caller clamps to ≥ 1). */ +function minFoldBenefitTokens(config: Config): number { + return (config as ResolvedKernelConfig).minFoldBenefitTokens ?? AUTO_FOLD_MIN_BENEFIT_TOKENS; +} + export function applyRanges(parsed: ReturnType, ctx: RewriteCtx, opts?: { loopTracking?: boolean }): ProxyToolResult { // #2146: preflight overflow-compress is bili's OWN internal lane — its // failures have separate reporting (noteSkip) and must not arm the @@ -1499,23 +1522,47 @@ export function applyRanges(parsed: ReturnType, ctx: netDelta += defaultCountTokens(prev) - defaultCountTokens(b.summary); } } - if (r.blocksCreated > 0 && touchedBlocks > 0 && netDelta <= 0) { + // #7333: minimum-benefit floor — generalizes the #2748 no-net-shrink + // gate. A committed fold rewrites the context prefix and re-bills the + // prompt-cache tail, so a burst of tiny model-initiated folds (one + // nudge → many small folds) re-bills the tail repeatedly for almost no + // reclaim. Below the pressure band, refuse sub-floor folds with a + // teaching receipt (batch the listed ranges into ONE call, or continue) + // instead of committing them. At/above maxContextLimit or in emergency + // the floor drops to 1 — survival folds are never blocked. + // minFoldBenefitTokens = 0 restores the legacy any-positive-shrink gate + // (floor clamps to 1). Refold-only calls (blocksCreated = 0) keep + // skipping this gate, exactly as today. + // The floor is a MODEL-FACING bar: it gates the model-initiated path + // (trackLoop) only. Bili's own overflow backstop folds ride + // loopTracking:false and must not be gated by a benefit floor — for + // them the floor stays at 1, i.e. the original no-net-shrink gate. + const minBenefitFloor = trackLoop + ? (inPressureBandOrEmergency(ctx) ? 1 : Math.max(1, minFoldBenefitTokens(ctx.config))) + : 1; + if (r.blocksCreated > 0 && touchedBlocks > 0 && netDelta < minBenefitFloor) { + const gateReason = netDelta <= 0 ? "gate:no-net-shrink" : "gate:below-min-benefit"; const detail = ranges.map((rg) => `${rg.startRef}–${rg.endRef}`).join(", "); const revNote = revs.length > 0 ? ` Note: startId > endId in range(s) ${revs.map((rg) => `${rg.startRef}→${rg.endRef}`).join(", ")} — your refs were reversed and normalized to ascending order before evaluation.` : ""; - const netDesc = netDelta < 0 - ? `committing it would grow the context by ${-netDelta} token(s)` - : `committing it leaves the context size unchanged`; // #847 repeat-guard: re-issuing the SAME bloated range escalates // advice; deliberately NOT fed into the #2146 circuit breaker — a // too-long summary is recoverable (write a shorter one), so arming // "stop calling compress entirely" would wrongly kill legit folds. const specKey = normalizedSpecKey(ranges); const repeatGuard = recordCompressFailure(ctx.session, specKey); - ctx.log(`[acp-proxy: compress REFUSED ${detail} — no net shrink (net delta=${netDelta} tok across ${touchedBlocks} touched block(s)); state left uncommitted, prefix cache untouched]`); - const receipt = `[Compression refused: no net shrink — the summary you supplied is not smaller than the range it replaces (${netDesc}). Nothing was folded: no block was created and the context prefix/cache were left untouched.${revNote} Do not re-issue this same range and summary; supply a much shorter summary for the range, target a larger span so the summary shrinks it, or continue your task without compressing.${repeatGuard !== "" ? " " + repeatGuard : ""}]`; - return compressResult(receipt, "refused", 0, "gate:no-net-shrink"); + ctx.log(`[acp-proxy: compress REFUSED ${detail} — ${gateReason} (net delta=${netDelta} tok across ${touchedBlocks} touched block(s), floor=${minBenefitFloor}); state left uncommitted, prefix cache untouched]`); + let receipt: string; + if (gateReason === "gate:below-min-benefit") { + receipt = `[Compression refused: below minimum benefit — this call would reclaim only ${netDelta} token(s), below compress.minFoldBenefitTokens (${minBenefitFloor}). Every committed fold rewrites the context prefix and re-bills the prompt-cache tail, so a burst of tiny folds re-bills the tail for almost no reclaim.${revNote} Put the other listed ranges into ONE compress call so the summary covers them together, or continue your task without compressing. Nothing was folded and the cache is untouched.${repeatGuard !== "" ? " " + repeatGuard : ""}]`; + } else { + const netDesc = netDelta < 0 + ? `committing it would grow the context by ${-netDelta} token(s)` + : `committing it leaves the context size unchanged`; + receipt = `[Compression refused: no net shrink — the summary you supplied is not smaller than the range it replaces (${netDesc}). Nothing was folded: no block was created and the context prefix/cache were left untouched.${revNote} Do not re-issue this same range and summary; supply a much shorter summary for the range, target a larger span so the summary shrinks it, or continue your task without compressing.${repeatGuard !== "" ? " " + repeatGuard : ""}]`; + } + return compressResult(receipt, "refused", 0, gateReason); } ctx.session.state = res.state; // #2627 backstop: no committed state may carry outbound-only turn- diff --git a/tests/issue2146-compress-loop-breaker.test.ts b/tests/issue2146-compress-loop-breaker.test.ts index ffd18d83f1..6c450790ae 100644 --- a/tests/issue2146-compress-loop-breaker.test.ts +++ b/tests/issue2146-compress-loop-breaker.test.ts @@ -80,7 +80,14 @@ test("#2146: distinct-spec failure streak arms the circuit breaker at 3", () => }); test("#2146: success clears the streak; later failures start fresh", () => { - const ctx = makeCtx(fixtureMessages()); + // #7333: 10000-char messages so the m00003–m00008 fold reclaims ≥ 4096 tok + // (the min-benefit floor); the small m00001/m00002 ranges stay sub-gate. + const msgs: CoreMessage[] = [ + textMsg("raw_1", "assistant", "a".repeat(800)), + textMsg("raw_2", "assistant", "b".repeat(800)), + ]; + for (let i = 3; i <= 8; i++) msgs.push(textMsg(`raw_${i}`, "assistant", "x".repeat(10000))); + const ctx = makeCtx(msgs); applyRanges(parseCompressInput(compressArgs("m00001", "m00001")), ctx); applyRanges(parseCompressInput(compressArgs("m00002", "m00002")), ctx); const armed = applyRanges(parseCompressInput(compressArgs("m00001", "m00002")), ctx).text; @@ -183,7 +190,14 @@ test("#2146: loopTracking:false (preflight lane) never touches the model-facing }); test("#2146: stale-generation receipts scrub the phantom refs; in-frontier failures keep them verbatim", () => { - const ctx = makeCtx(fixtureMessages()); + // #7333: 10000-char messages so the clamped m00001–m00008 fold reclaims + // ≥ 4096 tok (the min-benefit floor). + const msgs: CoreMessage[] = [ + textMsg("raw_1", "assistant", "a".repeat(800)), + textMsg("raw_2", "assistant", "b".repeat(800)), + ]; + for (let i = 3; i <= 8; i++) msgs.push(textMsg(`raw_${i}`, "assistant", "x".repeat(10000))); + const ctx = makeCtx(msgs); const stale = applyRanges(parseCompressInput(compressArgs("m00010", "m00014")), ctx).text; assert.ok(stale.startsWith("[Compression FAILED:"), `unknown refs fail (got: ${stale.slice(0, 120)})`); assert.match(stale, /above this session's highest ref \(m00008\)/, "frontier diagnosis present"); diff --git a/tests/issue2360-compress-receipt.test.ts b/tests/issue2360-compress-receipt.test.ts index b8f07a04f4..64ed7e7223 100644 --- a/tests/issue2360-compress-receipt.test.ts +++ b/tests/issue2360-compress-receipt.test.ts @@ -113,11 +113,14 @@ test("#2360: unknown-ref failures label stale-ref; covered ranges label covered- assert.match(stale, /\[cause: stale-ref/); // Full-view context: compress a big range successfully, then re-request it. + // #7333: messages are 10000 chars (2500 tok) each so the foldable portion + // (m00003–m00006, before the 5000-tok recent zone) reclaims ≥ 4096 tok and + // passes the new min-benefit floor; 5000-char messages left only 2460 tok. const all = [ textMsg("raw_1", "assistant", "a".repeat(800)), textMsg("raw_2", "assistant", "b".repeat(800)), ]; - for (let i = 3; i <= 8; i++) all.push(textMsg(`raw_${i}`, "assistant", "x".repeat(5000))); + for (let i = 3; i <= 8; i++) all.push(textMsg(`raw_${i}`, "assistant", "x".repeat(10000))); const session = makeSession(); const res = assignRefs(all, { existing: emptyRefMap(), nextIndex: 0 }); session.state.messageRefs = res.map; diff --git a/tests/issue5683-forbid-unprompted-compress.test.ts b/tests/issue5683-forbid-unprompted-compress.test.ts index 6c27bb38ac..e335cb0d4f 100644 --- a/tests/issue5683-forbid-unprompted-compress.test.ts +++ b/tests/issue5683-forbid-unprompted-compress.test.ts @@ -56,10 +56,11 @@ function textMsg(id: string, role: "user" | "assistant", text: string): CoreMess return { id, role, contentType: "text", text }; } -/** Nine 5000-char messages; preserveRecentMessages 2 keeps m8-m9 protected, - * so m1-m7 are the live fold space. */ +/** Nine 10000-char messages (2500 tok); preserveRecentMessages 2 keeps + * m8-m9 protected, so m1-m7 are the live fold space. #7333: 10000 chars so + * a 2-message subdivided span (m2-m3) reclaims ≥ 4096 tok (min-benefit floor). */ function freshCtx(): Ctx { - const msgs = Array.from({ length: 9 }, (_, i) => textMsg(`raw_${i + 1}`, i % 2 === 0 ? "user" : "assistant", "x".repeat(5000))); + const msgs = Array.from({ length: 9 }, (_, i) => textMsg(`raw_${i + 1}`, i % 2 === 0 ? "user" : "assistant", "x".repeat(10000))); return withRefs(makeCtx(msgs, { preserveRecentMessages: 2, preserveRecentTokens: 0 })); } diff --git a/tests/issue7333-min-fold-benefit.test.ts b/tests/issue7333-min-fold-benefit.test.ts new file mode 100644 index 0000000000..21e5cdb476 --- /dev/null +++ b/tests/issue7333-min-fold-benefit.test.ts @@ -0,0 +1,164 @@ +// #7333: minimum-benefit floor on the model-initiated compress commit gate. +// A committed fold rewrites the context prefix and re-bills the prompt-cache +// tail, so a burst of tiny model-initiated folds (one nudge → many small +// folds) re-bills the tail repeatedly for almost no reclaim. Below the +// pressure band, a fold that would reclaim fewer than +// compress.minFoldBenefitTokens (default 4096 — the same bar bili's own +// auto-fold applies, #3444) is refused with a teaching receipt instead of +// committed. At/above the pressure band or in emergency the floor drops to 1 +// (survival folds are never blocked); 0 restores the legacy any-positive- +// shrink gate; bili's own preflight folds (loopTracking:false) are never +// gated by the benefit floor (only the original no-net-shrink gate applies). +// +// Gate negative assertions per #3617: each gate row asserts BOTH directions — +// "refuses when it should" AND "commits when it should not". +import assert from "node:assert/strict"; +import { randomUUID } from "node:crypto"; +import { test } from "node:test"; +import type { Config, CoreMessage, NudgeDecision } from "acp-kernel"; +import { createCore, createInitialState, assignRefs, emptyRefMap, defaultConfig } from "acp-kernel"; +import type { Session } from "../src/session.ts"; +import { SessionStore, _setStoreForTest } from "../src/persist.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; +import { applyRanges, type RewriteCtx } from "../src/stream.ts"; +import { parseCompressInput } from "../src/compress-tool.ts"; + +_setStoreForTest(new SessionStore({ enabled: false })); + +function textMsg(id: string, role: "user" | "assistant", text: string): CoreMessage { + return { id, role, contentType: "text", text }; +} + +function makeSession(): Session { + return { + id: `issue7333-${randomUUID()}`, + meta: {}, + stats: { requests: 0, tokensSaved: 0, inputTokens: 0, cachedTokens: 0, outputTokens: 0, cacheSamples: 0, lastInputTokens: 15000, compressCreditTokens: 0, contextTokens: 0, retrieveCalls: 0, retrieveHits: 0, retrieveMisses: 0, storedBytes: 0, storeBytesSaved: 0, rangeRestores: 0 }, + metadata: {}, + state: createInitialState(), + createdAt: Date.now(), + lastSeen: Date.now(), + blockContents: new Map(), + inFlight: 0, + persisted: false, + pendingRetrievals: [], + }; +} + +type Ctx = RewriteCtx & { session: Session; config: Config }; + +/** Build a ctx whose ONLY message is `origChars` chars (non-CJK → ceil/4 + * tokens) and return it plus a summary of `sumChars` chars. The recent- + * message zone is disabled (preserveRecentMessages/Tokens = 0 — the kernel's + * documented opt-out for tests that compress the tail) so the single message + * is foldable rather than a protected no-op. The test mutates ctx.lastNudge / + * ctx.config before calling applyRanges. netDelta for the resulting fresh + * single-message fold = ceil(origChars/4) - ceil(sumChars/4). */ +function makeFoldCtx(origChars: number, sumChars: number, config?: Config): { ctx: Ctx; summary: string } { + const msg = textMsg("raw_1", "assistant", "a".repeat(origChars)); + const session = makeSession(); + const res = assignRefs([msg], { existing: emptyRefMap(), nextIndex: 0 }); + session.state.messageRefs = res.map; + const cfg = { ...(config ?? defaultConfig(200000)), preserveRecentMessages: 0, preserveRecentTokens: 0 }; + const ctx: Ctx = { + core: createCore(), + config: cfg, + messages: [msg], + session, + log: () => {}, + }; + return { ctx, summary: "s".repeat(sumChars) }; +} + +/** Build a minimal NudgeDecision carrying only the breakdown flags the host + * gate reads (overLimit / emergencyOverride). compressibleRanges is empty so + * the post-fold range-advertisement path (viableRanges) stays inert. */ +function makeNudge(breakdown: { overLimit?: number; emergencyOverride?: number }): NudgeDecision { + return { + shouldInject: false, + reason: "test", + compressibleRanges: [], + contextUsage: 0, + tier: 1, + breakdown: { usage: 0, growth: 0, effectiveThreshold: 0, overLimit: 0, emergencyOverride: 0, ...breakdown }, + } as unknown as NudgeDecision; +} + +function runCompress(ctx: Ctx, summary: string, opts?: { loopTracking?: boolean }) { + return applyRanges( + parseCompressInput({ content: [{ startId: "m00001", endId: "m00001", summary }] }), + ctx, + opts, + ); +} + +// --- the gate refuses when it should --------------------------------------- + +test("#7333: a sub-floor fold (reclaims 500 tok < 4096) is refused below the pressure band", () => { + // 20000-char range (5000 tok) → 18000-char summary (4500 tok): netDelta 500. + const { ctx, summary } = makeFoldCtx(20000, 18000); + const r = runCompress(ctx, summary); + assert.equal(r.reason, "gate:below-min-benefit", `reason, got: ${r.reason}`); + assert.ok(r.text.startsWith("[Compression refused: below minimum benefit"), `receipt, got: ${r.text.slice(0, 80)}`); + assert.ok(r.text.includes("compress.minFoldBenefitTokens (4096)"), "receipt names the floor"); + assert.ok(r.text.includes("reclaim only 500 token(s)"), "receipt states the actual reclaim"); + assert.ok(r.text.includes("Nothing was folded and the cache is untouched"), "receipt states the cache is untouched"); + assert.equal(ctx.session.state.blocks.length, 0, "nothing committed"); +}); + +test("#7333: a no-net-shrink fold (netDelta 0) is refused with the byte-identical pre-#7333 receipt", () => { + // 16000-char range (4000 tok) → 16000-char summary (4000 tok): netDelta 0. + const { ctx, summary } = makeFoldCtx(16000, 16000); + const r = runCompress(ctx, summary); + assert.equal(r.reason, "gate:no-net-shrink", `reason, got: ${r.reason}`); + assert.equal( + r.text, + "[Compression refused: no net shrink — the summary you supplied is not smaller than the range it replaces (committing it leaves the context size unchanged). Nothing was folded: no block was created and the context prefix/cache were left untouched. Do not re-issue this same range and summary; supply a much shorter summary for the range, target a larger span so the summary shrinks it, or continue your task without compressing.]", + "no-net-shrink receipt byte-identical to the pre-#7333 text", + ); + assert.equal(ctx.session.state.blocks.length, 0, "nothing committed"); +}); + +// --- the gate does NOT refuse when it should not --------------------------- + +test("#7333: a fold above the floor (reclaims 8000 tok ≥ 4096) commits", () => { + // 40000-char range (10000 tok) → 8000-char summary (2000 tok): netDelta 8000. + const { ctx, summary } = makeFoldCtx(40000, 8000); + const r = runCompress(ctx, summary); + assert.ok(r.text.startsWith("[Compressed "), `committed, got: ${r.text.slice(0, 80)}`); + assert.equal(ctx.session.state.blocks.length, 1, "one block created"); +}); + +test("#7333: in the pressure band the floor drops to 1 — a sub-floor fold commits", () => { + const { ctx, summary } = makeFoldCtx(20000, 18000); + ctx.lastNudge = makeNudge({ overLimit: 1 }); + const r = runCompress(ctx, summary); + assert.ok(r.text.startsWith("[Compressed "), `committed in-band, got: ${r.text.slice(0, 80)}`); + assert.equal(ctx.session.state.blocks.length, 1, "one block created"); +}); + +test("#7333: in emergency the floor drops to 1 — a sub-floor fold commits", () => { + const { ctx, summary } = makeFoldCtx(20000, 18000); + ctx.lastNudge = makeNudge({ emergencyOverride: 1 }); + const r = runCompress(ctx, summary); + assert.ok(r.text.startsWith("[Compressed "), `committed in emergency, got: ${r.text.slice(0, 80)}`); + assert.equal(ctx.session.state.blocks.length, 1, "one block created"); +}); + +test("#7333: minFoldBenefitTokens=0 restores the legacy any-positive-shrink gate", () => { + const config = { ...defaultConfig(200000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig; + const { ctx, summary } = makeFoldCtx(20000, 18000, config); + const r = runCompress(ctx, summary); + assert.ok(r.text.startsWith("[Compressed "), `legacy fold commits, got: ${r.text.slice(0, 80)}`); + assert.equal(ctx.session.state.blocks.length, 1, "one block created"); +}); + +test("#7333: bili's own preflight folds (loopTracking:false) are never gated by the benefit floor", () => { + // Same sub-floor shape as the first test (netDelta 500), but the preflight + // lane — bili's internal overflow backstop — commits it: only the + // no-net-shrink gate applies to loopTracking:false. + const { ctx, summary } = makeFoldCtx(20000, 18000); + const r = runCompress(ctx, summary, { loopTracking: false }); + assert.ok(r.text.startsWith("[Compressed "), `preflight fold commits, got: ${r.text.slice(0, 80)}`); + assert.equal(ctx.session.state.blocks.length, 1, "one block created"); +}); diff --git a/tests/issue847-compress-failure-guards.test.ts b/tests/issue847-compress-failure-guards.test.ts index ca29a4751c..8220f065bd 100644 --- a/tests/issue847-compress-failure-guards.test.ts +++ b/tests/issue847-compress-failure-guards.test.ts @@ -103,7 +103,9 @@ test("#847: repeated identical failing spec escalates; success clears the streak textMsg("raw_1", "assistant", "a".repeat(800)), textMsg("raw_2", "assistant", "b".repeat(800)), ]; - for (let i = 3; i <= 8; i++) msgs.push(textMsg(`raw_${i}`, "assistant", "x".repeat(5000))); + // #7333: 10000-char messages (2500 tok) so the foldable portion of + // m00003–m00008 (before the 5000-tok recent zone) reclaims ≥ 4096 tok. + for (let i = 3; i <= 8; i++) msgs.push(textMsg(`raw_${i}`, "assistant", "x".repeat(10000))); const ctx = makeCtx(msgs); const first = applyRanges(parseCompressInput(compressArgs("m00001", "m00002")), ctx).text; diff --git a/tests/loop-compress.test.ts b/tests/loop-compress.test.ts index ac3cb7807a..9942b88125 100644 --- a/tests/loop-compress.test.ts +++ b/tests/loop-compress.test.ts @@ -92,7 +92,7 @@ test("successful compress keeps every message in a large refreshed history", asy test("successful compress accepts a refresh hook returning its current view", async () => { const ctx = withRefs(makeCtx(Array.from({ length: 7 }, (_, i) => - textMsg(`raw_${i}`, i % 2 === 0 ? "user" : "assistant", `identity history ${i} ${bigText(5000)}`), + textMsg(`raw_${i}`, i % 2 === 0 ? "user" : "assistant", `identity history ${i} ${bigText(10000)}`), ))); let refreshCalls = 0; ctx.refreshFolded = (current) => { refreshCalls++; return current; }; @@ -333,13 +333,13 @@ test("loop #6: philosophy systemPrompt is transient — appears in the ONE re-re test("loop #7: successful compress (real block) → re-request fires (model continues; one-compress guard prevents a second mutate)", async () => { // 7 messages: kernel protects the last 5, so m00001/m00002 are compressible. const ctx = withRefs(makeCtx([ - textMsg("raw_1", "user", bigText(5000)), - textMsg("raw_2", "assistant", bigText(5000)), - textMsg("raw_3", "user", bigText(5000)), - textMsg("raw_4", "assistant", bigText(5000)), - textMsg("raw_5", "user", bigText(5000)), - textMsg("raw_6", "assistant", bigText(5000)), - textMsg("raw_7", "user", bigText(5000)), + textMsg("raw_1", "user", bigText(10000)), + textMsg("raw_2", "assistant", bigText(10000)), + textMsg("raw_3", "user", bigText(10000)), + textMsg("raw_4", "assistant", bigText(10000)), + textMsg("raw_5", "user", bigText(10000)), + textMsg("raw_6", "assistant", bigText(10000)), + textMsg("raw_7", "user", bigText(10000)), ])); const compressArgs = JSON.stringify({ content: [{ startId: "m00001", endId: "m00002", summary: "PAIR-SUMMARY-PAYLOAD-THAT-IS-LONG-ENOUGH-FOR-THE-KERNEL-MIN-LENGTH-CHECK" }] }); const round1 = [ @@ -368,13 +368,13 @@ test("loop external summary: streaming compress uses the configured model and cr const previousKey = process.env.E2E_SUMMARY_KEY; const originalFetch = globalThis.fetch; const ctx = withRefs(makeCtx([ - textMsg("raw_1", "user", bigText(5000)), - textMsg("raw_2", "assistant", bigText(5000)), - textMsg("raw_3", "user", bigText(5000)), - textMsg("raw_4", "assistant", bigText(5000)), - textMsg("raw_5", "user", bigText(5000)), - textMsg("raw_6", "assistant", bigText(5000)), - textMsg("raw_7", "user", bigText(5000)), + textMsg("raw_1", "user", bigText(10000)), + textMsg("raw_2", "assistant", bigText(10000)), + textMsg("raw_3", "user", bigText(10000)), + textMsg("raw_4", "assistant", bigText(10000)), + textMsg("raw_5", "user", bigText(10000)), + textMsg("raw_6", "assistant", bigText(10000)), + textMsg("raw_7", "user", bigText(10000)), ])); const summary = "Dedicated summary: preserve src/example.ts:27 and the pending test task.".repeat(3); const round1 = [ @@ -706,9 +706,9 @@ test("loop #422a: successful compress → re-request carries the refreshed fold // 7 messages: kernel protects the last 5, so m00001/m00002 are compressible. const ctx = withRefs( makeCtx([ - textMsg("raw_1", "user", "task: audit files. " + bigText(5000)), - textMsg("raw_2", "user", "consumed content " + bigText(5000)), - textMsg("raw_3", "user", bigText(5000)), + textMsg("raw_1", "user", "task: audit files. " + bigText(10000)), + textMsg("raw_2", "user", "consumed content " + bigText(10000)), + textMsg("raw_3", "user", bigText(10000)), textMsg("raw_4", "assistant", bigText(5000)), textMsg("raw_5", "user", bigText(5000)), textMsg("raw_6", "assistant", bigText(5000)), From cfefb0da26896d5aa962fc7d0fee3da5a1a8a630 Mon Sep 17 00:00:00 2001 From: ci-check Date: Fri, 20 Nov 2026 10:52:38 +0800 Subject: [PATCH 2/4] test: set minFoldBenefitTokens=0 in 17 test files broken by the new floor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The min-benefit floor (default 4096) in applyRanges refused small test folds, breaking 17 existing test files on CI. Set minFoldBenefitTokens=0 in each affected test's config to restore the pre-floor behavior — these tests pin fold mechanics (refold, CCR, stub, ledger-align, …), not the benefit floor, so the floor must be off for them to exercise their intended paths. Closes the CI red on PR #7334 (11 shards failing on the floor). --- tests/compress-recovery-ranges.test.ts | 7 ++++--- tests/compress-refused-ledger-align.test.ts | 3 ++- tests/compress-success-tail.test.ts | 3 ++- tests/epoch-confirm-lifecycle.test.ts | 3 ++- tests/fork-ccr-adoption.test.ts | 2 +- tests/issue1494-compress-params.test.ts | 3 ++- tests/issue1875-plugin-tool-outcome.test.ts | 3 ++- tests/issue2204-decompress-to-file-outcome.test.ts | 8 ++++---- tests/issue3126-no-visible-context.test.ts | 3 ++- tests/issue3635-summary-length-cap.test.ts | 4 ++-- tests/issue3859-no-visible-context-overlap.test.ts | 3 ++- tests/issue4313-message-timestamp-toggle.test.ts | 3 ++- tests/issue4733-ccr-restamp.test.ts | 2 +- tests/issue4812-armed-breaker-short-receipt.test.ts | 3 ++- tests/refold-wiring.test.ts | 3 ++- tests/stub-resubmission-guard.test.ts | 3 ++- tests/subagent-sessions.test.ts | 3 ++- 17 files changed, 36 insertions(+), 23 deletions(-) diff --git a/tests/compress-recovery-ranges.test.ts b/tests/compress-recovery-ranges.test.ts index 4591d8b8e5..48dc42d156 100644 --- a/tests/compress-recovery-ranges.test.ts +++ b/tests/compress-recovery-ranges.test.ts @@ -7,6 +7,7 @@ import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import { getSession } from "../src/session.ts"; import { applyRanges, type RewriteCtx } from "../src/stream.ts"; import { storeUnpromptedGate } from "../src/unprompted-gate.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; import { liveCompressionRanges } from "../src/acp-status.ts"; function spanContains(start: string, end: string, n: number): boolean { @@ -32,7 +33,7 @@ function makeCtx(count: number, preserveRecentMessages = 5): RewriteCtx { storeUnpromptedGate(session, { nudgeInjected: false, requireNudge: false, requireRecommendation: false, postComPressTail: true }); return { core: createCore(), - config: defaultConfig(200000, { preserveRecentMessages, preserveRecentTokens: 0 }), + config: { ...defaultConfig(200000, { preserveRecentMessages, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages, session, log: () => {}, @@ -136,11 +137,11 @@ test("token-based recent protection is honored even beyond the last-message coun test("failure recovery does not stop an active block-distillation nudge", () => { const ctx = makeCtx(12, 0); - ctx.config = defaultConfig(200000, { + ctx.config = { ...defaultConfig(200000, { preserveRecentMessages: 0, preserveRecentTokens: 0, tiers: { enabled: true, tier2Trigger: 2, tier3Trigger: 3 }, - }); + }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig; ctx.session.stats.lastInputTokens = 200000; ctx.session.stats.lastInputTokensSource = "usage"; for (const [start, end] of [["m00001", "m00004"], ["m00005", "m00008"], ["m00009", "m00012"]]) { diff --git a/tests/compress-refused-ledger-align.test.ts b/tests/compress-refused-ledger-align.test.ts index c457327d7b..ef849d7044 100644 --- a/tests/compress-refused-ledger-align.test.ts +++ b/tests/compress-refused-ledger-align.test.ts @@ -26,12 +26,13 @@ import type { CoreMessage } from "acp-kernel"; import { createCore, createInitialState, defaultConfig } from "acp-kernel"; import { parseCompressInput } from "../src/compress-tool.ts"; import { applyRanges, type RewriteCtx } from "../src/stream.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; import type { Session } from "../src/session.ts"; type Ctx = Omit & { log: (m: string) => void; logs: string[] }; type Marked = Session & { pendingLedgerAlign?: boolean }; -const cfg = defaultConfig(200000, { preserveRecentMessages: 2, preserveRecentTokens: 0 } as never); +const cfg = { ...defaultConfig(200000, { preserveRecentMessages: 2, preserveRecentTokens: 0 } as never), minFoldBenefitTokens: 0 } as ResolvedKernelConfig; const timeOf = (t: string | undefined): string | undefined => / time="([^"]+)"/.exec(t ?? "")?.[1]; function conversation(): CoreMessage[] { diff --git a/tests/compress-success-tail.test.ts b/tests/compress-success-tail.test.ts index dff3ef12c2..a68d549117 100644 --- a/tests/compress-success-tail.test.ts +++ b/tests/compress-success-tail.test.ts @@ -5,6 +5,7 @@ import { createCore, createInitialState, assignRefs, emptyRefMap, defaultConfig import { parseCompressInput } from "../src/compress-tool.ts"; import { applyRanges, type RewriteCtx } from "../src/stream.ts"; import { storeUnpromptedGate } from "../src/unprompted-gate.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; // #1387: post-compress success tail — remaining-ranges snapshot (pi #420) and // explicit stop signal (pi #521). Cross-host wording must stay verbatim. @@ -17,7 +18,7 @@ function makeCtx(messages: CoreMessage[], overrides?: Record): const logs: string[] = []; const ctx: Ctx = { core: createCore(), - config: defaultConfig(200000, overrides as never), + config: { ...defaultConfig(200000, overrides as never), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages, session: { id: "compress-tail-test", diff --git a/tests/epoch-confirm-lifecycle.test.ts b/tests/epoch-confirm-lifecycle.test.ts index 61388ac3de..dd869453a8 100644 --- a/tests/epoch-confirm-lifecycle.test.ts +++ b/tests/epoch-confirm-lifecycle.test.ts @@ -10,6 +10,7 @@ import { reconcileFoldCoverage } from "../src/fold-reconcile.ts"; import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import { createSession } from "../src/session.ts"; import { applyRanges } from "../src/stream.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; _setStoreForTest(new SessionStore({ enabled: false })); @@ -18,7 +19,7 @@ for (const shape of ["one-interior-survivor", "all-missing", "small-zombie"] as const dir = mkdtempSync(join(tmpdir(), "bili-epoch-confirm-")); try { const core = createCore(); - const config = defaultConfig(200_000); + const config = { ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig; const session = createSession(`epoch-confirm-${shape}`); const messages: CoreMessage[] = Array.from({ length: 40 }, (_, i) => ({ id: `h_original_${i}`, role: i % 2 ? "assistant" : "user", contentType: "text", diff --git a/tests/fork-ccr-adoption.test.ts b/tests/fork-ccr-adoption.test.ts index 5b5bedde45..deea72ad48 100644 --- a/tests/fork-ccr-adoption.test.ts +++ b/tests/fork-ccr-adoption.test.ts @@ -55,7 +55,7 @@ function ccrConfig(on: boolean): Config { // whole fold range nondeterministically. defaultConfig(LIMIT, { preserveRecentMessages: 0, preserveRecentTokens: 0, compress: { minCompressRange: 10, minSummaryLength: 20, maxSummaryLength: 5000 } }), LIMIT, - { absorb: { enabled: true, minToolTokens: 50 }, ccr: { enabled: on, minToolTokens: 50 } }, + { absorb: { enabled: true, minToolTokens: 50 }, ccr: { enabled: on, minToolTokens: 50 }, minFoldBenefitTokens: 0 }, ) as Config; } diff --git a/tests/issue1494-compress-params.test.ts b/tests/issue1494-compress-params.test.ts index ca201838c8..f8c2c2287b 100644 --- a/tests/issue1494-compress-params.test.ts +++ b/tests/issue1494-compress-params.test.ts @@ -12,6 +12,7 @@ import type { CoreMessage } from "acp-kernel"; import { assignRefs, createCore, createInitialState, defaultConfig, emptyRefMap } from "acp-kernel"; import { normalizeCompressInput, parseCompressInput } from "../src/compress-tool.ts"; import { applyRanges, type RewriteCtx } from "../src/stream.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; import { SessionStore, _setStoreForTest } from "../src/persist.ts"; type Ctx = Omit & { log: (m: string) => void; logs: string[] }; @@ -20,7 +21,7 @@ function makeCtx(): Ctx { const logs: string[] = []; return { core: createCore(), - config: defaultConfig(200000), + config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages: [] as CoreMessage[], session: { id: `i1494-${Math.random().toString(36).slice(2)}`, diff --git a/tests/issue1875-plugin-tool-outcome.test.ts b/tests/issue1875-plugin-tool-outcome.test.ts index aa02621896..7d1209abcb 100644 --- a/tests/issue1875-plugin-tool-outcome.test.ts +++ b/tests/issue1875-plugin-tool-outcome.test.ts @@ -17,6 +17,7 @@ import { createCore, defaultConfig, type Config, type CoreMessage } from "acp-ke import { type PluginToolDeps, _resetPluginStateForTest, handlePluginTool } from "../src/plugin.ts"; import { getSession } from "../src/session.ts"; import { applyRanges } from "../src/stream.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; import { parseCompressInput } from "../src/compress-tool.ts"; import { forwardTool } from "../src/mcp.ts"; @@ -90,7 +91,7 @@ describe("#1875: plugin tool endpoint reports business outcome, not just ok:true describe("#1875: applyRanges outcome mapping (applied / partial / refused)", () => { function makeCtx() { const core = createCore(); - const config = defaultConfig(200000) as Config; + const config = { ...defaultConfig(200000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig; const session = getSession(`t-1875-ar-${Math.random().toString(36).slice(2)}`); const msgs: CoreMessage[] = []; for (let i = 0; i < 12; i++) { diff --git a/tests/issue2204-decompress-to-file-outcome.test.ts b/tests/issue2204-decompress-to-file-outcome.test.ts index f9fdd879cd..f40a576387 100644 --- a/tests/issue2204-decompress-to-file-outcome.test.ts +++ b/tests/issue2204-decompress-to-file-outcome.test.ts @@ -21,7 +21,7 @@ import os from "node:os"; import path from "node:path"; import { createCore, defaultConfig, type Config, type CoreMessage } from "acp-kernel"; -import { applyCompressSettings } from "../src/compress-settings.ts"; +import { applyCompressSettings, type ResolvedKernelConfig } from "../src/compress-settings.ts"; import { drainPendingRetrievals, storeEffectiveCcr } from "../src/store.ts"; import { getSession } from "../src/session.ts"; import { applyRanges } from "../src/stream.ts"; @@ -43,7 +43,7 @@ const pad = (n: number): string => String(n).padStart(5, "0"); function foldBlock(tag: string, endRef: number, msgChars: number = 2000, log?: (msg: string) => void) { const count = endRef + 8; const core = createCore(); - const config = defaultConfig(200_000) as Config; + const config = { ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig; const session = getSession(`tf2204-${tag}-${Math.random().toString(36).slice(2)}`); const msgs: CoreMessage[] = []; for (let i = 0; i < count; i++) { @@ -68,7 +68,7 @@ function foldCcr() { const config = applyCompressSettings( defaultConfig(200_000), 200_000, - { absorb: { enabled: true, minToolTokens: 50 }, ccr: { enabled: true, minToolTokens: 50 } }, + { absorb: { enabled: true, minToolTokens: 50 }, ccr: { enabled: true, minToolTokens: 50 }, minFoldBenefitTokens: 0 }, ) as Config; const session = getSession(`tfr2204-${Math.random().toString(36).slice(2)}`); storeEffectiveCcr(session, { enabled: true, minToolTokens: 50 }); @@ -254,7 +254,7 @@ test("#2204 range toFile write failure → outcome:failure, no injection, block test("#2204 endpoint: a failed export answers ok:true + outcome:failure (and success stays outcome:success)", async () => { _resetPluginStateForTest(); const core = createCore(); - const config = defaultConfig(200_000) as Config; + const config = { ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig; const session = getSession(`t2204-ep-${Math.random().toString(36).slice(2)}`); const msgs: CoreMessage[] = []; // The kernel's recent-zone trims the span tail and its min-compress diff --git a/tests/issue3126-no-visible-context.test.ts b/tests/issue3126-no-visible-context.test.ts index 3c2374a4e1..6b439eaffd 100644 --- a/tests/issue3126-no-visible-context.test.ts +++ b/tests/issue3126-no-visible-context.test.ts @@ -13,6 +13,7 @@ import type { CoreMessage } from "acp-kernel"; import { createCore, createInitialState, defaultConfig, assignRefs, emptyRefMap } from "acp-kernel"; import { parseCompressInput } from "../src/compress-tool.ts"; import { applyRanges, type RewriteCtx } from "../src/stream.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; import { applyConfiguredCompression } from "../src/external-summary-compress.ts"; type Ctx = Omit & { log: (m: string) => void; logs: string[] }; @@ -30,7 +31,7 @@ function makeCtx(opts?: { messages?: CoreMessage[]; refs?: boolean }): Ctx { // Explicit protect-zone override (same recipe as tests/compress-span-hint.test.ts): // the bare default would fence m00010..m00040 under "most recent user // message" protection and mask the gate behavior under test. - config: defaultConfig(200000, { preserveRecentMessages: 5, preserveRecentTokens: 0 }), + config: { ...defaultConfig(200000, { preserveRecentMessages: 5, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages: opts?.messages ?? [], session: { id: "issue3126-test", diff --git a/tests/issue3635-summary-length-cap.test.ts b/tests/issue3635-summary-length-cap.test.ts index f563069cb4..df4055a6e1 100644 --- a/tests/issue3635-summary-length-cap.test.ts +++ b/tests/issue3635-summary-length-cap.test.ts @@ -10,7 +10,7 @@ import { ExternalSummaryExecutor, describeExternalSummaryFailure, summaryLengthB import { applyConfiguredCompression } from "../src/external-summary-compress.ts"; import { SummaryCredentialStore } from "../src/external-summary-credentials.ts"; import { parseCompressSettings } from "../src/config.ts"; -import { mergeCompress, applyCompressSettings } from "../src/compress-settings.ts"; +import { mergeCompress, applyCompressSettings, type ResolvedKernelConfig } from "../src/compress-settings.ts"; import { createSession } from "../src/session.ts"; import type { RewriteCtx } from "../src/stream.ts"; import { rmrf } from "./tmp-rm.ts"; @@ -103,7 +103,7 @@ const WIRE_RAW = "Historical source src/example.ts:27 E_TEST; do not deploy; sti function wireContext(settings: unknown, cap?: number): RewriteCtx { const core = createCore(); - const config = defaultConfig(400_000) as Config & { externalSummary?: unknown }; + const config = { ...defaultConfig(400_000), minFoldBenefitTokens: 0 } as Config & { externalSummary?: unknown; minFoldBenefitTokens?: number }; config.externalSummary = settings; config.preserveRecentMessages = 0; config.preserveRecentTokens = 0; diff --git a/tests/issue3859-no-visible-context-overlap.test.ts b/tests/issue3859-no-visible-context-overlap.test.ts index b3b9577f71..6fdfbd02c9 100644 --- a/tests/issue3859-no-visible-context-overlap.test.ts +++ b/tests/issue3859-no-visible-context-overlap.test.ts @@ -21,6 +21,7 @@ import type { CoreMessage } from "acp-kernel"; import { createCore, createInitialState, defaultConfig, assignRefs, emptyRefMap } from "acp-kernel"; import { parseCompressInput } from "../src/compress-tool.ts"; import { applyRanges, type RewriteCtx } from "../src/stream.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; import { resolveDecompress } from "../src/decompress-shared.ts"; type Ctx = Omit & { log: (m: string) => void; logs: string[] }; @@ -35,7 +36,7 @@ function makeCtx(): Ctx { const logs: string[] = []; const ctx: Ctx = { core: createCore(), - config: defaultConfig(200000, { preserveRecentMessages: 5, preserveRecentTokens: 0 }), + config: { ...defaultConfig(200000, { preserveRecentMessages: 5, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, // View present while the setup folds run; each eviction-scenario test // clears it afterwards (state survives, the message bytes do not). messages: MESSAGES, diff --git a/tests/issue4313-message-timestamp-toggle.test.ts b/tests/issue4313-message-timestamp-toggle.test.ts index e0c7ec35e6..ea4feffcff 100644 --- a/tests/issue4313-message-timestamp-toggle.test.ts +++ b/tests/issue4313-message-timestamp-toggle.test.ts @@ -25,6 +25,7 @@ import { createCore, createInitialState, defaultConfig, assignRefs, emptyRefMap import { FUNCTION_ACP_TAGS_TIMESTAMPED, LEAN_HOW_TO_COMPRESS, LEAN_HOW_TO_COMPRESS_TIMESTAMPED } from "acp-kernel"; import { parseCompressInput } from "../src/compress-tool.ts"; import { applyRanges, type RewriteCtx } from "../src/stream.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import { resolveMessageTimestamps } from "../src/config.ts"; import { messageTimestampSections } from "../src/external-summary-surface.ts"; @@ -117,7 +118,7 @@ type Ctx = Omit & { log: (m: string) => void }; function makeCtx(): Ctx { return { core: createCore(), - config: defaultConfig(200000, { preserveRecentMessages: 5, preserveRecentTokens: 0 }), + config: { ...defaultConfig(200000, { preserveRecentMessages: 5, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages: MESSAGES, session: { id: "toggle-span-gate", diff --git a/tests/issue4733-ccr-restamp.test.ts b/tests/issue4733-ccr-restamp.test.ts index 22b9f72944..9d86aec105 100644 --- a/tests/issue4733-ccr-restamp.test.ts +++ b/tests/issue4733-ccr-restamp.test.ts @@ -49,7 +49,7 @@ function foldWithPoisonedAlias(): { core: ReturnType; config: const config = applyCompressSettings( defaultConfig(200_000), 200_000, - { absorb: { enabled: true, minToolTokens: 50 }, ccr: { enabled: true, minToolTokens: 50 } }, + { absorb: { enabled: true, minToolTokens: 50 }, ccr: { enabled: true, minToolTokens: 50 }, minFoldBenefitTokens: 0 }, ) as Config; const session = getSession(`issue4733-${Math.random().toString(36).slice(2)}`); storeEffectiveCcr(session, { enabled: true, minToolTokens: 50 }); diff --git a/tests/issue4812-armed-breaker-short-receipt.test.ts b/tests/issue4812-armed-breaker-short-receipt.test.ts index 3f826e011d..32a16786fd 100644 --- a/tests/issue4812-armed-breaker-short-receipt.test.ts +++ b/tests/issue4812-armed-breaker-short-receipt.test.ts @@ -6,6 +6,7 @@ import { createCore, createInitialState, assignRefs, emptyRefMap, defaultConfig import type { Session } from "../src/session.ts"; import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import { applyRanges, type RewriteCtx } from "../src/stream.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; import { parseCompressInput } from "../src/compress-tool.ts"; _setStoreForTest(new SessionStore({ enabled: false })); @@ -36,7 +37,7 @@ function makeCtx(messages: CoreMessage[], config?: Config, logs?: string[]): Rew const session = makeSession(); const res = assignRefs(messages, { existing: emptyRefMap(), nextIndex: 0 }); session.state.messageRefs = res.map; - return { core: createCore(), config: config ?? defaultConfig(200000), messages, session, log: logs ? (m) => logs.push(m) : () => {} }; + return { core: createCore(), config: config ?? ({ ...defaultConfig(200000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig), messages, session, log: logs ? (m) => logs.push(m) : () => {} }; } // Same shape as the #2146 fixture: two sub-gate messages plus six big ones, so diff --git a/tests/refold-wiring.test.ts b/tests/refold-wiring.test.ts index 5fc019fdb2..2d1dceaeb7 100644 --- a/tests/refold-wiring.test.ts +++ b/tests/refold-wiring.test.ts @@ -2,6 +2,7 @@ import { test } from "node:test"; import assert from "node:assert/strict"; import { resolveDecompress } from "../src/decompress-shared.ts"; import { applyRanges } from "../src/stream.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; import { parseCompressInput } from "../src/compress-tool.ts"; import { createCore, defaultConfig, type Config, type CoreMessage } from "acp-kernel"; import { getSession } from "../src/session.ts"; @@ -19,7 +20,7 @@ import { getSession } from "../src/session.ts"; function makeCtx() { const core = createCore(); - const config = defaultConfig(200000) as Config; + const config = { ...defaultConfig(200000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig; const session = getSession(`refold-wiring-${Math.random().toString(36).slice(2)}`); return { core, config, session }; } diff --git a/tests/stub-resubmission-guard.test.ts b/tests/stub-resubmission-guard.test.ts index 42c5e2a097..0c8da944ab 100644 --- a/tests/stub-resubmission-guard.test.ts +++ b/tests/stub-resubmission-guard.test.ts @@ -22,6 +22,7 @@ import assert from "node:assert/strict"; import type { CompressionState, CoreMessage } from "acp-kernel"; import { assignRefs, createCore, createInitialState, defaultConfig, emptyRefMap, hideConsumedCompressCalls } from "acp-kernel"; import { applyRanges, findVisibleStubResubmissions, visibleSummaryStubs, type RewriteCtx } from "../src/stream.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; import { parseCompressInput } from "../src/compress-tool.ts"; import { resolveDecompress } from "../src/decompress-shared.ts"; import { SessionStore, _setStoreForTest } from "../src/persist.ts"; @@ -32,7 +33,7 @@ function makeCtx(): Ctx { const logs: string[] = []; return { core: createCore(), - config: defaultConfig(200000), + config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages: [] as CoreMessage[], session: { id: `stub-${Math.random().toString(36).slice(2)}`, diff --git a/tests/subagent-sessions.test.ts b/tests/subagent-sessions.test.ts index af2000cc40..c51419e684 100644 --- a/tests/subagent-sessions.test.ts +++ b/tests/subagent-sessions.test.ts @@ -4,6 +4,7 @@ import type { CoreMessage } from "acp-kernel"; import { createCore, createInitialState, assignRefs, emptyRefMap, defaultConfig, summaryMessageId } from "acp-kernel"; import { parseCompressInput } from "../src/compress-tool.ts"; import { applyRanges, type RewriteCtx } from "../src/stream.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; import { attachSubagentSessions, captureSubagentSessionIds, subagentSessionNote, subagentSessionsOf, syncSubagentSessions } from "../src/subagent-sessions.ts"; // #1702 (redesign of #1704 per review): the sub-agent session id is captured @@ -19,7 +20,7 @@ function makeCtx(messages: CoreMessage[], overrides?: Record): const logs: string[] = []; return { core: createCore(), - config: defaultConfig(200000, overrides as never), + config: { ...defaultConfig(200000, overrides as never), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages, session: { id: "subagent-sessions-test", From 3c7275e3cce55a8740243edb0fb69758d5d33402 Mon Sep 17 00:00:00 2001 From: ci-check Date: Sat, 21 Nov 2026 14:26:04 +0800 Subject: [PATCH 3/4] test: set minFoldBenefitTokens: 0 in 65 test files broken by the 4096 floor The rebase onto latest master exposed 65 additional test files whose small folds now trip the new 4096-token min-benefit floor. This commit adds minFoldBenefitTokens: 0 to each config (consistent with the author's option B fix in the 17 files already patched). Refs: #7333, #7334 --- tests/agent-providers.test.ts | 4 ++-- tests/anthropic-round2-thinking-hold.test.ts | 2 +- tests/cache-friendly-plugin.test.ts | 2 +- tests/cache-friendly-proxy.test.ts | 2 +- tests/ccr-v2.test.ts | 6 +++--- tests/claude-bridge-e2e.test.ts | 2 +- tests/claude-fork-lineage.test.ts | 4 ++-- tests/codex-compact-e2e.test.ts | 2 +- tests/compress-fingerprint-refold.test.ts | 2 +- tests/compress-from-store.test.ts | 2 +- tests/decompress-empty-range.test.ts | 6 +++--- tests/decompress-image-ref-dispatch.test.ts | 2 +- tests/derived-fork-block-inheritance.test.ts | 4 ++-- tests/dsh-authored-compaction.test.ts | 4 ++-- tests/durable-tool-identity.test.ts | 14 +++++++------- tests/e2e-anthropic.test.ts | 4 ++-- tests/e2e-export-handoff.test.ts | 2 +- tests/e2e-google-compress.test.ts | 4 ++-- tests/e2e-mid-system.test.ts | 4 ++-- tests/e2e-responses-mid-developer.test.ts | 4 ++-- tests/e2e-tag-echo.test.ts | 2 +- tests/e2e-trae-model-restamp.test.ts | 4 ++-- tests/e2e-vertex-anthropic.test.ts | 2 +- tests/external-summary-runtime.test.ts | 2 +- tests/fix-decompress-reaper.test.ts | 2 +- tests/fix-decompress-tofile.test.ts | 4 ++-- tests/fork-adoption-wires.test.ts | 4 ++-- tests/fork-adoption.test.ts | 4 ++-- tests/host-usage-postfold.test.ts | 14 +++++++------- tests/issue1333-derived-inheritance.test.ts | 10 +++++----- tests/issue1453-rerequest-transport.test.ts | 2 +- tests/issue1819-regurgitation-guard.test.ts | 8 ++++---- tests/issue2419-dsh-skill-catalog.test.ts | 4 ++-- tests/issue2446-dsh-mcp-catalog.test.ts | 4 ++-- tests/issue2447-dsh-workspace-instructions.test.ts | 4 ++-- tests/issue2481-dsh-runtime-context.test.ts | 4 ++-- tests/issue3302-sparse-ref-tombstones.test.ts | 2 +- tests/issue3322-coverage-regression-guard.test.ts | 2 +- .../issue3477-responses-compaction-archive.test.ts | 2 +- tests/issue4331-uncovered-history.test.ts | 2 +- tests/issue4797-superseded-deadlock.test.ts | 2 +- tests/issue5161-compress-scan-log-noise.test.ts | 2 +- tests/issue539-loop-reasoning.test.ts | 2 +- tests/lineage-reconcile-boot.test.ts | 4 ++-- tests/loop-compress.test.ts | 2 +- tests/plugin-call-identity.test.ts | 2 +- tests/plugin-fork.test.ts | 6 +++--- tests/plugin-protocol.test.ts | 6 +++--- tests/plugin-status-provenance.test.ts | 2 +- tests/proxy-decompress-cache.test.ts | 2 +- tests/responses-fold-cache-seam.test.ts | 2 +- tests/responses-instructions-drift.test.ts | 2 +- tests/responses-plugin-dev-position.test.ts | 2 +- tests/responses-refold-head-stability.test.ts | 2 +- tests/resume-adoption-wires.test.ts | 4 ++-- tests/resume-ref-inheritance.test.ts | 4 ++-- tests/seq-interval-lane.test.ts | 2 +- tests/seq-ledger.test.ts | 2 +- tests/session-continuity-proof.test.ts | 2 +- tests/snapshot-render.test.ts | 2 +- tests/snapshot-shadow.test.ts | 2 +- tests/tag-imitation-cache.test.ts | 2 +- tests/tight-fold-summaries.test.ts | 2 +- tests/wire-contract-go-session.test.ts | 2 +- tests/zcode-memory-isolation.test.ts | 2 +- 65 files changed, 111 insertions(+), 111 deletions(-) diff --git a/tests/agent-providers.test.ts b/tests/agent-providers.test.ts index c0dbe2040f..0cf1fb7339 100644 --- a/tests/agent-providers.test.ts +++ b/tests/agent-providers.test.ts @@ -160,7 +160,7 @@ test("#2336 endpoint + web GET/PUT contract through a real server", async () => proxyMode: "direct", proxySource: "direct", modelContextLimit: 400_000, - kernelConfig: defaultConfig(400_000), + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", @@ -255,7 +255,7 @@ const RAW = "Historical source for the inline-key dial test. ".repeat(120); function context(externalSummary: unknown): RewriteCtx { const core = createCore(); - const config = defaultConfig(400_000) as Config & { externalSummary?: unknown }; + const config = { ...defaultConfig(400_000), minFoldBenefitTokens: 0 } as Config & { externalSummary?: unknown }; config.externalSummary = externalSummary; config.preserveRecentMessages = 0; config.preserveRecentTokens = 0; diff --git a/tests/anthropic-round2-thinking-hold.test.ts b/tests/anthropic-round2-thinking-hold.test.ts index daada514d4..8c12f7511c 100644 --- a/tests/anthropic-round2-thinking-hold.test.ts +++ b/tests/anthropic-round2-thinking-hold.test.ts @@ -62,7 +62,7 @@ const UNSIGNED_BODY = { model: "claude", messages: [], stream: true, max_tokens: function makeCtx(id: string, messages: CoreMessage[] = []): LoopCtx { return { core: createCore(), - config: defaultConfig(200000) as Config, + config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 } as Config, messages, session: { id, diff --git a/tests/cache-friendly-plugin.test.ts b/tests/cache-friendly-plugin.test.ts index 7362367629..70512e5dbb 100644 --- a/tests/cache-friendly-plugin.test.ts +++ b/tests/cache-friendly-plugin.test.ts @@ -521,7 +521,7 @@ async function driveWire(wire: Wire, steps: Step[], opts?: DriveOpts): Promise { upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: {} }, modelContextLimit: 200_000, - kernelConfig: defaultConfig(200_000), + kernelConfig: { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/claude-fork-lineage.test.ts b/tests/claude-fork-lineage.test.ts index 63152b8f63..65355d8c52 100644 --- a/tests/claude-fork-lineage.test.ts +++ b/tests/claude-fork-lineage.test.ts @@ -220,11 +220,11 @@ function proxyOpts(relayUrl: string): ProxyOptions { upstream: "http://127.0.0.1", routes: {} as ProxyOptions["routes"], modelContextLimit: 1_000_000, - kernelConfig: defaultConfig(1_000_000, { + kernelConfig: { ...defaultConfig(1_000_000, { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, forkAdoption: true, diff --git a/tests/codex-compact-e2e.test.ts b/tests/codex-compact-e2e.test.ts index bb0d17df9b..9584cf2c78 100644 --- a/tests/codex-compact-e2e.test.ts +++ b/tests/codex-compact-e2e.test.ts @@ -148,7 +148,7 @@ async function withHarness(opts: { mode?: string; firstTurnTokens: number; stric upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-resp": { context: 15_000 } } } }, modelContextLimit: 15_000, - kernelConfig: defaultConfig(15_000), + kernelConfig: { ...defaultConfig(15_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/compress-fingerprint-refold.test.ts b/tests/compress-fingerprint-refold.test.ts index 942e6fdfb5..32306960da 100644 --- a/tests/compress-fingerprint-refold.test.ts +++ b/tests/compress-fingerprint-refold.test.ts @@ -20,7 +20,7 @@ function makeCtx(): Ctx { const logs: string[] = []; const ctx: Ctx = { core: createCore(), - config: defaultConfig(200000), + config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 }, messages: [] as CoreMessage[], session: { id: `fpr-${Math.random().toString(36).slice(2)}`, diff --git a/tests/compress-from-store.test.ts b/tests/compress-from-store.test.ts index 528657b9cb..d9d2f58c78 100644 --- a/tests/compress-from-store.test.ts +++ b/tests/compress-from-store.test.ts @@ -41,7 +41,7 @@ function makeCtx(opts?: { id?: string; messages?: CoreMessage[]; refs?: boolean const logs: string[] = []; const ctx: Ctx = { core: createCore(), - config: defaultConfig(200000, { preserveRecentMessages: 5, preserveRecentTokens: 0 }), + config: { ...defaultConfig(200000, { preserveRecentMessages: 5, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 }, messages: opts?.messages ?? [], session: { id: opts?.id ?? "sess-cfs", diff --git a/tests/decompress-empty-range.test.ts b/tests/decompress-empty-range.test.ts index 0011e1fbcb..3341860dea 100644 --- a/tests/decompress-empty-range.test.ts +++ b/tests/decompress-empty-range.test.ts @@ -45,7 +45,7 @@ type FoldResult = { function fold(opts: { ccr: boolean; plugin?: string }): FoldResult { const core = createCore(); const config = applyCompressSettings( - defaultConfig(200_000), + { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, 200_000, { ccr: opts.ccr ? { enabled: true, minToolTokens: 50 } : { enabled: false, minToolTokens: 50 } }, ) as Config; @@ -163,7 +163,7 @@ function readManifest(config: Config): ManifestBody { } test("#1712: manifest (CCR off by default) never advertises decompress range args on any wire", () => { - const m = readManifest(defaultConfig(200_000)); + const m = readManifest({ ...defaultConfig(200_000), minFoldBenefitTokens: 0 }); for (const wire of ["anthropic", "openai", "responses"]) { const props = propsOf(m.tools[wire] ?? [], DECOMPRESS_TOOL_NAME); assert.ok(props, `${wire}: decompress present`); @@ -174,7 +174,7 @@ test("#1712: manifest (CCR off by default) never advertises decompress range arg }); test("#1712: manifest with base CCR on advertises range args on anthropic/openai only — responses never arms CCR in plugin mode (#1271)", () => { - const m = readManifest({ ...defaultConfig(200_000), ccr: { ...DEFAULT_CCR_CONFIG, enabled: true } }); + const m = readManifest({ ...defaultConfig(200_000), minFoldBenefitTokens: 0, ccr: { ...DEFAULT_CCR_CONFIG, enabled: true } }); for (const wire of ["anthropic", "openai"]) { const props = propsOf(m.tools[wire] ?? [], DECOMPRESS_TOOL_NAME); assert.equal(props?.startId?.type, "string", `${wire}: startId advertised with base CCR on`); diff --git a/tests/decompress-image-ref-dispatch.test.ts b/tests/decompress-image-ref-dispatch.test.ts index 0e6aec6bc0..525e4a1bbc 100644 --- a/tests/decompress-image-ref-dispatch.test.ts +++ b/tests/decompress-image-ref-dispatch.test.ts @@ -59,7 +59,7 @@ type FoldResult = { function fold(): FoldResult { const core = createCore(); const config = applyCompressSettings( - defaultConfig(200_000), + { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, 200_000, { ccr: { enabled: false, minToolTokens: 50 } }, ) as Config; diff --git a/tests/derived-fork-block-inheritance.test.ts b/tests/derived-fork-block-inheritance.test.ts index 0bcdaa0bf0..ffab6240d4 100644 --- a/tests/derived-fork-block-inheritance.test.ts +++ b/tests/derived-fork-block-inheritance.test.ts @@ -156,11 +156,11 @@ function proxyOpts(relayUrl: string): ProxyOptions { upstream: "http://127.0.0.1", routes: {} as ProxyOptions["routes"], modelContextLimit: 1_000_000, - kernelConfig: defaultConfig(1_000_000, { + kernelConfig: { ...defaultConfig(1_000_000, { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/dsh-authored-compaction.test.ts b/tests/dsh-authored-compaction.test.ts index 09388b29cb..4b6f549df3 100644 --- a/tests/dsh-authored-compaction.test.ts +++ b/tests/dsh-authored-compaction.test.ts @@ -250,7 +250,7 @@ async function withHarness(fn: (h: Harness) => Promise, optsOverride: Part upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-test": { context: 15_000 } } } }, modelContextLimit: 15_000, - kernelConfig: defaultConfig(15_000), + kernelConfig: { ...defaultConfig(15_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", @@ -510,7 +510,7 @@ test("e2e: responses wire — authored answer + landed checkpoint recognized on upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-test": { context: 15_000 } } } }, modelContextLimit: 15_000, - kernelConfig: defaultConfig(15_000), + kernelConfig: { ...defaultConfig(15_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/durable-tool-identity.test.ts b/tests/durable-tool-identity.test.ts index e08aff4edd..6294165974 100644 --- a/tests/durable-tool-identity.test.ts +++ b/tests/durable-tool-identity.test.ts @@ -55,7 +55,7 @@ function filler(tag: string): string { test("withDurableProtection: default ensures durable/* latest-per-identity + classifier hook", () => { const cl = durableMessageToolPaths["dsh"]!; - const base = defaultConfig(200_000); + const base = { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }; const out = withDurableProtection(base, cl); assert.deepEqual(out.protectedLatestTools, ["durable/*"], "default adds durable/* to protectedLatestTools"); assert.equal(out.messagePathOf, cl, "classifier attached"); @@ -67,14 +67,14 @@ test("withDurableProtection: default ensures durable/* latest-per-identity + cla test("withDurableProtection: a durable pattern in protectedTools = whole-identity takeover", () => { const cl = durableMessageToolPaths["dsh"]!; - const out = withDurableProtection({ ...defaultConfig(200_000), protectedTools: ["read", "durable/agents-md"] }, cl); + const out = withDurableProtection({ ...defaultConfig(200_000), minFoldBenefitTokens: 0, protectedTools: ["read", "durable/agents-md"] }, cl); assert.deepEqual(out.protectedTools, ["read", "durable/agents-md"], "no durable/* injected — user policy wins verbatim"); assert.equal(out.messagePathOf, cl, "classifier still attached (identity translation is bili's job)"); }); test("withDurableProtection: a durable pattern in protectedLatestTools = takeover too (no default injection)", () => { const cl = durableMessageToolPaths["dsh"]!; - const out = withDurableProtection({ ...defaultConfig(200_000), protectedLatestTools: ["durable/*"] }, cl); + const out = withDurableProtection({ ...defaultConfig(200_000), minFoldBenefitTokens: 0, protectedLatestTools: ["durable/*"] }, cl); assert.deepEqual(out.protectedTools, [], "protectedTools not extended when latest takes over"); assert.deepEqual(out.protectedLatestTools, ["durable/*"]); assert.equal(out.messagePathOf, cl); @@ -96,14 +96,14 @@ test("dshTimeContextPath: clock readings get a path OUTSIDE durable/* — anchor assert.equal(cl(reading), "oneshot/time-context"); // ...and the default durable policy pins nothing in the injected/ // namespace (stays foldable; the path exists for the Rule-3 anchor skip). - const out = withDurableProtection(defaultConfig(200_000), cl); + const out = withDurableProtection({ ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, cl); assert.deepEqual(out.protectedLatestTools, ["durable/*"], "latest-pin default covers durable/* only"); assert.ok(!(out.protectedTools ?? []).some((p) => p.includes("injected")), "no all-instance protection for injected/*"); }); test("withDurableProtection: idempotent — no duplicate durable/* on re-apply", () => { const cl = durableMessageToolPaths["dsh"]!; - const once = withDurableProtection(defaultConfig(200_000), cl); + const once = withDurableProtection({ ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, cl); const twice = withDurableProtection(once, cl); assert.deepEqual(twice.protectedLatestTools, ["durable/*"]); }); @@ -143,11 +143,11 @@ async function startRig(compress?: CompressSettings): Promise { upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: {} }, modelContextLimit: 200_000, - kernelConfig: defaultConfig(200_000, { + kernelConfig: { ...defaultConfig(200_000, { preserveRecentMessages: 3, preserveRecentTokens: 0, compress: { minCompressRange: 500, maxSummaryLength: 20_000, minSummaryLength: 50 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false, ...compress }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/e2e-anthropic.test.ts b/tests/e2e-anthropic.test.ts index e25c66a180..67f6549943 100644 --- a/tests/e2e-anthropic.test.ts +++ b/tests/e2e-anthropic.test.ts @@ -188,7 +188,7 @@ async function startHarness(scripts: string[][], overrides: Partial string, f upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-test": { context: 400_000 } } } }, modelContextLimit: 400_000, - kernelConfig: defaultConfig(400_000, { + kernelConfig: { ...defaultConfig(400_000, { preserveRecentMessages: 3, preserveRecentTokens: 800, compress: { minCompressRange: 1, maxSummaryLength: 20000, minSummaryLength: 1 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/e2e-tag-echo.test.ts b/tests/e2e-tag-echo.test.ts index 33f536a8b3..d430f0fecd 100644 --- a/tests/e2e-tag-echo.test.ts +++ b/tests/e2e-tag-echo.test.ts @@ -57,7 +57,7 @@ function startHarness(scripts: string[][]): Promise { upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "claude-test": { context: 400_000 } } } }, modelContextLimit: 400_000, - kernelConfig: defaultConfig(400_000), + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/e2e-trae-model-restamp.test.ts b/tests/e2e-trae-model-restamp.test.ts index 527170f368..135cc7ecca 100644 --- a/tests/e2e-trae-model-restamp.test.ts +++ b/tests/e2e-trae-model-restamp.test.ts @@ -149,11 +149,11 @@ function proxyOpts(relayUrl: string): ProxyOptions { upstream: "http://127.0.0.1", routes: {} as ProxyOptions["routes"], modelContextLimit: 1_000_000, - kernelConfig: defaultConfig(1_000_000, { + kernelConfig: { ...defaultConfig(1_000_000, { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, compat: { roles: {} }, diff --git a/tests/e2e-vertex-anthropic.test.ts b/tests/e2e-vertex-anthropic.test.ts index 1a289879cc..3b6dd8157b 100644 --- a/tests/e2e-vertex-anthropic.test.ts +++ b/tests/e2e-vertex-anthropic.test.ts @@ -145,7 +145,7 @@ async function startHarness(scripts: string[][]): Promise { // six filler turns sit just under the 5000-token default, which would put // the filler inside the zone and make the fold fail for a reason this test // is not about. - kernelConfig: { ...defaultConfig(400_000), preserveRecentTokens: 0 }, + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0, preserveRecentTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/external-summary-runtime.test.ts b/tests/external-summary-runtime.test.ts index b97cdc4ac0..69ccb67899 100644 --- a/tests/external-summary-runtime.test.ts +++ b/tests/external-summary-runtime.test.ts @@ -32,7 +32,7 @@ const RAW = "Historical source src/example.ts:27 E_TEST; do not deploy; still ad function context(externalSummary?: unknown): RewriteCtx { const core = createCore(); - const config = defaultConfig(400_000) as Config & { externalSummary?: unknown }; + const config = { ...defaultConfig(400_000), minFoldBenefitTokens: 0 } as Config & { externalSummary?: unknown }; // The chain now rides the request Config rail (#833) — ctx.config is the // session's effective resolved config, exactly like the proxy serves it. if (externalSummary !== undefined) config.externalSummary = externalSummary; diff --git a/tests/fix-decompress-reaper.test.ts b/tests/fix-decompress-reaper.test.ts index a1dcc3c831..5dc6912ce8 100644 --- a/tests/fix-decompress-reaper.test.ts +++ b/tests/fix-decompress-reaper.test.ts @@ -11,7 +11,7 @@ import { getSession } from "../src/session.ts"; function makeCtx(tag: string) { const core = createCore(); - const config = defaultConfig(200000) as Config; + const config = { ...defaultConfig(200000), minFoldBenefitTokens: 0 } as Config; const session = getSession(`fix-${tag}-${Math.random().toString(36).slice(2)}`); return { core, config, session }; } diff --git a/tests/fix-decompress-tofile.test.ts b/tests/fix-decompress-tofile.test.ts index 61b346605e..d88088d9ee 100644 --- a/tests/fix-decompress-tofile.test.ts +++ b/tests/fix-decompress-tofile.test.ts @@ -28,7 +28,7 @@ const pad = (n: number): string => String(n).padStart(5, "0"); function foldBlock(tag: string, endRef: number, log?: (msg: string) => void) { const count = endRef + 8; const core = createCore(); - const config = defaultConfig(200_000) as Config; + const config = { ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as Config; const session = getSession(`tf-${tag}-${Math.random().toString(36).slice(2)}`); const msgs: CoreMessage[] = []; for (let i = 0; i < count; i++) { @@ -132,7 +132,7 @@ test("#1691 relative toFile resolves against the proxy cwd", () => { function foldCcr() { const core = createCore(); const config = applyCompressSettings( - defaultConfig(200_000), + { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, 200_000, { absorb: { enabled: true, minToolTokens: 50 }, ccr: { enabled: true, minToolTokens: 50 } }, ) as Config; diff --git a/tests/fork-adoption-wires.test.ts b/tests/fork-adoption-wires.test.ts index 97d01a8d06..8d3f435a9d 100644 --- a/tests/fork-adoption-wires.test.ts +++ b/tests/fork-adoption-wires.test.ts @@ -282,11 +282,11 @@ function proxyOpts(forkAdoption: boolean): ProxyOptions { upstream: "http://127.0.0.1", routes: {} as ProxyOptions["routes"], modelContextLimit: 1_000_000, - kernelConfig: defaultConfig(1_000_000, { + kernelConfig: { ...defaultConfig(1_000_000, { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, forkAdoption, diff --git a/tests/fork-adoption.test.ts b/tests/fork-adoption.test.ts index 8fbe6a5d52..dc7444e4e9 100644 --- a/tests/fork-adoption.test.ts +++ b/tests/fork-adoption.test.ts @@ -168,11 +168,11 @@ function proxyOpts(relayUrl: string, forkAdoption: boolean): ProxyOptions { upstream: "http://127.0.0.1", routes: {} as ProxyOptions["routes"], modelContextLimit: 1_000_000, - kernelConfig: defaultConfig(1_000_000, { + kernelConfig: { ...defaultConfig(1_000_000, { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, compat: { roles: {} }, diff --git a/tests/host-usage-postfold.test.ts b/tests/host-usage-postfold.test.ts index 950b9dbf4c..bdceaf678b 100644 --- a/tests/host-usage-postfold.test.ts +++ b/tests/host-usage-postfold.test.ts @@ -46,7 +46,7 @@ function makeCtx(id: string, messages: CoreMessage[]): { } { return { core: createCore(), - config: defaultConfig(200000), + config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 }, messages, session: makeSession(id), log: () => {}, @@ -385,14 +385,14 @@ test("#408/#660: prepareOpenai — post-fold provider usage reaches the host ver upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${relayPort}`]: { models: { "gpt-test": { context: 1_000_000 } }, compressProtocol: "marker" } } as ProxyOptions["routes"], modelContextLimit: 1_000_000, - kernelConfig: defaultConfig(1_000_000, { + kernelConfig: { ...defaultConfig(1_000_000, { // preserveRecentTokens defaults to 5000 — the whole small fixture // conversation would sit inside the token window and every range // would be protected. Disable it; the last-5-messages window stays. preserveRecentMessages: 5, preserveRecentTokens: 0, compress: { minCompressRange: 1000, maxSummaryLength: 20000, minSummaryLength: 50 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", @@ -494,7 +494,7 @@ test("#590: pi plugin mode reports folded usage verbatim", async () => { upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${relayPort}`]: { models: { "claude-test": { context: 400_000 } } } } as ProxyOptions["routes"], modelContextLimit: 400_000, - kernelConfig: defaultConfig(400_000), + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", @@ -621,7 +621,7 @@ test("#623: omp plugin mode reports folded usage verbatim", async () => { upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${relayPort}`]: { models: { "claude-test": { context: 400_000 } } } } as ProxyOptions["routes"], modelContextLimit: 400_000, - kernelConfig: defaultConfig(400_000), + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", @@ -792,7 +792,7 @@ async function withZCodeHarness(fn: (h: { proxy: http.Server; upstream: http.Ser upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "claude-test": { context: 100_000 } } } }, modelContextLimit: 100_000, - kernelConfig: defaultConfig(100_000), + kernelConfig: { ...defaultConfig(100_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", @@ -940,7 +940,7 @@ async function withCodexHarness(fn: (h: { proxy: http.Server; upstream: http.Ser // carrying the injected compress prompt + ACP tools); setup must not fail-fast. routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-resp": { context: 15_000 } } } }, modelContextLimit: 15_000, - kernelConfig: defaultConfig(15_000), + kernelConfig: { ...defaultConfig(15_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/issue1333-derived-inheritance.test.ts b/tests/issue1333-derived-inheritance.test.ts index 8b31195faa..829ca21526 100644 --- a/tests/issue1333-derived-inheritance.test.ts +++ b/tests/issue1333-derived-inheritance.test.ts @@ -59,12 +59,12 @@ function residentFixture(id: string): Session { messages.push({ id: `a${i}`, role: "assistant", contentType: "text", text: `assistant reply ${i} with enough prose to fold comfortably`.repeat(3) }); } const core = createCore({ countTokens }); - const seeded = core.processTurn({ messages, state: createInitialState(), config: defaultConfig(100000), tokenCount: 500 }); + const seeded = core.processTurn({ messages, state: createInitialState(), config: { ...defaultConfig(100000), minFoldBenefitTokens: 0 }, tokenCount: 500 }); const compressed = core.applyCompression({ ranges: [{ startRef: "m00001", endRef: "m00008", summary: "fixture summary about early user turn exchanges of the derived inheritance test conversation" }], messages: seeded.messages, state: seeded.state, - config: defaultConfig(100000, { compress: { minCompressRange: 0, minSummaryLength: 1, maxSummaryLength: 5000 }, preserveRecentMessages: 2, preserveRecentTokens: 0 }), + config: { ...defaultConfig(100000, { compress: { minCompressRange: 0, minSummaryLength: 1, maxSummaryLength: 5000 }, preserveRecentMessages: 2, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 }, }); const session = getSession(id, { protocol: "openai", upstreamOrigin: "http://upstream" }); session.state = compressed.state; @@ -181,7 +181,7 @@ test("decompress and search_context fall back to the parent chain read-only (#13 const child = getSession(`pfa-child-ro-${run}`, { protocol: "openai", upstreamOrigin: "http://upstream" }); child.metadata.derivedFromSessionId = parent.id; const core = createCore({ countTokens }); - const config = defaultConfig(100000); + const config = { ...defaultConfig(100000), minFoldBenefitTokens: 0 }; const ctx: ProxyToolCtx = { core, config, messages: [], session: child, log: () => undefined }; // Child-local decompress of the PARENT's block id: read-only fallback. @@ -350,11 +350,11 @@ function proxyOpts(relayPort: number): ProxyOptions { upstream: "http://127.0.0.1", routes: {} as ProxyOptions["routes"], modelContextLimit: 1_000_000, - kernelConfig: defaultConfig(1_000_000, { + kernelConfig: { ...defaultConfig(1_000_000, { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, compat: { roles: {} }, diff --git a/tests/issue1453-rerequest-transport.test.ts b/tests/issue1453-rerequest-transport.test.ts index 7371ef7aca..cfae13db41 100644 --- a/tests/issue1453-rerequest-transport.test.ts +++ b/tests/issue1453-rerequest-transport.test.ts @@ -18,7 +18,7 @@ function makeCtx(messages: CoreMessage[] = []): { } { return { core: createCore(), - config: defaultConfig(200000), + config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 }, messages, session: { id: "issue1453-test", diff --git a/tests/issue1819-regurgitation-guard.test.ts b/tests/issue1819-regurgitation-guard.test.ts index 2aa5aea9f1..d6ac1e846e 100644 --- a/tests/issue1819-regurgitation-guard.test.ts +++ b/tests/issue1819-regurgitation-guard.test.ts @@ -65,7 +65,7 @@ test("#1819 preflight: a summary that exceeds its range is rejected, never folde const regurgitated = "R".repeat(400_000); const attempted = await startSummaryServer(regurgitated); const session = getSession(`issue1819-${randomUUID()}`); - const config = defaultConfig(100_000, { preserveRecentMessages: 0, preserveRecentTokens: 0 }) as Config; + const config = { ...defaultConfig(100_000, { preserveRecentMessages: 0, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 } as Config; // Disable the length cap so ONLY the monotonicity guard can reject — // otherwise #861's cap would mask the regression. config.compress.maxSummaryLength = 0; @@ -100,7 +100,7 @@ test("#1819 preflight: a genuinely shrinking summary still folds (no false rejec const compact = "SUMMARY: keep the task goal, exact acceptance criteria and next step; the repeated filler output is disposable."; const attempted = await startSummaryServer(compact); const session = getSession(`issue1819-${randomUUID()}`); - const config = defaultConfig(100_000, { preserveRecentMessages: 0, preserveRecentTokens: 0 }) as Config; + const config = { ...defaultConfig(100_000, { preserveRecentMessages: 0, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 } as Config; config.compress.maxSummaryLength = 0; const logs: Array<[string, string]> = []; const deps: PreflightDeps = { @@ -128,7 +128,7 @@ test("#1819 preflight: a genuinely shrinking summary still folds (no false rejec // cache — instead of committing and appending a "[Net context change]" note. test("#2748 manual compress: an expanding fold is refused BEFORE commit (state + cache untouched)", () => { const core = createCore(); - const config = defaultConfig(200_000) as Config; + const config = { ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as Config; config.compress.maxSummaryLength = 0; const session = getSession(`issue2748-${randomUUID()}`); const msgs: CoreMessage[] = []; @@ -173,7 +173,7 @@ test("#2748 manual compress: an expanding fold is refused BEFORE commit (state + test("#2748 mixed batch: a net-negative batch is refused wholesale; a net-positive batch applies", () => { const core = createCore(); - const config = defaultConfig(200_000) as Config; + const config = { ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as Config; config.compress.maxSummaryLength = 0; const session = getSession(`issue2748mix-${randomUUID()}`); const msgs: CoreMessage[] = []; diff --git a/tests/issue2419-dsh-skill-catalog.test.ts b/tests/issue2419-dsh-skill-catalog.test.ts index 9230d458c0..c2e85badfb 100644 --- a/tests/issue2419-dsh-skill-catalog.test.ts +++ b/tests/issue2419-dsh-skill-catalog.test.ts @@ -70,11 +70,11 @@ async function startRig(): Promise { upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: {} }, modelContextLimit: 200_000, - kernelConfig: defaultConfig(200_000, { + kernelConfig: { ...defaultConfig(200_000, { preserveRecentMessages: 3, preserveRecentTokens: 0, compress: { minCompressRange: 500, maxSummaryLength: 20_000, minSummaryLength: 50 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/issue2446-dsh-mcp-catalog.test.ts b/tests/issue2446-dsh-mcp-catalog.test.ts index bea9440da8..ce847592c9 100644 --- a/tests/issue2446-dsh-mcp-catalog.test.ts +++ b/tests/issue2446-dsh-mcp-catalog.test.ts @@ -86,11 +86,11 @@ async function startRig(): Promise { upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: {} }, modelContextLimit: 200_000, - kernelConfig: defaultConfig(200_000, { + kernelConfig: { ...defaultConfig(200_000, { preserveRecentMessages: 3, preserveRecentTokens: 0, compress: { minCompressRange: 500, maxSummaryLength: 20_000, minSummaryLength: 50 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/issue2447-dsh-workspace-instructions.test.ts b/tests/issue2447-dsh-workspace-instructions.test.ts index 43fafc21cf..c9fa1744cb 100644 --- a/tests/issue2447-dsh-workspace-instructions.test.ts +++ b/tests/issue2447-dsh-workspace-instructions.test.ts @@ -76,11 +76,11 @@ async function startRig(): Promise { upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: {} }, modelContextLimit: 200_000, - kernelConfig: defaultConfig(200_000, { + kernelConfig: { ...defaultConfig(200_000, { preserveRecentMessages: 3, preserveRecentTokens: 0, compress: { minCompressRange: 500, maxSummaryLength: 20_000, minSummaryLength: 50 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/issue2481-dsh-runtime-context.test.ts b/tests/issue2481-dsh-runtime-context.test.ts index 44637e839f..48537804fc 100644 --- a/tests/issue2481-dsh-runtime-context.test.ts +++ b/tests/issue2481-dsh-runtime-context.test.ts @@ -112,11 +112,11 @@ async function startRig(): Promise { upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: {} }, modelContextLimit: 200_000, - kernelConfig: defaultConfig(200_000, { + kernelConfig: { ...defaultConfig(200_000, { preserveRecentMessages: 3, preserveRecentTokens: 0, compress: { minCompressRange: 500, maxSummaryLength: 20_000, minSummaryLength: 50 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/issue3302-sparse-ref-tombstones.test.ts b/tests/issue3302-sparse-ref-tombstones.test.ts index 8da439105f..7bd9fa36dc 100644 --- a/tests/issue3302-sparse-ref-tombstones.test.ts +++ b/tests/issue3302-sparse-ref-tombstones.test.ts @@ -26,7 +26,7 @@ function makeCtx(count: number, preserveRecentMessages = 5): RewriteCtx & { mess storeUnpromptedGate(session, { nudgeInjected: false, requireNudge: false, requireRecommendation: false, postComPressTail: true }); return { core: createCore(), - config: defaultConfig(200000, { preserveRecentMessages, preserveRecentTokens: 0 }), + config: { ...defaultConfig(200000, { preserveRecentMessages, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 }, messages, session, log: () => {}, diff --git a/tests/issue3322-coverage-regression-guard.test.ts b/tests/issue3322-coverage-regression-guard.test.ts index 2c25a13769..6e1a4ff22d 100644 --- a/tests/issue3322-coverage-regression-guard.test.ts +++ b/tests/issue3322-coverage-regression-guard.test.ts @@ -30,7 +30,7 @@ afterEach(() => { function makeCtx(prefix: string) { const core = createCore(); - const config = defaultConfig(200_000) as Config; + const config = { ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as Config; config.compress.maxSummaryLength = 0; // Fold ANY message: the guard under test must not depend on where the // token-based recent-zone boundary falls inside this small fixture. diff --git a/tests/issue3477-responses-compaction-archive.test.ts b/tests/issue3477-responses-compaction-archive.test.ts index 6a260c18ca..892b4d24a9 100644 --- a/tests/issue3477-responses-compaction-archive.test.ts +++ b/tests/issue3477-responses-compaction-archive.test.ts @@ -117,7 +117,7 @@ async function startHarness(modelFold: boolean): Promise { upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { [MODEL]: { context: WINDOW } } } }, modelContextLimit: WINDOW, - kernelConfig: defaultConfig(WINDOW), + kernelConfig: { ...defaultConfig(WINDOW), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/issue4331-uncovered-history.test.ts b/tests/issue4331-uncovered-history.test.ts index 05699717c1..8db6444685 100644 --- a/tests/issue4331-uncovered-history.test.ts +++ b/tests/issue4331-uncovered-history.test.ts @@ -26,7 +26,7 @@ function makeCtx(messages: CoreMessage[], overrides?: Record): const logs: string[] = []; const ctx: Ctx = { core: createCore(), - config: defaultConfig(200000, overrides as never), + config: { ...defaultConfig(200000, overrides as never), minFoldBenefitTokens: 0 }, messages, session: { id: "issue4331-test", diff --git a/tests/issue4797-superseded-deadlock.test.ts b/tests/issue4797-superseded-deadlock.test.ts index 9595d11d72..a69a9b8213 100644 --- a/tests/issue4797-superseded-deadlock.test.ts +++ b/tests/issue4797-superseded-deadlock.test.ts @@ -68,7 +68,7 @@ function makeCtx(): { ctx: RewriteCtx; logs: string[] } { const { session, messages } = restampedSession(); const ctx = { core: createCore(), - config: defaultConfig(100_000, { preserveRecentMessages: 0, preserveRecentTokens: 0 }), + config: { ...defaultConfig(100_000, { preserveRecentMessages: 0, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 }, messages, compressMessages: messages, session, diff --git a/tests/issue5161-compress-scan-log-noise.test.ts b/tests/issue5161-compress-scan-log-noise.test.ts index 286a6df0ed..c97a14db0c 100644 --- a/tests/issue5161-compress-scan-log-noise.test.ts +++ b/tests/issue5161-compress-scan-log-noise.test.ts @@ -31,7 +31,7 @@ function makeCtx(): Ctx { const logs: string[] = []; return { core: createCore(), - config: defaultConfig(200000), + config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 }, messages: [] as CoreMessage[], session: { id: `ext5161-${Math.random().toString(36).slice(2)}`, diff --git a/tests/issue539-loop-reasoning.test.ts b/tests/issue539-loop-reasoning.test.ts index b131f86bed..bfd14e02a6 100644 --- a/tests/issue539-loop-reasoning.test.ts +++ b/tests/issue539-loop-reasoning.test.ts @@ -76,7 +76,7 @@ function findToolCallAssistant(rb: { messages: WireMessage[] }, toolName: string // Mirror of server.prepareOpenai: openaiToCore → processTurn. function prepare(body: Record, session: Session) { const core = createCore(); - const config = defaultConfig(200000); + const config = { ...defaultConfig(200000), minFoldBenefitTokens: 0 }; const { msgs, systemText } = openaiToCore(body as OpenAIRequestBody) as { msgs: CoreMessage[]; systemText: string }; const turn = core.processTurn({ messages: msgs, state: session.state, config, tokenCount: 100, renderTags: "text-only" }); session.state = turn.state; diff --git a/tests/lineage-reconcile-boot.test.ts b/tests/lineage-reconcile-boot.test.ts index 64e6bb123b..dfaf825811 100644 --- a/tests/lineage-reconcile-boot.test.ts +++ b/tests/lineage-reconcile-boot.test.ts @@ -153,11 +153,11 @@ function proxyOpts(relayUrl: string, resumeInheritance?: boolean): ProxyOptions upstream: "http://127.0.0.1", routes: {} as ProxyOptions["routes"], modelContextLimit: 1_000_000, - kernelConfig: defaultConfig(1_000_000, { + kernelConfig: { ...defaultConfig(1_000_000, { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/loop-compress.test.ts b/tests/loop-compress.test.ts index 9942b88125..4434f5a350 100644 --- a/tests/loop-compress.test.ts +++ b/tests/loop-compress.test.ts @@ -22,7 +22,7 @@ function makeCtx(messages: CoreMessage[] = []): { } { return { core: createCore(), - config: defaultConfig(200000), + config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 }, messages, session: { id: "loop-compress-test", diff --git a/tests/plugin-call-identity.test.ts b/tests/plugin-call-identity.test.ts index 7ea6970bf7..eefdee0524 100644 --- a/tests/plugin-call-identity.test.ts +++ b/tests/plugin-call-identity.test.ts @@ -40,7 +40,7 @@ async function harness() { setRegistryForTest({}); _resetSessionsForTest(); _resetPluginStateForTest(); - const config = defaultConfig(200_000); + const config = { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }; const opts: ProxyOptions = { port: 0, host: "127.0.0.1", upstream: origin, routes: { [origin]: { models: { "gpt-identity": { context: 200_000 } } } }, diff --git a/tests/plugin-fork.test.ts b/tests/plugin-fork.test.ts index 8e555df402..36ac61c3b5 100644 --- a/tests/plugin-fork.test.ts +++ b/tests/plugin-fork.test.ts @@ -100,7 +100,7 @@ async function harness(persist = false, seedParent = true, compressExtra: Record const addr = upstream.address(); assert(addr && typeof addr === "object"); const upstreamUrl = `http://127.0.0.1:${addr.port}`; - const proxy = await startServer({ port: 0, host: "127.0.0.1", upstream: upstreamUrl, routes: { [upstreamUrl]: { models: { "claude-test": { context: 400000 } } } }, modelContextLimit: 400000, kernelConfig: defaultConfig(400000), compress: { injectTool: true, injectNudge: true, preserveRecentMessages: 1, preserveRecentTokens: 0, minCompressRangeChars: 100, ...compressExtra }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", log: false, debug: false, passthrough: false, autoUpdate: false, mitm: { enabled: false, domains: [] } } as ProxyOptions); + const proxy = await startServer({ port: 0, host: "127.0.0.1", upstream: upstreamUrl, routes: { [upstreamUrl]: { models: { "claude-test": { context: 400000 } } } }, modelContextLimit: 400000, kernelConfig: { ...defaultConfig(400000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true, preserveRecentMessages: 1, preserveRecentTokens: 0, minCompressRangeChars: 100, ...compressExtra }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", log: false, debug: false, passthrough: false, autoUpdate: false, mitm: { enabled: false, domains: [] } } as ProxyOptions); await once(proxy, "listening"); const paddr = proxy.address(); assert(paddr && typeof paddr === "object"); @@ -1055,7 +1055,7 @@ for (const storageMode of ["legacy", "full"] as const) { // side before the stand-in proxy boots, so exactly one writer holds // the index at a time (this IS the policy, pinned here for real). if (process.env.BILI_STORAGE_UNIFIED !== "legacy") h.store.closeQuietly(); - const code = `import {startServer} from './src/server.ts'; import {SessionStore,_setStoreForTest} from './src/persist.ts'; import {defaultConfig} from 'acp-kernel'; import {_setForTest} from './src/registry.ts'; _setForTest({}); _setStoreForTest(new SessionStore({dir:${JSON.stringify(h.dir + "/sessions")},enabled:true})); const s=await startServer({port:0,host:'127.0.0.1',upstream:${JSON.stringify(h.upstreamUrl)},modelContextLimit:400000,routes:{},kernelConfig:defaultConfig(400000),compress:{injectTool:true,injectNudge:true},promptCache:{routing:'auto'},sessionHeader:'x-acp-session',log:false,debug:false,passthrough:false,autoUpdate:false,mitm:{enabled:false,domains:[]}}); const ready=()=>process.stdout.write(JSON.stringify({port:s.address().port})+'\\n'); if(s.listening)ready();else s.once('listening',ready);`; + const code = `import {startServer} from './src/server.ts'; import {SessionStore,_setStoreForTest} from './src/persist.ts'; import {defaultConfig} from 'acp-kernel'; import {_setForTest} from './src/registry.ts'; _setForTest({}); _setStoreForTest(new SessionStore({dir:${JSON.stringify(h.dir + "/sessions")},enabled:true})); const s=await startServer({port:0,host:'127.0.0.1',upstream:${JSON.stringify(h.upstreamUrl)},modelContextLimit:400000,routes:{},kernelConfig:{ ...defaultConfig(400000), minFoldBenefitTokens: 0 },compress:{injectTool:true,injectNudge:true},promptCache:{routing:'auto'},sessionHeader:'x-acp-session',log:false,debug:false,passthrough:false,autoUpdate:false,mitm:{enabled:false,domains:[]}}); const ready=()=>process.stdout.write(JSON.stringify({port:s.address().port})+'\\n'); if(s.listening)ready();else s.once('listening',ready);`; child = spawn(process.execPath, ["--import", "tsx", "--input-type=module", "--eval", code], { cwd: fileURLToPath(new URL("../", import.meta.url)), env: { ...process.env, NODE_ENV: "test" }, stdio: ["ignore", "pipe", "pipe"] }); let stderr = ""; child.stderr!.on("data", (b) => { stderr += b.toString(); }); @@ -1314,7 +1314,7 @@ test("HTTP fork before absorb summary preserves the original pair on the first c await sendModel(h, "parent", history); const parent = resolveConversation("parent").session!; const result = parent.pluginSnapshot!.find((m) => m.contentType === "tool-result" && m.toolCallId === "build_1")!; - const outcome = applyAbsorb({ ref: parent.state.messageRefs.byRaw[result.id], summary: "Build succeeded with all original checks.", absorbCallId: "absorb_1", messages: parent.pluginSnapshot!, state: parent.state, config: { ...defaultConfig(400000), absorb: { ...DEFAULT_ABSORB_CONFIG, enabled: true, toolName: "acp_absorb" } } }); + const outcome = applyAbsorb({ ref: parent.state.messageRefs.byRaw[result.id], summary: "Build succeeded with all original checks.", absorbCallId: "absorb_1", messages: parent.pluginSnapshot!, state: parent.state, config: { ...defaultConfig(400000), minFoldBenefitTokens: 0, absorb: { ...DEFAULT_ABSORB_CONFIG, enabled: true, toolName: "acp_absorb" } } }); assert.equal(outcome.ok, true, outcome.resultText); parent.state = outcome.state; const snapshot = (await h.request("/__bili/plugin/snapshot?conversationId=parent")).body; diff --git a/tests/plugin-protocol.test.ts b/tests/plugin-protocol.test.ts index ead40e5411..633a879c93 100644 --- a/tests/plugin-protocol.test.ts +++ b/tests/plugin-protocol.test.ts @@ -131,7 +131,7 @@ async function startHarness( upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "claude-test": { context: 400_000 } } } }, modelContextLimit: 400_000, - kernelConfig: kernelConfig ?? defaultConfig(400_000), + kernelConfig: kernelConfig ?? { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true, ...compress }, compat: { roles: {} }, streamErrorShape: "protocol", @@ -274,7 +274,7 @@ test("plugin manifest serves the exact wire tool schemas, headers and version", // manifest advertises acp_rule again — enabling the feature must not // shrink the toolset dsh/pi/omp/MCP shims register. test("plugin manifest: acp_rule advertised when rules enabled in config", async () => { - const h = await startHarness([textScript()], { ...defaultConfig(400_000), rules: { enabled: true } }); + const h = await startHarness([textScript()], { ...defaultConfig(400_000), minFoldBenefitTokens: 0, rules: { enabled: true } }); try { const resp = await fetch(`http://127.0.0.1:${h.proxyPort}/__bili/plugin/manifest`); assert.equal(resp.status, 200); @@ -297,7 +297,7 @@ test("plugin manifest: acp_rule advertised when rules enabled in config", async // manifest advertises all eight tools again — enabling the features must not // shrink the toolset dsh/pi/omp/MCP shims register. test("plugin manifest: absorb and acp_rule advertised when enabled in config", async () => { - const h = await startHarness([textScript()], { ...defaultConfig(400_000), absorb: { enabled: true, toolName: "absorb", minToolTokens: 4000, contextThresholdPct: 0, excludeTools: [] }, rules: { enabled: true } }); + const h = await startHarness([textScript()], { ...defaultConfig(400_000), minFoldBenefitTokens: 0, absorb: { enabled: true, toolName: "absorb", minToolTokens: 4000, contextThresholdPct: 0, excludeTools: [] }, rules: { enabled: true } }); try { const resp = await fetch(`http://127.0.0.1:${h.proxyPort}/__bili/plugin/manifest`); assert.equal(resp.status, 200); diff --git a/tests/plugin-status-provenance.test.ts b/tests/plugin-status-provenance.test.ts index 07b0f802f8..32775eaa67 100644 --- a/tests/plugin-status-provenance.test.ts +++ b/tests/plugin-status-provenance.test.ts @@ -55,7 +55,7 @@ async function harness() { const addr = upstream.address(); assert(addr && typeof addr === "object"); const upstreamUrl = `http://127.0.0.1:${addr.port}`; - const proxy = await startServer({ port: 0, host: "127.0.0.1", upstream: upstreamUrl, routes: { [upstreamUrl]: { models: { "claude-test": { context: 400000 } } } }, modelContextLimit: 400000, kernelConfig: defaultConfig(400000), compress: { injectTool: true, injectNudge: true, preserveRecentMessages: 1, preserveRecentTokens: 0, minCompressRangeChars: 100 }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", log: false, debug: false, passthrough: false, autoUpdate: false, mitm: { enabled: false, domains: [] } } as ProxyOptions); + const proxy = await startServer({ port: 0, host: "127.0.0.1", upstream: upstreamUrl, routes: { [upstreamUrl]: { models: { "claude-test": { context: 400000 } } } }, modelContextLimit: 400000, kernelConfig: { ...defaultConfig(400000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true, preserveRecentMessages: 1, preserveRecentTokens: 0, minCompressRangeChars: 100 }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", log: false, debug: false, passthrough: false, autoUpdate: false, mitm: { enabled: false, domains: [] } } as ProxyOptions); await once(proxy, "listening"); const paddr = proxy.address(); assert(paddr && typeof paddr === "object"); diff --git a/tests/proxy-decompress-cache.test.ts b/tests/proxy-decompress-cache.test.ts index 7a288d39ff..6d245faecd 100644 --- a/tests/proxy-decompress-cache.test.ts +++ b/tests/proxy-decompress-cache.test.ts @@ -8,7 +8,7 @@ import { getSession } from "../src/session.ts"; function makeCtx() { const core = createCore(); - const config = defaultConfig(200000) as Config; + const config = { ...defaultConfig(200000), minFoldBenefitTokens: 0 } as Config; const session = getSession(`test-${Math.random().toString(36).slice(2)}`); return { core, config, session }; } diff --git a/tests/responses-fold-cache-seam.test.ts b/tests/responses-fold-cache-seam.test.ts index cca46a6d5e..73d498540f 100644 --- a/tests/responses-fold-cache-seam.test.ts +++ b/tests/responses-fold-cache-seam.test.ts @@ -137,7 +137,7 @@ test("#1548: post-fold re-request keeps the in-place summary; next-turn prefix s upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-test": { context: 200_000 } } } }, modelContextLimit: 200_000, - kernelConfig: defaultConfig(200_000), + kernelConfig: { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/responses-instructions-drift.test.ts b/tests/responses-instructions-drift.test.ts index dd83284248..45bd435a10 100644 --- a/tests/responses-instructions-drift.test.ts +++ b/tests/responses-instructions-drift.test.ts @@ -152,7 +152,7 @@ async function withProxy(upstreamHandler: (req: http.IncomingMessage, res: http. [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-drift-e2e": { context: 400_000 } } }, }, modelContextLimit: 400_000, - kernelConfig: defaultConfig(400_000), + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/responses-plugin-dev-position.test.ts b/tests/responses-plugin-dev-position.test.ts index 9fc9dbb6b0..b04a95abad 100644 --- a/tests/responses-plugin-dev-position.test.ts +++ b/tests/responses-plugin-dev-position.test.ts @@ -124,7 +124,7 @@ async function driveResponses(steps: Step[], mode: "plugin" | "proxy" | "codex-p port: 0, host: "127.0.0.1", upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-test": { context: 400_000 } } } }, modelContextLimit: 400_000, - kernelConfig: defaultConfig(400_000), + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true, nudgeGrowthTokens: 500 }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/responses-refold-head-stability.test.ts b/tests/responses-refold-head-stability.test.ts index a1abe9702c..82fc0c2fb3 100644 --- a/tests/responses-refold-head-stability.test.ts +++ b/tests/responses-refold-head-stability.test.ts @@ -151,7 +151,7 @@ test("#2733: chain re-folds keep the first history item byte-stable (direct-rang upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-test": { context: 200_000 } } } }, modelContextLimit: 200_000, - kernelConfig: defaultConfig(200_000), + kernelConfig: { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/resume-adoption-wires.test.ts b/tests/resume-adoption-wires.test.ts index 4a0630529b..3b5687f280 100644 --- a/tests/resume-adoption-wires.test.ts +++ b/tests/resume-adoption-wires.test.ts @@ -234,11 +234,11 @@ function proxyOpts(resumeInheritance: boolean): ProxyOptions { upstream: "http://127.0.0.1", routes: {} as ProxyOptions["routes"], modelContextLimit: 1_000_000, - kernelConfig: defaultConfig(1_000_000, { + kernelConfig: { ...defaultConfig(1_000_000, { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, forkAdoption: false, diff --git a/tests/resume-ref-inheritance.test.ts b/tests/resume-ref-inheritance.test.ts index 73a5907158..94e1d95f58 100644 --- a/tests/resume-ref-inheritance.test.ts +++ b/tests/resume-ref-inheritance.test.ts @@ -156,11 +156,11 @@ function proxyOpts(relayUrl: string, flags: { forkAdoption: boolean; resumeInher upstream: "http://127.0.0.1", routes: {} as ProxyOptions["routes"], modelContextLimit: 1_000_000, - kernelConfig: defaultConfig(1_000_000, { + kernelConfig: { ...defaultConfig(1_000_000, { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), + }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, forkAdoption: flags.forkAdoption, diff --git a/tests/seq-interval-lane.test.ts b/tests/seq-interval-lane.test.ts index 746bc9902e..722c9a9cc7 100644 --- a/tests/seq-interval-lane.test.ts +++ b/tests/seq-interval-lane.test.ts @@ -78,7 +78,7 @@ async function harness(): Promise { upstream.listen(0, "127.0.0.1"); await once(upstream, "listening"); const upstreamUrl = `http://127.0.0.1:${(upstream.address() as { port: number }).port}`; - const proxy = await startServer({ port: 0, host: "127.0.0.1", upstream: upstreamUrl, routes: { [upstreamUrl]: { models: { "claude-test": { context: 400000 } } } }, modelContextLimit: 400000, kernelConfig: defaultConfig(400000), compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", log: false, debug: false, passthrough: false, autoUpdate: false, mitm: { enabled: false, domains: [] } } as ProxyOptions); + const proxy = await startServer({ port: 0, host: "127.0.0.1", upstream: upstreamUrl, routes: { [upstreamUrl]: { models: { "claude-test": { context: 400000 } } } }, modelContextLimit: 400000, kernelConfig: { ...defaultConfig(400000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", log: false, debug: false, passthrough: false, autoUpdate: false, mitm: { enabled: false, domains: [] } } as ProxyOptions); if (!(proxy as unknown as { listening?: boolean }).listening) await once(proxy, "listening"); const proxyUrl = `http://127.0.0.1:${(proxy.address() as { port: number }).port}`; const turn = async (t: { sinceSeq: number; messages: unknown[]; msgIds?: string[]; resync?: boolean }) => { diff --git a/tests/seq-ledger.test.ts b/tests/seq-ledger.test.ts index 7823ca2a0a..03e35cc0d9 100644 --- a/tests/seq-ledger.test.ts +++ b/tests/seq-ledger.test.ts @@ -162,7 +162,7 @@ async function withHarness(fn: (h: Harness) => Promise): Promise { proxyMode: "direct", proxySource: "direct", modelContextLimit: 15000, - kernelConfig: defaultConfig(15000), + kernelConfig: { ...defaultConfig(15000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/session-continuity-proof.test.ts b/tests/session-continuity-proof.test.ts index 31c74b7cf6..3f3fcb8242 100644 --- a/tests/session-continuity-proof.test.ts +++ b/tests/session-continuity-proof.test.ts @@ -110,7 +110,7 @@ async function harness(wire: Wire) { const upstreamUrl = `http://127.0.0.1:${(upstream.address() as { port: number }).port}`; const proxy = await startServer({ port: 0, host: "127.0.0.1", upstream: upstreamUrl, routes: {}, - modelContextLimit: 400_000, kernelConfig: defaultConfig(400_000), + modelContextLimit: 400_000, kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false, preserveRecentMessages: 1, preserveRecentTokens: 0, minCompressRangeChars: 100 }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", log: false, debug: false, passthrough: false, autoUpdate: false, mitm: { enabled: false, domains: [] }, diff --git a/tests/snapshot-render.test.ts b/tests/snapshot-render.test.ts index c8954212a5..f3416f1fb5 100644 --- a/tests/snapshot-render.test.ts +++ b/tests/snapshot-render.test.ts @@ -132,7 +132,7 @@ async function withHarness(fn: (h: Harness) => Promise, storeEnabled: bool upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-test": { context: 15_000 }, "gemini-test": { context: 15_000 } } } }, modelContextLimit: 15_000, - kernelConfig: defaultConfig(15_000), + kernelConfig: { ...defaultConfig(15_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/snapshot-shadow.test.ts b/tests/snapshot-shadow.test.ts index d8e3609840..77f9a49c65 100644 --- a/tests/snapshot-shadow.test.ts +++ b/tests/snapshot-shadow.test.ts @@ -116,7 +116,7 @@ async function withHarness(fn: (h: Harness) => Promise, storeEnabled: bool upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-test": { context: 15_000 } } } }, modelContextLimit: 15_000, - kernelConfig: defaultConfig(15_000), + kernelConfig: { ...defaultConfig(15_000), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/tag-imitation-cache.test.ts b/tests/tag-imitation-cache.test.ts index dcfe3ff2ae..e03567ed6a 100644 --- a/tests/tag-imitation-cache.test.ts +++ b/tests/tag-imitation-cache.test.ts @@ -290,7 +290,7 @@ function proxyOptions(upstreamPort: number, model: string, ctx: number): ProxyOp upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { [model]: { context: ctx } } } }, modelContextLimit: ctx, - kernelConfig: defaultConfig(ctx), + kernelConfig: { ...defaultConfig(ctx), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/tight-fold-summaries.test.ts b/tests/tight-fold-summaries.test.ts index 518d234946..8d91a4ce94 100644 --- a/tests/tight-fold-summaries.test.ts +++ b/tests/tight-fold-summaries.test.ts @@ -150,7 +150,7 @@ function proxyOptions(upstreamPort: number, model: string, ctx: number): ProxyOp upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { [model]: { context: ctx } } } }, modelContextLimit: ctx, - kernelConfig: defaultConfig(ctx), + kernelConfig: { ...defaultConfig(ctx), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/wire-contract-go-session.test.ts b/tests/wire-contract-go-session.test.ts index 221268a511..c0c543ec4e 100644 --- a/tests/wire-contract-go-session.test.ts +++ b/tests/wire-contract-go-session.test.ts @@ -99,7 +99,7 @@ test("WC-016: a non-Go target keeps the existing no-session-header invariant", a // A resolved-config rail carrying a single OpenCode Go target (expanded form, inline key). function goContext(sessionId: string): RewriteCtx { const core = createCore(); - const config = defaultConfig(400_000) as Config & { externalSummary?: unknown }; + const config = { ...defaultConfig(400_000), minFoldBenefitTokens: 0 } as Config & { externalSummary?: unknown }; config.externalSummary = { enabled: true, targets: [{ name: "go", protocol: "openai", url: GO_URL, model: "deepseek-v4.1-flash", apiKey: "go-test-key" }] }; config.preserveRecentMessages = 0; config.preserveRecentTokens = 0; diff --git a/tests/zcode-memory-isolation.test.ts b/tests/zcode-memory-isolation.test.ts index eeda947129..598edabb8b 100644 --- a/tests/zcode-memory-isolation.test.ts +++ b/tests/zcode-memory-isolation.test.ts @@ -106,7 +106,7 @@ async function rig(plugin = false) { port: 0, host: "127.0.0.1", upstream, routes: { [upstream]: { models: { "gpt-test": { context: 1_000_000 } }, compressProtocol: "marker" } }, modelContextLimit: 1_000_000, - kernelConfig: defaultConfig(1_000_000, { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 } }), + kernelConfig: { ...defaultConfig(1_000_000, { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 } }), minFoldBenefitTokens: 0 }, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", log: false, debug: false, passthrough: false, compat: { roles: {} }, streamErrorShape: "protocol", passthroughSource: null, From 05b6224d99d8df031156f307e724ab140a47a321 Mon Sep 17 00:00:00 2001 From: ci-check Date: Sat, 21 Nov 2026 15:12:20 +0800 Subject: [PATCH 4/4] test: cast minFoldBenefitTokens config literals to ResolvedKernelConfig (fixes static-gates typecheck) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 65-file test commit set minFoldBenefitTokens: 0 on config literals typed as the kernel's Config, which tsc rejects (47x TS2353: the field lives on the host's ResolvedKernelConfig rail, not the kernel Config). Cast each failing literal to ResolvedKernelConfig — the pattern the 17-file commit already used in refold-wiring / issue4313 / issue3126 / issue1494 — and add the type import where missing (34 files). Type-only fix: assertions and type imports are erased at runtime, zero behavior change. Local verification: npm run typecheck (the failing static-gates step) clean; npm run build and check-dist-thin-install clean; targeted affected test files green (6 loop-compress failures reproduce identically on master — local environment noise, not PR-related; CI test lanes green on head). Refs: #7333, #7334 --- tests/agent-providers.test.ts | 3 ++- tests/cache-friendly-proxy.test.ts | 3 ++- tests/ccr-v2.test.ts | 8 ++++---- tests/claude-fork-lineage.test.ts | 3 ++- tests/compress-fingerprint-refold.test.ts | 3 ++- tests/compress-from-store.test.ts | 3 ++- tests/decompress-empty-range.test.ts | 8 ++++---- tests/decompress-image-ref-dispatch.test.ts | 4 ++-- tests/durable-tool-identity.test.ts | 9 +++++---- tests/e2e-anthropic.test.ts | 3 ++- tests/e2e-export-handoff.test.ts | 3 ++- tests/e2e-google-compress.test.ts | 3 ++- tests/e2e-mid-system.test.ts | 3 ++- tests/e2e-trae-model-restamp.test.ts | 3 ++- tests/fix-decompress-tofile.test.ts | 4 ++-- tests/fork-adoption-wires.test.ts | 3 ++- tests/fork-adoption.test.ts | 3 ++- tests/host-usage-postfold.test.ts | 9 +++++---- tests/issue1333-derived-inheritance.test.ts | 7 ++++--- tests/issue1453-rerequest-transport.test.ts | 3 ++- tests/issue3302-sparse-ref-tombstones.test.ts | 3 ++- tests/issue3477-responses-compaction-archive.test.ts | 3 ++- tests/issue4331-uncovered-history.test.ts | 3 ++- tests/issue5161-compress-scan-log-noise.test.ts | 3 ++- tests/loop-compress.test.ts | 3 ++- tests/plugin-fork.test.ts | 3 ++- tests/plugin-protocol.test.ts | 5 +++-- tests/responses-fold-cache-seam.test.ts | 3 ++- tests/responses-instructions-drift.test.ts | 3 ++- tests/responses-refold-head-stability.test.ts | 3 ++- tests/resume-adoption-wires.test.ts | 3 ++- tests/resume-ref-inheritance.test.ts | 3 ++- tests/tag-imitation-cache.test.ts | 3 ++- tests/tight-fold-summaries.test.ts | 3 ++- 34 files changed, 81 insertions(+), 51 deletions(-) diff --git a/tests/agent-providers.test.ts b/tests/agent-providers.test.ts index 0cf1fb7339..d1ee07cc37 100644 --- a/tests/agent-providers.test.ts +++ b/tests/agent-providers.test.ts @@ -23,6 +23,7 @@ import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; import type { RewriteCtx } from "../src/stream.ts"; import { rmrf } from "./tmp-rm.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; process.env.NODE_ENV = "test"; @@ -160,7 +161,7 @@ test("#2336 endpoint + web GET/PUT contract through a real server", async () => proxyMode: "direct", proxySource: "direct", modelContextLimit: 400_000, - kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/cache-friendly-proxy.test.ts b/tests/cache-friendly-proxy.test.ts index 77af079bd7..b7ebc5f326 100644 --- a/tests/cache-friendly-proxy.test.ts +++ b/tests/cache-friendly-proxy.test.ts @@ -42,6 +42,7 @@ import { rmrf } from "./tmp-rm.ts"; import { buildAbsorbSystemPrompt, ABSORB_TOOL_NAME } from "../src/compress-tool.ts"; import { GENERATION_BOUNDARY_NOTE } from "../src/generation-boundary.ts"; import { RESPONSES_SYSTEM_SECTION_SEPARATOR } from "../src/responses-system-sections.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; type Item = Record; type Wire = "responses" | "chat" | "anthropic" | "google"; @@ -333,7 +334,7 @@ function proxyOptions(upstreamPort: number, model: string, ctx: number): ProxyOp upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { [model]: { context: ctx } } } }, modelContextLimit: ctx, - kernelConfig: { ...defaultConfig(ctx), minFoldBenefitTokens: 0 }, + kernelConfig: { ...defaultConfig(ctx), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/ccr-v2.test.ts b/tests/ccr-v2.test.ts index 18841b6a42..9dc98cd37c 100644 --- a/tests/ccr-v2.test.ts +++ b/tests/ccr-v2.test.ts @@ -19,7 +19,7 @@ import { type CoreMessage, type MessageContentStore, } from "acp-kernel"; -import { applyCompressSettings } from "../src/compress-settings.ts"; +import { applyCompressSettings, type ResolvedKernelConfig } from "../src/compress-settings.ts"; import { adoptContentStore, contentStoreOf, drainPendingRetrievals, storeEffectiveCcr } from "../src/store.ts"; import { getSession } from "../src/session.ts"; import { SessionStore, _setStoreForTest } from "../src/persist.ts"; @@ -62,7 +62,7 @@ type FoldResult = { function fold(opts: { ccr: boolean; preStore?: MessageContentStore }): FoldResult { const core = createCore(); const config = applyCompressSettings( - { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, + { ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, 200_000, { absorb: { enabled: true, minToolTokens: 50 }, ccr: opts.ccr ? { enabled: true, minToolTokens: 50 } : { enabled: false, minToolTokens: 50 } }, ) as Config; @@ -317,7 +317,7 @@ async function startV2Proxy(captured: string[], noCcr?: boolean): Promise<{ prox [`http://127.0.0.1:${upstreamPort}`]: { models: { "claude-test": { context: 400_000 } } }, }, modelContextLimit: 400_000, - kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: noCcr ? { injectTool: true, injectNudge: false, minCompressRangeChars: 1000 } : { injectTool: true, injectNudge: false, minCompressRangeChars: 1000, ccr: { enabled: true } }, compat: { roles: {} }, streamErrorShape: "protocol", @@ -455,7 +455,7 @@ test("e2e CCR v2 non-stream: fold persists across turns; range restore delivered [`http://127.0.0.1:${upstreamPort}`]: { models: { "claude-test": { context: 400_000 } } }, }, modelContextLimit: 400_000, - kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: false, minCompressRangeChars: 1000, ccr: { enabled: true } }, compat: { roles: {} }, streamErrorShape: "protocol", diff --git a/tests/claude-fork-lineage.test.ts b/tests/claude-fork-lineage.test.ts index 65355d8c52..b926de3f06 100644 --- a/tests/claude-fork-lineage.test.ts +++ b/tests/claude-fork-lineage.test.ts @@ -15,6 +15,7 @@ import { claudeForkParentFromArgv, hookMainWithDeps } from "../src/claude-native import { PassThrough } from "node:stream"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; /** * #2408 claude --fork-session lineage declaration. `claude --resume @@ -224,7 +225,7 @@ function proxyOpts(relayUrl: string): ProxyOptions { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), minFoldBenefitTokens: 0 }, + }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, forkAdoption: true, diff --git a/tests/compress-fingerprint-refold.test.ts b/tests/compress-fingerprint-refold.test.ts index 32306960da..0b3272c995 100644 --- a/tests/compress-fingerprint-refold.test.ts +++ b/tests/compress-fingerprint-refold.test.ts @@ -13,6 +13,7 @@ import { parseCompressInput } from "../src/compress-tool.ts"; import { storeUnpromptedGate } from "../src/unprompted-gate.ts"; import { resolveDecompress } from "../src/decompress-shared.ts"; import { SessionStore, _setStoreForTest } from "../src/persist.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; type Ctx = Omit & { log: (m: string) => void; logs: string[] }; @@ -20,7 +21,7 @@ function makeCtx(): Ctx { const logs: string[] = []; const ctx: Ctx = { core: createCore(), - config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 }, + config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages: [] as CoreMessage[], session: { id: `fpr-${Math.random().toString(36).slice(2)}`, diff --git a/tests/compress-from-store.test.ts b/tests/compress-from-store.test.ts index d9d2f58c78..f10ca2529c 100644 --- a/tests/compress-from-store.test.ts +++ b/tests/compress-from-store.test.ts @@ -26,6 +26,7 @@ import { createCore, createInitialState, defaultConfig, assignRefs, emptyRefMap import { parseCompressInput } from "../src/compress-tool.ts"; import { applyRanges, type RewriteCtx } from "../src/stream.ts"; import { SessionStore, _setStoreForTest } from "../src/persist.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; type Ctx = Omit & { log: (m: string) => void; logs: string[] }; @@ -41,7 +42,7 @@ function makeCtx(opts?: { id?: string; messages?: CoreMessage[]; refs?: boolean const logs: string[] = []; const ctx: Ctx = { core: createCore(), - config: { ...defaultConfig(200000, { preserveRecentMessages: 5, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 }, + config: { ...defaultConfig(200000, { preserveRecentMessages: 5, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages: opts?.messages ?? [], session: { id: opts?.id ?? "sess-cfs", diff --git a/tests/decompress-empty-range.test.ts b/tests/decompress-empty-range.test.ts index 3341860dea..4bcc2801cf 100644 --- a/tests/decompress-empty-range.test.ts +++ b/tests/decompress-empty-range.test.ts @@ -11,7 +11,7 @@ import assert from "node:assert/strict"; process.env.BILI_PERSIST = "0"; import { createCore, defaultConfig, DEFAULT_CCR_CONFIG, DECOMPRESS_TOOL_NAME, SEARCH_CONTEXT_TOOL_NAME, type Config, type CoreMessage } from "acp-kernel"; -import { applyCompressSettings } from "../src/compress-settings.ts"; +import { applyCompressSettings, type ResolvedKernelConfig } from "../src/compress-settings.ts"; import { storeEffectiveCcr } from "../src/store.ts"; import { getSession } from "../src/session.ts"; import { parseCompressInput, BILI_ACP_TOOLS_ANTHROPIC, BILI_ACP_TOOLS_ANTHROPIC_NO_RANGE, BILI_ACP_TOOLS_OPENAI, BILI_ACP_TOOLS_OPENAI_NO_RANGE, BILI_ACP_TOOLS_RESPONSES, BILI_ACP_TOOLS_RESPONSES_NO_RANGE, BILI_ACP_TOOLS_GOOGLE, BILI_ACP_TOOLS_GOOGLE_NO_RANGE, BILI_ACP_READONLY_TOOLS_RESPONSES, BILI_ACP_READONLY_TOOLS_RESPONSES_NO_RANGE } from "../src/compress-tool.ts"; @@ -45,7 +45,7 @@ type FoldResult = { function fold(opts: { ccr: boolean; plugin?: string }): FoldResult { const core = createCore(); const config = applyCompressSettings( - { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, + { ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, 200_000, { ccr: opts.ccr ? { enabled: true, minToolTokens: 50 } : { enabled: false, minToolTokens: 50 } }, ) as Config; @@ -163,7 +163,7 @@ function readManifest(config: Config): ManifestBody { } test("#1712: manifest (CCR off by default) never advertises decompress range args on any wire", () => { - const m = readManifest({ ...defaultConfig(200_000), minFoldBenefitTokens: 0 }); + const m = readManifest({ ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig); for (const wire of ["anthropic", "openai", "responses"]) { const props = propsOf(m.tools[wire] ?? [], DECOMPRESS_TOOL_NAME); assert.ok(props, `${wire}: decompress present`); @@ -174,7 +174,7 @@ test("#1712: manifest (CCR off by default) never advertises decompress range arg }); test("#1712: manifest with base CCR on advertises range args on anthropic/openai only — responses never arms CCR in plugin mode (#1271)", () => { - const m = readManifest({ ...defaultConfig(200_000), minFoldBenefitTokens: 0, ccr: { ...DEFAULT_CCR_CONFIG, enabled: true } }); + const m = readManifest({ ...defaultConfig(200_000), minFoldBenefitTokens: 0, ccr: { ...DEFAULT_CCR_CONFIG, enabled: true } } as ResolvedKernelConfig); for (const wire of ["anthropic", "openai"]) { const props = propsOf(m.tools[wire] ?? [], DECOMPRESS_TOOL_NAME); assert.equal(props?.startId?.type, "string", `${wire}: startId advertised with base CCR on`); diff --git a/tests/decompress-image-ref-dispatch.test.ts b/tests/decompress-image-ref-dispatch.test.ts index 525e4a1bbc..f2b5ef8a87 100644 --- a/tests/decompress-image-ref-dispatch.test.ts +++ b/tests/decompress-image-ref-dispatch.test.ts @@ -25,7 +25,7 @@ process.env.BILI_PERSIST = "0"; process.env.XDG_STATE_HOME = mkdtempSync(join(tmpdir(), "bili-imgref-dispatch-")); import { createCore, defaultConfig, type Config, type CoreMessage } from "acp-kernel"; -import { applyCompressSettings } from "../src/compress-settings.ts"; +import { applyCompressSettings, type ResolvedKernelConfig } from "../src/compress-settings.ts"; import { getSession } from "../src/session.ts"; import { applyRanges } from "../src/stream.ts"; import { parseCompressInput } from "../src/compress-tool.ts"; @@ -59,7 +59,7 @@ type FoldResult = { function fold(): FoldResult { const core = createCore(); const config = applyCompressSettings( - { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, + { ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, 200_000, { ccr: { enabled: false, minToolTokens: 50 } }, ) as Config; diff --git a/tests/durable-tool-identity.test.ts b/tests/durable-tool-identity.test.ts index 6294165974..f660ac9dcc 100644 --- a/tests/durable-tool-identity.test.ts +++ b/tests/durable-tool-identity.test.ts @@ -37,6 +37,7 @@ import { _resetPluginStateForTest } from "../src/plugin.ts"; import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; import { _resetSessionsForTest } from "../src/session.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; process.env.NODE_ENV = "test"; process.env.BILI_PERSIST = "0"; @@ -67,14 +68,14 @@ test("withDurableProtection: default ensures durable/* latest-per-identity + cla test("withDurableProtection: a durable pattern in protectedTools = whole-identity takeover", () => { const cl = durableMessageToolPaths["dsh"]!; - const out = withDurableProtection({ ...defaultConfig(200_000), minFoldBenefitTokens: 0, protectedTools: ["read", "durable/agents-md"] }, cl); + const out = withDurableProtection({ ...defaultConfig(200_000), minFoldBenefitTokens: 0, protectedTools: ["read", "durable/agents-md"] } as ResolvedKernelConfig, cl); assert.deepEqual(out.protectedTools, ["read", "durable/agents-md"], "no durable/* injected — user policy wins verbatim"); assert.equal(out.messagePathOf, cl, "classifier still attached (identity translation is bili's job)"); }); test("withDurableProtection: a durable pattern in protectedLatestTools = takeover too (no default injection)", () => { const cl = durableMessageToolPaths["dsh"]!; - const out = withDurableProtection({ ...defaultConfig(200_000), minFoldBenefitTokens: 0, protectedLatestTools: ["durable/*"] }, cl); + const out = withDurableProtection({ ...defaultConfig(200_000), minFoldBenefitTokens: 0, protectedLatestTools: ["durable/*"] } as ResolvedKernelConfig, cl); assert.deepEqual(out.protectedTools, [], "protectedTools not extended when latest takes over"); assert.deepEqual(out.protectedLatestTools, ["durable/*"]); assert.equal(out.messagePathOf, cl); @@ -96,14 +97,14 @@ test("dshTimeContextPath: clock readings get a path OUTSIDE durable/* — anchor assert.equal(cl(reading), "oneshot/time-context"); // ...and the default durable policy pins nothing in the injected/ // namespace (stays foldable; the path exists for the Rule-3 anchor skip). - const out = withDurableProtection({ ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, cl); + const out = withDurableProtection({ ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, cl); assert.deepEqual(out.protectedLatestTools, ["durable/*"], "latest-pin default covers durable/* only"); assert.ok(!(out.protectedTools ?? []).some((p) => p.includes("injected")), "no all-instance protection for injected/*"); }); test("withDurableProtection: idempotent — no duplicate durable/* on re-apply", () => { const cl = durableMessageToolPaths["dsh"]!; - const once = withDurableProtection({ ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, cl); + const once = withDurableProtection({ ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, cl); const twice = withDurableProtection(once, cl); assert.deepEqual(twice.protectedLatestTools, ["durable/*"]); }); diff --git a/tests/e2e-anthropic.test.ts b/tests/e2e-anthropic.test.ts index 67f6549943..114c4f4218 100644 --- a/tests/e2e-anthropic.test.ts +++ b/tests/e2e-anthropic.test.ts @@ -11,6 +11,7 @@ import { startServer } from "../src/server.ts"; import type { ProxyOptions } from "../src/config.ts"; import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; interface Harness { proxyPort: number; @@ -549,7 +550,7 @@ test("e2e anthropic: forged classifier call leaves ACP state byte-equivalent (#2 // Zero the soft-protected recent zone: the kernel defaults preserve the // last 5 messages + 5000 recent tokens, and this fixture's whole history // fits inside that budget, which would make every range "protected". - const h = await startHarness([compressRound1Script(), compressRound2Script()], { kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0, preserveRecentMessages: 0, preserveRecentTokens: 0 } }); + const h = await startHarness([compressRound1Script(), compressRound2Script()], { kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0, preserveRecentMessages: 0, preserveRecentTokens: 0 } as ResolvedKernelConfig }); try { const sid = "e2e-forge-state"; // Establish real compression state first: refs assigned, one block active. diff --git a/tests/e2e-export-handoff.test.ts b/tests/e2e-export-handoff.test.ts index 21dc709fbe..2739a8ad63 100644 --- a/tests/e2e-export-handoff.test.ts +++ b/tests/e2e-export-handoff.test.ts @@ -12,6 +12,7 @@ import { exportSession, listSessions } from "../src/export.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; import type { ProxyOptions } from "../src/config.ts"; import { rmrf } from "./tmp-rm.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; // E2E for `bili export` (#151): drives the REAL proxy (startServer) against a // mock upstream that plays the model's side of the compress protocol — it reads @@ -124,7 +125,7 @@ test("e2e export: real proxy compresses via real tool call, block persists, bili upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: {} }, modelContextLimit: 400_000, - kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/e2e-google-compress.test.ts b/tests/e2e-google-compress.test.ts index 9417b749ad..7df8842eb4 100644 --- a/tests/e2e-google-compress.test.ts +++ b/tests/e2e-google-compress.test.ts @@ -8,6 +8,7 @@ import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import { listSessions } from "../src/session.ts"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; // Gemini native wire end-to-end: the client replays a growing `contents` array // against `/v1beta/models/:streamGenerateContent?alt=sse`, the mock @@ -241,7 +242,7 @@ function proxyOptions(upstreamPort: number): ProxyOptions { preserveRecentMessages: 3, preserveRecentTokens: 800, compress: { minCompressRange: 1000, maxSummaryLength: 20000, minSummaryLength: 50 }, - }), minFoldBenefitTokens: 0 }, + }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/e2e-mid-system.test.ts b/tests/e2e-mid-system.test.ts index 0ff36b33d2..fb76e40c85 100644 --- a/tests/e2e-mid-system.test.ts +++ b/tests/e2e-mid-system.test.ts @@ -7,6 +7,7 @@ import { startServer } from "../src/server.ts"; import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; // Regression for #355/#377: a multi-segment compress whose segments are // separated by an uncovered user message makes the kernel render a compressed @@ -146,7 +147,7 @@ test("e2e #355: multi-segment compress never puts a system message mid-conversat preserveRecentMessages: 3, preserveRecentTokens: 800, compress: { minCompressRange: 1, maxSummaryLength: 20000, minSummaryLength: 1 }, - }), minFoldBenefitTokens: 0 }, + }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/e2e-trae-model-restamp.test.ts b/tests/e2e-trae-model-restamp.test.ts index 135cc7ecca..8f4b8536c8 100644 --- a/tests/e2e-trae-model-restamp.test.ts +++ b/tests/e2e-trae-model-restamp.test.ts @@ -9,6 +9,7 @@ import { listSessions } from "../src/session.ts"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; import { setLogCapture } from "../src/logger.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; process.env.NODE_ENV = "test"; @@ -153,7 +154,7 @@ function proxyOpts(relayUrl: string): ProxyOptions { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), minFoldBenefitTokens: 0 }, + }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, compat: { roles: {} }, diff --git a/tests/fix-decompress-tofile.test.ts b/tests/fix-decompress-tofile.test.ts index d88088d9ee..f6a5e37521 100644 --- a/tests/fix-decompress-tofile.test.ts +++ b/tests/fix-decompress-tofile.test.ts @@ -8,7 +8,7 @@ import fs from "node:fs"; import os from "node:os"; import path from "node:path"; import { createCore, defaultConfig, type Config, type CoreMessage } from "acp-kernel"; -import { applyCompressSettings } from "../src/compress-settings.ts"; +import { applyCompressSettings, type ResolvedKernelConfig } from "../src/compress-settings.ts"; import { drainPendingRetrievals, storeEffectiveCcr } from "../src/store.ts"; import { getSession } from "../src/session.ts"; import { applyRanges } from "../src/stream.ts"; @@ -132,7 +132,7 @@ test("#1691 relative toFile resolves against the proxy cwd", () => { function foldCcr() { const core = createCore(); const config = applyCompressSettings( - { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, + { ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, 200_000, { absorb: { enabled: true, minToolTokens: 50 }, ccr: { enabled: true, minToolTokens: 50 } }, ) as Config; diff --git a/tests/fork-adoption-wires.test.ts b/tests/fork-adoption-wires.test.ts index 8d3f435a9d..a488abcaef 100644 --- a/tests/fork-adoption-wires.test.ts +++ b/tests/fork-adoption-wires.test.ts @@ -12,6 +12,7 @@ import { listSessions, _resetSessionsForTest } from "../src/session.ts"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; import { startChatRelay } from "./e2e/chat-relay.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; // Hermetic state dirs before any scenario boots a proxy (#2806 review): these // anonymous-fork scenarios reattach through prefix-affinity.json, and without @@ -286,7 +287,7 @@ function proxyOpts(forkAdoption: boolean): ProxyOptions { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), minFoldBenefitTokens: 0 }, + }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, forkAdoption, diff --git a/tests/fork-adoption.test.ts b/tests/fork-adoption.test.ts index dc7444e4e9..f18ba09805 100644 --- a/tests/fork-adoption.test.ts +++ b/tests/fork-adoption.test.ts @@ -9,6 +9,7 @@ import { listSessions } from "../src/session.ts"; import { forkAdoptionSkippedOf } from "../src/fork-adoption.ts"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; /** * #629 fork block-adoption end-to-end: an anonymous (prefix-affinity) client @@ -172,7 +173,7 @@ function proxyOpts(relayUrl: string, forkAdoption: boolean): ProxyOptions { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), minFoldBenefitTokens: 0 }, + }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, compat: { roles: {} }, diff --git a/tests/host-usage-postfold.test.ts b/tests/host-usage-postfold.test.ts index bdceaf678b..23c2457f2e 100644 --- a/tests/host-usage-postfold.test.ts +++ b/tests/host-usage-postfold.test.ts @@ -16,6 +16,7 @@ import { startServer } from "../src/server.ts"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; import { rmrf } from "./tmp-rm.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; // Some tests inspect raw on-disk session files directly (bypassing the store // codec), so pin the plain-JSON format: #1080 made BILIZSTD1 the default. @@ -46,7 +47,7 @@ function makeCtx(id: string, messages: CoreMessage[]): { } { return { core: createCore(), - config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 }, + config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages, session: makeSession(id), log: () => {}, @@ -392,7 +393,7 @@ test("#408/#660: prepareOpenai — post-fold provider usage reaches the host ver preserveRecentMessages: 5, preserveRecentTokens: 0, compress: { minCompressRange: 1000, maxSummaryLength: 20000, minSummaryLength: 50 }, - }), minFoldBenefitTokens: 0 }, + }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", @@ -494,7 +495,7 @@ test("#590: pi plugin mode reports folded usage verbatim", async () => { upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${relayPort}`]: { models: { "claude-test": { context: 400_000 } } } } as ProxyOptions["routes"], modelContextLimit: 400_000, - kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", @@ -621,7 +622,7 @@ test("#623: omp plugin mode reports folded usage verbatim", async () => { upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${relayPort}`]: { models: { "claude-test": { context: 400_000 } } } } as ProxyOptions["routes"], modelContextLimit: 400_000, - kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/issue1333-derived-inheritance.test.ts b/tests/issue1333-derived-inheritance.test.ts index 829ca21526..909c5b4c3e 100644 --- a/tests/issue1333-derived-inheritance.test.ts +++ b/tests/issue1333-derived-inheritance.test.ts @@ -20,6 +20,7 @@ import { startServer } from "../src/server.ts"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; import { rmrf } from "./tmp-rm.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; /** * #1333: pi RLM inline spawns create DERIVED sessions — the child's pi @@ -59,12 +60,12 @@ function residentFixture(id: string): Session { messages.push({ id: `a${i}`, role: "assistant", contentType: "text", text: `assistant reply ${i} with enough prose to fold comfortably`.repeat(3) }); } const core = createCore({ countTokens }); - const seeded = core.processTurn({ messages, state: createInitialState(), config: { ...defaultConfig(100000), minFoldBenefitTokens: 0 }, tokenCount: 500 }); + const seeded = core.processTurn({ messages, state: createInitialState(), config: { ...defaultConfig(100000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, tokenCount: 500 }); const compressed = core.applyCompression({ ranges: [{ startRef: "m00001", endRef: "m00008", summary: "fixture summary about early user turn exchanges of the derived inheritance test conversation" }], messages: seeded.messages, state: seeded.state, - config: { ...defaultConfig(100000, { compress: { minCompressRange: 0, minSummaryLength: 1, maxSummaryLength: 5000 }, preserveRecentMessages: 2, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 }, + config: { ...defaultConfig(100000, { compress: { minCompressRange: 0, minSummaryLength: 1, maxSummaryLength: 5000 }, preserveRecentMessages: 2, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, }); const session = getSession(id, { protocol: "openai", upstreamOrigin: "http://upstream" }); session.state = compressed.state; @@ -354,7 +355,7 @@ function proxyOpts(relayPort: number): ProxyOptions { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), minFoldBenefitTokens: 0 }, + }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, compat: { roles: {} }, diff --git a/tests/issue1453-rerequest-transport.test.ts b/tests/issue1453-rerequest-transport.test.ts index cfae13db41..afe174c477 100644 --- a/tests/issue1453-rerequest-transport.test.ts +++ b/tests/issue1453-rerequest-transport.test.ts @@ -6,6 +6,7 @@ import type { Session } from "../src/session.ts"; import { runCompressLoop, createResponsesAdapter } from "../src/loop/index.ts"; import { buildCompressSystemPrompt } from "../src/compress-tool.ts"; import { REPLAY_MAX_ATTEMPTS } from "../src/fetch-util.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; function makeCtx(messages: CoreMessage[] = []): { core: ReturnType; @@ -18,7 +19,7 @@ function makeCtx(messages: CoreMessage[] = []): { } { return { core: createCore(), - config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 }, + config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages, session: { id: "issue1453-test", diff --git a/tests/issue3302-sparse-ref-tombstones.test.ts b/tests/issue3302-sparse-ref-tombstones.test.ts index 7bd9fa36dc..ad359d73c8 100644 --- a/tests/issue3302-sparse-ref-tombstones.test.ts +++ b/tests/issue3302-sparse-ref-tombstones.test.ts @@ -8,6 +8,7 @@ import { getSession, reapDestroyedSubstrate } from "../src/session.ts"; import { applyRanges, type RewriteCtx } from "../src/stream.ts"; import { storeUnpromptedGate } from "../src/unprompted-gate.ts"; import { recordProbeFailures } from "../src/loop/core.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; _setStoreForTest(new SessionStore({ enabled: false })); @@ -26,7 +27,7 @@ function makeCtx(count: number, preserveRecentMessages = 5): RewriteCtx & { mess storeUnpromptedGate(session, { nudgeInjected: false, requireNudge: false, requireRecommendation: false, postComPressTail: true }); return { core: createCore(), - config: { ...defaultConfig(200000, { preserveRecentMessages, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 }, + config: { ...defaultConfig(200000, { preserveRecentMessages, preserveRecentTokens: 0 }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages, session, log: () => {}, diff --git a/tests/issue3477-responses-compaction-archive.test.ts b/tests/issue3477-responses-compaction-archive.test.ts index 892b4d24a9..2e58363aa1 100644 --- a/tests/issue3477-responses-compaction-archive.test.ts +++ b/tests/issue3477-responses-compaction-archive.test.ts @@ -31,6 +31,7 @@ import { _setForTest as setRegistryForTest } from "../src/registry.ts"; import { listSessions, _resetSessionsForTest, REF_FLOOR_RAW_ID, preCompactionArchiveOf, type Session } from "../src/session.ts"; import { _resetPluginStateForTest } from "../src/plugin.ts"; import { CODEX_COMPACT_PROMPT_ANCHOR } from "../src/codex-compact.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; const MODEL = "gpt-resp"; const WINDOW = 30_000; @@ -117,7 +118,7 @@ async function startHarness(modelFold: boolean): Promise { upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { [MODEL]: { context: WINDOW } } } }, modelContextLimit: WINDOW, - kernelConfig: { ...defaultConfig(WINDOW), minFoldBenefitTokens: 0 }, + kernelConfig: { ...defaultConfig(WINDOW), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/issue4331-uncovered-history.test.ts b/tests/issue4331-uncovered-history.test.ts index 8db6444685..9a743f7de9 100644 --- a/tests/issue4331-uncovered-history.test.ts +++ b/tests/issue4331-uncovered-history.test.ts @@ -7,6 +7,7 @@ import { applyRanges, type RewriteCtx } from "../src/stream.ts"; import { handleAcpStatus } from "../src/acp-status.ts"; import { storeUnpromptedGate } from "../src/unprompted-gate.ts"; import { describeUncoveredRuns, shortTokenCount, uncoveredHistoryRuns } from "../src/uncovered.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; // #4331: "no compressible ranges remain" fired while large mid-history spans sat // outside every active block AND every offer. Positive gates: the stop verdict @@ -26,7 +27,7 @@ function makeCtx(messages: CoreMessage[], overrides?: Record): const logs: string[] = []; const ctx: Ctx = { core: createCore(), - config: { ...defaultConfig(200000, overrides as never), minFoldBenefitTokens: 0 }, + config: { ...defaultConfig(200000, overrides as never), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages, session: { id: "issue4331-test", diff --git a/tests/issue5161-compress-scan-log-noise.test.ts b/tests/issue5161-compress-scan-log-noise.test.ts index c97a14db0c..63dd06a1ab 100644 --- a/tests/issue5161-compress-scan-log-noise.test.ts +++ b/tests/issue5161-compress-scan-log-noise.test.ts @@ -24,6 +24,7 @@ import { applyRanges, visibleSummaryStubs, type RewriteCtx } from "../src/stream import { parseCompressInput } from "../src/compress-tool.ts"; import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import { setLogCapture } from "../src/logger.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; type Ctx = Omit & { log: (m: string) => void; logs: string[] }; @@ -31,7 +32,7 @@ function makeCtx(): Ctx { const logs: string[] = []; return { core: createCore(), - config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 }, + config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages: [] as CoreMessage[], session: { id: `ext5161-${Math.random().toString(36).slice(2)}`, diff --git a/tests/loop-compress.test.ts b/tests/loop-compress.test.ts index 4434f5a350..aca292cf4a 100644 --- a/tests/loop-compress.test.ts +++ b/tests/loop-compress.test.ts @@ -8,6 +8,7 @@ import type { Session } from "../src/session.ts"; import { runCompressLoop, createResponsesAdapter, createAnthropicAdapter } from "../src/loop/index.ts"; import { buildCompressSystemPrompt } from "../src/compress-tool.ts"; import { REPLAY_MAX_ATTEMPTS } from "../src/fetch-util.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; function makeCtx(messages: CoreMessage[] = []): { core: ReturnType; @@ -22,7 +23,7 @@ function makeCtx(messages: CoreMessage[] = []): { } { return { core: createCore(), - config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 }, + config: { ...defaultConfig(200000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, messages, session: { id: "loop-compress-test", diff --git a/tests/plugin-fork.test.ts b/tests/plugin-fork.test.ts index 36ac61c3b5..f726dc9904 100644 --- a/tests/plugin-fork.test.ts +++ b/tests/plugin-fork.test.ts @@ -20,6 +20,7 @@ import { recordToolWitness, resetToolRingForTest } from "../src/tool-ring.ts"; import { contentStoreOf } from "../src/store.ts"; import { closeServers } from "./server-close-guard.ts"; import { openSqliteDatabase } from "../src/storage/driver.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; process.env.NODE_ENV = "test"; const testRoot = mkdtempSync(join(tmpdir(), "bili-fork-")); @@ -1314,7 +1315,7 @@ test("HTTP fork before absorb summary preserves the original pair on the first c await sendModel(h, "parent", history); const parent = resolveConversation("parent").session!; const result = parent.pluginSnapshot!.find((m) => m.contentType === "tool-result" && m.toolCallId === "build_1")!; - const outcome = applyAbsorb({ ref: parent.state.messageRefs.byRaw[result.id], summary: "Build succeeded with all original checks.", absorbCallId: "absorb_1", messages: parent.pluginSnapshot!, state: parent.state, config: { ...defaultConfig(400000), minFoldBenefitTokens: 0, absorb: { ...DEFAULT_ABSORB_CONFIG, enabled: true, toolName: "acp_absorb" } } }); + const outcome = applyAbsorb({ ref: parent.state.messageRefs.byRaw[result.id], summary: "Build succeeded with all original checks.", absorbCallId: "absorb_1", messages: parent.pluginSnapshot!, state: parent.state, config: { ...defaultConfig(400000), minFoldBenefitTokens: 0, absorb: { ...DEFAULT_ABSORB_CONFIG, enabled: true, toolName: "acp_absorb" } } as ResolvedKernelConfig }); assert.equal(outcome.ok, true, outcome.resultText); parent.state = outcome.state; const snapshot = (await h.request("/__bili/plugin/snapshot?conversationId=parent")).body; diff --git a/tests/plugin-protocol.test.ts b/tests/plugin-protocol.test.ts index 633a879c93..6d87f2ca21 100644 --- a/tests/plugin-protocol.test.ts +++ b/tests/plugin-protocol.test.ts @@ -12,6 +12,7 @@ import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; import { _resetPluginStateForTest, pluginReportedContextWindow, queuePluginRegister, takePendingPluginRegister } from "../src/plugin.ts"; import { clientConversationHeader } from "../src/session-id.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; interface Harness { proxyPort: number; @@ -274,7 +275,7 @@ test("plugin manifest serves the exact wire tool schemas, headers and version", // manifest advertises acp_rule again — enabling the feature must not // shrink the toolset dsh/pi/omp/MCP shims register. test("plugin manifest: acp_rule advertised when rules enabled in config", async () => { - const h = await startHarness([textScript()], { ...defaultConfig(400_000), minFoldBenefitTokens: 0, rules: { enabled: true } }); + const h = await startHarness([textScript()], { ...defaultConfig(400_000), minFoldBenefitTokens: 0, rules: { enabled: true } } as ResolvedKernelConfig); try { const resp = await fetch(`http://127.0.0.1:${h.proxyPort}/__bili/plugin/manifest`); assert.equal(resp.status, 200); @@ -297,7 +298,7 @@ test("plugin manifest: acp_rule advertised when rules enabled in config", async // manifest advertises all eight tools again — enabling the features must not // shrink the toolset dsh/pi/omp/MCP shims register. test("plugin manifest: absorb and acp_rule advertised when enabled in config", async () => { - const h = await startHarness([textScript()], { ...defaultConfig(400_000), minFoldBenefitTokens: 0, absorb: { enabled: true, toolName: "absorb", minToolTokens: 4000, contextThresholdPct: 0, excludeTools: [] }, rules: { enabled: true } }); + const h = await startHarness([textScript()], { ...defaultConfig(400_000), minFoldBenefitTokens: 0, absorb: { enabled: true, toolName: "absorb", minToolTokens: 4000, contextThresholdPct: 0, excludeTools: [] }, rules: { enabled: true } } as ResolvedKernelConfig); try { const resp = await fetch(`http://127.0.0.1:${h.proxyPort}/__bili/plugin/manifest`); assert.equal(resp.status, 200); diff --git a/tests/responses-fold-cache-seam.test.ts b/tests/responses-fold-cache-seam.test.ts index 73d498540f..5975783cbd 100644 --- a/tests/responses-fold-cache-seam.test.ts +++ b/tests/responses-fold-cache-seam.test.ts @@ -26,6 +26,7 @@ import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; import { rmrf } from "./tmp-rm.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; type Item = Record; @@ -137,7 +138,7 @@ test("#1548: post-fold re-request keeps the in-place summary; next-turn prefix s upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-test": { context: 200_000 } } } }, modelContextLimit: 200_000, - kernelConfig: { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, + kernelConfig: { ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/responses-instructions-drift.test.ts b/tests/responses-instructions-drift.test.ts index 45bd435a10..f3059dd1c1 100644 --- a/tests/responses-instructions-drift.test.ts +++ b/tests/responses-instructions-drift.test.ts @@ -7,6 +7,7 @@ import os from "node:os"; import path from "node:path"; import { defaultConfig } from "acp-kernel"; import type { ProxyOptions } from "../src/config.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; // #2668: hermetic XDG roots, set BEFORE importing anything from src/ (the // auto-restart.test.ts pattern — several src modules capture XDG-derived @@ -152,7 +153,7 @@ async function withProxy(upstreamHandler: (req: http.IncomingMessage, res: http. [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-drift-e2e": { context: 400_000 } } }, }, modelContextLimit: 400_000, - kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 }, + kernelConfig: { ...defaultConfig(400_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/responses-refold-head-stability.test.ts b/tests/responses-refold-head-stability.test.ts index 82fc0c2fb3..7c6b66bcbd 100644 --- a/tests/responses-refold-head-stability.test.ts +++ b/tests/responses-refold-head-stability.test.ts @@ -31,6 +31,7 @@ import { startServer } from "../src/server.ts"; import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; type Item = Record; @@ -151,7 +152,7 @@ test("#2733: chain re-folds keep the first history item byte-stable (direct-rang upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { "gpt-test": { context: 200_000 } } } }, modelContextLimit: 200_000, - kernelConfig: { ...defaultConfig(200_000), minFoldBenefitTokens: 0 }, + kernelConfig: { ...defaultConfig(200_000), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/resume-adoption-wires.test.ts b/tests/resume-adoption-wires.test.ts index 3b5687f280..6de2cb6fbe 100644 --- a/tests/resume-adoption-wires.test.ts +++ b/tests/resume-adoption-wires.test.ts @@ -12,6 +12,7 @@ import { listSessions } from "../src/session.ts"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; import { startChatRelay } from "./e2e/chat-relay.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; /** * #1853 resume-fork inheritance on the OTHER two wires. The #1486 harness @@ -238,7 +239,7 @@ function proxyOpts(resumeInheritance: boolean): ProxyOptions { preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), minFoldBenefitTokens: 0 }, + }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, forkAdoption: false, diff --git a/tests/resume-ref-inheritance.test.ts b/tests/resume-ref-inheritance.test.ts index 94e1d95f58..79db9312d8 100644 --- a/tests/resume-ref-inheritance.test.ts +++ b/tests/resume-ref-inheritance.test.ts @@ -11,6 +11,7 @@ import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import { listSessions } from "../src/session.ts"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; /** * #1486 resume-fork inheritance end-to-end. An identified client (x-acp- @@ -160,7 +161,7 @@ function proxyOpts(relayUrl: string, flags: { forkAdoption: boolean; resumeInher preserveRecentMessages: 2, preserveRecentTokens: 400, compress: { minCompressRange: 200, minSummaryLength: 20, maxSummaryLength: 5000 }, - }), minFoldBenefitTokens: 0 }, + }), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: false }, promptCache: { routing: "auto" }, forkAdoption: flags.forkAdoption, diff --git a/tests/tag-imitation-cache.test.ts b/tests/tag-imitation-cache.test.ts index e03567ed6a..07fea8e716 100644 --- a/tests/tag-imitation-cache.test.ts +++ b/tests/tag-imitation-cache.test.ts @@ -30,6 +30,7 @@ import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; import { rmrf } from "./tmp-rm.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; type Item = Record; type Wire = "responses" | "chat"; @@ -290,7 +291,7 @@ function proxyOptions(upstreamPort: number, model: string, ctx: number): ProxyOp upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { [model]: { context: ctx } } } }, modelContextLimit: ctx, - kernelConfig: { ...defaultConfig(ctx), minFoldBenefitTokens: 0 }, + kernelConfig: { ...defaultConfig(ctx), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session", diff --git a/tests/tight-fold-summaries.test.ts b/tests/tight-fold-summaries.test.ts index 8d91a4ce94..d7c0e224ea 100644 --- a/tests/tight-fold-summaries.test.ts +++ b/tests/tight-fold-summaries.test.ts @@ -42,6 +42,7 @@ import { SessionStore, _setStoreForTest } from "../src/persist.ts"; import type { ProxyOptions } from "../src/config.ts"; import { _setForTest as setRegistryForTest } from "../src/registry.ts"; import { rmrf } from "./tmp-rm.ts"; +import type { ResolvedKernelConfig } from "../src/compress-settings.ts"; type Item = Record; @@ -150,7 +151,7 @@ function proxyOptions(upstreamPort: number, model: string, ctx: number): ProxyOp upstream: "http://127.0.0.1", routes: { [`http://127.0.0.1:${upstreamPort}`]: { models: { [model]: { context: ctx } } } }, modelContextLimit: ctx, - kernelConfig: { ...defaultConfig(ctx), minFoldBenefitTokens: 0 }, + kernelConfig: { ...defaultConfig(ctx), minFoldBenefitTokens: 0 } as ResolvedKernelConfig, compress: { injectTool: true, injectNudge: true }, promptCache: { routing: "auto" }, sessionHeader: "x-acp-session",