@pentoshi/clai 3.11.9 → 3.11.11

package/dist/agent/request-budget.js

@@ -4,7 +4,9 @@ import { modelContextWindow } from "../llm/token-usage.js";
 // request tokens (system blocks, history, tool protocol, schemas and media
 // together) rather than in transcript size. Behaviour, status line and
 // reliability policy all read this module so they cannot disagree.
-export const DEFAULT_AUTO_COMPACT_REQUEST_TOKENS = 120_000;
+export const DEFAULT_AUTO_COMPACT_REQUEST_TOKENS = 180_000;
+/** A session-specific model window reserves 30% for output and wire overhead. */
+export const CUSTOM_CONTEXT_COMPACTION_RATIO = 0.7;
 // Never trigger below this: compaction itself needs room to be useful.
 export const MIN_AUTO_COMPACT_REQUEST_TOKENS = 20_000;
 // Output allowance reserved inside the model window before the trigger.
@@ -35,25 +37,40 @@ export function modelSafeRequestTokens(provider, model) {
     return Math.max(MIN_AUTO_COMPACT_REQUEST_TOKENS, window - RESERVED_OUTPUT_TOKENS - SAFETY_MARGIN_TOKENS);
 }
 export function resolveRequestBudget(input) {
+    const customLimit = input?.contextLimitTokens;
+    if (typeof customLimit === "number" &&
+        Number.isFinite(customLimit) &&
+        customLimit >= MIN_AUTO_COMPACT_REQUEST_TOKENS) {
+        const modelSafe = Math.floor(customLimit);
+        const effectiveTrigger = Math.floor(modelSafe * CUSTOM_CONTEXT_COMPACTION_RATIO);
+        return {
+            configured: effectiveTrigger,
+            modelSafe,
+            effectiveTrigger,
+            source: "session",
+            clampedByModel: false,
+        };
+    }
     const resolved = configuredRequestTokens();
     const raw = input?.overrideTokens ?? resolved.tokens;
     const configured = Math.max(MIN_AUTO_COMPACT_REQUEST_TOKENS, raw);
     const modelSafe = modelSafeRequestTokens(input?.provider, input?.model);
-    const effectiveTrigger = Math.min(configured, modelSafe);
     return {
         configured,
         modelSafe,
-        effectiveTrigger,
+        effectiveTrigger: configured,
         source: input?.overrideTokens === undefined ? resolved.source : "explicit",
-        clampedByModel: modelSafe < configured,
+        // The explicit 180k default is provider/model-neutral. A user can opt into
+        // a different window through the session control, which always uses 70%.
+        clampedByModel: false,
     };
 }
