@prestyj/cli 5.6.0 → 5.8.0

package/dist/ui/hooks/useAgentLoop.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAgentLoop.test.js","sourceRoot":"","sources":["../../../src/ui/hooks/useAgentLoop.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAE9D,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC7C,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,CAAC,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAChD,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,OAAO,GAAG,IAAI,uBAAuB,EAAE,CAAC;QAC9C,IAAI,uBAAuB,GAAG,CAAC,CAAC;QAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,uBAAuB,GAAG,OAAO,CAAC,MAAM,CACtC,aAAa,EACb,EAAE,EAAE,EAAE,aAAa,EAAE,EACrB,kCAAkC,EAClC,KAAK,CACN,CAAC;QACJ,CAAC;QAED,MAAM,CACJ,iBAAiB,CAAC;YAChB,mBAAmB,EAAE,CAAC;YACtB,uBAAuB;YACvB,sBAAsB,EAAE,KAAK;SAC9B,CAAC,CAAC,WAAW,CACf,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,OAAO,GAAG,IAAI,uBAAuB,EAAE,CAAC;QAC9C,IAAI,uBAAuB,GAAG,CAAC,CAAC;QAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,uBAAuB,GAAG,OAAO,CAAC,MAAM,CACtC,MAAM,EACN,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,EAAE,EAC5E,QAAQ,CAAC,EAAE,EACX,KAAK,CACN,CAAC;QACJ,CAAC;QAED,MAAM,CACJ,iBAAiB,CAAC;YAChB,mBAAmB,EAAE,CAAC;YACtB,uBAAuB;YACvB,sBAAsB,EAAE,KAAK;SAC9B,CAAC,CAAC,WAAW,CACf,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"useAgentLoop.test.js","sourceRoot":"","sources":["../../../src/ui/hooks/useAgentLoop.test.ts"],"names":[],"mappings":"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"}

package/dist/ui/hooks/useContextCompaction.d.ts

@@ -1,5 +1,6 @@
 import { type Dispatch, type MutableRefObject, type SetStateAction } from "react";
-import type { Message, Provider } from "@prestyj/ai";
+import type { Message, Provider, Usage } from "@prestyj/ai";
+import type { TransformContextOptions } from "@prestyj/agent";
 import { type ContextWindowOptions } from "../../core/model-registry.js";
 import type { AuthStorage } from "../../core/auth-storage.js";
 import type { SettingsManager } from "../../core/settings-manager.js";
