@pentoshi/clai 4.11.7 → 4.11.9

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

@@ -4,21 +4,12 @@ import type { ChatMessage, ProviderId, TokenUsage } from "../../types.js";
 export interface ContextUsageTarget {
     readonly provider?: ProviderId | undefined;
     readonly model?: string | undefined;
-    /** 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;
-/**
- * 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 {
@@ -27,7 +18,6 @@ export interface ContextProjection {
     readonly contextChip: string | undefined;
 }
 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 {
     readonly contextTokens: number;
     readonly contextLimit?: number | undefined;
@@ -37,7 +27,6 @@ export interface PartialUsageSnapshot {
     readonly exact: boolean;
     readonly contextSnapshot?: unknown;
 }
-/** 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;

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

@@ -1,12 +1,8 @@
-// Context snapshot projection for the session footer.
-//
-// 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 { resolveEffectiveContextLimit } from "../../agent/request-accounting.js";
+import { calibratedRequestTokens } from "../../llm/token-estimate-calibration.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) {
     const limit = target.contextLimitTokens;
     return typeof limit === "number" && Number.isFinite(limit) && limit > 0
@@ -43,9 +39,22 @@ function reportedReasoning(usage) {
         return undefined;
     return { kind: "reported", outputTokens: usage.reasoningTokens };
 }
+function estimateHistoryRequestTokens(target, history) {
+    const raw = estimateMessagesTokens(history);
+    if (raw <= 0)
+        return 0;
+    const limit = resolveEffectiveContextLimit({
+        provider: target.provider,
+        model: target.model,
+        ...(target.contextLimitTokens !== undefined
+            ? { contextLimitTokens: target.contextLimitTokens }
+            : {}),
+    }).reservedOutputTokens;
+    return calibratedRequestTokens(target.provider, target.model, raw + Math.max(0, Math.floor(limit / 4)));
+}
 function historyEstimateSnapshot(target, current, history, now) {
     return createContextSnapshot({
-        contextTokens: estimateMessagesTokens(history),
+        contextTokens: estimateHistoryRequestTokens(target, history),
         lastCompletionTokens: current?.lastCompletionTokens,
         sessionPromptTokens: current?.sessionPromptTokens,
         sessionCompletionTokens: current?.sessionCompletionTokens,
@@ -55,21 +64,10 @@ function historyEstimateSnapshot(target, current, history, now) {
         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)) {
@@ -79,7 +77,6 @@ export function resolveContextSnapshot(target, history, current, now = systemNow
     }
     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) +
@@ -89,9 +86,6 @@ export function recordContextUsageSnapshot(target, current, usage, attempt, now
     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),
@@ -111,11 +105,10 @@ export function recordContextUsageSnapshot(target, current, usage, attempt, now
         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);
+        : estimateHistoryRequestTokens(target, history);
     return createContextSnapshot({
         contextTokens,
         lastCompletionTokens: 0,
@@ -130,6 +123,11 @@ export function compactedContextSnapshot(target, current, history, afterTokens,
 export function estimatedContextSnapshot(target, current, estimatedTokens, now = systemNow) {
     if (!Number.isFinite(estimatedTokens) || estimatedTokens <= 0)
         return current;
+    if (current && current.contextTokens > 0 && current.scope === "provider-request") {
+        return sameLimit(current.limit, limitFor(target))
+            ? current
+            : withContextSnapshotLimit(current, limitFor(target));
+    }
     return createContextSnapshot({
         contextTokens: Math.floor(estimatedTokens),
         lastCompletionTokens: current?.lastCompletionTokens,
@@ -141,8 +139,6 @@ export function estimatedContextSnapshot(target, current, estimatedTokens, now =
         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, now = systemNow) => {
@@ -193,7 +189,6 @@ export function createContextProjector(formatChip) {
         return value;
     };
 }
-/** Restore V1 when available, otherwise migrate the unversioned legacy shape. */
 export function restoredContextSnapshot(target, usage, now = systemNow) {
     if (!usage)
         return undefined;
@@ -204,8 +199,6 @@ export function restoredContextSnapshot(target, usage, now = systemNow) {
     }
     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)
@@ -219,7 +212,6 @@ export function restoredContextSnapshot(target, usage, now = systemNow) {
         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))

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

@@ -31,9 +31,7 @@ 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;
 }
