@pentoshi/clai 4.11.25 → 4.11.27

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

@@ -103,24 +103,24 @@ const runAdmittedCompaction = async (ports, reason, force, admitted) => {
     ports.clearSuccessfulRequestSnapshot();
     ports.refreshSessionState(livePlan);
     ports.setLastCompactionMsgCount(ports.messages.length);
-    const afterTokens = ports.estimateRequestTokens(ports.messages);
+    const afterEstimate = ports.estimateRequestTokens(ports.messages);
+    const afterTokens = ports.measureRequestTokens?.(afterEstimate) ?? afterEstimate;
+    ports.clearProviderMeasurement();
     ports.audit("agent.compact", {
         newLength: ports.messages.length,
-        estimatedTokens: afterTokens,
+        estimatedTokens: afterEstimate,
+        afterTokens,
         reason,
         strategy: result.strategy ?? "single",
         compactionAdmissions: ledger.snapshot().attempts.length,
     });
     ports.writeCompleted(compactionId, compactionSummaryText(summaryBodyOf(ports.messages)), beforeTokens, afterTokens, measurement);
     const tokenLabel = measurement === "provider-reported"
-        ? `${beforeTokens.toLocaleString()} tokens → ${afterTokens.toLocaleString()} tokens`
+        ? `${beforeTokens.toLocaleString()} tokens → ~${afterTokens.toLocaleString()} tokens`
         : `~${beforeTokens.toLocaleString()} → ~${afterTokens.toLocaleString()} tokens`;
     ports.notify("info", `context auto-compacted to fit the window (${tokenLabel})${result.strategy === "emergency_prefix_slice" ? " — oldest slice only (lower confidence); run /compact for a full summary" : ""}`);
 };
 export const createCompactionCoordinator = (ports) => async (reason, options = {}) => {
-    if (repairToolProtocol(ports.messages) > 0) {
-        ports.clearSuccessfulRequestSnapshot();
-    }
     const contextLimitTokens = ports.contextLimitTokens();
     const admission = await planCompactionAdmission({
         messages: ports.messages,
@@ -132,11 +132,16 @@ export const createCompactionCoordinator = (ports) => async (reason, options = {
         estimateRequestTokens: ports.estimateRequestTokens,
         selectTools: ports.selectTools,
         buildDurableEnvelope: ports.buildDurableEnvelope,
+        prepareMessages: () => {
+            if (repairToolProtocol(ports.messages) > 0) {
+                ports.clearSuccessfulRequestSnapshot();
+            }
+        },
         isSuppressed: (key) => ports.attempts.isSuppressed(key),
         isExhausted: ports.attempts.isExhausted
             ? (key) => ports.attempts.isExhausted?.(key) === true
             : undefined,
-        providerPromptTokens: ports.providerPromptTokens,
+        measureRequestTokens: ports.measureRequestTokens,
         audit: ports.audit,
     }, options);
     if (!admission.admitted)

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":"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"}

package/dist/agent/turn/compaction-durable-envelope.js

@@ -30,7 +30,7 @@ const collectJobs = (ports) => {
     return { liveJobs, finishedJobs };
 };
 const build = async (ports) => {
-    const plan = await ports.loadPlan().catch(() => undefined);
+    const plan = await ports.loadPlan();
     const root = ports.getProjectRoot() ?? plan?.meta?.projectRoot;
     const consumed = consumedNotificationIds(ports.messages);
     const unread = [...ports.getUnreadNotificationIds()];

package/dist/agent/turn/compaction-durable-envelope.js.map

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

package/dist/agent/turn/compaction-replay-selection.js

@@ -1,4 +1,4 @@
-import { modelContextWindow } from "../../llm/token-usage.js";
+import { effectiveContextWindowTokens } from "../../llm/context-windows.js";
 import { planCompactionReplay } from "../compaction-executor.js";
 import { projectToolHistory } from "../tool-history.js";
 import { buildDirectCompactionPrompt, COMPACTION_MAX_COMPLETION_TOKENS, } from "../compaction-summary.js";
@@ -16,8 +16,7 @@ export const selectCompactionReplaySnapshot = (input) => {
                 : {}),
         }),
         maxTokens: COMPACTION_MAX_COMPLETION_TOKENS,
-        contextLimitTokens: input.contextLimitTokens ??
-            modelContextWindow(input.model, input.provider),
+        contextLimitTokens: effectiveContextWindowTokens(input.provider, input.model, input.contextLimitTokens),
         stream: true,
     });
     return replayPlan && !replayPlan.accounting.overLimit