@@ -7,7 +8,6 @@ import type { CompletedItem } from "../app-items.js";
 interface UseContextCompactionOptions {
     currentModel: string;
     currentProvider: Provider;
-    maxTokens: number;
     authStorage?: AuthStorage;
     contextWindowOptions: ContextWindowOptions;
     activeApiKey: string | undefined;
@@ -19,16 +19,13 @@ interface UseContextCompactionOptions {
     approvedPlanPathRef: MutableRefObject<string | undefined>;
     settingsRef: MutableRefObject<SettingsManager | null>;
     messagesRef: MutableRefObject<Message[]>;
-    lastActualTokensRef: MutableRefObject<number>;
-    lastActualTokensTimestampRef: MutableRefObject<number>;
     persistCompactedSession: (compactedMessages: readonly Message[]) => Promise<void>;
 }
 export interface ContextCompaction {
     compactionAbortRef: MutableRefObject<AbortController | null>;
     compactConversation: (messages: Message[], signal?: AbortSignal) => Promise<Message[]>;
-    transformContext: (messages: Message[], options?: {
-        force?: boolean;
-    }) => Promise<Message[]>;
+    transformContext: (messages: Message[], options: TransformContextOptions) => Promise<Message[]>;
+    recordProviderUsage: (usage: Usage, messages: Message[]) => void;
 }
 /**
  * Owns context compaction: the manual `compactConversation` flow (spinner +
@@ -36,6 +33,6 @@ export interface ContextCompaction {
  * the agent loop calls before each turn / on overflow. Extracted verbatim from
  * `App.tsx`.
  */
-export declare function useContextCompaction({ currentModel, currentProvider, maxTokens, authStorage, contextWindowOptions, activeApiKey, activeAccountId, activeProjectId, activeBaseUrl, setLiveItems, getId, approvedPlanPathRef, settingsRef, messagesRef, lastActualTokensRef, lastActualTokensTimestampRef, persistCompactedSession, }: UseContextCompactionOptions): ContextCompaction;
+export declare function useContextCompaction({ currentModel, currentProvider, authStorage, contextWindowOptions, activeApiKey, activeAccountId, activeProjectId, activeBaseUrl, setLiveItems, getId, approvedPlanPathRef, settingsRef, messagesRef, persistCompactedSession, }: UseContextCompactionOptions): ContextCompaction;
 export {};
 //# sourceMappingURL=useContextCompaction.d.ts.map

package/dist/ui/hooks/useContextCompaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useContextCompaction.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useContextCompaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,QAAQ,EACb,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACpB,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAOrD,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,aAAa,EAAiB,MAAM,iBAAiB,CAAC;AAGpE,UAAU,2BAA2B;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,QAAQ,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,YAAY,EAAE,QAAQ,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACxD,KAAK,EAAE,MAAM,MAAM,CAAC;IACpB,mBAAmB,EAAE,gBAAgB,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC1D,WAAW,EAAE,gBAAgB,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;IACtD,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC;IACzC,mBAAmB,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC9C,4BAA4B,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACvD,uBAAuB,EAAE,CAAC,iBAAiB,EAAE,SAAS,OAAO,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnF;AAED,MAAM,WAAW,iBAAiB;IAChC,kBAAkB,EAAE,gBAAgB,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;IAC7D,mBAAmB,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACvF,gBAAgB,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;CAC9F;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,eAAe,EACf,SAAS,EACT,WAAW,EACX,oBAAoB,EACpB,YAAY,EACZ,eAAe,EACf,eAAe,EACf,aAAa,EACb,YAAY,EACZ,KAAK,EACL,mBAAmB,EACnB,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,4BAA4B,EAC5B,uBAAuB,GACxB,EAAE,2BAA2B,GAAG,iBAAiB,CAqKjD"}
+{"version":3,"file":"useContextCompaction.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useContextCompaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,QAAQ,EACb,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACpB,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAQ9D,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,aAAa,EAAiB,MAAM,iBAAiB,CAAC;AAGpE,UAAU,2BAA2B;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,QAAQ,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,YAAY,EAAE,QAAQ,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACxD,KAAK,EAAE,MAAM,MAAM,CAAC;IACpB,mBAAmB,EAAE,gBAAgB,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC1D,WAAW,EAAE,gBAAgB,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;IACtD,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC;IACzC,uBAAuB,EAAE,CAAC,iBAAiB,EAAE,SAAS,OAAO,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnF;AAED,MAAM,WAAW,iBAAiB;IAChC,kBAAkB,EAAE,gBAAgB,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;IAC7D,mBAAmB,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACvF,gBAAgB,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,uBAAuB,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAChG,mBAAmB,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CAClE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,eAAe,EACf,WAAW,EACX,oBAAoB,EACpB,YAAY,EACZ,eAAe,EACf,eAAe,EACf,aAAa,EACb,YAAY,EACZ,KAAK,EACL,mBAAmB,EACnB,WAAW,EACX,WAAW,EACX,uBAAuB,GACxB,EAAE,2BAA2B,GAAG,iBAAiB,CAsOjD"}

package/dist/ui/hooks/useContextCompaction.js

@@ -1,6 +1,8 @@
 import { useCallback, useRef, } from "react";
-import { compact, shouldCompact, getCompactionReserveTokens, } from "../../core/compaction/compactor.js";
-import { estimateConversationTokens } from "../../core/compaction/token-estimator.js";
+import { compact, shouldCompact } from "../../core/compaction/compactor.js";
+import { calculateActiveContextTokens } from "../../core/compaction/active-context.js";
+import { pruneStaleToolResults } from "../../core/compaction/tool-result-pruner.js";
+import { estimateConversationTokens, calibrateEstimatorFromUsage, } from "../../core/compaction/token-estimator.js";
 import { getAuthStorageKeys, getContextWindow, } from "../../core/model-registry.js";
 import { log } from "../../core/logger.js";
 import { toErrorItem } from "../error-item.js";
@@ -10,9 +12,35 @@ import { toErrorItem } from "../error-item.js";
  * the agent loop calls before each turn / on overflow. Extracted verbatim from
  * `App.tsx`.
  */
-export function useContextCompaction({ currentModel, currentProvider, maxTokens, authStorage, contextWindowOptions, activeApiKey, activeAccountId, activeProjectId, activeBaseUrl, setLiveItems, getId, approvedPlanPathRef, settingsRef, messagesRef, lastActualTokensRef, lastActualTokensTimestampRef, persistCompactedSession, }) {
+export function useContextCompaction({ currentModel, currentProvider, authStorage, contextWindowOptions, activeApiKey, activeAccountId, activeProjectId, activeBaseUrl, setLiveItems, getId, approvedPlanPathRef, settingsRef, messagesRef, persistCompactedSession, }) {
     const compactionAbortRef = useRef(null);
     const lastCompactionTimeRef = useRef(0);
+    const providerContextRef = useRef(null);
+    const modelKey = `${currentProvider}:${currentModel}`;
+    const providerContextModelKeyRef = useRef(modelKey);
+    if (providerContextModelKeyRef.current !== modelKey) {
+        providerContextModelKeyRef.current = modelKey;
+        providerContextRef.current = null;
+    }
+    const rememberProviderUsage = useCallback((usage, messages, pendingMessages) => {
+        const anchorIndex = messages.length - pendingMessages.length - 1;
+        const anchor = messages[anchorIndex];
+        if (anchor?.role === "assistant") {
+            providerContextRef.current = { usage: { ...usage }, anchor };
+            // Feed the authoritative usage back into the token estimator so
+            // char-based estimates track this session's real tokenizer.
+            calibrateEstimatorFromUsage(messages.slice(0, anchorIndex), usage);
+        }
+    }, []);
+    const recordProviderUsage = useCallback((usage, messages) => {
+        for (let index = messages.length - 1; index >= 0; index--) {
+            const anchor = messages[index];
+            if (anchor?.role === "assistant") {
+                providerContextRef.current = { usage: { ...usage }, anchor };
+                return;
+            }
+        }
+    }, []);
     const compactConversation = useCallback(async (messages, signal) => {
         const contextWindow = getContextWindow(currentModel, contextWindowOptions);
         const tokensBefore = estimateConversationTokens(messages);
@@ -55,6 +83,7 @@ export function useContextCompaction({ currentModel, currentProvider, maxTokens,
                 approvedPlanPath: approvedPlanPathRef.current,
             });
             if (result.result.compacted) {
+                providerContextRef.current = null;
                 // Replace spinner with completed notice
                 setLiveItems((prev) => prev.map((item) => item.id === spinId
                     ? {
@@ -68,9 +97,11 @@ export function useContextCompaction({ currentModel, currentProvider, maxTokens,
                     : item));
             }
             else {
-                // Nothing was actually compacted — remove spinner silently
+                // Nothing was actually compacted — remove spinner silently and keep
+                // the original reference so the agent loop preserves its usage anchor.
                 log("INFO", "compaction", `Compaction skipped: ${result.result.reason ?? "unknown"}`);
                 setLiveItems((prev) => prev.filter((item) => item.id !== spinId));
+                return messages;
             }
             return result.messages;
         }
@@ -101,11 +132,14 @@ export function useContextCompaction({ currentModel, currentProvider, maxTokens,
         approvedPlanPathRef,
     ]);
     const transformContext = useCallback(async (messages, options) => {
+        if (options.usage) {
+            rememberProviderUsage(options.usage, messages, options.pendingMessages);
+        }
         const settings = settingsRef.current;
         const autoCompact = settings?.get("autoCompact") ?? true;
-        const threshold = settings?.get("compactThreshold") ?? 0.8;
-        // Force-compact on context overflow regardless of settings
-        if (options?.force) {
+        const threshold = settings?.get("compactThreshold") ?? 0.85;
+        // Force-compact on context overflow regardless of settings or cooldown.
+        if (options.force) {
             const result = await compactConversation(messages);
             if (result !== messages) {
                 messagesRef.current = result;
@@ -116,16 +150,40 @@ export function useContextCompaction({ currentModel, currentProvider, maxTokens,
         }
         if (!autoCompact)
             return messages;
-        // Time-based cooldown: skip if compaction ran within the last 30 seconds
+        // Cheap stale-tool-output pruning before the expensive LLM compaction
+        // check. In-place mutation preserves the usage anchor's identity; drop
+        // the retained usage afterwards since it counted the pruned content.
+        const pruneResult = pruneStaleToolResults(messages);
+        if (pruneResult.pruned) {
+            providerContextRef.current = null;
+            log("INFO", "compaction", "Pruned stale tool outputs", {
+                prunedResults: String(pruneResult.prunedResults),
+                freedTokens: String(pruneResult.freedTokens),
+            });
+        }
+        // Time-based cooldown: skip if compaction ran within the last 30 seconds.
         if (Date.now() - lastCompactionTimeRef.current < 30_000) {
             log("INFO", "compaction", `Skipping compaction — cooldown active`);
             return messages;
         }
+        // The turn's own usage also counted the pruned content — after a prune,
+        // fall back to estimating the (now smaller) history so the freed tokens
+        // actually defer the LLM compaction.
+        let usage = pruneResult.pruned ? undefined : options.usage;
+        let pendingMessages = options.pendingMessages;
+        if (!usage && providerContextRef.current) {
+            const anchorIndex = messages.lastIndexOf(providerContextRef.current.anchor);
+            if (anchorIndex >= 0) {
+                usage = providerContextRef.current.usage;
+                pendingMessages = messages.slice(anchorIndex + 1);
+            }
+            else {
+                providerContextRef.current = null;
+            }
+        }
         const contextWindow = getContextWindow(currentModel, contextWindowOptions);
-        const reserveTokens = getCompactionReserveTokens(maxTokens);
-        const tokensFresh = lastActualTokensTimestampRef.current > lastCompactionTimeRef.current;
-        const actualTokens = lastActualTokensRef.current > 0 && tokensFresh ? lastActualTokensRef.current : undefined;
-        if (shouldCompact(messages, contextWindow, threshold, actualTokens, reserveTokens)) {
+        const activeTokens = calculateActiveContextTokens(messages, { usage, pendingMessages });
+        if (shouldCompact(messages, contextWindow, threshold, activeTokens)) {
             const result = await compactConversation(messages);
             if (result !== messages) {
                 messagesRef.current = result;
@@ -140,12 +198,15 @@ export function useContextCompaction({ currentModel, currentProvider, maxTokens,
         compactConversation,
         contextWindowOptions,
         persistCompactedSession,
-        maxTokens,
         settingsRef,
         messagesRef,
-        lastActualTokensRef,
-        lastActualTokensTimestampRef,
+        rememberProviderUsage,
     ]);
-    return { compactionAbortRef, compactConversation, transformContext };
+    return {
+        compactionAbortRef,
+        compactConversation,
+        transformContext,
+        recordProviderUsage,
+    };
 }
 //# sourceMappingURL=useContextCompaction.js.map

package/dist/ui/hooks/useContextCompaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"useContextCompaction.js","sourceRoot":"","sources":["../../../src/ui/hooks/useContextCompaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,MAAM,GAIP,MAAM,OAAO,CAAC;AAEf,OAAO,EACL,OAAO,EACP,aAAa,EACb,0BAA0B,GAC3B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AACtF,OAAO,EACL,kBAAkB,EAClB,gBAAgB,GAEjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAI3C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AA4B/C;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAAC,EACnC,YAAY,EACZ,eAAe,EACf,SAAS,EACT,WAAW,EACX,oBAAoB,EACpB,YAAY,EACZ,eAAe,EACf,eAAe,EACf,aAAa,EACb,YAAY,EACZ,KAAK,EACL,mBAAmB,EACnB,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,4BAA4B,EAC5B,uBAAuB,GACK;IAC5B,MAAM,kBAAkB,GAAG,MAAM,CAAyB,IAAI,CAAC,CAAC;IAChE,MAAM,qBAAqB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAExC,MAAM,mBAAmB,GAAG,WAAW,CACrC,KAAK,EAAE,QAAmB,EAAE,MAAoB,EAAsB,EAAE;QACtE,MAAM,aAAa,GAAG,gBAAgB,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;QAC3E,MAAM,YAAY,GAAG,0BAA0B,CAAC,QAAQ,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,KAAK,EAAE,CAAC;QACvB,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE;YAC9C,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YACjC,eAAe,EAAE,MAAM,CAAC,YAAY,CAAC;YACrC,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC;SACrC,CAAC,CAAC;QAEH,wBAAwB;QACxB,YAAY,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAEtE,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,eAAe,EAAE,CAAC;QACzD,MAAM,gBAAgB,GAAG,MAAM,IAAI,UAAU,EAAE,MAAM,CAAC;QACtD,IAAI,UAAU;YAAE,kBAAkB,CAAC,OAAO,GAAG,UAAU,CAAC;QAExD,IAAI,CAAC;YACH,+CAA+C;YAC/C,IAAI,aAAa,GAAG,YAAY,CAAC;YACjC,IAAI,gBAAgB,GAAG,eAAe,CAAC;YACvC,IAAI,gBAAgB,GAAG,eAAe,CAAC;YACvC,IAAI,cAAc,GAAG,aAAa,CAAC;YACnC,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,kBAAkB,CAAC,eAAe,EAAE;oBAClE,WAAW,EAAE,kBAAkB,CAAC,eAAe,EAAE,YAAY,CAAC;iBAC/D,CAAC,CAAC;gBACH,aAAa,GAAG,KAAK,CAAC,WAAW,CAAC;gBAClC,gBAAgB,GAAG,KAAK,CAAC,SAAS,CAAC;gBACnC,gBAAgB,GAAG,KAAK,CAAC,SAAS,CAAC;gBACnC,cAAc,GAAG,KAAK,CAAC,OAAO,IAAI,cAAc,CAAC;YACnD,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE;gBACrC,QAAQ,EAAE,eAAe;gBACzB,KAAK,EAAE,YAAY;gBACnB,MAAM,EAAE,aAAa;gBACrB,SAAS,EAAE,gBAAgB;gBAC3B,SAAS,EAAE,gBAAgB;gBAC3B,OAAO,EAAE,cAAc;gBACvB,aAAa;gBACb,MAAM,EAAE,gBAAgB;gBACxB,gBAAgB,EAAE,mBAAmB,CAAC,OAAO;aAC9C,CAAC,CAAC;YAEH,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;gBAC5B,wCAAwC;gBACxC,YAAY,CAAC,CAAC,IAAI,EAAE,EAAE,CACpB,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAChB,IAAI,CAAC,EAAE,KAAK,MAAM;oBAChB,CAAC,CAAE;wBACC,IAAI,EAAE,WAAW;wBACjB,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa;wBAC1C,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ;wBAChC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB;wBAChD,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB;wBAC9C,EAAE,EAAE,MAAM;qBACO;oBACrB,CAAC,CAAC,IAAI,CACT,CACF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,2DAA2D;gBAC3D,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,uBAAuB,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC,CAAC;gBACtF,YAAY,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC;YACpE,CAAC;YAED,OAAO,MAAM,CAAC,QAAQ,CAAC;QACzB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC7D,MAAM,OAAO,GACX,gBAAgB,EAAE,OAAO,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAChF,GAAG,CACD,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAC1B,YAAY,EACZ,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,sBAAsB,GAAG,EAAE,CAC7D,CAAC;YACF,YAAY,CAAC,CAAC,IAAI,EAAE,EAAE,CACpB,OAAO;gBACL,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC;gBAC3C,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAChB,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAC1E,CACN,CAAC;YACF,OAAO,QAAQ,CAAC,CAAC,oCAAoC;QACvD,CAAC;gBAAS,CAAC;YACT,IAAI,UAAU,IAAI,kBAAkB,CAAC,OAAO,KAAK,UAAU;gBACzD,kBAAkB,CAAC,OAAO,GAAG,IAAI,CAAC;QACtC,CAAC;IACH,CAAC,EACD;QACE,YAAY;QACZ,eAAe;QACf,YAAY;QACZ,eAAe;QACf,eAAe;QACf,aAAa;QACb,oBAAoB;QACpB,WAAW;QACX,YAAY;QACZ,KAAK;QACL,mBAAmB;KACpB,CACF,CAAC;IAEF,MAAM,gBAAgB,GAAG,WAAW,CAClC,KAAK,EAAE,QAAmB,EAAE,OAA6B,EAAsB,EAAE;QAC/E,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC;QACrC,MAAM,WAAW,GAAG,QAAQ,EAAE,GAAG,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC;QACzD,MAAM,SAAS,GAAG,QAAQ,EAAE,GAAG,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC;QAE3D,2DAA2D;QAC3D,IAAI,OAAO,EAAE,KAAK,EAAE,CAAC;YACnB,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YACnD,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACxB,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC;gBAC7B,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;YACD,qBAAqB,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC3C,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,CAAC,WAAW;YAAE,OAAO,QAAQ,CAAC;QAElC,yEAAyE;QACzE,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,qBAAqB,CAAC,OAAO,GAAG,MAAM,EAAE,CAAC;YACxD,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,uCAAuC,CAAC,CAAC;YACnE,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,MAAM,aAAa,GAAG,gBAAgB,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;QAC3E,MAAM,aAAa,GAAG,0BAA0B,CAAC,SAAS,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,4BAA4B,CAAC,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAAC;QACzF,MAAM,YAAY,GAChB,mBAAmB,CAAC,OAAO,GAAG,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3F,IAAI,aAAa,CAAC,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,CAAC;YACnF,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YACnD,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACxB,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC;gBAC7B,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;YACD,qBAAqB,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC3C,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,EACD;QACE,YAAY;QACZ,mBAAmB;QACnB,oBAAoB;QACpB,uBAAuB;QACvB,SAAS;QACT,WAAW;QACX,WAAW;QACX,mBAAmB;QACnB,4BAA4B;KAC7B,CACF,CAAC;IAEF,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,CAAC;AACvE,CAAC"}
+{"version":3,"file":"useContextCompaction.js","sourceRoot":"","sources":["../../../src/ui/hooks/useContextCompaction.ts"],"names":[],"mappings":"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"}

package/dist/ui/hooks/useContextCompaction.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=useContextCompaction.test.d.ts.map

package/dist/ui/hooks/useContextCompaction.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useContextCompaction.test.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useContextCompaction.test.tsx"],"names":[],"mappings":""}

package/dist/ui/hooks/useContextCompaction.test.js

@@ -0,0 +1,135 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import React, { useEffect, useRef, useState } from "react";
+import { render } from "ink";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { useContextCompaction } from "./useContextCompaction.js";
+import { getCalibratedRatio, setEstimatorModel } from "../../core/compaction/token-estimator.js";
+const compactMock = vi.hoisted(() => vi.fn());
+vi.mock("../../core/compaction/compactor.js", async () => {
+    const actual = await vi.importActual("../../core/compaction/compactor.js");
+    return { ...actual, compact: compactMock };
+});
+const usage = {
+    inputTokens: 145_000,
+    cacheRead: 2_000,
+    cacheWrite: 1_000,
+    outputTokens: 11_000,
+};
+const pendingMessage = {
+    role: "tool",
+    content: [
+        {
+            type: "tool_result",
+            toolCallId: "t1",
+            content: "pending tool output ".repeat(200),
+        },
+    ],
+};
+function Harness({ provider, reuseRecordedUsage = false, onTransformed, }) {
+    const messagesRef = useRef([
+        { role: "system", content: "sys" },
+        { role: "user", content: "run tool" },
+        {
+            role: "assistant",
+            content: [{ type: "tool_call", id: "t1", name: "read", args: {} }],
+        },
+        pendingMessage,
+    ]);
+    const settingsRef = useRef({
+        get(key) {
+            if (key === "autoCompact")
+                return true;
+            if (key === "compactThreshold")
+                return 0.8;
+            return undefined;
+        },
+    });
+    const approvedPlanPathRef = useRef(undefined);
+    const [, setLiveItems] = useState([]);
+    const startedRef = useRef(false);
+    const { transformContext, recordProviderUsage } = useContextCompaction({
+        currentModel: "test-model",
+        currentProvider: provider,
+        contextWindowOptions: { provider },
+        activeApiKey: "test-key",
+        activeAccountId: undefined,
+        activeProjectId: undefined,
+        activeBaseUrl: undefined,
+        setLiveItems,
+        getId: () => "compact-1",
+        approvedPlanPathRef,
+        settingsRef,
+        messagesRef,
+        persistCompactedSession: async () => { },
+    });
+    useEffect(() => {
+        if (startedRef.current)
+            return;
+        startedRef.current = true;
+        if (reuseRecordedUsage) {
+            recordProviderUsage(usage, messagesRef.current.slice(0, -1));
+            void transformContext(messagesRef.current, { pendingMessages: [] }).then(onTransformed);
+            return;
+        }
+        void transformContext(messagesRef.current, {
+            usage,
+            pendingMessages: [pendingMessage],
+        }).then(onTransformed);
+    }, [onTransformed, recordProviderUsage, reuseRecordedUsage, transformContext]);
+    return null;
+}
+describe("useContextCompaction", () => {
+    beforeEach(() => {
+        compactMock.mockReset();
+        compactMock.mockResolvedValue({
+            messages: [
+                { role: "system", content: "sys" },
+                { role: "user", content: "[compacted]" },
+            ],
+            result: {
+                compacted: true,
+                originalCount: 4,
+                newCount: 2,
+                tokensBeforeEstimate: 161_000,
+                tokensAfterEstimate: 2_000,
+            },
+        });
+    });
+    it.each(["anthropic", "openai"])("counts cache, output, and pending messages for %s", async (provider) => {
+        let transformed;
+        const mounted = render(_jsx(Harness, { provider: provider, onTransformed: (messages) => (transformed = messages) }), { patchConsole: false });
+        await vi.waitFor(() => expect(transformed).toBeDefined());
+        mounted.unmount();
+        expect(compactMock).toHaveBeenCalledTimes(1);
+        expect(transformed).toEqual([
+            { role: "system", content: "sys" },
+            { role: "user", content: "[compacted]" },
+        ]);
+    });
+    it("calibrates the token estimator from the anchored provider usage", async () => {
+        // Model switch resets any calibration left over from previous tests.
+        setEstimatorModel("calibration-reset-sentinel");
+        setEstimatorModel("test-model");
+        expect(getCalibratedRatio()).toBeNull();
+        let transformed;
+        const mounted = render(_jsx(Harness, { provider: "openai", onTransformed: (messages) => (transformed = messages) }), { patchConsole: false });
+        await vi.waitFor(() => expect(transformed).toBeDefined());
+        mounted.unmount();
+        const ratio = getCalibratedRatio();
+        expect(ratio).not.toBeNull();
+        expect(ratio).toBeGreaterThanOrEqual(2.0);
+        expect(ratio).toBeLessThanOrEqual(5.0);
+    });
+    it("reuses authoritative usage for the first context check of the next run", async () => {
+        let transformed;
+        const mounted = render(_jsx(Harness, { provider: "openai", reuseRecordedUsage: true, onTransformed: (messages) => (transformed = messages) }), { patchConsole: false });
+        await vi.waitFor(() => expect(transformed).toBeDefined());
+        mounted.unmount();
+        expect(compactMock).toHaveBeenCalledTimes(1);
+        expect(transformed).toEqual([
+            { role: "system", content: "sys" },
+            { role: "user", content: "[compacted]" },
+        ]);
+    });
+});
+//# sourceMappingURL=useContextCompaction.test.js.map

package/dist/ui/hooks/useContextCompaction.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useContextCompaction.test.js","sourceRoot":"","sources":["../../../src/ui/hooks/useContextCompaction.test.tsx"],"names":[],"mappings":"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"}

package/dist/ui/hooks/useSessionPersistence.d.ts

@@ -1,6 +1,6 @@
 import { type MutableRefObject } from "react";
 import type { Message, Provider } from "@prestyj/ai";
-import type { SessionManager } from "../../core/session-manager.js";
+import type { SessionManager, TurnMetricPayload } from "../../core/session-manager.js";
 import type { SessionStats } from "../session-summary.js";
 /** Minimal session-store surface the persistence layer mirrors into. */
 interface PersistenceSessionStore {
@@ -14,10 +14,12 @@ interface UseSessionPersistenceOptions {
     sessionStatsRef: MutableRefObject<SessionStats>;
     persistedIndexRef: MutableRefObject<number>;
     messagesRef: MutableRefObject<Message[]>;
+    turnMetricsRef: MutableRefObject<TurnMetricPayload[]>;
     cwdRef: MutableRefObject<string>;
     currentProvider: Provider;
     currentModel: string;
     sessionStore?: PersistenceSessionStore;
+    onCompactedSession?: (sessionId: string) => Promise<void>;
 }
 export interface SessionPersistence {
     appendMessagesToSession: (sessionPath: string, messages: readonly Message[], startIndex: number) => Promise<void>;
@@ -29,6 +31,6 @@ export interface SessionPersistence {
  * compacted checkpoint, and keeping `persistedIndexRef`/`sessionStatsRef`/the
  * session store in sync. Extracted verbatim from `App.tsx`.
  */
-export declare function useSessionPersistence({ sessionManagerRef, sessionPathRef, sessionStatsRef, persistedIndexRef, messagesRef, cwdRef, currentProvider, currentModel, sessionStore, }: UseSessionPersistenceOptions): SessionPersistence;
+export declare function useSessionPersistence({ sessionManagerRef, sessionPathRef, sessionStatsRef, persistedIndexRef, messagesRef, turnMetricsRef, cwdRef, currentProvider, currentModel, sessionStore, onCompactedSession, }: UseSessionPersistenceOptions): SessionPersistence;
 export {};
 //# sourceMappingURL=useSessionPersistence.d.ts.map

package/dist/ui/hooks/useSessionPersistence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSessionPersistence.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useSessionPersistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAKrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,wEAAwE;AACxE,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,4BAA4B;IACpC,iBAAiB,EAAE,gBAAgB,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAC3D,cAAc,EAAE,gBAAgB,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACrD,eAAe,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAChD,iBAAiB,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC5C,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC;IACzC,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACjC,eAAe,EAAE,QAAQ,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,uBAAuB,CAAC;CACxC;AAED,MAAM,WAAW,kBAAkB;IACjC,uBAAuB,EAAE,CACvB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,uBAAuB,EAAE,CAAC,iBAAiB,EAAE,SAAS,OAAO,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClF,kBAAkB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACzC;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,MAAM,EACN,eAAe,EACf,YAAY,EACZ,YAAY,GACb,EAAE,4BAA4B,GAAG,kBAAkB,CA+DnD"}
+{"version":3,"file":"useSessionPersistence.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useSessionPersistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAKrD,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAGvF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,wEAAwE;AACxE,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,4BAA4B;IACpC,iBAAiB,EAAE,gBAAgB,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAC3D,cAAc,EAAE,gBAAgB,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACrD,eAAe,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAChD,iBAAiB,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC5C,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC;IACzC,cAAc,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;IACtD,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACjC,eAAe,EAAE,QAAQ,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,uBAAuB,CAAC;IACvC,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3D;AAED,MAAM,WAAW,kBAAkB;IACjC,uBAAuB,EAAE,CACvB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,uBAAuB,EAAE,CAAC,iBAAiB,EAAE,SAAS,OAAO,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClF,kBAAkB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACzC;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,cAAc,EACd,MAAM,EACN,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,kBAAkB,GACnB,EAAE,4BAA4B,GAAG,kBAAkB,CAuEnD"}

package/dist/ui/hooks/useSessionPersistence.js

@@ -1,12 +1,13 @@
 import { useCallback } from "react";
 import { appendMessagesToSession as appendSessionMessages, createCompactedSessionCheckpoint, } from "../../core/session-compaction.js";
 import { log } from "../../core/logger.js";
+import { findUserSessionPrompt } from "../../core/session-preview.js";
 /**
  * Owns session message persistence: appending new turn messages, persisting a
  * compacted checkpoint, and keeping `persistedIndexRef`/`sessionStatsRef`/the
  * session store in sync. Extracted verbatim from `App.tsx`.
  */
-export function useSessionPersistence({ sessionManagerRef, sessionPathRef, sessionStatsRef, persistedIndexRef, messagesRef, cwdRef, currentProvider, currentModel, sessionStore, }) {
+export function useSessionPersistence({ sessionManagerRef, sessionPathRef, sessionStatsRef, persistedIndexRef, messagesRef, turnMetricsRef, cwdRef, currentProvider, currentModel, sessionStore, onCompactedSession, }) {
     const appendMessagesToSession = useCallback(async (sessionPath, messages, startIndex) => {
         const sm = sessionManagerRef.current;
         if (!sm)
@@ -22,9 +23,14 @@ export function useSessionPersistence({ sessionManagerRef, sessionPathRef, sessi
             provider: currentProvider,
             model: currentModel,
             messages: compactedMessages,
+            preview: findUserSessionPrompt(messagesRef.current),
         });
         sessionPathRef.current = session.path;
         sessionStatsRef.current.sessionId = session.id;
+        for (const metric of turnMetricsRef.current) {
+            await sm.appendTurnMetric(session.path, metric);
+        }
+        await onCompactedSession?.(session.id);
         persistedIndexRef.current = compactedMessages.length;
         if (sessionStore) {
             sessionStore.sessionPath = session.path;
@@ -36,11 +42,14 @@ export function useSessionPersistence({ sessionManagerRef, sessionPathRef, sessi
         currentModel,
         currentProvider,
         sessionStore,
+        onCompactedSession,
         sessionManagerRef,
         sessionPathRef,
         sessionStatsRef,
+        messagesRef,
         persistedIndexRef,
         cwdRef,
+        turnMetricsRef,
     ]);
     const persistNewMessages = useCallback(async () => {
         const sp = sessionPathRef.current;

package/dist/ui/hooks/useSessionPersistence.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSessionPersistence.js","sourceRoot":"","sources":["../../../src/ui/hooks/useSessionPersistence.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useSessionPersistence.js","sourceRoot":"","sources":["../../../src/ui/hooks/useSessionPersistence.ts"],"names":[],"mappings":"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"}

package/dist/ui/hooks/useTerminalTitle.d.ts

@@ -1,7 +1,7 @@
 export interface TerminalTitleOptions {
     isRunning: boolean;
-    /** LLM-generated session title (shown as the terminal window title). */
-    sessionTitle?: string;
+    cwd: string;
+    gitBranch?: string | null;
 }
-export declare function useTerminalTitle({ isRunning, sessionTitle }: TerminalTitleOptions): void;
+export declare function useTerminalTitle({ isRunning, cwd, gitBranch }: TerminalTitleOptions): void;
 //# sourceMappingURL=useTerminalTitle.d.ts.map

package/dist/ui/hooks/useTerminalTitle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTerminalTitle.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useTerminalTitle.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,wEAAwE;IACxE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,gBAAgB,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,oBAAoB,GAAG,IAAI,CA2BxF"}
+{"version":3,"file":"useTerminalTitle.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useTerminalTitle.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,wBAAgB,gBAAgB,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,oBAAoB,GAAG,IAAI,CAwB1F"}

package/dist/ui/hooks/useTerminalTitle.js

@@ -1,6 +1,6 @@
 import { useEffect, useRef } from "react";
 import { useStdout } from "ink";
-export function useTerminalTitle({ isRunning, sessionTitle }) {
+export function useTerminalTitle({ isRunning, cwd, gitBranch }) {
     const { stdout } = useStdout();
     // Track previous title to avoid redundant writes
     const prevTitleRef = useRef("");
@@ -8,18 +8,14 @@ export function useTerminalTitle({ isRunning, sessionTitle }) {
     useEffect(() => {
         if (!stdout)
             return;
-        let title;
-        if (sessionTitle) {
-            title = isRunning ? `● ${sessionTitle}` : sessionTitle;
-        }
-        else {
-            title = "EZ Coder";
-        }
+        const directory = cwd.split(/[\\/]/).filter(Boolean).pop();
+        const context = directory ? `${directory}${gitBranch ? ` │ ⎇ ${gitBranch}` : ""}` : "EZ Coder";
+        const title = isRunning ? `● ${context}` : context;
         if (title !== prevTitleRef.current) {
             prevTitleRef.current = title;
             stdout.write(`\x1b]0;${title}\x1b\\`);
         }
-    }, [stdout, isRunning, sessionTitle]);
+    }, [stdout, isRunning, cwd, gitBranch]);
     // Reset title on unmount
     useEffect(() => {
         return () => {

package/dist/ui/hooks/useTerminalTitle.js.map

@@ -1 +1 @@
-{"version":3,"file":"useTerminalTitle.js","sourceRoot":"","sources":["../../../src/ui/hooks/useTerminalTitle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAQhC,MAAM,UAAU,gBAAgB,CAAC,EAAE,SAAS,EAAE,YAAY,EAAwB;IAChF,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;IAE/B,iDAAiD;IACjD,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;IAEhC,uBAAuB;IACvB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,IAAI,KAAa,CAAC;QAClB,IAAI,YAAY,EAAE,CAAC;YACjB,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,KAAK,YAAY,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,UAAU,CAAC;QACrB,CAAC;QACD,IAAI,KAAK,KAAK,YAAY,CAAC,OAAO,EAAE,CAAC;YACnC,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC;QACxC,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;IAEtC,yBAAyB;IACzB,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE;YACV,MAAM,EAAE,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACzC,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AACf,CAAC"}
+{"version":3,"file":"useTerminalTitle.js","sourceRoot":"","sources":["../../../src/ui/hooks/useTerminalTitle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAQhC,MAAM,UAAU,gBAAgB,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAwB;IAClF,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;IAE/B,iDAAiD;IACjD,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;IAEhC,uBAAuB;IACvB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;QAC3D,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;QAC/F,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACnD,IAAI,KAAK,KAAK,YAAY,CAAC,OAAO,EAAE,CAAC;YACnC,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC;QACxC,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;IAExC,yBAAyB;IACzB,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE;YACV,MAAM,EAAE,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACzC,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AACf,CAAC"}

package/dist/ui/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/ui/login.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AA4F5C,MAAM,WAAW,oBAAoB;IACnC,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,sDAAsD;IACtD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uCAAuC;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,aAAa,CAAC,EAAE,oBAAoB,GAAG,MAAM,GAC5C,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAgE1B"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/ui/login.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAiG5C,MAAM,WAAW,oBAAoB;IACnC,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,sDAAsD;IACtD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uCAAuC;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,aAAa,CAAC,EAAE,oBAAoB,GAAG,MAAM,GAC5C,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAgE1B"}

package/dist/ui/login.js

@@ -40,7 +40,12 @@ const PROVIDERS = [
         value: "gemini",
         description: "Gemini 3.1 Flash Lite, Gemini 3.5 Flash, Gemini 3.1 Pro (Preview)",
     },
-    { label: "Moonshot", value: "moonshot", description: "Kimi K2.7 · OAuth or API key" },
+    { label: "xAI (Grok)", value: "xai", description: "Grok 4.5" },
+    {
+        label: "Moonshot",
+        value: "moonshot",
+        description: "Kimi K3, K2.7 Code · OAuth or API key",
+    },
     { label: "Z.AI (GLM)", value: "glm", description: "GLM-5.2, GLM-5.1, GLM-4.7, GLM-4.7 Flash" },
     { label: "MiniMax", value: "minimax", description: "MiniMax M3" },
     {
@@ -49,8 +54,8 @@ const PROVIDERS = [
         description: "MiMo-V2.5-Pro, MiMo-V2.5-Pro-UltraSpeed, MiMo-V2.5 · Token Plan or API Credits",
     },
     { label: "DeepSeek", value: "deepseek", description: "DeepSeek V4 Pro, V4 Flash" },
-    { label: "OpenRouter", value: "openrouter", description: "Multi-provider gateway" },
     { label: "Sakana (Fugu)", value: "sakana", description: "Fugu, Fugu Ultra" },
+    { label: "OpenRouter", value: "openrouter", description: "Multi-provider gateway" },
 ];
 function renderScreen(selectedIndex) {
     const lines = [];