@@ -54,7 +52,6 @@ export interface SessionControllerDeps {
     readonly clock?: Clock | undefined;
     readonly mintTurnId?: (() => TurnId) | undefined;
     readonly getTranscriptSnapshot?: (() => ClassicTranscriptItem[] | undefined) | undefined;
-    /** 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;
@@ -81,30 +78,23 @@ export declare class SessionController implements Disposable {
     private compactingFlag;
     private readonly activeCompactions;
     private compactAbort;
-    /** Display name written into history.db. */
     private sessionTitle;
     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 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;
     private readonly usageLedger;
-    /** Bumped by reset/history load/dispose so late callbacks can be ignored. */
     private lifecycleGeneration;
     private lastTurnResult;
     private restoredPreviousTurn;
     private activeTurnGeneration;
     private readonly projectContext;
     constructor(deps: SessionControllerDeps);
-    /** Current per-session scratch/output workspace (always bound while live). */
     get workspace(): SessionWorkspace | undefined;
     get sessionId(): SessionId;
     getState(): SessionState;
@@ -114,37 +104,24 @@ export declare class SessionController implements Disposable {
     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;
+    recordTokenUsage(usage: TokenUsage, model?: string, provider?: ProviderId, attempt?: ContextAttemptReference, api?: string | undefined): void;
     usageReport(): SessionUsageReport;
     noteContextCompacted(afterTokens?: number, scope?: "message-history" | "assembled-request", compactionId?: string): void;
     noteContextEstimate(estimatedTokens: number): void;
     private refreshEstimatedContext;
     get messages(): readonly ChatMessage[];
-    /** Subscribe to transient UI state such as running/queue status. */
     subscribe(listener: SessionStateListener): () => void;
     setProvider(provider: ProviderId | undefined): void;
     setContextLimitTokens(limit: number | undefined): void;
     setModel(model: string | undefined): void;
     setMode(mode: Mode): void;
-    /**
-     * Replace model history (and optionally rebind the session id so later
-     * autosaves update the resumed history row).
-     */
     loadHistory(messages: readonly ChatMessage[], options?: {
         sessionId?: string;
         title?: string | undefined;
-        /**
-         * Restored from history so the footer matches the live session count.
-         * Accepts partial snapshots (contextLimit optional).
-         */
         contextUsage?: ContextUsageSnapshot | PartialUsageSnapshot | undefined;
-        /** Loaded durable revision; resume advances to a fresh writer generation. */
         persistenceRevision?: number | undefined;
-        /** Last turn outcome or interrupted in-flight checkpoint from history. */
         previousTurn?: PreviousTurnSignal | undefined;
-        /** Per-session scratch/output folder (restored with history). */
         workspaceFolder?: string | undefined;
         workspaceCode?: string | undefined;
         provider?: ProviderId | undefined;
@@ -155,19 +132,12 @@ export declare class SessionController implements Disposable {
     allowTool(name: string): void;
     disallowTool(name: string): void;
     allowedTools(): readonly string[];
-    /**
-     * Clear conversation state. When `mintNewId` is true (for `/new`/`/clean`),
-     * remint the session id so subsequent autosave does not overwrite the prior
-     * history row.
-     */
     reset(options?: {
         mintNewId?: boolean;
     }): void;
-    /** Roll back history after a rejected plan-implement compaction. */
     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. */
         persist?: boolean | undefined;
     }): Promise<CompactResult>;
     private settlePersistedResponderResults;
@@ -189,20 +159,13 @@ export declare class SessionController implements Disposable {
     sendQueuedNow(index: number): void;
     abort(reason?: string): void;
     continueQueue(): Promise<void>;
-    /** In-memory plan-approval flag consumed by the agent gate (CORE-005). */
     setPlanApproved(value: boolean): void;
     isPlanApproved(): boolean;
-    /** Fires after every turn settles (completed/aborted/error), including drain. */
     onTurnEnd(listener: TurnEndListener): () => void;
     submit(prompt: string, opts?: TurnDisplayOptions): Promise<TurnResult>;
     drain(): Promise<TurnResult[]>;
     private runTurn;
-    /**
-     * Best-effort mid-turn autosave (throttled). Called from onMessages so a
-     * long agent run still lands tools/messages on disk before abort/crash.
-     */
     private scheduleAutosave;
-    /** Fence the previous lifecycle: running turn, compaction and title. */
     private beginLifecycleGeneration;
     dispose(): void;
     private notifyState;

package/dist/app/controllers/session-controller.js

@@ -16,6 +16,7 @@ import { asSessionId } from "../events/app-event.js";
 import { EventSequencer } from "../events/sequencer.js";
 import { OutputSpool } from "../events/event-buffer.js";
 import { mergeCancelAllResult } from "./cancel-all-result.js";
+import { withSessionAffinity } from "../../llm/session-affinity.js";
 import { TurnController } from "./turn-controller.js";
 import { SessionLoopRecovery } from "./session-loop-recovery.js";
 import { CompositeDisposable } from "./disposable.js";
@@ -44,24 +45,18 @@ export class SessionController {
     mode;
     compactingFlag = false;
     activeCompactions = new Set();
-    compactAbort; // cancels in-flight /compact
-    /** Display name written into history.db. */
+    compactAbort;
     sessionTitle;
     namer;
     lastMainRequestSnapshot;
-    /** Throttle mid-turn history autosaves so abort/crash still keep tools on disk. */
     lastAutosaveAt = 0;
     autosaveInFlight = false;
-    /** Orders autosave, terminal, compaction, title, switch, and shutdown writes. */
     persistence;
     static AUTOSAVE_MIN_MS = 15_000;
-    /** Last known versioned context measurement for the session. */
     contextSnapshot;
-    /** Avoid applying the same manual compaction in both commit and event paths. */
     lastContextCompactionId;
     contextLimits = new SessionContextLimits();
     usageLedger = new SessionUsageLedger();
-    /** Bumped by reset/history load/dispose so late callbacks can be ignored. */
     lifecycleGeneration = 0;
     lastTurnResult;
     restoredPreviousTurn;
@@ -76,7 +71,6 @@ export class SessionController {
         this.mode = deps.mode ?? "agent";
         this.policy = createSessionPolicy(this.sessionIdValue);
         void this.deps.interactiveSessions?.activateOwner(this.sessionIdValue).catch(() => undefined);
-        // Isolate scratch + tool outputs for this session immediately.
         beginSessionWorkspace();
         void prefetchProviderCatalog(this.provider);
         publishRouteReasoningVocabulary(this.provider, this.model);
@@ -140,7 +134,6 @@ export class SessionController {
             this.responder = undefined;
         }
     }
-    /** Current per-session scratch/output workspace (always bound while live). */
     get workspace() {
         return getActiveSessionWorkspace();
     }
@@ -189,22 +182,18 @@ export class SessionController {
     resolveContextSnapshot() {
         return resolveSnapshot(this.usageTarget, this.history, this.contextSnapshot, () => this.contextTimestamp());
     }
-    /** Next-request occupancy, only when a request-scoped measurement exists. */
     requestScopedContextTokens() {
         const snapshot = this.contextSnapshot;
         if (!snapshot || snapshot.contextTokens <= 0)
             return undefined;
-        return snapshot.scope === "provider-request" ||
-            snapshot.scope === "assembled-request"
-            ? snapshot.contextTokens
-            : undefined;
+        return snapshot.contextTokens;
     }
-    recordTokenUsage(usage, model, provider, attempt) {
+    recordTokenUsage(usage, model, provider, attempt, api) {
         if (provider !== undefined)
             this.provider = provider;
         if (model !== undefined)
             this.model = model;
-        this.usageLedger.record(usage, this.provider, this.model);
+        this.usageLedger.record(usage, this.provider, this.model, api);
         this.setContextSnapshot(recordContextUsageSnapshot(this.usageTarget, this.contextSnapshot, usage, attempt, () => this.contextTimestamp()));
         this.notifyState();
     }
@@ -232,7 +221,6 @@ export class SessionController {
     get messages() {
         return this.history;
     }
-    /** Subscribe to transient UI state such as running/queue status. */
     subscribe(listener) {
         this.stateListeners.add(listener);
         return () => this.stateListeners.delete(listener);
@@ -255,7 +243,6 @@ export class SessionController {
         this.model = model;
         this.lastMainRequestSnapshot = undefined;
         this.setContextSnapshot(this.resolveContextSnapshot());
-        // Allow native tools again after /model switch (sticky text-only is process-global).
         clearTextOnlyModels();
         publishRouteReasoningVocabulary(this.provider, model);
         this.notifyState();
@@ -264,15 +251,9 @@ export class SessionController {
         this.mode = mode;
         this.notifyState();
     }
-    /**
-     * Replace model history (and optionally rebind the session id so later
-     * autosaves update the resumed history row).
-     */
     loadHistory(messages, options = {}) {
         this.beginLifecycleGeneration();
         this.applyRestoredModel(options.provider, options.model);
-        // Deep-copy then heal broken assistant/tool pairs from aborted turns so
-        // /history resume + "continue" never dies on invalid native tool protocol.
         const healed = messages.map((m) => ({ ...m }));
         repairToolProtocol(healed);
         this.history = healed;
@@ -281,8 +262,6 @@ export class SessionController {
         this.spool.clear();
         this.sessionTitle = options.title;
         this.namer.restore(options.title);
-        // Prefer the exact snapshot saved during the live turn; only estimate when
-        // older sessions have no usage payload (would otherwise drop 39k → ~11k).
         this.lastContextCompactionId = undefined;
         const restored = restoredContextSnapshot(this.usageTarget, options.contextUsage, () => this.contextTimestamp());
         this.usageLedger.restore(options.contextUsage?.routeUsage);
@@ -304,8 +283,6 @@ export class SessionController {
             this.persistence.rebind(options.persistenceRevision);
             void this.deps.interactiveSessions?.activateOwner(this.sessionIdValue).catch(() => undefined);
         }
-        // Rebind (or mint) the per-session workspace so scratch + outputs
-        // continue under the same folder when resuming history.
         beginSessionWorkspace({
             folderName: options.workspaceFolder,
             code: options.workspaceCode,
@@ -333,11 +310,6 @@ export class SessionController {
     allowedTools() {
         return [...this.policy.allow];
     }
-    /**
-     * Clear conversation state. When `mintNewId` is true (for `/new`/`/clean`),
-     * remint the session id so subsequent autosave does not overwrite the prior
-     * history row.
-     */
     reset(options = {}) {
         this.beginLifecycleGeneration();
         this.sequencer.rebind(this.sessionIdValue);
@@ -356,7 +328,6 @@ export class SessionController {
             this.sequencer.rebind(this.sessionIdValue);
             this.persistence.newSession();
             void this.deps.interactiveSessions?.activateOwner(this.sessionIdValue).catch(() => undefined);
-            // Fresh session identity → fresh isolated workspace.
             beginSessionWorkspace();
             this.provider = undefined;
             this.model = undefined;
@@ -366,7 +337,6 @@ export class SessionController {
         this.policy = createSessionPolicy(this.sessionIdValue);
         this.notifyState();
     }
-    /** Roll back history after a rejected plan-implement compaction. */
     restoreMessages(messages, contextSnapshot) {
         this.history = [...messages];
         this.lastMainRequestSnapshot = undefined;
@@ -405,7 +375,7 @@ export class SessionController {
                 ? { provider, model: this.model ?? getProviderModel(provider), messages: history }
                 : undefined);
         try {
-            return await runSessionCompaction({
+            return await withSessionAffinity(this.sessionIdValue, () => runSessionCompaction({
                 history,
                 sessionTranscript,
                 keepRecent,
@@ -432,7 +402,7 @@ export class SessionController {
                     this.notifyState();
                 },
                 persistNow: () => this.persistNow(),
-            });
+            }));
         }
         finally {
             if (generation === this.lifecycleGeneration) {
@@ -484,6 +454,7 @@ export class SessionController {
             previousTurn: this.continuationCheckpoint() ?? null,
             ...(this.provider ? { provider: this.provider } : {}),
             ...(this.model ? { model: this.model } : {}),
+            thinking: { ...getConfig().thinking },
             ...(contextUsage ? { contextUsage } : {}),
         });
         this.settlePersistedResponderResults();
@@ -537,19 +508,17 @@ export class SessionController {
     abort(reason) {
         this.responder?.deactivate();
         this.turn.abort(reason);
-        this.compactAbort?.abort(); // also cancel in-flight /compact (outside a turn)
+        this.compactAbort?.abort();
     }
     async continueQueue() {
         await this.prompts.continue();
     }
-    /** In-memory plan-approval flag consumed by the agent gate (CORE-005). */
     setPlanApproved(value) {
         this.policy.planApproved.value = value;
     }
     isPlanApproved() {
         return this.policy.planApproved.value;
     }
-    /** Fires after every turn settles (completed/aborted/error), including drain. */
     onTurnEnd(listener) {
         this.turnEndListeners.add(listener);
         return () => this.turnEndListeners.delete(listener);
@@ -599,12 +568,10 @@ export class SessionController {
             requestSecret: this.deps.requestSecret,
             session: this.policy,
             onMessages: (messages) => {
-                // A later reset/load owns the session; ignore late callbacks.
                 if (turnGeneration !== this.lifecycleGeneration)
                     return;
                 this.history = pathBackedMessages(messages);
                 this.notifyState();
-                // Periodic durable snapshot so Esc/kill mid-run does not wipe tools.
                 this.scheduleAutosave();
             },
             onSuccessfulRequest: (snapshot) => {
@@ -646,10 +613,6 @@ export class SessionController {
             this.responder?.scheduleWake();
         }
     }
-    /**
-     * Best-effort mid-turn autosave (throttled). Called from onMessages so a
-     * long agent run still lands tools/messages on disk before abort/crash.
-     */
     scheduleAutosave() {
         if (this.deps.noHistory || getConfig().privateMode)
             return;
@@ -668,7 +631,6 @@ export class SessionController {
             this.autosaveInFlight = false;
         });
     }
-    /** Fence the previous lifecycle: running turn, compaction and title. */
     beginLifecycleGeneration() {
         this.lifecycleGeneration += 1;
         this.lastTurnResult = undefined;