@pentoshi/clai 3.9.2 → 3.9.4

package/dist/app/controllers/session-compact-helper.d.ts

@@ -1,11 +1,33 @@
 /**
  * Summarizer callback used by SessionController.compact (keeps the controller slim).
  */
-import type { ProviderId } from "../../types.js";
+import type { ChatMessage, ProviderId } from "../../types.js";
+import { type CompactResult } from "../../agent/context-manager.js";
+import type { AnyAppEvent } from "../events/app-event.js";
+import type { EventSequencer } from "../events/sequencer.js";
 export declare function summarizeForSessionCompact(prompt: string, opts: {
     provider: ProviderId | undefined;
     model: string | undefined;
     signal?: AbortSignal | undefined;
     /** plan-implement needs denser handoff memory — allow a larger completion. */
     purpose?: "default" | "plan-implement" | undefined;
+    onToken?: ((token: string) => void) | undefined;
 }): Promise<string>;
+interface RunSessionCompactionOptions {
+    readonly history: ChatMessage[];
+    readonly sessionTranscript?: string | undefined;
+    readonly keepRecent: number;
+    readonly signal: AbortSignal;
+    readonly purpose?: "default" | "plan-implement" | undefined;
+    readonly provider: ProviderId | undefined;
+    readonly model: string | undefined;
+    readonly persist: boolean;
+    readonly compactionId: string;
+    readonly sequencer: EventSequencer;
+    readonly emit: (event: AnyAppEvent) => void;
+    readonly isCurrent: () => boolean;
+    readonly commit: (result: CompactResult) => void;
+    readonly persistNow: () => Promise<void>;
+}
+export declare function runSessionCompaction(options: RunSessionCompactionOptions): Promise<CompactResult>;
+export {};

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

@@ -1,14 +1,16 @@
 /**
  * Summarizer callback used by SessionController.compact (keeps the controller slim).
  */
