@prestyj/cli 5.10.0 → 5.12.0

package/dist/core/compaction/query-aware-selector.test.js

@@ -0,0 +1,96 @@
+import { describe, expect, it, vi } from "vitest";
+import { selectMessagesInBudget } from "./compactor.js";
+import { estimateConversationTokens } from "./token-estimator.js";
+import { findLatestHumanQuery, selectQueryAwareContext } from "./query-aware-selector.js";
+function message(role, content) {
+    return { role, content };
+}
+describe("selectQueryAwareContext", () => {
+    it("keeps older evidence relevant to the latest request ahead of unrelated recent context", () => {
+        const messages = [
+            message("user", "Build the account settings flow."),
+            message("assistant", "AuthService validates the OAuth callback verifier in src/auth/callback.ts."),
+            message("assistant", "Adjusted unrelated dashboard colors and spacing."),
+            message("user", "Fix the OAuth callback verifier mismatch in AuthService."),
+        ];
+        const budget = estimateConversationTokens([messages[0], messages[1], messages[3]]);
+        const result = selectQueryAwareContext(messages, "Fix the OAuth callback verifier mismatch in AuthService.", budget, { fallback: selectMessagesInBudget });
+        expect(result.strategy).toBe("query_aware");
+        expect(result.messages).toEqual([messages[0], messages[1], messages[3]]);
+        expect(result.messages).not.toContain(messages[2]);
+    });
+    it("never exceeds the hard token budget", () => {
+        const messages = [
+            message("user", `Original request ${"a".repeat(1_000)}`),
+            message("assistant", `OAuth callback evidence ${"b".repeat(1_000)}`),
+            message("assistant", `OAuth verifier definition ${"c".repeat(1_000)}`),
+            message("user", "Investigate the OAuth verifier."),
+        ];
+        const budget = 320;
+        const result = selectQueryAwareContext(messages, "Investigate the OAuth verifier.", budget, {
+            fallback: selectMessagesInBudget,
+        });
+        expect(result.selectedTokens).toBeLessThanOrEqual(budget);
+        expect(estimateConversationTokens(result.messages)).toBeLessThanOrEqual(budget);
+    });
+    it("uses the existing selector deterministically when the query has no signal", () => {
+        const messages = [
+            message("user", "first"),
+            message("assistant", "middle"),
+            message("user", "latest"),
+        ];
+        const fallback = vi.fn(selectMessagesInBudget);
+        const first = selectQueryAwareContext(messages, "please continue", 100, { fallback });
+        const second = selectQueryAwareContext(messages, "please continue", 100, { fallback });
+        expect(first).toEqual(second);
+        expect(first).toMatchObject({ strategy: "fallback", fallbackReason: "empty_query" });
+        expect(first.messages).toEqual(selectMessagesInBudget(messages, 100));
+        expect(fallback).toHaveBeenCalledTimes(2);
+    });
+    it("falls back without throwing when retrieval fails or returns invalid rankings", () => {
+        const messages = [
+            message("user", "Original OAuth request"),
+            message("assistant", "OAuth implementation evidence"),
+            message("user", "Fix OAuth verifier"),
+        ];
+        const expected = selectMessagesInBudget(messages, 100);
+        const failed = selectQueryAwareContext(messages, "Fix OAuth verifier", 100, {
+            fallback: selectMessagesInBudget,
+            retrieve: () => {
+                throw new Error("retriever unavailable");
+            },
+        });
+        const invalid = selectQueryAwareContext(messages, "Fix OAuth verifier", 100, {
+            fallback: selectMessagesInBudget,
+            retrieve: () => [{ index: 99, score: 1 }],
+        });
+        expect(failed).toMatchObject({
+            strategy: "fallback",
+            fallbackReason: "retrieval_failed",
+            messages: expected,
+        });
+        expect(invalid).toMatchObject({
+            strategy: "fallback",
+            fallbackReason: "invalid_ranking",
+            messages: expected,
+        });
+    });
+});
+describe("findLatestHumanQuery", () => {
+    it("ignores runtime continuation messages", () => {
+        const messages = [
+            {
+                role: "user",
+                content: "Fix the OAuth verifier",
+                provenance: { source: "human", kind: "prompt", visibility: "transcript" },
+            },
+            {
+                role: "user",
+                content: "Continue after compaction",
+                provenance: { source: "runtime", kind: "continuation", visibility: "hidden" },
+            },
+        ];
+        expect(findLatestHumanQuery(messages)).toBe("Fix the OAuth verifier");
+    });
+});
+//# sourceMappingURL=query-aware-selector.test.js.map

package/dist/core/compaction/query-aware-selector.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-aware-selector.test.js","sourceRoot":"","sources":["../../../src/core/compaction/query-aware-selector.test.ts"],"names":[],"mappings":"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"}