package/dist/agent/turn/compaction-replay-selection.js.map

@@ -1 +1 @@
-{"version":3,"file":"compaction-replay-selection.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-replay-selection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EACL,2BAA2B,EAC3B,gCAAgC,GACjC,MAAM,0BAA0B,CAAC;AAWlC,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,KAAqC,EACE,EAAE;IACzC,IAAI,CAAC,KAAK,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IACtC,IAAI,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC1E,MAAM,UAAU,GAAG,oBAAoB,CAAC;QACtC,WAAW,EAAE,KAAK,CAAC,QAAQ;QAC3B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM,EAAE,2BAA2B,CAAC;YAClC,GAAG,CAAC,KAAK,CAAC,eAAe;gBACvB,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,eAAe,EAAE;gBACzC,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;QACF,SAAS,EAAE,gCAAgC;QAC3C,kBAAkB,EAChB,KAAK,CAAC,kBAAkB;YACxB,kBAAkB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC;QACjD,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IACH,OAAO,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS;QACnD,CAAC,CAAC,KAAK,CAAC,QAAQ;QAChB,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC"}
+{"version":3,"file":"compaction-replay-selection.js","sourceRoot":"","sources":["../../../src/agent/turn/compaction-replay-selection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EACL,2BAA2B,EAC3B,gCAAgC,GACjC,MAAM,0BAA0B,CAAC;AAWlC,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,KAAqC,EACE,EAAE;IACzC,IAAI,CAAC,KAAK,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IACtC,IAAI,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC1E,MAAM,UAAU,GAAG,oBAAoB,CAAC;QACtC,WAAW,EAAE,KAAK,CAAC,QAAQ;QAC3B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM,EAAE,2BAA2B,CAAC;YAClC,GAAG,CAAC,KAAK,CAAC,eAAe;gBACvB,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,eAAe,EAAE;gBACzC,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;QACF,SAAS,EAAE,gCAAgC;QAC3C,kBAAkB,EAAE,4BAA4B,CAC9C,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,kBAAkB,CACzB;QACD,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IACH,OAAO,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS;QACnD,CAAC,CAAC,KAAK,CAAC,QAAQ;QAChB,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC"}

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

@@ -31,7 +31,7 @@ const summarize = async (ports, summaryPrompt, stage) => {
             }),
         ...(contextLimitTokens !== undefined ? { contextLimitTokens } : {}),
         ...(ports.state.activeLedger ? { operation: ports.state.activeLedger } : {}),
-        qualityRetry: false,
+        qualityRetry: true,
         retryOnServerError: false,
         retryOnTruncation: false,
         retryOnRequestShapeRejection: false,

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

package/dist/agent/turn/loop/answer-path.js