-import { completeWithProvider } from "../../llm/router.js";
+import { compactMessagesWithSummary, estimateMessagesTokens, isCompactionMemoryMessage, } from "../../agent/context-manager.js";
+import { completeWithProvider, streamWithProvider } from "../../llm/router.js";
+import { createThinkingStreamParser, stripThinking, } from "../../ui/thinking.js";
 export async function summarizeForSessionCompact(prompt, opts) {
     const maxTokens = 2_048;
     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) => {
-        const response = await completeWithProvider({
+    const completeSummary = async (p, onToken) => {
+        const request = {
             provider: opts.provider,
             model: opts.model,
             messages: [
@@ -21,12 +23,44 @@ export async function summarizeForSessionCompact(prompt, opts) {
             temperature: 0.1,
             maxTokens,
             signal: opts.signal,
+        };
+        let rawSummary;
+        if (!onToken) {
+            rawSummary = (await completeWithProvider(request)).text;
+        }
+        else {
+            const parser = createThinkingStreamParser(onToken, undefined, {
+                remember: false,
+            });
+            const response = await streamWithProvider(request, (token) => parser.push(token), { onStatus: () => undefined });
+            parser.finish();
+            rawSummary = response.text;
+        }
+        const parsed = stripThinking(rawSummary);
+        if (parsed.visible.trim() || !parsed.hasThinking)
+            return rawSummary;
+        const retry = await completeWithProvider({
+            ...request,
+            messages: [
+                {
+                    role: "system",
+                    content: `${systemContent}\nReturn only the continuation-memory summary. Do not include analysis, reasoning, or <think> tags.`,
+                },
+                { role: "user", content: p },
+            ],
+            temperature: 0,
+            maxTokens: 8_192,
+            thinking: { enabled: false, effort: "none" },
         });
-        return response.text;
+        const retryVisible = stripThinking(retry.text).visible.trim();
+        if (retryVisible && onToken)
+            onToken(retryVisible);
+        return retry.text;
     };
     const chunkSize = 50_000;
-    if (prompt.length <= chunkSize)
-        return completeSummary(prompt);
+    if (prompt.length <= chunkSize) {
+        return completeSummary(prompt, opts.onToken);
+    }
     const chunks = Array.from({ length: Math.ceil(prompt.length / chunkSize) }, (_, index) => prompt.slice(index * chunkSize, (index + 1) * chunkSize));
     const partials = [];
     for (let index = 0; index < chunks.length; index += 1) {
@@ -40,6 +74,82 @@ export async function summarizeForSessionCompact(prompt, opts) {
         ? "Merge these ordered partial plan-mode research memories into one non-redundant implement handoff. Use sections: User goals, Research evidence, Coverage ledger, Confirmed findings, Negative/tested-OK, Untested/open, Artifacts, Durable rules, Plan-mode-only notes, Commands/tools, Current state, Remaining work, Open risks. Complete every fact; never cut mid-token.\n\n" +
             partials.map((part, index) => `PART ${index + 1}:\n${part}`).join("\n\n")
         : "Merge these ordered partial session memories into one non-redundant continuation memory. Preserve all concrete facts and unresolved work. Use sections: User goals, Decisions and constraints, Work completed, Commands/tools and results, Current state, Remaining work.\n\n" +
-            partials.map((part, index) => `PART ${index + 1}:\n${part}`).join("\n\n"));
+            partials.map((part, index) => `PART ${index + 1}:\n${part}`).join("\n\n"), opts.onToken);
+}
+export async function runSessionCompaction(options) {
+    const emit = (type, payload) => {
+        options.emit(options.sequencer.build(type, payload, undefined));
+    };
+    const beforeTokens = estimateMessagesTokens(options.history);
+    if (options.persist) {
+        emit("compaction-started", {
+            compactionId: options.compactionId,
+            beforeTokens,
+        });
+    }
+    let settled = false;
+    try {
+        const result = await compactMessagesWithSummary(options.history, (prompt, stage) => summarizeForSessionCompact(prompt, {
+            provider: options.provider,
+            model: options.model,
+            signal: options.signal,
+            purpose: options.purpose,
+            ...(options.persist && stage?.phase !== "map"
+                ? {
+                    onToken: (text) => {
+                        if (options.isCurrent()) {
+                            emit("compaction-delta", {
+                                compactionId: options.compactionId,
+                                text,
+                            });
+                        }
+                    },
+                }
+                : {}),
+        }), {
+            budgetTokens: 0,
+            keepRecent: options.keepRecent,
+            purpose: options.purpose,
+        }, options.sessionTranscript);
+        if (!options.isCurrent())
+            return result;
+        options.commit(result);
+        if (options.persist && result.summarized) {
+            const summary = [...result.messages]
+                .reverse()
+                .find((message) => isCompactionMemoryMessage(message))?.content ??
+                "Compacted context";
+            emit("compaction-completed", {
+                compactionId: options.compactionId,
+                summary,
+                beforeTokens: result.beforeTokens,
+                afterTokens: result.afterTokens,
+            });
+        }
+        else if (options.persist) {
+            emit("compaction-failed", {
+                compactionId: options.compactionId,
+                message: "There was no closed history to compact.",
+                retainedTokens: beforeTokens,
+            });
+        }
+        if (options.persist)
+            settled = true;
+        if (options.persist && result.summarized && result.after !== result.before) {
+            await options.persistNow();
+        }
+        return result;
+    }
+    catch (error) {
+        if (options.persist && !settled && options.isCurrent()) {
+            const message = error instanceof Error ? error.message : String(error);
+            emit("compaction-failed", {
+                compactionId: options.compactionId,
+                message: /aborted/i.test(message) ? "Compaction was cancelled." : message,
+                retainedTokens: beforeTokens,
+            });
+        }
+        throw error;
+    }
 }
 //# sourceMappingURL=session-compact-helper.js.map

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":"AAAA;;GAEG;AAGH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,MAAc,EACd,IAMC;IAED,MAAM,SAAS,GAAG,KAAK,CAAC;IACxB,MAAM,aAAa,GACjB,IAAI,CAAC,OAAO,KAAK,gBAAgB;QAC/B,CAAC,CAAC,mhBAAmhB;QACrhB,CAAC,CAAC,4XAA4X,CAAC;IAEnY,MAAM,eAAe,GAAG,KAAK,EAAE,CAAS,EAAmB,EAAE;QAC3D,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC;YAC1C,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,aAAa;iBACvB;gBACD,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE;aAC7B;YACD,WAAW,EAAE,GAAG;YAChB,SAAS;YACT,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,IAAI,CAAC;IACvB,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,CAAC;IACzB,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS;QAAE,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CACvB,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,EAChD,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,SAAS,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CACvE,CAAC;IACF,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACtD,IAAI,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;QAC9B,QAAQ,CAAC,IAAI,CACX,MAAM,eAAe,CACnB,IAAI,CAAC,OAAO,KAAK,gBAAgB;YAC/B,CAAC,CAAC,kBAAkB,KAAK,GAAG,CAAC,OAAO,MAAM,CAAC,MAAM,8KAA8K,MAAM,CAAC,KAAK,CAAC,EAAE;YAC9O,CAAC,CAAC,kBAAkB,KAAK,GAAG,CAAC,OAAO,MAAM,CAAC,MAAM,sHAAsH,MAAM,CAAC,KAAK,CAAC,EAAE,CACzL,CACF,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;IAC9B,OAAO,eAAe,CACpB,IAAI,CAAC,OAAO,KAAK,gBAAgB;QAC/B,CAAC,CAAC,iXAAiX;YAC/W,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,KAAK,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;QAC7E,CAAC,CAAC,+QAA+Q;YAC7Q,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,KAAK,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAChF,CAAC;AACJ,CAAC"}
+{"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

@@ -0,0 +1,24 @@
+import { type ContextUsageSnapshot } from "../../llm/token-usage.js";
+import type { ChatMessage, ProviderId, TokenUsage } from "../../types.js";
+export interface ContextUsageTarget {
+    readonly provider?: ProviderId | undefined;
+    readonly model?: string | undefined;
+}
+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 interface ContextProjection {
+    contextUsage: ContextUsageSnapshot | undefined;
+    contextChip: string | undefined;
+}
+export declare function createContextProjector(formatChip: (snapshot: ContextUsageSnapshot) => string): (target: ContextUsageTarget, history: readonly ChatMessage[], current: ContextUsageSnapshot | undefined) => ContextProjection;
+export interface PartialUsageSnapshot {
+    contextTokens: number;
+    contextLimit?: number | undefined;
+    lastCompletionTokens?: number | undefined;
+    sessionPromptTokens?: number | undefined;
+    sessionCompletionTokens?: number | undefined;
+    exact: boolean;
+}
+export declare function restoredUsageSnapshot(target: ContextUsageTarget, usage: PartialUsageSnapshot | ContextUsageSnapshot | undefined): ContextUsageSnapshot | undefined;

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

@@ -0,0 +1,89 @@
+// Context-usage projection for the session footer.
+//
+// The denominator shown to the user is the request budget that governs the next
+// request (auto-compaction trigger), not the raw model window, so the footer
+// agrees with the moment compaction actually fires.
+import { requestBudgetDenominator } from "../../agent/request-budget.js";
+import { estimateMessagesTokens } from "../../agent/context-manager.js";
+import { applyUsageToSnapshot, snapshotFromEstimate, } from "../../llm/token-usage.js";
+// Effective request budget used as the footer denominator.
+export function contextUsageLimit(target) {
+    return requestBudgetDenominator(target.provider, target.model);
+}
+// 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 };
+    }
+    if (history.length === 0 && !current)
+        return undefined;
+    const estimated = snapshotFromEstimate(history, target.model, target.provider, current);
+    return { ...estimated, contextLimit };
+}
+// Fold provider-reported usage into the snapshot against the request budget.
+export function recordUsageSnapshot(target, current, usage) {
+    return applyUsageToSnapshot(current, usage, contextUsageLimit(target));
+}
+// 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
+        : estimateMessagesTokens(history);
+    return {
+        contextTokens: estimated,
+        contextLimit: contextUsageLimit(target),
+        lastCompletionTokens: 0,
+        sessionPromptTokens: current?.sessionPromptTokens ?? 0,
+        sessionCompletionTokens: current?.sessionCompletionTokens ?? 0,
+        exact: false,
+    };
+}
+// 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) => {
+        const first = history[0];
+        const last = history[history.length - 1];
+        const key = [
+            target.provider ?? "",
+            target.model ?? "",
+            history.length,
+            first?.content.length ?? 0,
+            last?.content.length ?? 0,
+            current?.contextTokens ?? -1,
+            current?.contextLimit ?? -1,
+            current?.lastCompletionTokens ?? -1,
+            current?.exact ? 1 : 0,
+        ].join("|");
+        if (cache?.key === key)
+            return cache.value;
+        const contextUsage = resolveContextUsageSnapshot(target, history, current);
+        const value = {
+            contextUsage,
+            contextChip: contextUsage ? formatChip(contextUsage) : undefined,
+        };
+        cache = { key, value };
+        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)
+        return undefined;
+    return {
+        contextTokens: usage.contextTokens,
+        contextLimit: typeof usage.contextLimit === "number" && usage.contextLimit > 0
+            ? usage.contextLimit
+            : contextUsageLimit(target),
+        lastCompletionTokens: usage.lastCompletionTokens ?? 0,
+        sessionPromptTokens: usage.sessionPromptTokens ?? 0,
+        sessionCompletionTokens: usage.sessionCompletionTokens ?? 0,
+        exact: usage.exact === true,
+    };
+}
+//# sourceMappingURL=session-context-usage.js.map

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

