@pentoshi/clai 4.1.0 → 4.2.0

package/dist/app/controllers/session-context-usage.js

@@ -1,10 +1,10 @@
-// Context-usage projection for the session footer.
+// Context snapshot projection for the session footer.
 //
-// A denominator is displayed only when the user explicitly sets a session
-// model-window override. The default footer remains a concise current-context
-// count; compaction policy is resolved independently by the agent runner.
+// ContextSnapshotV1 is the runtime source of truth. ContextUsageSnapshot is a
+// deliberately narrow legacy projection for existing renderers and history.
 import { estimateMessagesTokens } from "../../agent/context-manager.js";
-import { applyUsageToSnapshot, snapshotFromEstimate, } from "../../llm/token-usage.js";
+import { contextLimitFromSessionOverride, contextSnapshotFromLegacy, createContextSnapshot, isContextSnapshotV1, toLegacyContextUsage, withContextSnapshotLimit, } from "../../llm/context-snapshot.js";
+const systemNow = () => Date.now();
 // The footer denominator is the explicit model window, never a guessed window
 // or compaction trigger. Zero means no session override was set.
 export function contextUsageLimit(target) {
@@ -13,54 +13,143 @@ export function contextUsageLimit(target) {
         ? Math.floor(limit)
         : 0;
 }
-// Prefer the last API `prompt_tokens` as context fill (exact); otherwise
-// estimate from current history so the footer always has a number.
-export function resolveContextUsageSnapshot(target, history, current) {
-    const contextLimit = contextUsageLimit(target);
-    if (current?.exact && current.contextTokens > 0) {
-        return { ...current, contextLimit };
+function limitFor(target) {
+    return contextLimitFromSessionOverride(contextUsageLimit(target));
+}
+function sameLimit(left, right) {
+    return left.source === right.source && left.tokens === right.tokens;
+}
+function hasPromptMeasurement(usage) {
+    return usage.promptTokensKnown !== false;
+}
+function reportedCache(usage) {
+    const readTokens = usage.cachedPromptTokens;
+    const creationTokens = usage.cacheCreationTokens;
+    const uncachedTokens = usage.uncachedPromptTokens;
+    if (readTokens === undefined &&
+        creationTokens === undefined &&
+        uncachedTokens === undefined) {
+        return undefined;
     }
-    const estimated = snapshotFromEstimate(history, target.model, target.provider, current);
-    return { ...estimated, contextLimit };
+    return {
+        kind: "reported",
+        ...(readTokens !== undefined ? { readTokens } : {}),
+        ...(creationTokens !== undefined ? { creationTokens } : {}),
+        ...(uncachedTokens !== undefined ? { uncachedTokens } : {}),
+    };
 }
-// Fold provider-reported usage into the snapshot against the request budget.
-export function recordUsageSnapshot(target, current, usage) {
-    return applyUsageToSnapshot(current, usage, contextUsageLimit(target));
+function reportedReasoning(usage) {
+    if (usage.reasoningTokens === undefined)
+        return undefined;
+    return { kind: "reported", outputTokens: usage.reasoningTokens };
 }
-// After /compact or auto-compact the exact prompt_tokens are stale: report the
-// post-compaction size until the next API usage report.
-export function compactedUsageSnapshot(target, current, history, afterTokens) {
-    const estimated = typeof afterTokens === "number" && afterTokens > 0
-        ? afterTokens
+function historyEstimateSnapshot(target, current, history, now) {
+    return createContextSnapshot({
+        contextTokens: estimateMessagesTokens(history),
+        lastCompletionTokens: current?.lastCompletionTokens,
+        sessionPromptTokens: current?.sessionPromptTokens,
+        sessionCompletionTokens: current?.sessionCompletionTokens,
+        scope: "message-history",
+        precision: "estimate",
+        limit: limitFor(target),
+        observedAt: now(),
+    });
+}
+/**
+ * Scopes that describe the occupancy of a real model request. Both the
+ * pre-dispatch assembled estimate and the provider's post-dispatch count
+ * measure the same thing, so either may be presented as the current fill.
+ */
+const REQUEST_SCOPES = new Set([
+    "provider-request",
+    "assembled-request",
+]);
+/**
+ * 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 function resolveContextSnapshot(target, history, current, now = systemNow) {
+    const limit = limitFor(target);
+    if (current && current.contextTokens > 0 && REQUEST_SCOPES.has(current.scope)) {
+        return sameLimit(current.limit, limit)
+            ? current
+            : withContextSnapshotLimit(current, limit);
+    }
+    return historyEstimateSnapshot(target, current, history, now);
+}
+/** Fold provider usage into one canonical provider-request observation. */
+export function recordContextUsageSnapshot(target, current, usage, attempt, now = systemNow) {
+    const promptMeasured = hasPromptMeasurement(usage);
+    const sessionPromptTokens = (current?.sessionPromptTokens ?? 0) +
+        (usage.exact && promptMeasured ? usage.promptTokens : 0);
+    const sessionCompletionTokens = (current?.sessionCompletionTokens ?? 0) +
+        (usage.exact ? usage.completionTokens : 0);
+    const cache = reportedCache(usage);
+    const reasoning = reportedReasoning(usage);
+    return createContextSnapshot({
+        // A completion-only report cannot refresh current context occupancy. Keep
+        // the prior number only as an explicitly unknown observation so the next
+        // estimate replaces it instead of presenting stale provider exactness.
+        contextTokens: promptMeasured
+            ? usage.promptTokens
+            : (current?.contextTokens ?? 0),
+        lastCompletionTokens: usage.completionTokens,
+        sessionPromptTokens,
+        sessionCompletionTokens,
+        scope: promptMeasured ? "provider-request" : "unknown",
+        precision: usage.exact && promptMeasured
+            ? "provider-exact"
+            : promptMeasured
+                ? "estimate"
+                : "unknown",
+        limit: limitFor(target),
+        ...(cache ? { cache } : {}),
+        ...(reasoning ? { reasoning } : {}),
+        ...(attempt ? { attempt } : {}),
+        observedAt: now(),
+    });
+}
+/** After compaction, exact provider fill is stale and the new scope is explicit. */
+export function compactedContextSnapshot(target, current, history, afterTokens, scope, now = systemNow) {
+    const contextTokens = typeof afterTokens === "number" && Number.isFinite(afterTokens) && afterTokens > 0
+        ? Math.floor(afterTokens)
         : estimateMessagesTokens(history);
-    return {
-        contextTokens: estimated,
-        contextLimit: contextUsageLimit(target),
+    return createContextSnapshot({
+        contextTokens,
         lastCompletionTokens: 0,
-        sessionPromptTokens: current?.sessionPromptTokens ?? 0,
-        sessionCompletionTokens: current?.sessionCompletionTokens ?? 0,
-        exact: false,
-    };
+        sessionPromptTokens: current?.sessionPromptTokens,
+        sessionCompletionTokens: current?.sessionCompletionTokens,
+        scope,
+        precision: "estimate",
+        limit: limitFor(target),
+        observedAt: now(),
+    });
 }
-export function estimatedUsageSnapshot(target, current, estimatedTokens) {
+export function estimatedContextSnapshot(target, current, estimatedTokens, now = systemNow) {
     if (!Number.isFinite(estimatedTokens) || estimatedTokens <= 0)
         return current;
-    if (current?.exact)
+    if (current?.scope === "provider-request" &&
+        current.precision === "provider-exact") {
         return current;
-    return {
+    }
+    return createContextSnapshot({
         contextTokens: Math.floor(estimatedTokens),
-        contextLimit: current?.contextLimit ?? contextUsageLimit(target),
-        lastCompletionTokens: current?.lastCompletionTokens ?? 0,
-        sessionPromptTokens: current?.sessionPromptTokens ?? 0,
-        sessionCompletionTokens: current?.sessionCompletionTokens ?? 0,
-        exact: false,
-    };
+        lastCompletionTokens: current?.lastCompletionTokens,
+        sessionPromptTokens: current?.sessionPromptTokens,
+        sessionCompletionTokens: current?.sessionCompletionTokens,
+        scope: "assembled-request",
+        precision: "estimate",
+        limit: limitFor(target),
+        observedAt: now(),
+    });
 }
 // The estimate walks the whole transcript, so the projection is memoized
 // against the inputs that can change it instead of recomputed per render.
 export function createContextProjector(formatChip) {
     let cache;
-    return (target, history, current) => {
+    return (target, history, current, now = systemNow) => {
         const first = history[0];
         const last = history[history.length - 1];
         const key = [
@@ -70,15 +159,37 @@ export function createContextProjector(formatChip) {
             history.length,
             first?.content.length ?? 0,
             last?.content.length ?? 0,
+            current?.version ?? 0,
             current?.contextTokens ?? -1,
-            current?.contextLimit ?? -1,
-            current?.lastCompletionTokens ?? -1,
-            current?.exact ? 1 : 0,
+            current?.scope ?? "",
+            current?.precision ?? "",
+            current?.limit.source ?? "",
+            current?.limit.tokens ?? -1,
+            current?.cache.kind ?? "",
+            current?.cache.kind === "reported" ? current.cache.readTokens ?? -1 : -1,
+            current?.cache.kind === "reported"
+                ? current.cache.creationTokens ?? -1
+                : -1,
+            current?.cache.kind === "reported"
+                ? current.cache.uncachedTokens ?? -1
+                : -1,
+            current?.reasoning.kind ?? "",
+            current?.reasoning.kind === "reported"
+                ? current.reasoning.outputTokens ?? -1
+                : -1,
+            current?.reasoning.kind === "reported"
+                ? current.reasoning.inputArtifactTokens ?? -1
+                : -1,
+            current?.observedAt ?? -1,
         ].join("|");
         if (cache?.key === key)
             return cache.value;
-        const contextUsage = resolveContextUsageSnapshot(target, history, current);
+        const contextSnapshot = resolveContextSnapshot(target, history, current, now);
+        const contextUsage = contextSnapshot
+            ? toLegacyContextUsage(contextSnapshot)
+            : undefined;
         const value = {
+            contextSnapshot,
             contextUsage,
             contextChip: contextUsage ? formatChip(contextUsage) : undefined,
         };
@@ -86,20 +197,44 @@ export function createContextProjector(formatChip) {
         return value;
     };
 }
-// Prefer the exact snapshot saved during the live turn; older sessions without
-// a usage payload fall back to an estimate at the call site.
-export function restoredUsageSnapshot(target, usage) {
-    if (!usage || usage.contextTokens <= 0)
+/** Restore V1 when available, otherwise migrate the unversioned legacy shape. */
+export function restoredContextSnapshot(target, usage, now = systemNow) {
+    if (!usage)
         return undefined;
-    return {
+    if (isContextSnapshotV1(usage)) {
+        return usage.contextTokens > 0
+            ? withContextSnapshotLimit(usage, limitFor(target))
+            : undefined;
+    }
+    const persisted = usage.contextSnapshot;
+    if (isContextSnapshotV1(persisted) && persisted.contextTokens > 0) {
+        // A saved denominator might have been an old auto-compact trigger. The
+        // live session override remains the only display limit after restore.
+        return withContextSnapshotLimit(persisted, limitFor(target));
+    }
+    if (usage.contextTokens <= 0)
+        return undefined;
+    return contextSnapshotFromLegacy({
         contextTokens: usage.contextTokens,
-        // Persisted snapshots from older builds stored an auto-compact trigger
-        // here. Only a live explicit session override may become a denominator.
-        contextLimit: contextUsageLimit(target),
+        contextLimit: usage.contextLimit ?? 0,
         lastCompletionTokens: usage.lastCompletionTokens ?? 0,
         sessionPromptTokens: usage.sessionPromptTokens ?? 0,
         sessionCompletionTokens: usage.sessionCompletionTokens ?? 0,
         exact: usage.exact === true,
-    };
+    }, limitFor(target), now());
+}
+// Compatibility exports retained for old callers and legacy-focused tests.
+export function resolveContextUsageSnapshot(target, history, current) {
+    const canonical = resolveContextSnapshot(target, history, current
+        ? contextSnapshotFromLegacy(current, limitFor(target))
+        : undefined);
+    return canonical ? toLegacyContextUsage(canonical) : undefined;
+}
+export function compactedUsageSnapshot(target, current, history, afterTokens) {
+    return toLegacyContextUsage(compactedContextSnapshot(target, current ? contextSnapshotFromLegacy(current, limitFor(target)) : undefined, history, afterTokens, "message-history"));
+}
+export function estimatedUsageSnapshot(target, current, estimatedTokens) {
+    const canonical = estimatedContextSnapshot(target, current ? contextSnapshotFromLegacy(current, limitFor(target)) : undefined, estimatedTokens);
+    return canonical ? toLegacyContextUsage(canonical) : undefined;
 }
 //# sourceMappingURL=session-context-usage.js.map

package/dist/app/controllers/session-context-usage.js.map

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

package/dist/app/controllers/session-controller.d.ts

@@ -1,6 +1,7 @@
 import type { ChatMessage, Mode, ProviderId, TokenUsage, ToolResult } from "../../types.js";
 import { type CompactResult } from "../../agent/context-manager.js";
 import { type ContextUsageSnapshot } from "../../llm/token-usage.js";
+import type { ContextAttemptReference, ContextSnapshotV1 } from "../../llm/context-snapshot.js";
 import { type PartialUsageSnapshot } from "./session-context-usage.js";
 import type { PreviousTurnSignal } from "../../agent/continue-orient.js";
 import { type SessionWorkspace } from "../../store/session-workspace.js";
@@ -29,6 +30,9 @@ export interface SessionState {
     readonly queued: readonly string[];
     readonly responder: ResponderRuntimeState;
     readonly title: string | undefined;
+    /** Canonical versioned context measurement for runtime consumers. */
+    readonly contextSnapshot: ContextSnapshotV1 | undefined;
+    /** Six-field legacy projection retained for existing renderers. */
     readonly contextUsage: ContextUsageSnapshot | undefined;
     readonly contextChip: string | undefined;
 }
@@ -52,6 +56,7 @@ export interface SessionControllerDeps {
     /** When true, never persist sessions or generate AI titles (CLI --no-history). */
     readonly noHistory?: boolean | undefined;
     readonly notifyResponderDelivery?: ((summary: string) => void) | undefined;
+    readonly titleCompleter?: ((messages: ChatMessage[]) => Promise<string>) | undefined;
 }
 export type TurnEndListener = (result: TurnResult) => void;
 export type SessionStateListener = () => void;
@@ -74,19 +79,20 @@ export declare class SessionController implements Disposable {
     private compactingFlag;
     private readonly activeCompactions;
     private compactAbort;
-    /** Display name written into history.db (AI title or explicit /save name). */
+    /** Display name written into history.db. */
     private sessionTitle;
-    /** User-message count at last successful AI title (classic refresh cadence). */
-    private titledAtUserCount;
-    private titleInFlight;
+    private readonly namer;
+    private lastMainRequestSnapshot;
     /** Throttle mid-turn history autosaves so abort/crash still keep tools on disk. */
     private lastAutosaveAt;
     private autosaveInFlight;
     /** Orders autosave, terminal, compaction, title, switch, and shutdown writes. */
     private readonly persistence;
     private static readonly AUTOSAVE_MIN_MS;
-    /** Last known context / session token totals for the status strip. */
-    private contextUsage;
+    /** Last known versioned context measurement for the session. */
+    private contextSnapshot;
+    /** Avoid applying the same manual compaction in both commit and event paths. */
+    private lastContextCompactionId;
     private readonly contextLimits;
     /** Bumped by reset/history load/dispose so late callbacks can be ignored. */
     private lifecycleGeneration;
@@ -102,9 +108,13 @@ export declare class SessionController implements Disposable {
     private contextUsageProjection;
     private get contextLimitTokens();
     private get usageTarget();
-    private resolveContextUsage;
-    recordTokenUsage(usage: TokenUsage, model?: string, provider?: ProviderId): void;
-    noteContextCompacted(afterTokens?: number): void;
+    private contextTimestamp;
+    private setContextSnapshot;
+    private resolveContextSnapshot;
+    /** Next-request occupancy, only when a request-scoped measurement exists. */
+    private requestScopedContextTokens;
+    recordTokenUsage(usage: TokenUsage, model?: string, provider?: ProviderId, attempt?: ContextAttemptReference): void;
+    noteContextCompacted(afterTokens?: number, scope?: "message-history" | "assembled-request", compactionId?: string): void;
     noteContextEstimate(estimatedTokens: number): void;
     private refreshEstimatedContext;
     get messages(): readonly ChatMessage[];
@@ -147,7 +157,7 @@ export declare class SessionController implements Disposable {
         mintNewId?: boolean;
     }): void;
     /** Roll back history after a rejected plan-implement compaction. */
-    restoreMessages(messages: readonly ChatMessage[], contextUsage?: ContextUsageSnapshot | undefined): void;
+    restoreMessages(messages: readonly ChatMessage[], contextSnapshot?: ContextSnapshotV1 | ContextUsageSnapshot | undefined): void;
     compact(sessionTranscript?: string, keepRecent?: number, signal?: AbortSignal, options?: {
         purpose?: "default" | "plan-implement" | undefined;
         /** Default true: emit compacted event + persist. */
@@ -156,7 +166,6 @@ export declare class SessionController implements Disposable {
     private settlePersistedResponderResults;
     private continuationCheckpoint;
     persistNow(name?: string): Promise<void>;
-    maybeRefreshTitle(): Promise<void>;
     estimateContext(): {
         messages: number;
         tokens: number;