@pentoshi/clai 4.1.0 → 4.2.0

package/dist/app/controllers/session-compact-helper.js

@@ -1,23 +1,11 @@
 /**
  * Summarizer callback used by SessionController.compact (keeps the controller slim).
  */
-import { buildCompactionRetryPrompt, compactionSinglePassInputBudget, COMPACTION_MAX_COMPLETION_TOKENS, COMPACTION_MAP_MAX_COMPLETION_TOKENS, isCompactionCompletionTruncated, looksLikeIncompleteCompactionSummary, looksLikeTranscriptReplay, normalizeCompactionSummary, } from "../../agent/compaction-summary.js";
+import { buildDirectCompactionPrompt, compactionSinglePassInputBudget, COMPACTION_MAX_COMPLETION_TOKENS, COMPACTION_MAP_MAX_COMPLETION_TOKENS, } from "../../agent/compaction-summary.js";
+import { executeCompactionSummary, planCompactionReplay, } from "../../agent/compaction-executor.js";
 import { compactMessagesWithSummary, estimateMessagesTokens, isCompactionMemoryMessage, } from "../../agent/context-manager.js";
-import { completeWithProvider, streamWithProvider } from "../../llm/router.js";
-import { streamAlreadyEmitted } from "../../llm/stream-progress.js";
 import { modelContextWindow } from "../../llm/token-usage.js";