-// Status/footer denominator: the request budget that actually governs the next
-// request, not the raw model window.
-export function requestBudgetDenominator(provider, model) {
+// Request budget used by callers that need the active compaction trigger.
+export function requestBudgetDenominator(provider, model, contextLimitTokens) {
     return resolveRequestBudget({
         ...(provider ? { provider } : {}),
         ...(model ? { model } : {}),
+        ...(contextLimitTokens ? { contextLimitTokens } : {}),
     }).effectiveTrigger;
 }
 //# sourceMappingURL=request-budget.js.map

package/dist/agent/request-budget.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-budget.js","sourceRoot":"","sources":["../../src/agent/request-budget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG3D,yEAAyE;AACzE,2EAA2E;AAC3E,uEAAuE;AACvE,mEAAmE;AACnE,MAAM,CAAC,MAAM,mCAAmC,GAAG,OAAO,CAAC;AAE3D,uEAAuE;AACvE,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAC;AAEtD,wEAAwE;AACxE,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC;AAE7C,4DAA4D;AAC5D,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC;AAiB1C,0EAA0E;AAC1E,+EAA+E;AAC/E,yEAAyE;AACzE,MAAM,UAAU,uBAAuB;IAIrC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,IACE,oBAAoB,CAAC,0BAA0B,CAAC;QAChD,OAAO,MAAM,CAAC,wBAAwB,KAAK,QAAQ,EACnD,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,wBAAwB,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IACzE,CAAC;IACD,IACE,oBAAoB,CAAC,wBAAwB,CAAC;QAC9C,OAAO,MAAM,CAAC,sBAAsB,KAAK,QAAQ,EACjD,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,sBAAsB,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IACrE,CAAC;IACD,OAAO;QACL,MAAM,EAAE,mCAAmC;QAC3C,MAAM,EAAE,SAAS;KAClB,CAAC;AACJ,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,sBAAsB,CACpC,QAAgC,EAChC,KAAyB;IAEzB,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC,GAAG,CACb,+BAA+B,EAC/B,MAAM,GAAG,sBAAsB,GAAG,oBAAoB,CACvD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,KAIpC;IACC,MAAM,QAAQ,GAAG,uBAAuB,EAAE,CAAC;IAC3C,MAAM,GAAG,GAAG,KAAK,EAAE,cAAc,IAAI,QAAQ,CAAC,MAAM,CAAC;IACrD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAC;IAClE,MAAM,SAAS,GAAG,sBAAsB,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACxE,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IACzD,OAAO;QACL,UAAU;QACV,SAAS;QACT,gBAAgB;QAChB,MAAM,EAAE,KAAK,EAAE,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU;QAC1E,cAAc,EAAE,SAAS,GAAG,UAAU;KACvC,CAAC;AACJ,CAAC;AAED,+EAA+E;AAC/E,qCAAqC;AACrC,MAAM,UAAU,wBAAwB,CACtC,QAAgC,EAChC,KAAyB;IAEzB,OAAO,oBAAoB,CAAC;QAC1B,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5B,CAAC,CAAC,gBAAgB,CAAC;AACtB,CAAC"}
+{"version":3,"file":"request-budget.js","sourceRoot":"","sources":["../../src/agent/request-budget.ts"],"names":[],"mappings":"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"}

package/dist/agent/runner.d.ts

@@ -56,6 +56,8 @@ export interface AgentRunOptions {
     displayPrompt?: string | null | undefined;
     /** How the previous turn ended, so recovery is decided from state. */
     previousTurn?: PreviousTurnSignal | undefined;
+    /** User-declared model window for this provider/model/session. */
+    contextLimitTokens?: number | undefined;
 }
 export declare function runAgentTurn(prompt: string, options?: AgentRunOptions): Promise<import("./turn-outcome.js").TurnOutcome>;
 /** Compatibility boundary for callers that consume visible assistant text. */

package/dist/agent/runner.js

@@ -60,7 +60,6 @@ import { maybeAppendPlanModeReminder, PLAN_REMINDER_TOAST, } from "./plan-mode-r
 import { LoopGuard } from "./loop-guard.js";
 import { appendInterruptedReasoning, interruptedReasoningBrief, isMeaningfulResumptionYield, } from "./interrupted-reasoning.js";
 import { CompactionAttemptLedger, compactionAttemptKey, } from "./compaction-attempt.js";
-import { resolveRequestBudget } from "./request-budget.js";
 import { loadPlan, mutatePlan, markTask, appendPlanTask, readyPlanTasks, foregroundRemaining, responderOpenTasks, isPlanTerminal, isPlanSuccessful, } from "../store/plan.js";
 import { stat } from "node:fs/promises";
 import { isOutsideWorkingDirectory, resolveFsToolPath, } from "../tools/fs.js";
@@ -558,10 +557,11 @@ export async function runAgentTurn(prompt, options = {}) {
                 imageView: visionAvailable,
                 // E6: slim native constitution when API tool schemas are attached.
                 ...(native ? { slimNative: reliability.slimNativePrompt } : {}),
-                ...(pentestPromptTurn ? { pentest: true } : {}),
             });
         };
-        const systemSections = [renderRequestEnvironmentContext()];
+        const systemSections = [
+            renderRequestEnvironmentContext({ plan: activePlan }),
+        ];
         if (projectContext) {
             systemSections.push(`Project context from .clai/context.md:\n${projectContext}`);
         }
@@ -2829,10 +2829,10 @@ export async function runAgentTurn(prompt, options = {}) {
                     { role: "user", content: summaryPrompt },
                 ],
                 temperature: 0.1,
-                maxTokens: 2_048,
+                maxTokens: 8_192,
                 signal: options.signal,
             };
