@pentoshi/clai 4.11.9 → 4.11.12

package/dist/agent/turn/compaction-admission.js

@@ -2,7 +2,9 @@ import { compactionAttemptKey } from "../compaction-attempt.js";
 import { toolSchemaHash } from "../context-breakdown.js";
 import { autoCompactTriggerTokens, getReliabilityPolicy, } from "../reliability-policy.js";
 const REJECTED = { admitted: false };
-export const planCompactionAdmission = async (ports, force) => {
+export const planCompactionAdmission = async (ports, options = {}) => {
+    const bypassThreshold = options.bypassThreshold === true;
+    const retrySuppressed = options.retrySuppressed === true;
     const beforeTokens = ports.estimateRequestTokens(ports.messages);
     const compactTrigger = autoCompactTriggerTokens(getReliabilityPolicy(), {
         provider: ports.provider,
@@ -11,9 +13,9 @@ export const planCompactionAdmission = async (ports, force) => {
             ? { contextLimitTokens: ports.contextLimitTokens }
             : {}),
     });
-    if (!force && beforeTokens < compactTrigger)
+    if (!bypassThreshold && beforeTokens < compactTrigger)
         return REJECTED;
-    if (ports.messages.length <= ports.keepRecent + 2)
+    if (ports.messages.length <= 2)
         return REJECTED;
     const durableEnvelope = await ports.buildDurableEnvelope();
     const attemptKey = compactionAttemptKey({
@@ -25,9 +27,9 @@ export const planCompactionAdmission = async (ports, force) => {
         schemaHash: toolSchemaHash(ports.selectTools()),
         ...(durableEnvelope ? { durableEnvelope } : {}),
     });
-    if (!force && ports.isSuppressed(attemptKey))
+    if (!retrySuppressed && ports.isSuppressed(attemptKey))
         return REJECTED;
-    if (force && ports.isExhausted?.(attemptKey))
+    if (retrySuppressed && ports.isExhausted?.(attemptKey))
         return REJECTED;
     return {
         admitted: true,

package/dist/agent/turn/compaction-admission.js.map

@@ -1 +1 @@
-{"version":3,"file":"compaction-admission.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-admission.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACL,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AA0BlC,MAAM,QAAQ,GAAwB,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAE1D,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,KAA+B,EAC/B,KAAc,EACgB,EAAE;IAChC,MAAM,YAAY,GAAG,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACjE,MAAM,cAAc,GAAG,wBAAwB,CAAC,oBAAoB,EAAE,EAAE;QACtE,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,GAAG,CAAC,KAAK,CAAC,kBAAkB,KAAK,SAAS;YACxC,CAAC,CAAC,EAAE,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,EAAE;YAClD,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CAAC;IACH,IAAI,CAAC,KAAK,IAAI,YAAY,GAAG,cAAc;QAAE,OAAO,QAAQ,CAAC;IAC7D,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,KAAK,CAAC,UAAU,GAAG,CAAC;QAAE,OAAO,QAAQ,CAAC;IACnE,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,oBAAoB,EAAE,CAAC;IAC3D,MAAM,UAAU,GAAG,oBAAoB,CAAC;QACtC,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,aAAa,EAAE,cAAc;QAC7B,UAAU,EAAE,cAAc,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QAC/C,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChD,CAAC,CAAC;IACH,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC9D,IAAI,KAAK,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC9D,OAAO;QACL,QAAQ,EAAE,IAAI;QACd,YAAY;QACZ,cAAc;QACd,eAAe;QACf,UAAU;KACX,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"compaction-admission.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-admission.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACL,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AA0BlC,MAAM,QAAQ,GAAwB,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAO1D,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,KAA+B,EAC/B,UAAsC,EAAE,EACV,EAAE;IAChC,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,KAAK,IAAI,CAAC;IACzD,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,KAAK,IAAI,CAAC;IACzD,MAAM,YAAY,GAAG,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACjE,MAAM,cAAc,GAAG,wBAAwB,CAAC,oBAAoB,EAAE,EAAE;QACtE,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,GAAG,CAAC,KAAK,CAAC,kBAAkB,KAAK,SAAS;YACxC,CAAC,CAAC,EAAE,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,EAAE;YAClD,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CAAC;IACH,IAAI,CAAC,eAAe,IAAI,YAAY,GAAG,cAAc;QAAE,OAAO,QAAQ,CAAC;IACvE,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,QAAQ,CAAC;IAChD,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,oBAAoB,EAAE,CAAC;IAC3D,MAAM,UAAU,GAAG,oBAAoB,CAAC;QACtC,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,aAAa,EAAE,cAAc;QAC7B,UAAU,EAAE,cAAc,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QAC/C,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChD,CAAC,CAAC;IACH,IAAI,CAAC,eAAe,IAAI,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC;QAAE,OAAO,QAAQ,CAAC;IACxE,IAAI,eAAe,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC;QAAE,OAAO,QAAQ,CAAC;IACxE,OAAO;QACL,QAAQ,EAAE,IAAI;QACd,YAAY;QACZ,cAAc;QACd,eAAe;QACf,UAAU;KACX,CAAC;AACJ,CAAC,CAAC"}

package/dist/agent/turn/compaction-coordinator.d.ts

@@ -1,6 +1,7 @@
 import type { ChatMessage, ProviderId, SuccessfulRequestSnapshot, ToolDefinition } from "../../types.js";
 import type { SessionPlan } from "../../store/plan.js";
 import type { resolveToolDialect } from "../../llm/capabilities.js";
+import { type CompactionAdmissionOptions } from "./compaction-admission.js";
 import { executeAutomaticCompaction } from "./automatic-compaction-execution.js";
 import type { CompactionExecutionState } from "./compaction-summarizer.js";
 export type CompactionAuditPayload = Readonly<Record<string, string | number | boolean | undefined>>;
@@ -39,4 +40,4 @@ export interface CompactionCoordinatorPorts {
     readonly notify: (level: "info" | "warn", message: string) => void;
     readonly audit: (event: string, payload: CompactionAuditPayload) => void;
 }
-export declare const createCompactionCoordinator: (ports: CompactionCoordinatorPorts) => (reason: string, force?: boolean) => Promise<void>;
+export declare const createCompactionCoordinator: (ports: CompactionCoordinatorPorts) => (reason: string, options?: CompactionAdmissionOptions) => Promise<void>;

package/dist/agent/turn/compaction-coordinator.js

@@ -2,8 +2,9 @@ import { OperationLedger, singleAdmissionOperationPolicy, } from "../../llm/oper
 import { isCompactionMemoryMessage, shouldApplyAutoCompact, } from "../context-manager.js";
 import { isOperationPolicyError } from "../../llm/operation-ledger.js";
 import { COMPACTION_MAX_ATTEMPTS } from "../compaction-attempt.js";
+import { isCompactionOverLimitError } from "../compaction-executor.js";
 import { describeDominantContextBlock } from "../context-breakdown.js";
-import { planCompactionAdmission } from "./compaction-admission.js";
+import { planCompactionAdmission, } from "./compaction-admission.js";
 import { executeAutomaticCompaction } from "./automatic-compaction-execution.js";
 import { prepareCompactionCandidateMessages } from "./compaction-candidate.js";
 import { measureCompactionFinalFit } from "./compaction-final-fit.js";
@@ -14,7 +15,7 @@ const summaryBodyOf = (messages) => messages.find((message) => isCompactionMemor
 const isAbortLike = (error) => error.name === "AbortError" || error.message.includes("aborted");
 const runAdmittedCompaction = async (ports, reason, force, admitted) => {
     const { beforeTokens, compactTrigger, durableEnvelope, attemptKey, compactionId, contextLimitTokens, ledger, } = admitted;
-    const result = await executeAutomaticCompaction({
+    const execute = (forcePrefixSlice) => executeAutomaticCompaction({
         messages: ports.messages,
         summarize: ports.summarize,
         tools: ports.selectTools(),
@@ -22,9 +23,25 @@ const runAdmittedCompaction = async (ports, reason, force, admitted) => {
         model: ports.model(),
         contextLimitTokens,
         keepRecent: ports.keepRecent,
-        forceDirectSinglePass: Boolean(ports.executionState.replaySnapshot),
+        forceDirectSinglePass: !forcePrefixSlice && Boolean(ports.executionState.replaySnapshot),
+        ...(forcePrefixSlice ? { forcePrefixSlice: true } : {}),
         durableEnvelope,
     });
+    let result;
+    try {
+        result = await execute(false);
+    }
+    catch (error) {
+        if (!isCompactionOverLimitError(error))
+            throw error;
+        ports.executionState.replaySnapshot = undefined;
+        ports.audit("agent.compact.slice-fallback", {
+            reason,
+            requestTokens: error.requestTokens,
+            safeLimit: error.effectiveSafeTokens,
+        });
+        result = await execute(true);
+    }
     if (!shouldApplyAutoCompact({
         summarized: result.summarized,
         summaryBody: summaryBodyOf(result.messages),
@@ -64,7 +81,7 @@ const runAdmittedCompaction = async (ports, reason, force, admitted) => {
         contextLimitTokens,
         selectTools: ports.selectTools,
     });
-    if (finalFit?.accounting.overLimit) {
+    if (finalFit.accounting.overLimit) {
         const dominant = describeDominantContextBlock(candidateMessages);
         ports.attempts.recordFailure(attemptKey);
         ports.audit("agent.compact.overflow", {
@@ -95,7 +112,7 @@ const runAdmittedCompaction = async (ports, reason, force, admitted) => {
     ports.writeCompleted(compactionId, compactionSummaryText(summaryBodyOf(ports.messages)), beforeTokens, afterTokens);
     ports.notify("info", `context auto-compacted to fit the window (~${beforeTokens.toLocaleString()} → ~${afterTokens.toLocaleString()} tokens)${result.strategy === "emergency_prefix_slice" ? " — oldest slice only (lower confidence); run /compact for a full summary" : ""}`);
 };
-export const createCompactionCoordinator = (ports) => async (reason, force = false) => {
+export const createCompactionCoordinator = (ports) => async (reason, options = {}) => {
     if (repairToolProtocol(ports.messages) > 0) {
         ports.clearSuccessfulRequestSnapshot();
     }
@@ -114,7 +131,7 @@ export const createCompactionCoordinator = (ports) => async (reason, force = fal
         isExhausted: ports.attempts.isExhausted
             ? (key) => ports.attempts.isExhausted?.(key) === true
             : undefined,
-    }, force);
+    }, options);
     if (!admission.admitted)
         return;
     const compactionId = ports.newCompactionId();
@@ -131,7 +148,7 @@ export const createCompactionCoordinator = (ports) => async (reason, force = fal
     });
     ports.writeStarted(compactionId, admission.beforeTokens);
     try {
-        await runAdmittedCompaction(ports, reason, force, {
+        await runAdmittedCompaction(ports, reason, options.bypassThreshold === true, {
             beforeTokens: admission.beforeTokens,
             compactTrigger: admission.compactTrigger,
             durableEnvelope: admission.durableEnvelope,

package/dist/agent/turn/compaction-coordinator.js.map

@@ -1 +1 @@
-{"version":3,"file":"compaction-coordinator.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-coordinator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compaction-coordinator.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-coordinator.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,eAAe,EACf,8BAA8B,GAC/B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,yBAAyB,EACzB,sBAAsB,GACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EACL,uBAAuB,GAExB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,kCAAkC,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EACL,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAwDxD,MAAM,aAAa,GAAG,CAAC,QAAgC,EAAU,EAAE,CACjE,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC;AAEhF,MAAM,WAAW,GAAG,CAAC,KAAY,EAAW,EAAE,CAC5C,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAYnE,MAAM,qBAAqB,GAAG,KAAK,EACjC,KAAiC,EACjC,MAAc,EACd,KAAc,EACd,QAA4B,EACb,EAAE;IACjB,MAAM,EACJ,YAAY,EACZ,cAAc,EACd,eAAe,EACf,UAAU,EACV,YAAY,EACZ,kBAAkB,EAClB,MAAM,GACP,GAAG,QAAQ,CAAC;IACb,MAAM,OAAO,GAAG,CAAC,gBAAyB,EAAE,EAAE,CAC5C,0BAA0B,CAAC;QACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE;QAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE;QAC1B,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE;QACpB,kBAAkB;QAClB,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,qBAAqB,EACnB,CAAC,gBAAgB,IAAI,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC;QACnE,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,eAAe;KAChB,CAAC,CAAC;IACL,IAAI,MAAM,CAAC;IACX,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;YAAE,MAAM,KAAK,CAAC;QACpD,KAAK,CAAC,cAAc,CAAC,cAAc,GAAG,SAAS,CAAC;QAChD,KAAK,CAAC,KAAK,CAAC,8BAA8B,EAAE;YAC1C,MAAM;YACN,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,SAAS,EAAE,KAAK,CAAC,mBAAmB;SACrC,CAAC,CAAC;QACH,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,IACE,CAAC,sBAAsB,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC3C,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,aAAa,EAAE,MAAM,CAAC,QAAQ;KAC/B,CAAC,EACF,CAAC;QACD,KAAK,CAAC,WAAW,CACf,YAAY,EACZ,4EAA4E,EAC5E,YAAY,CACb,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,eAAe,GAAG,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACrE,IAAI,CAAC,KAAK,IAAI,eAAe,IAAI,cAAc,EAAE,CAAC;QAChD,MAAM,QAAQ,GAAG,4BAA4B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC/D,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACzC,KAAK,CAAC,KAAK,CAAC,wBAAwB,EAAE;YACpC,MAAM;YACN,eAAe;YACf,OAAO,EAAE,cAAc;YACvB,QAAQ;SACT,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,CACV,MAAM,EACN,qBAAqB,eAAe,CAAC,cAAc,EAAE,oCAAoC,cAAc,CAAC,cAAc,EAAE,sBAAsB,QAAQ,EAAE,CACzJ,CAAC;QACF,KAAK,CAAC,WAAW,CACf,YAAY,EACZ,2DAA2D,QAAQ,GAAG,EACtE,YAAY,CACb,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;IACxC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;QAC3D,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,sBAAsB,EAAE,KAAK,CAAC,iBAAiB,EAAE;QACjD,iBAAiB,EAAE,KAAK,CAAC,WAAW,EAAE;QACtC,QAAQ;QACR,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE;KACnC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,yBAAyB,CAAC;QACzC,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE;QAC1B,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE;QACpB,QAAQ,EAAE,iBAAiB;QAC3B,kBAAkB;QAClB,WAAW,EAAE,KAAK,CAAC,WAAW;KAC/B,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,4BAA4B,CAAC,iBAAiB,CAAC,CAAC;QACjE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACzC,KAAK,CAAC,KAAK,CAAC,wBAAwB,EAAE;YACpC,MAAM;YACN,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa;YAClD,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB;YACxD,OAAO,EAAE,cAAc;YACvB,QAAQ;SACT,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,CACV,MAAM,EACN,2EAA2E,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,cAAc,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE,6BAA6B,QAAQ,sCAAsC,CACrR,CAAC;QACF,KAAK,CAAC,WAAW,CACf,YAAY,EACZ,oFAAoF,QAAQ,GAAG,EAC/F,YAAY,CACb,CAAC;QACF,OAAO;IACT,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,iBAAiB,CAAC,CAAC;IACtE,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACzC,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAC3B,KAAK,CAAC,8BAA8B,EAAE,CAAC;IACvC,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACpC,KAAK,CAAC,yBAAyB,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEvD,MAAM,WAAW,GAAG,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAChE,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE;QAC3B,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM;QAChC,eAAe,EAAE,WAAW;QAC5B,MAAM;QACN,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,QAAQ;QACrC,oBAAoB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,MAAM;KACxD,CAAC,CAAC;IACH,KAAK,CAAC,cAAc,CAClB,YAAY,EACZ,qBAAqB,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EACpD,YAAY,EACZ,WAAW,CACZ,CAAC;IACF,KAAK,CAAC,MAAM,CACV,MAAM,EACN,8CAA8C,YAAY,CAAC,cAAc,EAAE,OAAO,WAAW,CAAC,cAAc,EAAE,WAAW,MAAM,CAAC,QAAQ,KAAK,wBAAwB,CAAC,CAAC,CAAC,0EAA0E,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1P,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GACtC,CAAC,KAAiC,EAAE,EAAE,CACtC,KAAK,EACH,MAAc,EACd,UAAsC,EAAE,EACzB,EAAE;IACjB,IAAI,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3C,KAAK,CAAC,8BAA8B,EAAE,CAAC;IACzC,CAAC;IACD,MAAM,kBAAkB,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;IACtD,MAAM,SAAS,GAAG,MAAM,uBAAuB,CAC7C;QACE,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE;QAC1B,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE;QACpB,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE;QACxB,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,kBAAkB;QAClB,qBAAqB,EAAE,KAAK,CAAC,qBAAqB;QAClD,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,oBAAoB,EAAE,KAAK,CAAC,oBAAoB;QAChD,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC;QACvD,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,WAAW;YACrC,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,KAAK,IAAI;YACrD,CAAC,CAAC,SAAS;KACd,EACD,OAAO,CACR,CAAC;IACF,IAAI,CAAC,SAAS,CAAC,QAAQ;QAAE,OAAO;IAEhC,MAAM,YAAY,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;IAC7C,KAAK,CAAC,cAAc,CAAC,QAAQ,GAAG,YAAY,CAAC;IAC7C,MAAM,MAAM,GAAG,IAAI,eAAe,CAChC,8BAA8B,CAAC,YAAY,EAAE,CAAC,CAAC,CAChD,CAAC;IACF,KAAK,CAAC,cAAc,CAAC,YAAY,GAAG,MAAM,CAAC;IAC3C,KAAK,CAAC,cAAc,CAAC,cAAc,GAAG,8BAA8B,CAAC;QACnE,QAAQ,EAAE,KAAK,CAAC,6BAA6B,EAAE;QAC/C,OAAO,EAAE,KAAK,CAAC,QAAQ;QACvB,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE;QAC1B,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE;QACpB,kBAAkB;QAClB,eAAe,EAAE,SAAS,CAAC,eAAe;KAC3C,CAAC,CAAC;IACH,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IAEzD,IAAI,CAAC;QACH,MAAM,qBAAqB,CACzB,KAAK,EACL,MAAM,EACN,OAAO,CAAC,eAAe,KAAK,IAAI,EAChC;YACA,YAAY,EAAE,SAAS,CAAC,YAAY;YACpC,cAAc,EAAE,SAAS,CAAC,cAAc;YACxC,eAAe,EAAE,SAAS,CAAC,eAAe;YAC1C,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,YAAY;YACZ,kBAAkB;YAClB,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,KAAK,CAAC,WAAW,CACf,YAAY,EACZ,wBAAwB,CAAC;YACvB,OAAO;YACP,aAAa,EAAE,sBAAsB,CAAC,KAAK,CAAC;SAC7C,CAAC,EACF,SAAS,CAAC,YAAY,CACvB,CAAC;QACF,IAAI,KAAK,YAAY,KAAK,IAAI,WAAW,CAAC,KAAK,CAAC;YAAE,MAAM,KAAK,CAAC;QAC9D,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACnD,KAAK,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;QACzD,IAAI,KAAK,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;YACvD,KAAK,CAAC,MAAM,CACV,MAAM,EACN,0BAA0B,uBAAuB,qLAAqL,CACvO,CAAC;YACF,KAAK,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;YAAS,CAAC;QACT,IAAI,KAAK,CAAC,cAAc,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;YACnD,KAAK,CAAC,cAAc,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC5C,CAAC;QACD,IAAI,KAAK,CAAC,cAAc,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;YACjD,KAAK,CAAC,cAAc,CAAC,YAAY,GAAG,SAAS,CAAC;QAChD,CAAC;QACD,KAAK,CAAC,cAAc,CAAC,cAAc,GAAG,SAAS,CAAC;IAClD,CAAC;AACH,CAAC,CAAC"}

package/dist/agent/turn/compaction-final-fit.d.ts

@@ -7,4 +7,4 @@ export interface CompactionFinalFitInput {
     readonly contextLimitTokens: number | undefined;
     readonly selectTools: () => readonly ToolDefinition[] | undefined;
 }
-export declare const measureCompactionFinalFit: (input: CompactionFinalFitInput) => ReturnType<typeof accountAssembledRequest> | undefined;
+export declare const measureCompactionFinalFit: (input: CompactionFinalFitInput) => ReturnType<typeof accountAssembledRequest>;

package/dist/agent/turn/compaction-final-fit.js

@@ -1,14 +1,15 @@
 import { accountAssembledRequest } from "../request-accounting.js";
 export const measureCompactionFinalFit = (input) => {
-    if (input.contextLimitTokens === undefined)
-        return undefined;
+    const tools = input.selectTools();
     return accountAssembledRequest({
         provider: input.provider,
         model: input.model,
         messages: input.messages,
         stream: true,
-        ...(input.selectTools()?.length ? { tools: input.selectTools() } : {}),
-        contextLimitTokens: input.contextLimitTokens,
+        ...(tools?.length ? { tools } : {}),
+        ...(input.contextLimitTokens !== undefined
+            ? { contextLimitTokens: input.contextLimitTokens }
+            : {}),
     });
 };
 //# sourceMappingURL=compaction-final-fit.js.map

package/dist/agent/turn/compaction-final-fit.js.map

@@ -1 +1 @@
-{"version":3,"file":"compaction-final-fit.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-final-fit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAUnE,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,KAA8B,EAC0B,EAAE;IAC1D,IAAI,KAAK,CAAC,kBAAkB,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC7D,OAAO,uBAAuB,CAAC;QAC7B,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,MAAM,EAAE,IAAI;QACZ,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;KAC7C,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"compaction-final-fit.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-final-fit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAUnE,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,KAA8B,EACc,EAAE;IAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAClC,OAAO,uBAAuB,CAAC;QAC7B,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,MAAM,EAAE,IAAI;QACZ,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,KAAK,CAAC,kBAAkB,KAAK,SAAS;YACxC,CAAC,CAAC,EAAE,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,EAAE;YAClD,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/agent/turn/compaction-summarizer.js

@@ -22,12 +22,12 @@ const summarize = async (ports, summaryPrompt, stage) => {
             ? {
                 baseRequest: replay,
                 history: ports.history,
-                ...(contextLimitTokens !== undefined ? { contextLimitTokens } : {}),
             }
             : {
                 ...(sourceMessages ? { sourceMessages } : {}),
                 ...(compactionTools?.length ? { tools: compactionTools } : {}),
             }),
+        ...(contextLimitTokens !== undefined ? { contextLimitTokens } : {}),
         ...(ports.state.activeLedger ? { operation: ports.state.activeLedger } : {}),
         qualityRetry: false,
         retryOnServerError: true,

package/dist/agent/turn/compaction-summarizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"compaction-summarizer.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-summarizer.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,oCAAoC,EACpC,gCAAgC,EAChC,wBAAwB,GACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAoBrE,MAAM,SAAS,GAAG,KAAK,EACrB,KAAgC,EAChC,aAAqB,EACrB,KAA8B,EACb,EAAE;IACjB,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAAK,KAAK,KAAK,CAAC;IAClD,MAAM,YAAY,GAAG,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3E,MAAM,SAAS,GACb,KAAK,EAAE,KAAK,KAAK,KAAK;QACpB,CAAC,CAAC,oCAAoC;QACtC,CAAC,CAAC,gCAAgC,CAAC;IACvC,MAAM,cAAc,GAAG,KAAK,EAAE,cAAc,CAAC;IAC7C,MAAM,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACpF,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC;IAC1C,MAAM,kBAAkB,GAAG,KAAK,CAAC,yBAAyB,EAAE,CAAC;IAC7D,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,wBAAwB,CAAC;IAC1D,OAAO,OAAO,CAAC;QACb,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,aAAa,EAAE,wBAAwB;QACvC,MAAM,EAAE,aAAa;QACrB,SAAS;QACT,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,GAAG,CAAC,MAAM;YACR,CAAC,CAAC;gBACE,WAAW,EAAE,MAAM;gBACnB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,GAAG,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACpE;YACH,CAAC,CAAC;gBACE,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7C,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC/D,CAAC;QACN,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,YAAY,EAAE,KAAK;QACnB,kBAAkB,EAAE,IAAI;QACxB,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,YAAY;YACnB,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC;YAClE,CAAC,CAAC,SAAS;KAChB,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,KAAgC,EAAE,EAAE,CAC7E,CAAC,aAAqB,EAAE,KAA8B,EAAmB,EAAE,CACzE,SAAS,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC"}
+{"version":3,"file":"compaction-summarizer.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-summarizer.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,oCAAoC,EACpC,gCAAgC,EAChC,wBAAwB,GACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAoBrE,MAAM,SAAS,GAAG,KAAK,EACrB,KAAgC,EAChC,aAAqB,EACrB,KAA8B,EACb,EAAE;IACjB,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAAK,KAAK,KAAK,CAAC;IAClD,MAAM,YAAY,GAAG,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3E,MAAM,SAAS,GACb,KAAK,EAAE,KAAK,KAAK,KAAK;QACpB,CAAC,CAAC,oCAAoC;QACtC,CAAC,CAAC,gCAAgC,CAAC;IACvC,MAAM,cAAc,GAAG,KAAK,EAAE,cAAc,CAAC;IAC7C,MAAM,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACpF,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC;IAC1C,MAAM,kBAAkB,GAAG,KAAK,CAAC,yBAAyB,EAAE,CAAC;IAC7D,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,wBAAwB,CAAC;IAC1D,OAAO,OAAO,CAAC;QACb,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,aAAa,EAAE,wBAAwB;QACvC,MAAM,EAAE,aAAa;QACrB,SAAS;QACT,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,GAAG,CAAC,MAAM;YACR,CAAC,CAAC;gBACE,WAAW,EAAE,MAAM;gBACnB,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB;YACH,CAAC,CAAC;gBACE,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7C,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC/D,CAAC;QACN,GAAG,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,YAAY,EAAE,KAAK;QACnB,kBAAkB,EAAE,IAAI;QACxB,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,YAAY;YACnB,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC;YAClE,CAAC,CAAC,SAAS;KAChB,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,KAAgC,EAAE,EAAE,CAC7E,CAAC,aAAqB,EAAE,KAA8B,EAAmB,EAAE,CACzE,SAAS,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC"}

package/dist/agent/turn/event-emitter.js

@@ -64,6 +64,9 @@ const emitToolResultEvent = (emit, id, result, summary, artifactPath) => {
     };
     if (typeof result.exitCode === "number")
         event.exitCode = result.exitCode;
+    if (typeof result.runFailure === "boolean") {
+        event.runFailure = result.runFailure;
+    }
     if (artifactPath)
         event.artifactPath = artifactPath;
     if (result.fileChanges && result.fileChanges.length > 0) {

package/dist/agent/turn/event-emitter.js.map

@@ -1 +1 @@
-{"version":3,"file":"event-emitter.js","sourceRoot":"","sources":["../../../src/agent/turn/event-emitter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"event-emitter.js","sourceRoot":"","sources":["../../../src/agent/turn/event-emitter.ts"],"names":[],"mappings":"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"}

package/dist/agent/turn/history-writer.d.ts

@@ -11,7 +11,7 @@ export interface TurnHistoryWriter {
     readonly recoveryUserMessage: (content: string) => ChatMessage;
     readonly upsertActionCycleRecovery: (content: string) => void;
     readonly recoveryProse: (content: string) => string | undefined;
-    readonly pushAssistantHistory: (content: string, reasoning?: Pick<CompletionResult, "reasoningArtifacts" | "reasoningBlock">) => void;
+    readonly pushAssistantHistory: (content: string, reasoning?: Pick<CompletionResult, "reasoningArtifacts" | "reasoningBlock">, hasToolCalls?: boolean) => void;
 }
 export declare const recoveryProseFrom: (content: string) => string | undefined;
 export declare const createTurnHistoryWriter: (ports: TurnHistoryPorts) => TurnHistoryWriter;

package/dist/agent/turn/history-writer.js

@@ -31,15 +31,16 @@ const replaceActionCycleRecovery = (ports, content) => {
     }
     ports.messages.push(buildRecoveryUserMessage(ports, prefix + content));
 };
-const persistedReasoning = (reasoning) => {
+const isToolCallContent = (text) => /```tool\b|<tool_call>|<\|tool_call/i.test(text);
+const persistedReasoning = (reasoning, hasToolCalls = false) => {
     const persistedArtifacts = reasoningArtifactsForPersistence({
         artifacts: reasoning?.reasoningArtifacts,
-        hasToolCalls: false,
+        hasToolCalls,
     });
     const reasoningBlock = persistedArtifacts
         ? legacyReasoningBlockFromArtifacts(persistedArtifacts)
         : reasoning?.reasoningArtifacts
-            ? undefined
+            ? (hasToolCalls ? reasoning?.reasoningBlock : undefined)
             : reasoning?.reasoningBlock;
     return {
         ...(reasoningBlock?.text || reasoningBlock?.items?.length
@@ -48,25 +49,26 @@ const persistedReasoning = (reasoning) => {
         ...(persistedArtifacts ? { reasoningArtifacts: persistedArtifacts } : {}),
     };
 };
-const appendAssistantHistory = (ports, content, reasoning) => {
+const appendAssistantHistory = (ports, content, reasoning, hasToolCalls) => {
     const cleaned = ports.sanitizeAssistantText(hasReasoningMarker(content) ? stripThinking(content).visible : content);
     if (!ports.visibleCommitted()) {
         const prose = recoveryProseFrom(cleaned);
         if (prose)
             ports.writeAssistantMessage(prose);
     }
+    const toolTurn = hasToolCalls ?? isToolCallContent(content);
     ports.messages.push({
         role: "assistant",
         content: cleaned.trim()
             ? cleaned
             : "[No visible assistant response was produced.]",
-        ...persistedReasoning(reasoning),
+        ...persistedReasoning(reasoning, toolTurn),
     });
 };
 export const createTurnHistoryWriter = (ports) => ({
     recoveryUserMessage: (content) => buildRecoveryUserMessage(ports, content),
     upsertActionCycleRecovery: (content) => replaceActionCycleRecovery(ports, content),
     recoveryProse: recoveryProseFrom,
-    pushAssistantHistory: (content, reasoning) => appendAssistantHistory(ports, content, reasoning),
+    pushAssistantHistory: (content, reasoning, hasToolCalls) => appendAssistantHistory(ports, content, reasoning, hasToolCalls),
 });
 //# sourceMappingURL=history-writer.js.map

package/dist/agent/turn/history-writer.js.map

@@ -1 +1 @@
-{"version":3,"file":"history-writer.js","sourceRoot":"","sources":["../../../src/agent/turn/history-writer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"history-writer.js","sourceRoot":"","sources":["../../../src/agent/turn/history-writer.ts"],"names":[],"mappings":"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"}

package/dist/agent/turn/loop/completion-interpretation.js

@@ -1,6 +1,7 @@
 import { stripThinking } from "../../../ui/thinking.js";
 import { trimExactContinuationOverlap } from "../continuation-overlap.js";
 import { recordRequestTokenObservation } from "../../../llm/token-estimate-calibration.js";
+import { effectivePromptTokens } from "../../../llm/token-usage.js";
 import { contextAttemptFromOperationUsage } from "../../../llm/context-snapshot.js";
 export const accountCompletionUsage = async (ports, completion) => {
     const usage = completion.usage;
@@ -8,14 +9,13 @@ export const accountCompletionUsage = async (ports, completion) => {
         return;
     const requestRouteMatched = ports.dispatchedRequestRoute?.provider === completion.provider &&
         ports.dispatchedRequestRoute.model === completion.model;
-    if (usage.exact &&
-        usage.promptTokens > 0 &&
-        requestRouteMatched) {
+    const consumedPromptTokens = effectivePromptTokens(usage) ?? 0;
+    if (usage.exact && consumedPromptTokens > 0 && requestRouteMatched) {
         recordRequestTokenObservation({
             provider: completion.provider,
             model: completion.model,
             estimatedRequestTokens: ports.dispatchedRawRequestTokens,
-            actualPromptTokens: usage.promptTokens,
+            actualPromptTokens: consumedPromptTokens,
         });
     }
     const attempt = contextAttemptFromOperationUsage(completion.operationUsage);

package/dist/agent/turn/loop/completion-interpretation.js.map

@@ -1 +1 @@
-{"version":3,"file":"completion-interpretation.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/completion-interpretation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"completion-interpretation.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/completion-interpretation.ts"],"names":[],"mappings":"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"}

package/dist/agent/turn/loop/deps.d.ts

@@ -14,6 +14,7 @@ import type { TurnEvidenceFlags } from "../evidence-flags.js";
 import type { TurnCounters } from "../turn-counters.js";
 import type { ToolExecutionState } from "../tool-execution/state.js";
 import type { ResponderClaimLedger } from "../responder-claims.js";
+import type { CompactionAdmissionOptions } from "../compaction-admission.js";
 import type { WireOccurrenceLedger } from "./wire-occurrences.js";
 import type { StreamRecoveryState } from "../../stream-recovery.js";
 import type { TurnLoopState } from "./state.js";
@@ -77,7 +78,7 @@ export interface TurnLoopDeps extends TurnWriters {
     readonly currentContextLimitTokens: () => number | undefined;
     readonly estimateNextRequestTokens: (messages: readonly ChatMessage[]) => number;
     readonly selectToolDefs: (native: boolean, compact: boolean) => ToolDefinition[] | undefined;
-    readonly maybeAutoCompact: (reason: string, force?: boolean) => Promise<void>;
+    readonly maybeAutoCompact: (reason: string, options?: CompactionAdmissionOptions) => Promise<void>;
     readonly resolveNativeTools: (provider: ProviderId, model: string) => {
         dialect: ToolDialect;
         native: boolean;
@@ -88,7 +89,7 @@ export interface TurnLoopDeps extends TurnWriters {
     readonly recoveryUserMessage: (text: string) => ChatMessage;
     readonly applySalvagedWrite: (salvaged: SalvagedWrite) => Promise<SalvagedWriteReceipt>;
     readonly nextToolEventId: () => string;
-    readonly pushAssistantHistory: (text: string, reasoning?: Pick<CompletionResult, "reasoningBlock" | "reasoningArtifacts">) => void;
+    readonly pushAssistantHistory: (text: string, reasoning?: Pick<CompletionResult, "reasoningBlock" | "reasoningArtifacts">, hasToolCalls?: boolean) => void;
     readonly liveMessages: () => ChatMessage[];
     readonly upsertActionCycleRecovery: (message: string) => void;
     readonly probeStateKey: (call: ToolCall) => string | undefined;

package/dist/agent/turn/loop/round-request.d.ts

@@ -1,3 +1,4 @@
+import { RequestOverLimitError } from "../../request-accounting.js";
 import type { CompletionResult } from "../../../types.js";
 import type { StreamSession } from "./stream-session.js";
 import type { TurnLoopDeps } from "./deps.js";
@@ -16,4 +17,5 @@ export interface RoundRequestInput {
     readonly delay: (ms: number) => Promise<void>;
     readonly setToolsAttached: (attached: boolean) => void;
 }
+export declare function recoverDispatchOverLimit(deps: Pick<TurnLoopDeps, "messages" | "estimateNextRequestTokens" | "maybeAutoCompact">, error: RequestOverLimitError): Promise<void>;
 export declare const requestRound: (deps: TurnLoopDeps, input: RoundRequestInput) => Promise<RoundRequestResult>;

package/dist/agent/turn/loop/round-request.js

@@ -10,6 +10,15 @@ import { classifyStreamFailure, resetStreamRecoveryState } from "../../stream-re
 import { assembleRequest } from "../../turn/loop/request-assembly.js";
 import { recoverFromStreamFailure } from "../../turn/loop/stream-failure.js";
 import { buildStreamRequest } from "../../turn/loop/stream-request.js";
+export async function recoverDispatchOverLimit(deps, error) {
+    const beforeRecovery = deps.estimateNextRequestTokens(deps.messages);
+    await deps.maybeAutoCompact("dispatch-over-limit", {
+        bypassThreshold: true,
+    });
+    const afterRecovery = deps.estimateNextRequestTokens(deps.messages);
+    if (afterRecovery >= beforeRecovery)
+        throw error;
+}
 export const requestRound = async (deps, input) => {
     const { streamSession, responderDelivery } = input;
     let completion;
@@ -80,6 +89,7 @@ export const requestRound = async (deps, input) => {
                 onStatus: streamSession.onStatus,
                 onStreamEvent: streamSession.onStreamEvent,
                 onSuccessfulRequest: streamSession.onSuccessfulRequest,
+                retryRateLimits: false,
             });
             deps.loop.freeTierConsecutiveFailures = 0;
             resetStreamRecoveryState(deps.recoveryState);
@@ -90,8 +100,10 @@ export const requestRound = async (deps, input) => {
         catch (streamError) {
             if (deps.options.signal?.aborted)
                 throw streamError;
-            if (streamError instanceof RequestOverLimitError)
-                throw streamError;
+            if (streamError instanceof RequestOverLimitError) {
+                await recoverDispatchOverLimit(deps, streamError);
+                return { kind: "continue" };
+            }
             const failedOperationUsage = operationUsageFromError(streamError);
             const failedAttempt = failedOperationUsage?.attempts.at(-1);
             const failedUsage = failedOperationUsage?.aggregate.usage;
@@ -126,10 +138,14 @@ export const requestRound = async (deps, input) => {
                 sanitizeAssistantText,
                 finishDeltaParser: streamSession.finishDeltaParser,
                 recoveryUserMessage: deps.recoveryUserMessage,
-                forceCompact: (reason) => deps.maybeAutoCompact(reason, true),
+                forceCompact: (reason) => deps.maybeAutoCompact(reason, {
+                    bypassThreshold: true,
+                    retrySuppressed: true,
+                }),
                 delay: (ms) => input.delay(ms),
             }, failureState, {
                 kind: classifyStreamFailure(streamError),
+                error: streamError,
                 alreadyEmitted: streamAlreadyEmitted(streamError),
                 attemptUsage: failedUsage && failedAttempt
                     ? {

package/dist/agent/turn/loop/round-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"round-request.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/round-request.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"round-request.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/round-request.ts"],"names":[],"mappings":"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"}

package/dist/agent/turn/loop/run-rounds.js

@@ -484,15 +484,13 @@ export const runTurnRounds = async (deps, input) => {
                     allCalls
                         .map((c) => `\`\`\`tool\n${JSON.stringify(c)}\n\`\`\``)
                         .join("\n\n");
-                deps.pushAssistantHistory(standardizedContent, completion);
+                deps.pushAssistantHistory(standardizedContent, completion, allCalls.length > 0);
             }
             const scopeForBatch = await loadScopeForSession(deps.session.sessionId).catch(() => undefined);
             const isParallelSafe = (c) => {
                 if (deps.mcpRuntime?.isParallelSafe(c.name))
                     return true;
-                if (c.name === "pentest.recon" ||
-                    c.name === "net.context" ||
-                    c.name === "tool.batch" ||
+                if (c.name === "tool.batch" ||
                     c.name === "tool.check" ||
                     c.name === "shell.jobs" ||
                     c.name === "shell.tail") {