package/dist/core/compaction/tool-result-pruner.d.ts

@@ -1,34 +1,47 @@
 import type { Message } from "@prestyj/ai";
 /**
- * Cheap context pruning for stale tool outputs (opencode-style, no LLM call).
+ * Cheap context pruning for stale tool payloads (opencode-style, no LLM call).
  *
- * Two signals, one pass:
+ * Three signals, one pass:
  * 1. Superseded reads — an old `read` of a file that was re-read later carries
  *    zero information; the newest read wins.
  * 2. Old tool-output overflow — walking backwards, the most recent
- *    `protectTokens` worth of tool output (plus everything in the last
- *    `protectTurns` user turns) is kept verbatim; anything older is stubbed.
+ *    `protectTokens` worth of tool output plus the last `protectToolBatches`
+ *    provider tool batches are kept verbatim; anything older is stubbed.
+ * 3. Large completed tool arguments — old write/edit payloads are capped once
+ *    their result has returned; the files and tool result are the durable truth.
+ *
+ * `PROTECTED_TOOLS` output is never pruned: it is behavioural instruction rather
+ * than reproducible data, so a "re-run the tool" stub is not recoverable — the
+ * agent has no signal that it ever loaded the skill.
+ *
+ * Tool batches—not human turns—are the protection boundary. Autonomous research
+ * can execute dozens of provider/tool cycles for one user prompt; protecting the
+ * whole human turn lets reproducible reads refill the context immediately after
+ * compaction.
  *
  * Cache stability: pruning mutates history, which invalidates the provider's
- * prompt-cache prefix once. To avoid churning the cache every turn, nothing is
- * pruned unless at least `minimumTokens` would be freed in one batch — so
- * prunes are rare, large, and the stubbed prefix is stable afterwards.
- * Stubs are idempotent (marked with a prefix) and never re-pruned.
+ * prompt-cache prefix. To limit churn, nothing is pruned unless at least
+ * `minimumTokens` would be freed in one batch. Stubs and compacted arguments are
+ * idempotent, so later passes leave the rewritten prefix stable.
  */
 export declare const PRUNE_PROTECT_TOKENS = 40000;
 export declare const PRUNE_MINIMUM_TOKENS = 20000;
-export declare const PRUNE_PROTECT_TURNS = 2;
+export declare const PRUNE_PROTECT_TOOL_BATCHES = 2;
+/** Tools whose output is instruction, not reproducible data — never pruned. */
+export declare const PRUNE_PROTECTED_TOOLS: Set<string>;
 export interface PruneOptions {
     /** Recent tool-output token budget kept verbatim. Default 40k. */
     protectTokens?: number;
     /** Minimum freed tokens required to apply a prune batch. Default 20k. */
     minimumTokens?: number;
-    /** Number of most-recent user turns whose tool outputs are never pruned. Default 2. */
-    protectTurns?: number;
+    /** Number of most-recent provider tool batches never pruned. Default 2. */
+    protectToolBatches?: number;
 }
 export interface PruneResult {
     pruned: boolean;
     prunedResults: number;
+    compactedToolCalls: number;
     freedTokens: number;
 }
 /** Mutates `messages` in place; message/array identity is preserved so usage

package/dist/core/compaction/tool-result-pruner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-result-pruner.d.ts","sourceRoot":"","sources":["../../../src/core/compaction/tool-result-pruner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAc,MAAM,aAAa,CAAC;AAGvD;;;;;;;;;;;;;;;GAeG;AAEH,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAC3C,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAC3C,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAIrC,MAAM,WAAW,YAAY;IAC3B,kEAAkE;IAClE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yEAAyE;IACzE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uFAAuF;IACvF,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB;AAQD;iEACiE;AACjE,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,GAAE,YAAiB,GAAG,WAAW,CAqF/F"}
+{"version":3,"file":"tool-result-pruner.d.ts","sourceRoot":"","sources":["../../../src/core/compaction/tool-result-pruner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,OAAO,EAAc,MAAM,aAAa,CAAC;AAIpE;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAC3C,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAC3C,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAE5C,+EAA+E;AAC/E,eAAO,MAAM,qBAAqB,aAAqB,CAAC;AAWxD,MAAM,WAAW,YAAY;IAC3B,kEAAkE;IAClE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yEAAyE;IACzE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;CACrB;AAeD;iEACiE;AACjE,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,GAAE,YAAiB,GAAG,WAAW,CA+I/F"}

package/dist/core/compaction/tool-result-pruner.js

@@ -1,30 +1,50 @@
+import { compactHistoricalToolCallArgs } from "./compactor.js";
 import { estimateTokens } from "./token-estimator.js";
 /**
- * Cheap context pruning for stale tool outputs (opencode-style, no LLM call).
+ * Cheap context pruning for stale tool payloads (opencode-style, no LLM call).
  *
- * Two signals, one pass:
+ * Three signals, one pass:
  * 1. Superseded reads — an old `read` of a file that was re-read later carries
  *    zero information; the newest read wins.
  * 2. Old tool-output overflow — walking backwards, the most recent
- *    `protectTokens` worth of tool output (plus everything in the last
- *    `protectTurns` user turns) is kept verbatim; anything older is stubbed.
+ *    `protectTokens` worth of tool output plus the last `protectToolBatches`
+ *    provider tool batches are kept verbatim; anything older is stubbed.
+ * 3. Large completed tool arguments — old write/edit payloads are capped once
+ *    their result has returned; the files and tool result are the durable truth.
+ *
+ * `PROTECTED_TOOLS` output is never pruned: it is behavioural instruction rather
+ * than reproducible data, so a "re-run the tool" stub is not recoverable — the
+ * agent has no signal that it ever loaded the skill.
+ *
+ * Tool batches—not human turns—are the protection boundary. Autonomous research
+ * can execute dozens of provider/tool cycles for one user prompt; protecting the
+ * whole human turn lets reproducible reads refill the context immediately after
+ * compaction.
  *
  * Cache stability: pruning mutates history, which invalidates the provider's
- * prompt-cache prefix once. To avoid churning the cache every turn, nothing is
- * pruned unless at least `minimumTokens` would be freed in one batch — so
- * prunes are rare, large, and the stubbed prefix is stable afterwards.
- * Stubs are idempotent (marked with a prefix) and never re-pruned.
+ * prompt-cache prefix. To limit churn, nothing is pruned unless at least
+ * `minimumTokens` would be freed in one batch. Stubs and compacted arguments are
+ * idempotent, so later passes leave the rewritten prefix stable.
  */
 export const PRUNE_PROTECT_TOKENS = 40_000;
 export const PRUNE_MINIMUM_TOKENS = 20_000;