@@ -0,0 +1 @@
+{"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,8 @@
 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 PartialUsageSnapshot } from "./session-context-usage.js";
+import type { PreviousTurnSignal } from "../../agent/continue-orient.js";
 import { type SessionWorkspace } from "../../store/session-workspace.js";
 import type { TranscriptItem as ClassicTranscriptItem } from "../../tui/state.js";
 import { type AnyAppEvent, type SessionId, type TurnId } from "../events/app-event.js";
@@ -8,6 +10,7 @@ import { type Clock, type IdFactory } from "../events/sequencer.js";
 import { OutputSpool } from "../events/event-buffer.js";
 import type { AgentPort } from "../ports/agent-port.js";
 import type { JobsPort } from "../ports/jobs-port.js";
+import type { InteractiveSessionsPort } from "../ports/interactive-sessions-port.js";
 import type { PersistencePort } from "../ports/persistence-port.js";
 import type { ConfirmationPort } from "../ports/confirm-port.js";
 import type { SecretPort } from "../ports/secret-port.js";
@@ -34,6 +37,7 @@ export interface SessionControllerDeps {
     readonly agent: AgentPort;
     readonly persistence: PersistencePort;
     readonly jobs?: JobsPort | undefined;
+    readonly interactiveSessions?: InteractiveSessionsPort | undefined;
     readonly emit: (event: AnyAppEvent) => void;
     readonly sessionId?: string | undefined;
     readonly provider?: ProviderId | undefined;
@@ -82,23 +86,23 @@ export declare class SessionController implements Disposable {
     private static readonly AUTOSAVE_MIN_MS;
     /** Last known context / session token totals for the status strip. */
     private contextUsage;
+    /** 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;
-    /**
-     * Prefer last API prompt_tokens as context fill (exact); otherwise estimate
-     * from current history so the footer always has a number.
-     */
+    private contextUsageProjection;
+    private get usageTarget();
     private resolveContextUsage;
     /** Record provider-reported usage (from agent token-usage events). */
     recordTokenUsage(usage: TokenUsage, model?: string): void;
-    /**
-     * After /compact or auto-compact: history was replaced with a short memory
-     * + recent turns. Drop stale exact prompt_tokens so the footer shows the
-     * live context size until the next API usage report.
-     */
+    /** After /compact or auto-compact, report the post-compaction context size. */
     noteContextCompacted(afterTokens?: number): void;
     /** After history loads, estimate fill until the next API usage report. */
     private refreshEstimatedContext;
@@ -119,16 +123,11 @@ export declare class SessionController implements Disposable {
          * Restored from history so the footer matches the live session count.
          * Accepts partial snapshots (contextLimit optional).
          */
-        contextUsage?: ContextUsageSnapshot | {
-            contextTokens: number;
-            contextLimit?: number | undefined;
-            lastCompletionTokens?: number | undefined;
-            sessionPromptTokens?: number | undefined;
-            sessionCompletionTokens?: number | undefined;
-            exact: boolean;
-        } | undefined;
+        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;
@@ -153,6 +152,7 @@ export declare class SessionController implements Disposable {
         persist?: boolean | undefined;
     }): Promise<CompactResult>;
     private settlePersistedResponderResults;
+    private continuationCheckpoint;
     persistNow(name?: string): Promise<void>;
     maybeRefreshTitle(): Promise<void>;
     estimateContext(): {
@@ -160,6 +160,12 @@ export declare class SessionController implements Disposable {
         tokens: number;
     };
     cancelAll(): Promise<ToolResult>;
+    /**
+     * Fence the outgoing owner id and start one tracked teardown before that id is
+     * rebound or released, so no new operation can enter the old owner and the old
+     * owner never becomes reachable through the new conversation context.
+     */
+    private fenceInteractiveOwner;
     enqueue(prompt: string, opts?: TurnDisplayOptions): void;
     queued(): readonly string[];
     removeQueued(index: number): void;
@@ -182,6 +188,8 @@ export declare class SessionController implements Disposable {
      * 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;
 }