sidekick-shared 0.25.0 → 0.26.1

package/dist/pricingCatalog.js

@@ -60,6 +60,7 @@ const path = __importStar(require("node:path"));
 const modelContext_1 = require("./modelContext");
 const modelInfo_1 = require("./modelInfo");
 const paths_1 = require("./paths");
+const atomic_1 = require("./writers/atomic");
 // ── Constants ──
 exports.LITELLM_CATALOG_URL = 'https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json';
 const CACHE_FILE_NAME = 'pricing-catalog.json';
@@ -77,16 +78,16 @@ const DEFAULT_TIMEOUT_MS = 3_000;
  * Always resolves — never throws. Offline-safe.
  */
 async function hydratePricingCatalog(options = {}) {
-    const { cacheDir = (0, paths_1.getConfigDir)(), fetchImpl = globalThis.fetch, ttlMs = DEFAULT_TTL_MS, timeoutMs = DEFAULT_TIMEOUT_MS, url = exports.LITELLM_CATALOG_URL, logger, } = options;
+    const { cacheDir = (0, paths_1.getConfigDir)(), fetchImpl = globalThis.fetch, ttlMs = DEFAULT_TTL_MS, timeoutMs = DEFAULT_TIMEOUT_MS, url = exports.LITELLM_CATALOG_URL, logger, offline = false, } = options;
     const cachePath = path.join(cacheDir, CACHE_FILE_NAME);
     const now = Date.now();
-    // 1. Fresh cache?
+    // 1. Fresh cache? (Offline callers take any cache, however old.)
     const cached = await readCache(cachePath);
-    if (cached && now - Date.parse(cached.fetchedAt) < ttlMs) {
+    if (cached && (offline || now - Date.parse(cached.fetchedAt) < ttlMs)) {
         return applyCacheFile(cached, 'cache');
     }
     // 2. Try network.
-    if (fetchImpl) {
+    if (fetchImpl && !offline) {
         const fetched = await fetchCatalog(url, fetchImpl, timeoutMs, logger);
         if (fetched) {
             const payload = {
@@ -256,7 +257,9 @@ async function readCache(cachePath) {
 async function writeCache(cachePath, payload, logger) {
     try {
         await node_fs_1.promises.mkdir(path.dirname(cachePath), { recursive: true });
-        await node_fs_1.promises.writeFile(cachePath, JSON.stringify(payload, null, 2), 'utf8');
+        // The CLI and the extension host can both refresh the catalog at once;
+        // the atomic writer keeps a reader from ever seeing a half-written file.
+        await (0, atomic_1.atomicWriteJson)(cachePath, payload);
     }
     catch (err) {
         logger?.(`pricingCatalog: failed to write cache: ${String(err)}`);

package/dist/providers/claudeCode.js

@@ -48,6 +48,7 @@ const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const string_decoder_1 = require("string_decoder");
 const sessionContext_1 = require("../context/sessionContext");
+const sessionStats_1 = require("../sessionStats");
 const jsonl_1 = require("../parsers/jsonl");
 const diagnostics_1 = require("./diagnostics");
 const sessionPathResolver_1 = require("../parsers/sessionPathResolver");
@@ -342,16 +343,13 @@ class ClaudeCodeProvider {
         const results = [];
         const seen = new Set();
         for (const folder of this.getAllProjectFolders()) {
-            for (const sessionPath of this.findSessionsInDirectory(folder.dir)) {
-                if (seen.has(sessionPath))
+            // The directory listing already stat'ed each file; reuse it instead of
+            // stat'ing every session a second time.
+            for (const file of (0, sessionPathResolver_1.findSessionFilesWithStats)(folder.dir)) {
+                if (seen.has(file.path))
                     continue;
-                seen.add(sessionPath);
-                try {
-                    results.push({ path: sessionPath, mtime: fs.statSync(sessionPath).mtime });
-                }
-                catch {
-                    // Skip files that vanish between listing and stat.
-                }
+                seen.add(file.path);
+                results.push({ path: file.path, mtime: file.mtime, sizeBytes: file.sizeBytes });
             }
         }
         this.recordHomeStatus('listAllSessionFiles');
@@ -535,93 +533,10 @@ class ClaudeCodeProvider {
     }
     // --- Stats ---
     readSessionStats(sessionPath) {
-        const sessionId = path.basename(sessionPath, '.jsonl');
-        let messageCount = 0;
-        let startTime = '';
-        let endTime = '';
-        const tokens = { input: 0, output: 0, cacheWrite: 0, cacheRead: 0 };
-        const modelUsage = {};
-        const toolUsage = {};
-        let compactionEstimate = 0;
-        let truncationCount = 0;
-        let reportedCost = 0;
-        try {
-            const content = fs.readFileSync(sessionPath, 'utf8');
-            const lines = content.split('\n');
-            for (const line of lines) {
-                const trimmed = line.trim();
-                if (!trimmed || !trimmed.startsWith('{'))
-                    continue;
-                try {
-                    const event = JSON.parse(trimmed);
-                    if (!startTime && event.timestamp)
-                        startTime = event.timestamp;
-                    if (event.timestamp)
-                        endTime = event.timestamp;
-                    if (event.type === 'assistant' && event.message?.usage) {
-                        messageCount++;
-                        const u = event.message.usage;
-                        tokens.input += u.input_tokens || 0;
-                        tokens.output += u.output_tokens || 0;
-                        tokens.cacheWrite += u.cache_creation_input_tokens || 0;
-                        tokens.cacheRead += u.cache_read_input_tokens || 0;
-                        if (u.reported_cost)
-                            reportedCost += u.reported_cost;
-                        const model = event.message.model || 'unknown';
-                        if (!modelUsage[model])
-                            modelUsage[model] = { calls: 0, tokens: 0 };
-                        modelUsage[model].calls++;
-                        modelUsage[model].tokens += (u.input_tokens || 0) + (u.output_tokens || 0);
-                        // Check content for tool_use blocks
-                        if (Array.isArray(event.message.content)) {
-                            for (const block of event.message.content) {
-                                if (block.type === 'tool_use' && typeof block.name === 'string') {
-                                    toolUsage[block.name] = (toolUsage[block.name] || 0) + 1;
-                                }
-                            }
-                        }
-                    }
-                    if (event.type === 'user')
-                        messageCount++;
-                    if (event.type === 'summary')
-                        compactionEstimate++;
-                    // Check for truncation in tool results
-                    if (event.type === 'user' && Array.isArray(event.message?.content)) {
-                        for (const block of event.message.content) {
-                            if (block.type === 'tool_result' && typeof block.content === 'string') {
-                                for (const pattern of jsonl_1.TRUNCATION_PATTERNS) {
-                                    if (pattern.regex.test(block.content)) {
-                                        truncationCount++;
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                catch {
-                    // Skip malformed lines
-                }
-            }
-        }
-        catch {
-            // Skip unreadable files
-        }
-        return {
-            providerId: 'claude-code',
-            sessionId,
-            filePath: sessionPath,
-            label: this.extractSessionLabel(sessionPath),
-            startTime,
-            endTime,
-            messageCount,
-            tokens,
-            modelUsage,
-            toolUsage,
-            compactionEstimate,
-            truncationCount,
-            reportedCost,
-        };
+        // One reader pass through the shared aggregator: cache-inclusive per-model
+        // totals, cost with provenance, a tool success/failure split, and the label
+        // from the first user prompt in the events already read.
+        return (0, sessionStats_1.readSessionFileStats)(this, sessionPath);
     }
     readSessionContextSnapshot(sessionPath, options = {}) {
         return (0, sessionContext_1.readSessionContextSnapshot)(this, sessionPath, options);

package/dist/providers/codex.d.ts

@@ -74,6 +74,8 @@ export declare class CodexProvider implements SessionProviderBase {
     isSessionFile(filename: string): boolean;
     getSessionId(sessionPath: string): string;
     encodeWorkspacePath(workspacePath: string): string;
+    /** Thread title or first user message from the SQLite index; null without it. */
+    private extractSessionLabelFromDb;
     extractSessionLabel(sessionPath: string): string | null;
     extractSessionLabelsAsync(sessionPaths: readonly string[]): Promise<Map<string, string | null>>;
     createReader(sessionPath: string): SessionReader;