-export const PRUNE_PROTECT_TURNS = 2;
+export const PRUNE_PROTECT_TOOL_BATCHES = 2;
+/** Tools whose output is instruction, not reproducible data — never pruned. */
+export const PRUNE_PROTECTED_TOOLS = new Set(["skill"]);
 const PRUNE_MARKER = "[Pruned:";
+/**
+ * Prefix of the token-overflow stub specifically. Reaching one of these while
+ * walking backwards proves the whole older prefix was already considered, which
+ * a superseded-read stub does NOT prove — read dedup fires independently of the
+ * token budget, so an older verbatim result can sit behind one.
+ */
+const PRUNE_OVERFLOW_MARKER = `${PRUNE_MARKER} old tool output`;
 /** Mutates `messages` in place; message/array identity is preserved so usage
  *  anchors and React refs stay valid. Returns what was freed. */
 export function pruneStaleToolResults(messages, opts = {}) {
     const protectTokens = opts.protectTokens ?? PRUNE_PROTECT_TOKENS;
     const minimumTokens = opts.minimumTokens ?? PRUNE_MINIMUM_TOKENS;
-    const protectTurns = opts.protectTurns ?? PRUNE_PROTECT_TURNS;
+    const protectToolBatches = opts.protectToolBatches ?? PRUNE_PROTECT_TOOL_BATCHES;
     // toolCallId → tool name + args (for read-dedup path identification).
     const callInfo = new Map();
     for (const msg of messages) {
@@ -37,22 +57,37 @@ export function pruneStaleToolResults(messages, opts = {}) {
         }
     }
     const seenReadPaths = new Set();
-    const candidates = [];
-    let userTurns = 0;
+    const resultCandidates = [];
+    const toolBatchByCallId = new Map();
+    let recentToolBatches = 0;
     let recentToolTokens = 0;
-    for (let msgIndex = messages.length - 1; msgIndex >= 0; msgIndex--) {
+    scan: for (let msgIndex = messages.length - 1; msgIndex >= 0; msgIndex--) {
         const msg = messages[msgIndex];
-        if (msg.role === "user")
-            userTurns++;
         if (msg.role !== "tool" || !Array.isArray(msg.content))
             continue;
+        recentToolBatches++;
+        const protectedBatch = recentToolBatches <= protectToolBatches;
         for (let partIndex = msg.content.length - 1; partIndex >= 0; partIndex--) {
             const result = msg.content[partIndex];
-            if (result.type !== "tool_result" || typeof result.content !== "string")
+            if (result.type !== "tool_result")
+                continue;
+            toolBatchByCallId.set(result.toolCallId, recentToolBatches);
+            if (typeof result.content !== "string")
                 continue;
-            if (result.content.startsWith(PRUNE_MARKER))
+            // An overflow stub outside the protect zone means an earlier pass blew
+            // the token budget here and pruned every prunable result older than it in
+            // that same batch. History only grows at the tail, so nothing older can
+            // have become prunable since: stop instead of re-scanning the whole
+            // transcript every turn. Other stub kinds prove nothing about what lies
+            // behind them, so they are merely skipped.
+            if (result.content.startsWith(PRUNE_MARKER)) {
+                if (!protectedBatch && result.content.startsWith(PRUNE_OVERFLOW_MARKER))
+                    break scan;
                 continue;
+            }
             const info = callInfo.get(result.toolCallId);
+            if (info && PRUNE_PROTECTED_TOOLS.has(info.name))
+                continue;
             // Dedup key includes the range: a partial read (offset/limit) covers
             // different content than a full read or another range, so only an
             // identical path+range read supersedes an older one.
@@ -62,13 +97,12 @@ export function pruneStaleToolResults(messages, opts = {}) {
             const readKey = readPath !== undefined
                 ? `${readPath}#${String(info?.args.offset ?? "")}:${String(info?.args.limit ?? "")}`
                 : undefined;
-            const protectedTurn = userTurns < protectTurns;
             // Newest read of each path+range wins — remember it even inside the
             // protect zone so an older duplicate outside the zone still counts as
             // superseded.
             if (readKey !== undefined) {
-                if (seenReadPaths.has(readKey) && !protectedTurn) {
-                    candidates.push({
+                if (seenReadPaths.has(readKey) && !protectedBatch) {
+                    resultCandidates.push({
                         result,
                         freedTokens: estimateTokens(result.content),
                         stub: `${PRUNE_MARKER} this read of ${readPath} was superseded by a newer read later in the conversation.]`,
@@ -77,13 +111,13 @@ export function pruneStaleToolResults(messages, opts = {}) {
                 }
                 seenReadPaths.add(readKey);
             }
-            if (protectedTurn)
+            if (protectedBatch)
                 continue;
             const resultTokens = estimateTokens(result.content);
             recentToolTokens += resultTokens;
             if (recentToolTokens <= protectTokens)
                 continue;
-            candidates.push({
+            resultCandidates.push({
                 result,
                 freedTokens: resultTokens,
                 stub: `${PRUNE_MARKER} old tool output (${result.content.length} chars) removed to save ` +
@@ -91,13 +125,51 @@ export function pruneStaleToolResults(messages, opts = {}) {
             });
         }
     }
-    const freedTokens = candidates.reduce((sum, candidate) => sum + candidate.freedTokens, 0);
+    // Completed write/edit-style calls can carry entire files in their arguments.
+    // Once outside the protected batches, cap those payloads before they alone can
+    // trigger an LLM compaction. Unresolved calls are deliberately left untouched.
+    const toolArgCandidates = [];
+    for (const message of messages) {
+        if (message.role !== "assistant" || !Array.isArray(message.content))
+            continue;
+        const compactedMessage = compactHistoricalToolCallArgs([message], (toolCallId) => {
+            const batch = toolBatchByCallId.get(toolCallId);
+            return batch !== undefined && batch > protectToolBatches;
+        })[0];
+        if (compactedMessage === message)
+            continue;
+        const originalContent = message.content;
+        const compactedContent = compactedMessage.content;
+        const originalTokens = estimateTokens(JSON.stringify(originalContent));
+        const compactedTokens = estimateTokens(JSON.stringify(compactedContent));
+        const compactedToolCalls = compactedContent.filter((part, index) => part !== originalContent[index]).length;
+        toolArgCandidates.push({
+            message,
+            content: compactedMessage.content,
+            compactedToolCalls,
+            freedTokens: Math.max(0, originalTokens - compactedTokens),
+        });
+    }
+    const freedTokens = [...resultCandidates, ...toolArgCandidates].reduce((sum, candidate) => sum + candidate.freedTokens, 0);
     if (freedTokens < minimumTokens) {
-        return { pruned: false, prunedResults: 0, freedTokens: 0 };
+        return {
+            pruned: false,
+            prunedResults: 0,
+            compactedToolCalls: 0,
+            freedTokens: 0,
+        };
     }
-    for (const candidate of candidates) {
+    for (const candidate of resultCandidates) {
         candidate.result.content = candidate.stub;
     }
-    return { pruned: true, prunedResults: candidates.length, freedTokens };
+    for (const candidate of toolArgCandidates) {
+        candidate.message.content = candidate.content;
+    }
+    return {
+        pruned: true,
+        prunedResults: resultCandidates.length,
+        compactedToolCalls: toolArgCandidates.reduce((sum, candidate) => sum + candidate.compactedToolCalls, 0),
+        freedTokens,
+    };
 }
 //# sourceMappingURL=tool-result-pruner.js.map

package/dist/core/compaction/tool-result-pruner.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-result-pruner.js","sourceRoot":"","sources":["../../../src/core/compaction/tool-result-pruner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-result-pruner.js","sourceRoot":"","sources":["../../../src/core/compaction/tool-result-pruner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAC3C,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAC3C,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAC;AAE5C,+EAA+E;AAC/E,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;AAExD,MAAM,YAAY,GAAG,UAAU,CAAC;AAChC;;;;;GAKG;AACH,MAAM,qBAAqB,GAAG,GAAG,YAAY,kBAAkB,CAAC;AA+BhE;iEACiE;AACjE,MAAM,UAAU,qBAAqB,CAAC,QAAmB,EAAE,OAAqB,EAAE;IAChF,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,oBAAoB,CAAC;IACjE,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,oBAAoB,CAAC;IACjE,MAAM,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,IAAI,0BAA0B,CAAC;IAEjF,sEAAsE;IACtE,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA2D,CAAC;IACpF,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;YAAE,SAAS;QACtE,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAC/B,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAC9B,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,MAAM,gBAAgB,GAAsB,EAAE,CAAC;IAC/C,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACpD,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAC1B,IAAI,gBAAgB,GAAG,CAAC,CAAC;IAEzB,IAAI,EAAE,KAAK,IAAI,QAAQ,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,QAAQ,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC;QACzE,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC/B,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;YAAE,SAAS;QACjE,iBAAiB,EAAE,CAAC;QACpB,MAAM,cAAc,GAAG,iBAAiB,IAAI,kBAAkB,CAAC;QAC/D,KAAK,IAAI,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,SAAS,IAAI,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC;YACzE,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACtC,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa;gBAAE,SAAS;YAC5C,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;YAC5D,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;gBAAE,SAAS;YACjD,uEAAuE;YACvE,0EAA0E;YAC1E,wEAAwE;YACxE,oEAAoE;YACpE,wEAAwE;YACxE,2CAA2C;YAC3C,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC5C,IAAI,CAAC,cAAc,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC;oBAAE,MAAM,IAAI,CAAC;gBACpF,SAAS;YACX,CAAC;YAED,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC7C,IAAI,IAAI,IAAI,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;gBAAE,SAAS;YAC3D,qEAAqE;YACrE,kEAAkE;YAClE,qDAAqD;YACrD,MAAM,QAAQ,GACZ,IAAI,EAAE,IAAI,KAAK,MAAM,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ;gBAC9D,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS;gBACrB,CAAC,CAAC,SAAS,CAAC;YAChB,MAAM,OAAO,GACX,QAAQ,KAAK,SAAS;gBACpB,CAAC,CAAC,GAAG,QAAQ,IAAI,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE;gBACpF,CAAC,CAAC,SAAS,CAAC;YAEhB,oEAAoE;YACpE,sEAAsE;YACtE,cAAc;YACd,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC1B,IAAI,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;oBAClD,gBAAgB,CAAC,IAAI,CAAC;wBACpB,MAAM;wBACN,WAAW,EAAE,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC;wBAC3C,IAAI,EAAE,GAAG,YAAY,iBAAiB,QAAQ,6DAA6D;qBAC5G,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBACD,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC7B,CAAC;YAED,IAAI,cAAc;gBAAE,SAAS;YAE7B,MAAM,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACpD,gBAAgB,IAAI,YAAY,CAAC;YACjC,IAAI,gBAAgB,IAAI,aAAa;gBAAE,SAAS;YAEhD,gBAAgB,CAAC,IAAI,CAAC;gBACpB,MAAM;gBACN,WAAW,EAAE,YAAY;gBACzB,IAAI,EACF,GAAG,YAAY,qBAAqB,MAAM,CAAC,OAAO,CAAC,MAAM,0BAA0B;oBACnF,4DAA4D;aAC/D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,8EAA8E;IAC9E,+EAA+E;IAC/E,+EAA+E;IAC/E,MAAM,iBAAiB,GAAuB,EAAE,CAAC;IACjD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;YAAE,SAAS;QAC9E,MAAM,gBAAgB,GAAG,6BAA6B,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE;YAC/E,MAAM,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAChD,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,GAAG,kBAAkB,CAAC;QAC3D,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACN,IAAI,gBAAgB,KAAK,OAAO;YAAE,SAAS;QAE3C,MAAM,eAAe,GAAG,OAAO,CAAC,OAAwB,CAAC;QACzD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,OAAwB,CAAC;QACnE,MAAM,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC;QACvE,MAAM,eAAe,GAAG,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACzE,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,MAAM,CAChD,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,eAAe,CAAC,KAAK,CAAC,CACjD,CAAC,MAAM,CAAC;QACT,iBAAiB,CAAC,IAAI,CAAC;YACrB,OAAO;YACP,OAAO,EAAE,gBAAgB,CAAC,OAAO;YACjC,kBAAkB;YAClB,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,GAAG,eAAe,CAAC;SAC3D,CAAC,CAAC;IACL,CAAC;IAED,MAAM,WAAW,GAAG,CAAC,GAAG,gBAAgB,EAAE,GAAG,iBAAiB,CAAC,CAAC,MAAM,CACpE,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,GAAG,GAAG,SAAS,CAAC,WAAW,EAC/C,CAAC,CACF,CAAC;IACF,IAAI,WAAW,GAAG,aAAa,EAAE,CAAC;QAChC,OAAO;YACL,MAAM,EAAE,KAAK;YACb,aAAa,EAAE,CAAC;YAChB,kBAAkB,EAAE,CAAC;YACrB,WAAW,EAAE,CAAC;SACf,CAAC;IACJ,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;QACzC,SAAS,CAAC,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC;IAC5C,CAAC;IACD,KAAK,MAAM,SAAS,IAAI,iBAAiB,EAAE,CAAC;QAC1C,SAAS,CAAC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;IAChD,CAAC;IACD,OAAO;QACL,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,gBAAgB,CAAC,MAAM;QACtC,kBAAkB,EAAE,iBAAiB,CAAC,MAAM,CAC1C,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,GAAG,GAAG,SAAS,CAAC,kBAAkB,EACtD,CAAC,CACF;QACD,WAAW;KACZ,CAAC;AACJ,CAAC"}

package/dist/core/compaction/tool-result-pruner.test.js

@@ -17,8 +17,19 @@ function resultOf(messages, toolCallId) {
     }
     throw new Error(`missing tool result ${toolCallId}`);
 }
+function callOf(messages, toolCallId) {
+    for (const msg of messages) {
+        if (msg.role !== "assistant" || !Array.isArray(msg.content))
+            continue;
+        for (const part of msg.content) {
+            if (part.type === "tool_call" && part.id === toolCallId)
+                return part;
+        }
+    }
+    throw new Error(`missing tool call ${toolCallId}`);
+}
 describe("pruneStaleToolResults", () => {
-    it("stubs superseded reads outside the protect turns", () => {
+    it("stubs superseded reads outside the protected tool batches", () => {
         const messages = [
             { role: "user", content: "turn 1" },
             ...toolTurn("old-read", "read", { file_path: "src/a.ts" }, "x".repeat(40_000)),
@@ -27,7 +38,10 @@ describe("pruneStaleToolResults", () => {
             ...toolTurn("new-read", "read", { file_path: "src/a.ts" }, "fresh content"),
             { role: "user", content: "turn 3" },
         ];
-        const result = pruneStaleToolResults(messages, { minimumTokens: 1_000 });
+        const result = pruneStaleToolResults(messages, {
+            minimumTokens: 1_000,
+            protectToolBatches: 1,
+        });
         expect(result.pruned).toBe(true);
         expect(result.prunedResults).toBe(1);
         expect(resultOf(messages, "old-read").content).toContain("superseded by a newer read");
@@ -63,6 +77,7 @@ describe("pruneStaleToolResults", () => {
         const result = pruneStaleToolResults(messages, {
             protectTokens: 10_000,
             minimumTokens: 1_000,
+            protectToolBatches: 1,
         });
         expect(result.pruned).toBe(true);
         // "recent" fills the 10k protect budget; "oldest" overflows it.
@@ -70,7 +85,7 @@ describe("pruneStaleToolResults", () => {
         expect(resultOf(messages, "oldest").content).toContain("old tool output");
         expect(resultOf(messages, "oldest").content).toContain("Re-run the tool");
     });
-    it("never touches tool output inside the protected recent turns", () => {
+    it("never touches tool output inside the protected recent batches", () => {
         const messages = [
             { role: "user", content: "turn 1" },
             ...toolTurn("latest", "bash", { command: "ls" }, "z".repeat(200_000)),
@@ -82,6 +97,35 @@ describe("pruneStaleToolResults", () => {
         expect(result.pruned).toBe(false);
         expect(resultOf(messages, "latest").content).toBe("z".repeat(200_000));
     });
+    it("caps large completed tool arguments outside the protected batches", () => {
+        const oldContent = "old".repeat(40_000);
+        const recentContent = "recent".repeat(20_000);
+        const messages = [
+            { role: "user", content: "implement several files" },
+            ...toolTurn("old-write", "write", { file_path: "old.ts", content: oldContent }, "ok"),
+            ...toolTurn("recent-write", "write", { file_path: "recent.ts", content: recentContent }, "ok"),
+            ...toolTurn("latest", "grep", { pattern: "done" }, "done"),
+        ];
+        const first = pruneStaleToolResults(messages, {
+            protectTokens: 100_000,
+            minimumTokens: 1,
+            protectToolBatches: 2,
+        });
+        const compacted = callOf(messages, "old-write").args.content;
+        expect(first.pruned).toBe(true);
+        expect(first.prunedResults).toBe(0);
+        expect(first.compactedToolCalls).toBe(1);
+        expect(compacted.length).toBeLessThan(oldContent.length);
+        expect(compacted).toContain("more characters truncated");
+        expect(callOf(messages, "recent-write").args.content).toBe(recentContent);
+        const second = pruneStaleToolResults(messages, {
+            protectTokens: 100_000,
+            minimumTokens: 1,
+            protectToolBatches: 2,
+        });
+        expect(second.pruned).toBe(false);
+        expect(callOf(messages, "old-write").args.content).toBe(compacted);
+    });
     it("holds the batch until the minimum freed-token threshold is met", () => {
         const messages = [
             { role: "user", content: "turn 1" },
@@ -92,10 +136,57 @@ describe("pruneStaleToolResults", () => {
         const result = pruneStaleToolResults(messages, {
             protectTokens: 100,
             minimumTokens: 20_000,
+            protectToolBatches: 0,
         });
         expect(result.pruned).toBe(false);
         expect(resultOf(messages, "small").content).toBe("s".repeat(2_000));
     });
+    it("bounds tool output during one long autonomous user turn", () => {
+        const messages = [{ role: "user", content: "research then implement" }];
+        for (let batch = 1; batch <= 12; batch++) {
+            messages.push(...toolTurn(`batch-${batch}`, "read", { file_path: `repo/${batch}.ts` }, "x".repeat(100_000)));
+            pruneStaleToolResults(messages, {
+                protectTokens: 40_000,
+                minimumTokens: 20_000,
+                protectToolBatches: 2,
+            });
+        }
+        const verbatimResults = Array.from({ length: 12 }, (_, index) => resultOf(messages, `batch-${index + 1}`)).filter((result) => !result.content.toString().startsWith("[Pruned:"));
+        // Two protected batches plus one older result fitting inside the 40k-token budget.
+        expect(verbatimResults).toHaveLength(3);
+        expect(resultOf(messages, "batch-10").content).toBe("x".repeat(100_000));
+        expect(resultOf(messages, "batch-11").content).toBe("x".repeat(100_000));
+        expect(resultOf(messages, "batch-12").content).toBe("x".repeat(100_000));
+        expect(resultOf(messages, "batch-1").content).toContain("old tool output");
+    });
+    it("treats parallel tool results as one provider batch", () => {
+        const messages = [
+            { role: "user", content: "research in parallel" },
+            {
+                role: "assistant",
+                content: [
+                    { type: "tool_call", id: "parallel-a", name: "grep", args: { pattern: "a" } },
+                    { type: "tool_call", id: "parallel-b", name: "grep", args: { pattern: "b" } },
+                ],
+            },
+            {
+                role: "tool",
+                content: [
+                    { type: "tool_result", toolCallId: "parallel-a", content: "a".repeat(100_000) },
+                    { type: "tool_result", toolCallId: "parallel-b", content: "b".repeat(100_000) },
+                ],
+            },
+            ...toolTurn("latest", "read", { file_path: "src/latest.ts" }, "latest"),
+        ];
+        const result = pruneStaleToolResults(messages, {
+            protectTokens: 1,
+            minimumTokens: 1,
+            protectToolBatches: 2,
+        });
+        expect(result.pruned).toBe(false);
+        expect(resultOf(messages, "parallel-a").content).toBe("a".repeat(100_000));
+        expect(resultOf(messages, "parallel-b").content).toBe("b".repeat(100_000));
+    });
     it("is idempotent: stubs are never re-pruned or re-counted", () => {
         const messages = [
             { role: "user", content: "turn 1" },
@@ -103,13 +194,90 @@ describe("pruneStaleToolResults", () => {
             { role: "user", content: "turn 2" },
             { role: "user", content: "turn 3" },
         ];
-        const first = pruneStaleToolResults(messages, { protectTokens: 100, minimumTokens: 1_000 });
+        const first = pruneStaleToolResults(messages, {
+            protectTokens: 100,
+            minimumTokens: 1_000,
+            protectToolBatches: 0,
+        });
         const stub = resultOf(messages, "old").content;
-        const second = pruneStaleToolResults(messages, { protectTokens: 100, minimumTokens: 1 });
+        const second = pruneStaleToolResults(messages, {
+            protectTokens: 100,
+            minimumTokens: 1,
+            protectToolBatches: 0,
+        });
         expect(first.pruned).toBe(true);
         expect(second.pruned).toBe(false);
         expect(resultOf(messages, "old").content).toBe(stub);
     });
+    it("never prunes skill output, which is instruction rather than reproducible data", () => {
+        const messages = [
+            { role: "user", content: "turn 1" },
+            ...toolTurn("skill-load", "skill", { skill: "evidence-led-ui" }, "s".repeat(120_000)),
+            { role: "user", content: "turn 2" },
+            ...toolTurn("old-bash", "bash", { command: "ls" }, "o".repeat(120_000)),
+            { role: "user", content: "turn 3" },
+            { role: "user", content: "turn 4" },
+        ];
+        const result = pruneStaleToolResults(messages, {
+            protectTokens: 100,
+            minimumTokens: 1_000,
+            protectToolBatches: 0,
+        });
+        expect(result.pruned).toBe(true);
+        expect(result.prunedResults).toBe(1);
+        expect(resultOf(messages, "skill-load").content).toBe("s".repeat(120_000));
+        expect(resultOf(messages, "old-bash").content).toContain("old tool output");
+    });
+    it("stops scanning at the first stub outside the protected batches", () => {
+        const messages = [
+            { role: "user", content: "turn 1" },
+            ...toolTurn("oldest", "bash", { command: "ls" }, "o".repeat(120_000)),
+            { role: "user", content: "turn 2" },
+            ...toolTurn("middle", "bash", { command: "pwd" }, "m".repeat(120_000)),
+            { role: "user", content: "turn 3" },
+        ];
+        const opts = { protectTokens: 100, minimumTokens: 1_000, protectToolBatches: 0 };
+        expect(pruneStaleToolResults(messages, opts).prunedResults).toBe(2);
+        // Fresh output arrives; the older half is already stubbed, so the second
+        // pass must stop at "middle" rather than re-walking the whole transcript.
+        messages.push(...toolTurn("newest", "bash", { command: "env" }, "n".repeat(120_000)));
+        const second = pruneStaleToolResults(messages, opts);
+        expect(second.pruned).toBe(true);
+        expect(second.prunedResults).toBe(1);
+        expect(resultOf(messages, "newest").content).toContain("old tool output");
+        expect(resultOf(messages, "oldest").content).toContain("old tool output");
+    });
+    it("does not let a superseded-read stub strand older output behind it", () => {
+        // A read dedup stub is written regardless of the token budget, so it can
+        // sit in front of results that are still verbatim. Stopping the backwards
+        // walk at one would strand them permanently.
+        const messages = [
+            { role: "user", content: "turn 1" },
+            ...toolTurn("old-bash", "bash", { command: "ls" }, "o".repeat(400_000)),
+            { role: "user", content: "turn 2" },
+            ...toolTurn("read-1", "read", { file_path: "/a.ts" }, "a".repeat(1_000)),
+            { role: "user", content: "turn 3" },
+            ...toolTurn("read-2", "read", { file_path: "/a.ts" }, "a".repeat(1_000)),
+            { role: "user", content: "turn 4" },
+        ];
+        // A protect budget this large spares the bash output, so only the
+        // superseded read is stubbed on the first pass.
+        const first = pruneStaleToolResults(messages, {
+            protectTokens: 500_000,
+            minimumTokens: 100,
+            protectToolBatches: 0,
+        });
+        expect(first.prunedResults).toBe(1);
+        expect(resultOf(messages, "old-bash").content).toBe("o".repeat(400_000));
+        // Now the budget is tight: the older bash output must still be reachable.
+        const second = pruneStaleToolResults(messages, {
+            protectTokens: 100,
+            minimumTokens: 1_000,
+            protectToolBatches: 0,
+        });
+        expect(second.pruned).toBe(true);
+        expect(resultOf(messages, "old-bash").content).toContain("old tool output");
+    });
     it("skips structured (non-string) tool results", () => {
         const messages = [
             { role: "user", content: "turn 1" },
@@ -140,7 +308,11 @@ describe("pruneStaleToolResults", () => {
         ];
         const anchor = messages[3];
         const toolMsg = messages[2];
-        pruneStaleToolResults(messages, { protectTokens: 100, minimumTokens: 1_000 });
+        pruneStaleToolResults(messages, {
+            protectTokens: 100,
+            minimumTokens: 1_000,
+            protectToolBatches: 0,
+        });
         expect(messages[3]).toBe(anchor);
         expect(messages[2]).toBe(toolMsg);
     });