-import { createThinkingStreamParser, stripThinking } from "../../ui/thinking.js";
-function isCompactionServerError(error) {
-    if (streamAlreadyEmitted(error))
-        return false;
-    const status = error && typeof error === "object" && "status" in error
-        ? Number(error.status)
-        : 0;
-    if (status >= 500 && status <= 504)
-        return true;
-    const message = error instanceof Error ? error.message : String(error);
-    return /internal server error/i.test(message);
-}
+import { OperationLedger, } from "../../llm/operation-ledger.js";
 export async function summarizeForSessionCompact(prompt, opts) {
     const maxTokens = opts.stage === "map"
         ? COMPACTION_MAP_MAX_COMPLETION_TOKENS
@@ -25,113 +13,53 @@ export async function summarizeForSessionCompact(prompt, opts) {
     const systemContent = opts.purpose === "plan-implement"
         ? "Write concise, non-redundant research memory for an agent executing an approved plan. Do not add framing: the PLAN MODE HANDOFF wrapper and active plan are injected separately. For coding target 600–1000 tokens; preserve only verified state, reusable research/artifacts, decisions, blockers, and risks. Security handoffs may be longer to preserve findings and coverage. Never invent or cut a fact mid-token. You are summarizing, not continuing: never emit tool calls or fabricate tool results, file receipts, or transcript lines."
         : "You compress conversation history into accurate continuation memory. You are SUMMARIZING the past session, not continuing it: do not answer the user, do not perform the next task, and never emit tool calls or fabricate tool results, file-write receipts (bytes/lines/sha256), exit codes, or 'TOOL:'/'[tools: …]' transcript lines. Describe what already happened in your own words.";
-    const completeSummary = async (p, onToken) => {
-        const request = {
-            provider: opts.provider,
-            model: opts.model,
-            messages: opts.sourceMessages
-                ? [
-                    ...opts.sourceMessages,
-                    { role: "user", content: p },
-                ]
-                : [
-                    {
-                        role: "system",
-                        content: systemContent,
-                    },
-                    { role: "user", content: p },
-                ],
-            temperature: 0.1,
-            maxTokens,
-            thinking: { enabled: false, effort: "none" },
-            signal: opts.signal,
-        };
-        const runProviderAttempt = async (attemptRequest, replace = false) => {
-            if (!onToken) {
-                return completeWithProvider(attemptRequest, { maxRetries: 0 });
-            }
-            if (replace)
-                onToken("", true);
-            const parser = createThinkingStreamParser((text) => onToken(text), undefined, { remember: false });
-            const result = await streamWithProvider(attemptRequest, (token) => parser.push(token), { onStatus: () => undefined, maxRetries: 0 });
-            parser.finish();
-            return result;
-        };
-        const runAttempt = async (attemptRequest, replace = false) => {
-            try {
-                return await runProviderAttempt(attemptRequest, replace);
-            }
-            catch (error) {
-                if (!isCompactionServerError(error))
-                    throw error;
-                return await runProviderAttempt(attemptRequest, replace);
-            }
-        };
-        const first = await runAttempt(request);
-        let visible = normalizeCompactionSummary(stripThinking(first.text).visible);
-        let retryReason;
-        if (isCompactionCompletionTruncated(first, maxTokens)) {
-            retryReason = "truncated";
-        }
-        else if (!visible) {
-            retryReason = "reasoning-only";
-        }
-        else if (looksLikeTranscriptReplay(visible)) {
-            retryReason = "replayed";
-        }
-        else if (looksLikeIncompleteCompactionSummary(visible)) {
-            retryReason = "incomplete";
-        }
-        if (retryReason) {
-            const retry = await runAttempt({
-                ...request,
-                messages: opts.sourceMessages
-                    ? [
-                        ...opts.sourceMessages,
-                        {
-                            role: "user",
-                            content: buildCompactionRetryPrompt(p, retryReason),
-                        },
-                    ]
-                    : [
-                        {
-                            role: "system",
-                            content: `${systemContent}\nReturn only a complete continuation-memory summary. Do not include analysis, reasoning, or <think> tags.`,
-                        },
-                        {
-                            role: "user",
-                            content: buildCompactionRetryPrompt(p, retryReason),
-                        },
-                    ],
-                temperature: 0,
-                maxTokens,
-                thinking: { enabled: false, effort: "none" },
-            }, true);
-            if (isCompactionCompletionTruncated(retry, maxTokens)) {
-                throw new Error("compaction failed: model hit the summary output limit twice — original context retained");
-            }
-            visible = normalizeCompactionSummary(stripThinking(retry.text).visible);
-            if (!visible) {
-                throw new Error("compaction failed: model returned an empty summary");
-            }
-            if (looksLikeTranscriptReplay(visible)) {
-                throw new Error("compaction failed: model replayed the transcript twice — original context retained");
-            }
-            if (looksLikeIncompleteCompactionSummary(visible)) {
-                throw new Error("compaction failed: model returned an incomplete summary twice — original context retained");
-            }
-        }
-        return visible;
-    };
-    // `compactMessagesWithSummary` owns chunking/map-reduce. A second splitting
-    // layer here multiplied one /compact into N map calls plus another reduce.
-    return completeSummary(prompt, opts.onToken);
+    return executeCompactionSummary({
+        provider: opts.provider,
+        model: opts.model,
+        systemContent,
+        prompt,
+        maxTokens,
+        signal: opts.signal,
+        ...(opts.sourceMessages ? { sourceMessages: opts.sourceMessages } : {}),
+        ...(opts.baseRequest ? { baseRequest: opts.baseRequest } : {}),
+        ...(opts.history ? { history: opts.history } : {}),
+        ...(opts.contextLimitTokens !== undefined
+            ? { contextLimitTokens: opts.contextLimitTokens }
+            : {}),
+        ...(opts.operation ? { operation: opts.operation } : {}),
+        stream: Boolean(opts.onToken),
+        retryOnServerError: true,
+        qualityRetry: false,
+        onToken: opts.onToken,
+    });
 }
 export async function runSessionCompaction(options) {
     const emit = (type, payload) => {
         options.emit(options.sequencer.build(type, payload, undefined));
     };
-    const beforeTokens = estimateMessagesTokens(options.history);
+    const historyTokensBefore = estimateMessagesTokens(options.history);
+    // The request-scoped measurement is the same provider-reported number the
+    // composer chip shows. The raw history estimate can exceed it (deliberately
+    // conservative chars-per-token ratio); preferring the estimate here made the
+    // compaction card disagree with the chip, so the request-scoped figure wins
+    // whenever one exists.
+    const requestTokensBefore = typeof options.requestTokensBefore === "number" &&
+        Number.isFinite(options.requestTokensBefore) &&
+        options.requestTokensBefore > 0
+        ? Math.floor(options.requestTokensBefore)
+        : undefined;
+    const scope = requestTokensBefore === undefined ? "message-history" : "assembled-request";
+    const beforeTokens = requestTokensBefore ?? historyTokensBefore;
+    // Compaction only rewrites messages: the system prefix and tool schemas are
+    // untouched, so the request shrinks by exactly what the history shrinks by.
+    const reportedFor = (result) => ({
+        beforeTokens,
+        afterTokens: requestTokensBefore === undefined
+            ? result.afterTokens
+            : Math.max(0, requestTokensBefore -
+                Math.max(0, result.beforeTokens - result.afterTokens)),
+        scope,
+    });
     if (options.persist) {
         emit("compaction-started", {
             compactionId: options.compactionId,
@@ -139,16 +67,58 @@ export async function runSessionCompaction(options) {
         });
     }
     let settled = false;
+    const operation = new OperationLedger({
+        kind: "compaction",
+        admissionBudget: 64,
+        continuationBudget: 0,
+    });
     try {
-        const result = await compactMessagesWithSummary(options.history, (prompt, stage) => summarizeForSessionCompact(prompt, {
+        const successfulRequest = options.successfulRequest;
+        if (!successfulRequest) {
+            throw new Error("compaction failed: no successful live model request is available for cache-preserving compaction; complete a turn first");
+        }
+        const contextLimitTokens = options.contextLimitTokens ??
+            modelContextWindow(successfulRequest.model, successfulRequest.provider);
+        const instruction = buildDirectCompactionPrompt({
+            ...(options.purpose ? { purpose: options.purpose } : {}),
+        });
+        // Cache-preserving replay: the summary request resends the last
+        // successful turn request verbatim with the instruction appended, so the
+        // whole prior prompt is served from cache. When that assembled request
+        // would not fit (e.g. compacting a nearly-full session), fall back to the
+        // legacy transcript-rendered requests rather than failing closed.
+        const replayPlan = planCompactionReplay({
+            baseRequest: successfulRequest,
+            history: options.history,
+            prompt: instruction,
+            maxTokens: COMPACTION_MAX_COMPLETION_TOKENS,
+            contextLimitTokens,
+            stream: true,
+        });
+        const replay = replayPlan && !replayPlan.accounting.overLimit
+            ? successfulRequest
+            : undefined;
+        const result = await compactMessagesWithSummary(options.history, (prompt, stage) => summarizeForSessionCompact(replay ? instruction : prompt, {
             provider: options.provider,
             model: options.model,
             signal: options.signal,
             purpose: options.purpose,
             stage: stage?.phase,
-            ...(stage?.sourceMessages
-                ? { sourceMessages: stage.sourceMessages }
-                : {}),
+            ...(replay
+                ? {
+                    baseRequest: replay,
+                    history: options.history,
+                    contextLimitTokens,
+                }
+                : {
+                    // Legacy path: the direct strategy carries the full source
+                    // messages; the transcript strategies embed the material in
+                    // the prompt itself and need no sourceMessages.
+                    ...(stage?.sourceMessages
+                        ? { sourceMessages: stage.sourceMessages }
+                        : {}),
+                }),
+            operation,
             ...(options.persist && stage?.phase !== "map"
                 ? {
                     onToken: (text, replace) => {
@@ -166,12 +136,14 @@ export async function runSessionCompaction(options) {
             budgetTokens: 0,
             keepRecent: options.keepRecent,
             purpose: options.purpose,
-            singlePassInputBudgetTokens: compactionSinglePassInputBudget(options.contextLimitTokens ??
-                modelContextWindow(options.model, options.provider)),
-        }, options.sessionTranscript);
+            singleAdmission: true,
+            ...(replay ? { forceDirectSinglePass: true } : {}),
+            singlePassInputBudgetTokens: compactionSinglePassInputBudget(contextLimitTokens),
+        });
         if (!options.isCurrent())
             return result;
-        options.commit(result);
+        const reported = reportedFor(result);
+        options.commit(result, reported);
         if (options.persist && result.summarized) {
             const summary = [...result.messages]
                 .reverse()
@@ -180,8 +152,9 @@ export async function runSessionCompaction(options) {
             emit("compaction-completed", {
                 compactionId: options.compactionId,
                 summary,
-                beforeTokens: result.beforeTokens,
-                afterTokens: result.afterTokens,
+                beforeTokens: reported.beforeTokens,
+                afterTokens: reported.afterTokens,
+                contextScope: reported.scope,
             });
         }
         else if (options.persist) {

package/dist/app/controllers/session-compact-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-compact-helper.js","sourceRoot":"","sources":["../../../src/app/controllers/session-compact-helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-compact-helper.js","sourceRoot":"","sources":["../../../src/app/controllers/session-compact-helper.ts"],"names":[],"mappings":"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"}

package/dist/app/controllers/session-context-usage.d.ts

@@ -1,4 +1,5 @@
-import { type ContextUsageSnapshot } from "../../llm/token-usage.js";
+import { type ContextAttemptReference, type ContextSnapshotScope, type ContextSnapshotV1 } from "../../llm/context-snapshot.js";
+import type { ContextUsageSnapshot } from "../../llm/token-usage.js";
 import type { ChatMessage, ProviderId, TokenUsage } from "../../types.js";
 export interface ContextUsageTarget {
     readonly provider?: ProviderId | undefined;
@@ -6,22 +7,38 @@ export interface ContextUsageTarget {
     /** Explicit provider/model window for this session, if the user set one. */
     readonly contextLimitTokens?: number | undefined;
 }
+export type ContextClock = () => number;
 export declare function contextUsageLimit(target: ContextUsageTarget): number;
-export declare function resolveContextUsageSnapshot(target: ContextUsageTarget, history: readonly ChatMessage[], current: ContextUsageSnapshot | undefined): ContextUsageSnapshot | undefined;
-export declare function recordUsageSnapshot(target: ContextUsageTarget, current: ContextUsageSnapshot | undefined, usage: TokenUsage): ContextUsageSnapshot;
-export declare function compactedUsageSnapshot(target: ContextUsageTarget, current: ContextUsageSnapshot | undefined, history: readonly ChatMessage[], afterTokens?: number): ContextUsageSnapshot;
-export declare function estimatedUsageSnapshot(target: ContextUsageTarget, current: ContextUsageSnapshot | undefined, estimatedTokens: number): ContextUsageSnapshot | undefined;
+/**
+ * Keep the most recent request-scoped measurement. The message-history estimate
+ * omits the system prefix and tool schemas, so substituting it for a live
+ * measurement made the displayed number oscillate between two different scopes
+ * every step; it is now only a cold-start fallback.
+ */
+export declare function resolveContextSnapshot(target: ContextUsageTarget, history: readonly ChatMessage[], current: ContextSnapshotV1 | undefined, now?: ContextClock): ContextSnapshotV1 | undefined;
+/** Fold provider usage into one canonical provider-request observation. */
+export declare function recordContextUsageSnapshot(target: ContextUsageTarget, current: ContextSnapshotV1 | undefined, usage: TokenUsage, attempt: ContextAttemptReference | undefined, now?: ContextClock): ContextSnapshotV1;
+/** After compaction, exact provider fill is stale and the new scope is explicit. */
+export declare function compactedContextSnapshot(target: ContextUsageTarget, current: ContextSnapshotV1 | undefined, history: readonly ChatMessage[], afterTokens: number | undefined, scope: Extract<ContextSnapshotScope, "message-history" | "assembled-request">, now?: ContextClock): ContextSnapshotV1;
+export declare function estimatedContextSnapshot(target: ContextUsageTarget, current: ContextSnapshotV1 | undefined, estimatedTokens: number, now?: ContextClock): ContextSnapshotV1 | undefined;
 export interface ContextProjection {
-    contextUsage: ContextUsageSnapshot | undefined;
-    contextChip: string | undefined;
+    readonly contextSnapshot: ContextSnapshotV1 | undefined;
+    readonly contextUsage: ContextUsageSnapshot | undefined;
+    readonly contextChip: string | undefined;
 }
-export declare function createContextProjector(formatChip: (snapshot: ContextUsageSnapshot) => string): (target: ContextUsageTarget, history: readonly ChatMessage[], current: ContextUsageSnapshot | undefined) => ContextProjection;
+export declare function createContextProjector(formatChip: (snapshot: ContextUsageSnapshot) => string): (target: ContextUsageTarget, history: readonly ChatMessage[], current: ContextSnapshotV1 | undefined, now?: ContextClock) => ContextProjection;
+/** Legacy persisted shape, optionally carrying the additive V1 object. */
 export interface PartialUsageSnapshot {
-    contextTokens: number;
-    contextLimit?: number | undefined;
-    lastCompletionTokens?: number | undefined;
-    sessionPromptTokens?: number | undefined;
-    sessionCompletionTokens?: number | undefined;
-    exact: boolean;
+    readonly contextTokens: number;
+    readonly contextLimit?: number | undefined;
+    readonly lastCompletionTokens?: number | undefined;
+    readonly sessionPromptTokens?: number | undefined;
+    readonly sessionCompletionTokens?: number | undefined;
+    readonly exact: boolean;
+    readonly contextSnapshot?: unknown;
 }
-export declare function restoredUsageSnapshot(target: ContextUsageTarget, usage: PartialUsageSnapshot | ContextUsageSnapshot | undefined): ContextUsageSnapshot | undefined;
+/** Restore V1 when available, otherwise migrate the unversioned legacy shape. */
+export declare function restoredContextSnapshot(target: ContextUsageTarget, usage: PartialUsageSnapshot | ContextUsageSnapshot | ContextSnapshotV1 | undefined, now?: ContextClock): ContextSnapshotV1 | undefined;
+export declare function resolveContextUsageSnapshot(target: ContextUsageTarget, history: readonly ChatMessage[], current: ContextUsageSnapshot | undefined): ContextUsageSnapshot | undefined;
+export declare function compactedUsageSnapshot(target: ContextUsageTarget, current: ContextUsageSnapshot | undefined, history: readonly ChatMessage[], afterTokens?: number): ContextUsageSnapshot;
+export declare function estimatedUsageSnapshot(target: ContextUsageTarget, current: ContextUsageSnapshot | undefined, estimatedTokens: number): ContextUsageSnapshot | undefined;