@@ -31,7 +31,7 @@ export const resolveAnswerPath = async (deps, input) => {
     deps.counters.malformedFenceRetries = recoveryLadderState.malformedFenceRetries;
     if (recoveryDecision === "retry")
         return { kind: "continue" };
-    const livePlanAtCompletion = await loadPlan(deps.session.sessionId).catch(() => undefined);
+    const livePlanAtCompletion = await loadPlan(deps.session.sessionId);
     const assessment = assessCompletion({
         visible: assistantText.visible,
         canonicalVisible: canonicalAssistantVisible,
@@ -72,7 +72,7 @@ export const resolveAnswerPath = async (deps, input) => {
     const finalOutcome = await resolveFinalOutcome({
         outcomeState: deps.outcomeState,
         planApproved: deps.session.planApproved.value,
-        loadPlan: () => loadPlan(deps.session.sessionId).catch(() => undefined),
+        loadPlan: () => loadPlan(deps.session.sessionId),
         saveOutcomeState,
     }, cleaned);
     const outcomeStatus = finalOutcome.status;

package/dist/agent/turn/loop/answer-path.js.map

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

package/dist/agent/turn/loop/completion-interpretation.d.ts

@@ -13,7 +13,6 @@ export interface CompletionUsagePorts {
         api?: string | undefined;
         attempt?: ReturnType<typeof contextAttemptFromOperationUsage> | undefined;
     }) => void;
-    readonly emitContextFallback: (estimatedTokens: number) => void;
     readonly audit: (event: string, payload: Readonly<Record<string, string | number | boolean | undefined>>) => Promise<void>;
 }
 export declare const accountCompletionUsage: (ports: CompletionUsagePorts, completion: CompletionResult) => Promise<void>;

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

@@ -1,15 +1,12 @@
 import { stripThinking } from "../../../ui/thinking.js";
 import { trimExactContinuationOverlap } from "../continuation-overlap.js";
-import { calibratedRequestTokens, recordRequestTokenObservation, } from "../../../llm/token-estimate-calibration.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;
-    const reportFallback = () => ports.emitContextFallback(calibratedRequestTokens(completion.provider, completion.model, ports.dispatchedRawRequestTokens));
-    if (!usage) {
-        reportFallback();
+    if (!usage)
         return;
-    }
     const requestRouteMatched = ports.dispatchedRequestRoute?.provider === completion.provider &&
         ports.dispatchedRequestRoute.model === completion.model;
     const consumedPromptTokens = effectivePromptTokens(usage) ?? 0;
@@ -29,8 +26,6 @@ export const accountCompletionUsage = async (ports, completion) => {
         ...(completion.api ? { api: completion.api } : {}),
         ...(attempt.kind === "generation" ? { attempt } : {}),
     });
-    if (usage.promptTokensKnown === false)
-        reportFallback();
     const cacheRead = usage.cachedPromptTokens ?? 0;
     const cacheCreated = usage.cacheCreationTokens ?? 0;
     if (cacheRead === 0 && cacheCreated === 0)

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":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,6BAA6B,EAAE,MAAM,4CAA4C,CAAC;AAC3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,gCAAgC,EAAE,MAAM,kCAAkC,CAAC;AAoBpF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,KAA2B,EAC3B,UAA4B,EACb,EAAE;IACjB,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,mBAAmB,GACvB,KAAK,CAAC,sBAAsB,EAAE,QAAQ,KAAK,UAAU,CAAC,QAAQ;QAC9D,KAAK,CAAC,sBAAsB,CAAC,KAAK,KAAK,UAAU,CAAC,KAAK,CAAC;IAC1D,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/D,IAAI,KAAK,CAAC,KAAK,IAAI,oBAAoB,GAAG,CAAC,IAAI,mBAAmB,EAAE,CAAC;QACnE,6BAA6B,CAAC;YAC5B,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,sBAAsB,EAAE,KAAK,CAAC,0BAA0B;YACxD,kBAAkB,EAAE,oBAAoB;SACzC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,OAAO,GAAG,gCAAgC,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAC5E,KAAK,CAAC,cAAc,CAAC;QACnB,KAAK;QACL,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACtD,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,KAAK,CAAC,kBAAkB,IAAI,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,KAAK,CAAC,mBAAmB,IAAI,CAAC,CAAC;IACpD,IAAI,SAAS,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC;QAAE,OAAO;IAClD,MAAM,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE;QACtC,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,eAAe,EAAE,SAAS;QAC1B,mBAAmB,EAAE,YAAY;QACjC,QAAQ,EACN,KAAK,CAAC,YAAY,GAAG,CAAC;YACpB,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;KACR,CAAC,CAAC;AACL,CAAC,CAAC;AAkBF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,KAInC,EAAyB,EAAE;IAC1B,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG;QACnB,KAAK,CAAC,qBAAqB,CAAC,IAAI,EAAE;YAChC,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;QACtD,KAAK,CAAC,YAAY;KACnB;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,MAAM,CAAC,CAAC;IAChB,MAAM,gBAAgB,GAAG,4BAA4B,CACnD,KAAK,CAAC,kBAAkB,EACxB,KAAK,CAAC,OAAO,CACd,CAAC;IACF,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5C,OAAO;QACL,aAAa,EAAE;YACb,OAAO,EAAE,gBAAgB;YACzB,WAAW;YACX,YAAY;SACb;QACD,gBAAgB,EAAE,KAAK,CAAC,kBAAkB,GAAG,gBAAgB;QAC7D,YAAY;QACZ,cAAc,EACZ,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,MAAM;YAC3C,KAAK,CAAC,UAAU,CAAC,cAAc;YAC7B,CAAC,CAAC,KAAK,CAAC,UAAU;YAClB,CAAC,CAAC,WAAW;gBACX,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE;gBAC5C,CAAC,CAAC,KAAK,CAAC,UAAU;KACzB,CAAC;AACJ,CAAC,CAAC"}

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