-            const response = await streamWithProvider(request, (token) => deltaParser?.push(token), { onStatus: () => undefined });
+            const response = await streamWithProvider(request, (token) => deltaParser?.push(token), { onStatus: () => undefined, maxRetries: 1 });
             deltaParser?.finish();
             const parsed = stripThinking(response.text);
             if (parsed.visible.trim() || !parsed.hasThinking)
@@ -2849,7 +2849,7 @@ export async function runAgentTurn(prompt, options = {}) {
                 temperature: 0,
                 maxTokens: 8_192,
                 thinking: { enabled: false, effort: "none" },
-            });
+            }, { maxRetries: 1 });
             const retryVisible = stripThinking(retry.text).visible.trim();
             if (retryVisible && compactionId) {
                 writeCompactionDelta(compactionId, retryVisible);
@@ -2918,8 +2918,13 @@ export async function runAgentTurn(prompt, options = {}) {
         }
         async function maybeAutoCompact(reason, force = false) {
             const beforeTokens = estimateNextRequestTokens(messages);
-            const budget = resolveRequestBudget({ provider, model });
-            const compactTrigger = budget.effectiveTrigger;
+            const compactTrigger = autoCompactTriggerTokens(getReliabilityPolicy(), {
+                provider,
+                model,
+                ...(options.contextLimitTokens
+                    ? { contextLimitTokens: options.contextLimitTokens }
+                    : {}),
+            });
             if (!force && beforeTokens < compactTrigger)
                 return;
             // Structural eligibility only: there must be closed history to summarize.
@@ -3003,12 +3008,10 @@ export async function runAgentTurn(prompt, options = {}) {
                         : insertedText(insertedSummary, insertedSummary.startsWith(PLAN_IMPLEMENT_MEMORY_PREFIX)
                             ? PLAN_IMPLEMENT_MEMORY_PREFIX
                             : COMPACTION_MEMORY_PREFIX);
-                // Card shows pre/post of the summarization; plan re-injection is noted.
-                writeCompactionCompleted(compactionId, summaryText, beforeTokens, compactedTokens);
-                const planNote = afterTokens > compactedTokens
-                    ? ` (compacted to ~${compactedTokens.toLocaleString()}, +plan → ~${afterTokens.toLocaleString()})`
-                    : "";
-                writeNotice("info", `context auto-compacted to fit the window (~${beforeTokens.toLocaleString()} → ~${compactedTokens.toLocaleString()} tokens${planNote})`, chalk.dim(`  ℹ context auto-compacted (~${beforeTokens.toLocaleString()} → ~${compactedTokens.toLocaleString()} tokens${planNote})\n`));
+                // Report the final assembled request, including live plan and session
+                // state reinjection, so the card and the next provider request agree.
+                writeCompactionCompleted(compactionId, summaryText, beforeTokens, afterTokens);
+                writeNotice("info", `context auto-compacted to fit the window (~${beforeTokens.toLocaleString()} → ~${afterTokens.toLocaleString()} tokens)`, chalk.dim(`  ℹ context auto-compacted (~${beforeTokens.toLocaleString()} → ~${afterTokens.toLocaleString()} tokens)\n`));
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : String(error);
@@ -3121,7 +3124,7 @@ export async function runAgentTurn(prompt, options = {}) {
                         ? `${seconds}s`
                         : `${Math.floor(seconds / 60)}m${String(seconds % 60).padStart(2, "0")}s`;
                     if (generatedTokens > 0 && !inThinking) {
-                        return `generating response · ${generatedTokens} tokens · ${elapsed}`;
+                        return `generating response · ${elapsed}`;
                     }
                     if (sawReasoning)
                         return `thinking · ${elapsed}`;
@@ -3166,6 +3169,11 @@ export async function runAgentTurn(prompt, options = {}) {
                     const turnTools = selectToolDefs(nativeToolsActive, useCompactSystemPrompt);
                     toolsAttached = Boolean(turnTools?.length);
                     const contextBreakdown = buildContextBreakdown(messages, toolsAttached ? turnTools : undefined);
+                    emit({
+                        type: "context-estimate",
+                        estimatedTokens: contextBreakdown.estimatedTotalTokens,
+                        model,
+                    });
                     // E4: advisory only — never blocks free-tier users.
                     if (!freeTierLargeContextWarned) {
                         const notices = freeTierGuardNotices({
@@ -3721,7 +3729,10 @@ export async function runAgentTurn(prompt, options = {}) {
                                         const salvageHistoryCalls = ensureUniqueToolCallIds(nativeToolCalls, toolCallIdsInHistory(messages));
                                         const salvagedCallIndex = nativeToolCalls.indexOf(writeTc);
                                         const salvagedCallId = salvageHistoryCalls[salvagedCallIndex]?.id ?? writeTc.id;
-                                        appendAssistantWithTools(messages, assistantText.visible, salvageHistoryCalls, completion.reasoningBlock);
+                                        appendAssistantWithTools(messages, assistantText.visible, salvageHistoryCalls, completion.reasoningBlock ??
+                                            (assistantText.hasThinking && assistantText.thinkContent
+                                                ? { text: assistantText.thinkContent }
+                                                : undefined));
                                         for (const tc of salvageHistoryCalls) {
                                             appendToolResult(messages, tc.id, tc.id === salvagedCallId
                                                 ? `Tool ${tc.name} result (exit=0, ok=true):\nSalvaged partial write: ${lineCount} lines to ${salvaged.path}`
@@ -4071,6 +4082,7 @@ export async function runAgentTurn(prompt, options = {}) {
                         sawServerTail,
                         sawLocalHttpProbe,
                         sawFailedLocalHttpProbe,
+                        serverCriterionRequired: outcomeState.outcome.criteria.some((criterion) => criterion.domain === "server" && criterion.required),
                         sawActivePentestTest,
                         sawSuccessfulMutation,
                         featureAppAsk,
@@ -4254,7 +4266,9 @@ export async function runAgentTurn(prompt, options = {}) {
                 if (sequenceDecision.suppress) {
                     const reason = sequenceDecision.terminal
                         ? "The model repeated the same action sequence after it was already suppressed. No commands were run again."
-                        : "The same action sequence already ran in the previous model round. No commands were run again; reuse the existing results and choose a materially different next action or finish.";
+                        : sequenceDecision.oscillation
+                            ? "This exact action sequence already completed earlier this turn (the agent is oscillating back to finished work). No commands were run again; every one of these results is already in context — synthesize them and either advance to a genuinely new action or finish."
+                            : "The same action sequence already ran in the previous model round. No commands were run again; reuse the existing results and choose a materially different next action or finish.";
                     writeNotice("warn", reason, chalk.yellow(`  ⚠ ${reason}\n`));
                     const suppressedResults = bound.map((b) => {
                         const duplicate = runIds.has(b.id);
@@ -4284,7 +4298,10 @@ export async function runAgentTurn(prompt, options = {}) {
                         emitToolResult(eventId, result, resultReason);
                     }
                     if (historyNativeCalls.length) {
-                        appendAssistantWithTools(messages, beforeTool ?? "", historyNativeCalls, completion.reasoningBlock);
+                        appendAssistantWithTools(messages, beforeTool ?? "", historyNativeCalls, completion.reasoningBlock ??
+                            (assistantText.hasThinking && assistantText.thinkContent
+                                ? { text: assistantText.thinkContent }
+                                : undefined));
                         for (const { b, resultReason, result } of suppressedResults) {
                             appendToolResult(messages, b.id, `Tool ${b.call.name} result (exit=${result.exitCode}, ok=false):\n${resultReason}`, b.call.name, false);
                         }
@@ -4325,7 +4342,10 @@ export async function runAgentTurn(prompt, options = {}) {
                     }
                 }
                 if (historyNativeCalls.length) {
-                    appendAssistantWithTools(messages, beforeTool ?? "", historyNativeCalls, completion.reasoningBlock);
+                    appendAssistantWithTools(messages, beforeTool ?? "", historyNativeCalls, completion.reasoningBlock ??
+                        (assistantText.hasThinking && assistantText.thinkContent
+                            ? { text: assistantText.thinkContent }
+                            : undefined));
                 }
                 else {
                     const standardizedContent = (beforeTool ? beforeTool.trim() + "\n\n" : "") +