@@ -77,6 +77,7 @@ export interface TurnLoopDeps extends TurnWriters {
     readonly composeCurrentSystemPrompt: (native: boolean) => string;
     readonly currentContextLimitTokens: () => number | undefined;
     readonly estimateNextRequestTokens: (messages: readonly ChatMessage[]) => number;
+    readonly measureRequestTokens: (estimatedTokens: number) => number | undefined;
     readonly selectToolDefs: (native: boolean, compact: boolean) => ToolDefinition[] | undefined;
     readonly maybeAutoCompact: (reason: string, options?: CompactionAdmissionOptions) => Promise<void>;
     readonly resolveNativeTools: (provider: ProviderId, model: string) => {

package/dist/agent/turn/loop/empty-response.d.ts

@@ -1,13 +1,13 @@
 import type { ChatMessage } from "../../../types.js";
 export interface EmptyResponseState {
     emptyVisibleRetries: number;
-    retryWithoutThinking: boolean;
     interruptedReasoning: string;
 }
 export interface EmptyResponsePorts {
     readonly messages: ChatMessage[];
     readonly toolsAttached: boolean;
     readonly planModeWithoutPlan: boolean;
+    readonly maxRetries?: number | undefined;
     readonly notify: (level: "info" | "warn", message: string) => void;
     readonly commitAssistantRetry: (text: string) => void;
     readonly recoveryUserMessage: (content: string) => ChatMessage;

package/dist/agent/turn/loop/empty-response.js

@@ -18,7 +18,8 @@ const baseNudgeFor = (ports, input) => {
 };
 export const handleEmptyResponse = (ports, state, input) => {
     state.emptyVisibleRetries += 1;
-    if (state.emptyVisibleRetries > MAX_EMPTY_RETRIES) {
+    const maxRetries = ports.maxRetries ?? MAX_EMPTY_RETRIES;
+    if (state.emptyVisibleRetries > maxRetries) {
         ports.notify("warn", "model returned an empty response after retries — no answer produced");
         return "stop";
     }
@@ -29,9 +30,6 @@ export const handleEmptyResponse = (ports, state, input) => {
         state.interruptedReasoning = appendInterruptedReasoning(state.interruptedReasoning, input.assistantThinkContent);
     }
     const preservedReasoning = state.interruptedReasoning;
-    if (input.hasThinking && state.emptyVisibleRetries >= 2) {
-        state.retryWithoutThinking = true;
-    }
     ports.commitAssistantRetry(input.assistantVisible);
     state.interruptedReasoning = preservedReasoning;
     const baseNudge = baseNudgeFor(ports, input);

package/dist/agent/turn/loop/empty-response.js.map

@@ -1 +1 @@
-{"version":3,"file":"empty-response.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/empty-response.ts"],"names":[],"mappings":"AACA,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AA0BtD,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAM,YAAY,GAAG,CACnB,KAAyB,EACzB,KAAyB,EACjB,EAAE;IACV,IAAI,KAAK,CAAC,sBAAsB,EAAE,CAAC;QACjC,OAAO,oJAAoJ,CAAC;IAC9J,CAAC;IACD,IAAI,KAAK,CAAC,mBAAmB,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC,aAAa;YACxB,CAAC,CAAC,iHAAiH;YACnH,CAAC,CAAC,2FAA2F;gBACzF,4EAA4E,CAAC;IACrF,CAAC;IACD,OAAO,KAAK,CAAC,aAAa;QACxB,CAAC,CAAC,qBAAqB,GAAG,SAAS,CAAC,IAAI,CAAC;QACzC,CAAC,CAAC,qEAAqE;YACnE,4EAA4E,CAAC;AACrF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,KAAyB,EACzB,KAAyB,EACzB,KAAyB,EACF,EAAE;IACzB,KAAK,CAAC,mBAAmB,IAAI,CAAC,CAAC;IAC/B,IAAI,KAAK,CAAC,mBAAmB,GAAG,iBAAiB,EAAE,CAAC;QAClD,KAAK,CAAC,MAAM,CACV,MAAM,EACN,qEAAqE,CACtE,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CACV,MAAM,EACN,KAAK,CAAC,WAAW;QACf,CAAC,CAAC,+EAA+E;QACjF,CAAC,CAAC,yDAAyD,CAC9D,CAAC;IACF,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;QACtB,KAAK,CAAC,oBAAoB,GAAG,0BAA0B,CACrD,KAAK,CAAC,oBAAoB,EAC1B,KAAK,CAAC,qBAAqB,CAC5B,CAAC;IACJ,CAAC;IACD,MAAM,kBAAkB,GAAG,KAAK,CAAC,oBAAoB,CAAC;IACtD,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,mBAAmB,IAAI,CAAC,EAAE,CAAC;QACxD,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC;IACpC,CAAC;IACD,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACnD,KAAK,CAAC,oBAAoB,GAAG,kBAAkB,CAAC;IAEhD,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW;QACtC,CAAC,CAAC,yBAAyB,CAAC,KAAK,CAAC,oBAAoB,CAAC;QACvD,CAAC,CAAC,SAAS,CAAC;IACd,KAAK,CAAC,QAAQ,CAAC,IAAI,CACjB,KAAK,CAAC,mBAAmB,CACvB,cAAc;QACZ,CAAC,CAAC,sFAAsF;YACpF,0EAA0E;YAC1E,2EAA2E;YAC3E,cAAc;YACd,MAAM;YACN,SAAS;QACb,CAAC,CAAC,SAAS,CACd,CACF,CAAC;IACF,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC"}
+{"version":3,"file":"empty-response.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/empty-response.ts"],"names":[],"mappings":"AACA,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AA0BtD,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAM,YAAY,GAAG,CACnB,KAAyB,EACzB,KAAyB,EACjB,EAAE;IACV,IAAI,KAAK,CAAC,sBAAsB,EAAE,CAAC;QACjC,OAAO,oJAAoJ,CAAC;IAC9J,CAAC;IACD,IAAI,KAAK,CAAC,mBAAmB,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC,aAAa;YACxB,CAAC,CAAC,iHAAiH;YACnH,CAAC,CAAC,2FAA2F;gBACzF,4EAA4E,CAAC;IACrF,CAAC;IACD,OAAO,KAAK,CAAC,aAAa;QACxB,CAAC,CAAC,qBAAqB,GAAG,SAAS,CAAC,IAAI,CAAC;QACzC,CAAC,CAAC,qEAAqE;YACnE,4EAA4E,CAAC;AACrF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,KAAyB,EACzB,KAAyB,EACzB,KAAyB,EACF,EAAE;IACzB,KAAK,CAAC,mBAAmB,IAAI,CAAC,CAAC;IAC/B,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,iBAAiB,CAAC;IACzD,IAAI,KAAK,CAAC,mBAAmB,GAAG,UAAU,EAAE,CAAC;QAC3C,KAAK,CAAC,MAAM,CACV,MAAM,EACN,qEAAqE,CACtE,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CACV,MAAM,EACN,KAAK,CAAC,WAAW;QACf,CAAC,CAAC,+EAA+E;QACjF,CAAC,CAAC,yDAAyD,CAC9D,CAAC;IACF,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;QACtB,KAAK,CAAC,oBAAoB,GAAG,0BAA0B,CACrD,KAAK,CAAC,oBAAoB,EAC1B,KAAK,CAAC,qBAAqB,CAC5B,CAAC;IACJ,CAAC;IACD,MAAM,kBAAkB,GAAG,KAAK,CAAC,oBAAoB,CAAC;IACtD,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACnD,KAAK,CAAC,oBAAoB,GAAG,kBAAkB,CAAC;IAEhD,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW;QACtC,CAAC,CAAC,yBAAyB,CAAC,KAAK,CAAC,oBAAoB,CAAC;QACvD,CAAC,CAAC,SAAS,CAAC;IACd,KAAK,CAAC,QAAQ,CAAC,IAAI,CACjB,KAAK,CAAC,mBAAmB,CACvB,cAAc;QACZ,CAAC,CAAC,sFAAsF;YACpF,0EAA0E;YAC1E,2EAA2E;YAC3E,cAAc;YACd,MAAM;YACN,SAAS;QACb,CAAC,CAAC,SAAS,CACd,CACF,CAAC;IACF,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC"}

package/dist/agent/turn/loop/output-budget.d.ts

@@ -3,7 +3,6 @@ export declare const MAX_OUTPUT_BUDGET_CONTINUATIONS = 1;
 export interface OutputBudgetState {
     truncatedBudgetRounds: number;
     continuationBudgetFloor: number;
-    retryWithoutThinking: boolean;
     interruptedVisible: string;
     interruptedReasoning: string;
     lowYieldResumptions: number;

package/dist/agent/turn/loop/output-budget.js

@@ -16,13 +16,11 @@ export const outputBudgetExhausted = (input) => outputBudgetWasExhausted({
     completionTokens: input.completion.usage?.completionTokens ?? 0,
     requestedMaxTokens: input.completionBudget,
 });
-const continuationNudge = (hasVisible, retryWithoutThinking, reasoning) => [
+const continuationNudge = (hasVisible, reasoning) => [
     hasVisible
         ? "Your previous response was cut off by the output token limit. Continue from the exact stopping point without repeating any prior text."
         : "Your previous response spent the output budget before producing a visible answer. Do not restart the analysis; use the preserved conclusions and answer now.",
-    retryWithoutThinking
-        ? "Optional reasoning is disabled for this continuation. Emit the next tool call or final answer directly and briefly."
-        : "Finish the reasoning briefly, then emit the next tool call or final answer directly.",
+    "Finish the reasoning briefly, then emit the next tool call or final answer directly.",
     interruptedReasoningBrief(reasoning),
 ]
     .filter((part) => Boolean(part))
@@ -38,7 +36,6 @@ const preserveAndContinue = (ports, state, input, completionBudget) => {
         profile.limits.outputTokens === undefined
             ? desired
             : Math.min(desired, profile.limits.outputTokens);
-    state.retryWithoutThinking = profile.reasoning.generation !== "mandatory";
     if (input.hasThinking) {
         state.interruptedReasoning = appendInterruptedReasoning(state.interruptedReasoning, input.assistantThinkContent);
     }
@@ -54,10 +51,8 @@ const preserveAndContinue = (ports, state, input, completionBudget) => {
         ports.commitAssistantRetry(input.assistantVisible);
         state.interruptedReasoning = preservedReasoning;
     }
-    ports.notify("warn", state.retryWithoutThinking
-        ? "response used the whole output budget — preserving it and continuing once with optional reasoning disabled"
-        : "response used the whole output budget — preserving it and continuing once at the route limit");
-    ports.messages.push(ports.recoveryUserMessage(continuationNudge(hasVisible, state.retryWithoutThinking, state.interruptedReasoning)));
+    ports.notify("warn", "response used the whole output budget — preserving it and continuing once with a larger output budget at the same reasoning effort");
+    ports.messages.push(ports.recoveryUserMessage(continuationNudge(hasVisible, state.interruptedReasoning)));
     return "continue-round";
 };
 export const handleOutputBudgetExhaustion = (ports, state, input, completionBudget) => {

package/dist/agent/turn/loop/output-budget.js.map

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

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

@@ -4,7 +4,6 @@ export interface RequestAssemblyState {
     freeTierConsecutiveFailures: number;
     truncatedBudgetRounds: number;
     continuationBudgetFloor: number;
-    retryWithoutThinking: boolean;
 }
 export interface RequestAssemblyPorts {
     readonly messages: ChatMessage[];
@@ -15,11 +14,10 @@ export interface RequestAssemblyPorts {
     readonly thinking: ReasoningPreference | undefined;
     readonly step: number;
     readonly contextLimitTokens: number | undefined;
-    readonly providerReportedContextTokens?: number | undefined;
+    readonly measureRequestTokens?: ((estimatedTokens: number) => number | undefined) | undefined;
     readonly estimateRequestTokens: (messages: readonly ChatMessage[]) => number;
     readonly selectTools: () => ToolDefinition[] | undefined;
     readonly notify: (level: "info" | "warn", message: string) => void;
-    readonly emitContextEstimate: (estimatedTokens: number) => void;
     readonly audit: (event: string, payload: Readonly<Record<string, string | number | boolean | undefined>>) => Promise<void>;
 }
 export interface AssembledRequest {

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

@@ -1,6 +1,7 @@
 import { resolveBuiltInProfile } from "../../../llm/provider-profiles.js";
 import { buildContextBreakdown, contextBreakdownAuditPayload, } from "../../context-breakdown.js";
-import { autoCompactTriggerTokens, freeTierGuardNotices, getReliabilityPolicy, resolveStepMaxTokens, } from "../../reliability-policy.js";
+import { freeTierGuardNotices, resolveStepMaxTokens, } from "../../reliability-policy.js";
+import { autoCompactTriggerTokens } from "../../request-budget.js";
 import { assertValidToolProtocol, repairToolProtocol, } from "../../tool-history.js";
 import { accountAssembledRequest, RequestOverLimitError, resolveEffectiveContextLimit, } from "../../request-accounting.js";
 const showFreeTierAdvisories = (ports, state) => {
@@ -11,7 +12,7 @@ const showFreeTierAdvisories = (ports, state) => {
         ports.notify("info", notice);
     }
 };
-const overLimitMessage = (requestTokens, safeTokens) => `estimated request (~${requestTokens.toLocaleString()} tokens) exceeds the model's safe context window (~${safeTokens?.toLocaleString()} tokens) — run /compact, trim large outputs, or raise the session context limit`;
+const overLimitMessage = (requestTokens, safeTokens) => `request (~${requestTokens.toLocaleString()} tokens) exceeds the model's safe context window (~${safeTokens.toLocaleString()} tokens) — run /compact, trim large outputs, or raise the session context limit`;
 export const assembleRequest = async (ports, state) => {
     const tools = ports.selectTools();
     const toolsAttached = Boolean(tools?.length);
@@ -25,9 +26,8 @@ export const assembleRequest = async (ports, state) => {
     const requestedStepMaxTokens = resolveStepMaxTokens({
         nativeToolsActive: ports.nativeToolsActive,
         toolsAttached,
-        recoveryNudge: state.retryWithoutThinking,
         truncationDepth: state.truncatedBudgetRounds,
-        thinkingEnabled: Boolean(ports.thinking?.enabled) && !state.retryWithoutThinking,
+        thinkingEnabled: Boolean(ports.thinking?.enabled),
         minimumTokens: state.continuationBudgetFloor,
         ...(routeOutputTokenLimit !== undefined
             ? { outputTokenLimit: routeOutputTokenLimit }
@@ -52,7 +52,7 @@ export const assembleRequest = async (ports, state) => {
         dialect: ports.dialect,
         step: ports.step,
         ...contextBreakdownAuditPayload(contextBreakdown),
-        compactTriggerTokens: autoCompactTriggerTokens(getReliabilityPolicy(), {
+        compactTriggerTokens: autoCompactTriggerTokens({
             provider: ports.provider,
             model: ports.model,
             ...(ports.contextLimitTokens !== undefined
@@ -72,9 +72,7 @@ export const assembleRequest = async (ports, state) => {
         messages: ports.messages,
         stream: true,
         reservedOutputTokens: stepMaxTokens,
-        reasoning: state.retryWithoutThinking && ports.thinking
-            ? { ...ports.thinking, enabled: false, effort: "low" }
-            : ports.thinking,
+        reasoning: ports.thinking,
         ...(toolsAttached && tools?.length
             ? { tools, toolChoice: "auto", parallelToolCalls: true }
             : {}),
@@ -82,21 +80,23 @@ export const assembleRequest = async (ports, state) => {
             ? { contextLimitTokens: ports.contextLimitTokens }
             : {}),
     }).accounting;
-    if (ports.providerReportedContextTokens === undefined) {
-        ports.emitContextEstimate(finalAccounting.requestTokens);
-    }
-    if (finalAccounting.overLimit && ports.providerReportedContextTokens === undefined) {
+    const measuredTokens = ports.measureRequestTokens?.(estimatedInputTokens);
+    const requestTokens = measuredTokens ?? finalAccounting.requestTokens;
+    const effectiveSafeTokens = finalAccounting.limit.effectiveSafeTokens;
+    if (effectiveSafeTokens !== undefined && requestTokens > effectiveSafeTokens) {
         await ports.audit("agent.request.over-limit-blocked", {
             provider: ports.provider,
             model: ports.model,
+            requestTokens,
+            tokenMeasurement: measuredTokens === undefined ? "estimated" : "provider-reported",
             estimatedTokens: finalAccounting.requestTokens,
-            effectiveSafeTokens: finalAccounting.limit.effectiveSafeTokens,
+            effectiveSafeTokens,
             limitSource: finalAccounting.limit.source,
             reservedOutputTokens: finalAccounting.limit.reservedOutputTokens,
             safetyMarginTokens: finalAccounting.limit.safetyMarginTokens,
         });
-        ports.notify("warn", overLimitMessage(finalAccounting.requestTokens, finalAccounting.limit.effectiveSafeTokens));
-        throw new RequestOverLimitError(`estimated request (~${finalAccounting.requestTokens.toLocaleString()} tokens) exceeds the effective safe context limit (~${finalAccounting.limit.effectiveSafeTokens?.toLocaleString()} tokens); dispatch blocked`);
+        ports.notify("warn", overLimitMessage(requestTokens, effectiveSafeTokens));
+        throw new RequestOverLimitError(`request (~${requestTokens.toLocaleString()} tokens) exceeds the effective safe context limit (~${effectiveSafeTokens.toLocaleString()} tokens); dispatch blocked`);
     }
     return {
         tools,

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

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

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

@@ -39,7 +39,6 @@ export const requestRound = async (deps, input) => {
             freeTierConsecutiveFailures: deps.loop.freeTierConsecutiveFailures,
             truncatedBudgetRounds: deps.loop.truncatedBudgetRounds,
             continuationBudgetFloor: deps.loop.continuationBudgetFloor,
-            retryWithoutThinking: deps.loop.retryWithoutThinking,
         };
         const contextLimitTokens = deps.currentContextLimitTokens();
         try {
@@ -52,11 +51,10 @@ export const requestRound = async (deps, input) => {
                 thinking: deps.thinking,
                 step: deps.loop.step,
                 contextLimitTokens,
-                providerReportedContextTokens: deps.loop.lastProviderPromptTokens,
+                measureRequestTokens: deps.measureRequestTokens,
                 estimateRequestTokens: deps.estimateNextRequestTokens,
                 selectTools: () => deps.selectToolDefs(deps.nativeToolsActive(), deps.useCompactSystemPrompt),
                 notify: deps.writeNotice,
-                emitContextEstimate: (estimatedTokens) => deps.emit({ type: "context-estimate", estimatedTokens, model: deps.loop.model }),
                 audit: (event, payload) => auditLog(event, payload),
             }, assemblyState);
             const turnTools = assembled.tools;
@@ -82,7 +80,6 @@ export const requestRound = async (deps, input) => {
                 maxTokens: deps.loop.stepMaxTokens,
                 signal: deps.options.signal,
                 thinking: deps.thinking,
-                retryWithoutThinking: deps.loop.retryWithoutThinking,
                 toolsAttached,
                 tools: turnTools,
                 onToolCallDelta: streamSession.onToolCallDelta,
@@ -116,7 +113,6 @@ export const requestRound = async (deps, input) => {
                 interruptedReasoning: deps.loop.interruptedReasoning,
                 allowModelFallback: deps.loop.allowModelFallback,
                 preferModelFallback: deps.loop.preferModelFallback,
-                retryWithoutThinking: deps.loop.retryWithoutThinking,
                 visibleCommitted: deps.outputState.visibleCommitted,
             };
             const decision = await recoverFromStreamFailure({
@@ -166,7 +162,6 @@ export const requestRound = async (deps, input) => {
             deps.loop.interruptedReasoning = failureState.interruptedReasoning;
             deps.loop.allowModelFallback = failureState.allowModelFallback;
             deps.loop.preferModelFallback = failureState.preferModelFallback;
-            deps.loop.retryWithoutThinking = failureState.retryWithoutThinking;
             deps.outputState.visibleCommitted = failureState.visibleCommitted;
             if (decision === "rethrow")
                 throw streamError;

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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"}