sidekick-shared 0.24.5 → 0.25.0

package/dist/sessionPreviews.js

@@ -53,26 +53,46 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readSessionPreview = readSessionPreview;
+exports.readSessionPreviewAsync = readSessionPreviewAsync;
 exports.listSessionPreviews = listSessionPreviews;
+exports.listSessionPreviewsAsync = listSessionPreviewsAsync;
 const fs = __importStar(require("fs"));
 const DEFAULT_PREFIX_BYTES = 16 * 1024;
 const DEFAULT_LIMIT = 50;
+const DEFAULT_CONCURRENCY = 4;
+const MAX_CONCURRENCY = 16;
 /**
  * Reads a bounded preview of one session file. Returns `null` when the file is
  * missing or unreadable; malformed content degrades to `null` fields instead
  * of throwing.
  */
 function readSessionPreview(provider, sessionPath, options = {}) {
-    let stats;
+    let sizeBytes;
     let modifiedAt;
     try {
-        stats = fs.statSync(sessionPath);
+        const stats = fs.statSync(sessionPath);
+        sizeBytes = stats.size;
         // Inside the try: an out-of-range mtime RangeErrors on serialization,
         // and this function's contract is to degrade, not throw.
         modifiedAt = stats.mtime.toISOString();
     }
     catch {
-        return null;
+        let metadata;
+        try {
+            metadata = provider.getSessionMetadata?.(sessionPath);
+        }
+        catch {
+            return null;
+        }
+        if (!metadata)
+            return null;
+        sizeBytes = 0;
+        try {
+            modifiedAt = metadata.mtime.toISOString();
+        }
+        catch {
+            return null;
+        }
     }
     let firstUserPrompt = null;
     try {
@@ -94,12 +114,42 @@ function readSessionPreview(provider, sessionPath, options = {}) {
         sessionId,
         filePath: sessionPath,
         modifiedAt,
-        sizeBytes: stats.size,
+        sizeBytes,
         firstUserPrompt,
         firstTimestamp: prefix.firstTimestamp,
         workspacePath: prefix.workspacePath,
     };
 }
+/** Event-loop-safe counterpart to readSessionPreview with per-call degradation status. */
+async function readSessionPreviewAsync(provider, sessionPath, options = {}) {
+    let labels;
+    const diagnostics = [];
+    try {
+        labels = await extractLabelsAsync(provider, [sessionPath], options);
+    }
+    catch {
+        labels = new Map([[sessionPath, null]]);
+        diagnostics.push({
+            providerId: provider.id,
+            kind: 'read_failed',
+            severity: 'warning',
+            phase: 'read',
+            message: `${provider.id} session label was unavailable.`,
+        });
+    }
+    const info = await statSessionFileAsync(provider, sessionPath);
+    if (!info) {
+        return {
+            preview: null,
+            diagnostics: dedupeDiagnostics([...diagnostics, ...providerDiagnostics(provider)]),
+        };
+    }
+    const preview = await readSessionPreviewFromInfoAsync(provider, info, labels.get(sessionPath) ?? null, options);
+    return {
+        preview,
+        diagnostics: dedupeDiagnostics([...diagnostics, ...providerDiagnostics(provider)]),
+    };
+}
 /**
  * Lists previews across providers, newest first. Enumeration is stat-only;
  * content is read only for the post-`limit` survivors.
@@ -125,6 +175,75 @@ function listSessionPreviews(providers, options = {}) {
     }
     return previews;
 }
+/**
+ * Lists previews without blocking the caller loop on corpus-wide synchronous
+ * work. SQLite-backed providers perform at most one subprocess per call.
+ */
+async function listSessionPreviewsAsync(providers, options = {}) {
+    const limit = Math.max(0, options.limit ?? DEFAULT_LIMIT);
+    const sinceMs = resolveSinceMs(options.since);
+    const candidates = [];
+    const operationDiagnostics = [];
+    await Promise.all(providers.map(async (provider) => {
+        let files = [];
+        try {
+            files = provider.listSessionFilesAsync
+                ? await provider.listSessionFilesAsync(options.workspacePath)
+                : await enumerateSessionFilesAsyncFallback(provider, options.workspacePath, options);
+        }
+        catch {
+            files = [];
+            operationDiagnostics.push({
+                providerId: provider.id,
+                kind: 'read_failed',
+                severity: 'error',
+                phase: 'enumerate',
+                message: `${provider.id} session enumeration failed.`,
+            });
+        }
+        for (const info of files) {
+            const mtimeMs = info.mtime.getTime();
+            if (sinceMs !== null && mtimeMs <= sinceMs)
+                continue;
+            candidates.push({ provider, info });
+        }
+    }));
+    candidates.sort((left, right) => right.info.mtime.getTime() - left.info.mtime.getTime());
+    const selected = candidates.slice(0, limit);
+    const labels = new Map();
+    await Promise.all(providers.map(async (provider) => {
+        const paths = selected
+            .filter((item) => item.provider === provider)
+            .map((item) => item.info.path);
+        if (paths.length === 0)
+            return;
+        try {
+            labels.set(provider, await extractLabelsAsync(provider, paths, options));
+        }
+        catch {
+            labels.set(provider, new Map(paths.map((sessionPath) => [sessionPath, null])));
+            operationDiagnostics.push({
+                providerId: provider.id,
+                kind: 'read_failed',
+                severity: 'warning',
+                phase: 'read',
+                message: `${provider.id} session labels were unavailable.`,
+            });
+        }
+    }));
+    const previews = await mapWithConcurrency(selected, async ({ provider, info }) => {
+        const preview = await readSessionPreviewFromInfoAsync(provider, info, labels.get(provider)?.get(info.path) ?? info.label ?? null, options);
+        await yieldControl(options);
+        return preview;
+    }, concurrency(options));
+    return {
+        previews: previews.filter((preview) => preview !== null),
+        diagnostics: dedupeDiagnostics([
+            ...operationDiagnostics,
+            ...providers.flatMap(providerDiagnostics),
+        ]),
+    };
+}
 function resolveSinceMs(since) {
     if (since === undefined)
         return null;
@@ -169,6 +288,150 @@ function statSessionFile(sessionPath) {
         return null;
     }
 }
+async function statSessionFileAsync(provider, sessionPath) {
+    try {
+        const stat = await fs.promises.stat(sessionPath);
+        return {
+            path: sessionPath,
+            mtime: stat.mtime,
+            sizeBytes: stat.size,
+            sessionId: safeSessionId(provider, sessionPath),
+        };
+    }
+    catch {
+        let metadata = null;
+        try {
+            // Async first: for DB-backed synthetic paths the sync variant can spawn
+            // a blocking sqlite3 subprocess, defeating this API's event-loop safety.
+            if (provider.getSessionMetadataAsync) {
+                metadata = await provider.getSessionMetadataAsync(sessionPath);
+            }
+            else {
+                metadata = provider.getSessionMetadata?.(sessionPath) ?? null;
+            }
+        }
+        catch {
+            metadata = null;
+        }
+        if (!metadata)
+            return null;
+        return {
+            path: sessionPath,
+            mtime: metadata.mtime,
+            sizeBytes: 0,
+            sessionId: safeSessionId(provider, sessionPath),
+        };
+    }
+}
+async function extractLabelsAsync(provider, sessionPaths, options) {
+    if (provider.extractSessionLabelsAsync) {
+        // Callers deliberately do not retry through the synchronous provider path
+        // if this batch fails: DB-backed providers could otherwise spawn once per
+        // session after their single async batch failed.
+        return provider.extractSessionLabelsAsync(sessionPaths);
+    }
+    const values = new Map();
+    for (const sessionPath of sessionPaths) {
+        values.set(sessionPath, await extractLabelWithYield(provider, sessionPath, options));
+    }
+    return values;
+}
+async function enumerateSessionFilesAsyncFallback(provider, workspacePath, options) {
+    await yieldControl(options);
+    const paths = workspacePath
+        ? provider.findAllSessions(workspacePath)
+        : provider.listAllSessionFiles
+            ? provider.listAllSessionFiles().map((item) => item.path)
+            : provider
+                .getAllProjectFolders()
+                .flatMap((folder) => provider.findSessionsInDirectory(folder.dir));
+    return (await mapWithConcurrency([...new Set(paths)], async (sessionPath) => {
+        const info = await statSessionFileAsync(provider, sessionPath);
+        await yieldControl(options);
+        return info;
+    }, concurrency(options))).filter((item) => item !== null);
+}
+async function readSessionPreviewFromInfoAsync(provider, info, firstUserPrompt, options) {
+    let modifiedAt;
+    try {
+        modifiedAt = info.mtime.toISOString();
+    }
+    catch {
+        return null;
+    }
+    const prefix = await scanPrefixAsync(info.path, options.maxPrefixBytes ?? DEFAULT_PREFIX_BYTES);
+    return {
+        provider: provider.id,
+        sessionId: info.sessionId ?? safeSessionId(provider, info.path),
+        filePath: info.path,
+        modifiedAt,
+        sizeBytes: info.sizeBytes ?? 0,
+        firstUserPrompt,
+        firstTimestamp: prefix.firstTimestamp ?? info.createdAt?.toISOString() ?? null,
+        workspacePath: prefix.workspacePath ?? info.workspacePath ?? null,
+    };
+}
+async function extractLabelWithYield(provider, sessionPath, options) {
+    await yieldControl(options);
+    try {
+        return provider.extractSessionLabel(sessionPath);
+    }
+    catch {
+        return null;
+    }
+}
+function safeSessionId(provider, sessionPath) {
+    try {
+        return provider.getSessionId(sessionPath);
+    }
+    catch {
+        return '';
+    }
+}
+function concurrency(options) {
+    const requested = options.concurrency ?? DEFAULT_CONCURRENCY;
+    if (!Number.isFinite(requested))
+        return DEFAULT_CONCURRENCY;
+    return Math.min(MAX_CONCURRENCY, Math.max(1, Math.floor(requested)));
+}
+async function yieldControl(options) {
+    if (options.yieldBetweenReads) {
+        await options.yieldBetweenReads();
+        return;
+    }
+    await new Promise((resolve) => setImmediate(resolve));
+}
+async function mapWithConcurrency(values, mapper, maxConcurrency) {
+    const results = new Array(values.length);
+    let cursor = 0;
+    await Promise.all(Array.from({ length: Math.min(maxConcurrency, values.length) }, async () => {
+        while (true) {
+            const index = cursor++;
+            if (index >= values.length)
+                return;
+            results[index] = await mapper(values[index]);
+        }
+    }));
+    return results;
+}
+function providerDiagnostics(provider) {
+    try {
+        return [...(provider.getLastOperationStatus?.().diagnostics ?? [])];
+    }
+    catch {
+        return [];
+    }
+}
+function dedupeDiagnostics(diagnostics) {
+    const seen = new Set();
+    return diagnostics.filter((diagnostic) => {
+        const key = `${diagnostic.providerId}\0${diagnostic.kind}\0${diagnostic.phase}`;
+        if (seen.has(key))
+            return false;
+        seen.add(key);
+        return true;
+    });
+}
 /**
  * Parses complete JSONL lines out of the first `maxPrefixBytes` of a file,
  * taking the first top-level `timestamp` string and the first workspace path
@@ -232,3 +495,55 @@ function scanPrefix(sessionPath, maxPrefixBytes) {
     }
     return result;
 }
+async function scanPrefixAsync(sessionPath, maxPrefixBytes) {
+    const result = { firstTimestamp: null, workspacePath: null };
+    let handle = null;
+    try {
+        handle = await fs.promises.open(sessionPath, 'r');
+        const stats = await handle.stat();
+        const readBytes = Math.min(stats.size, Math.max(1, maxPrefixBytes));
+        const buffer = Buffer.alloc(readBytes);
+        const { bytesRead } = await handle.read(buffer, 0, readBytes, 0);
+        parsePrefixInto(result, buffer.toString('utf8', 0, bytesRead), bytesRead >= stats.size);
+    }
+    catch {
+        return result;
+    }
+    finally {
+        await handle?.close().catch(() => undefined);
+    }
+    return result;
+}
+function parsePrefixInto(result, content, sawWholeFile) {
+    const lines = content.split('\n');
+    const completeLines = sawWholeFile ? lines : lines.slice(0, -1);
+    for (const line of completeLines) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        let parsed;
+        try {
+            parsed = JSON.parse(trimmed);
+        }
+        catch {
+            continue;
+        }
+        if (parsed === null || typeof parsed !== 'object')
+            continue;
+        if (result.firstTimestamp === null && typeof parsed.timestamp === 'string') {
+            result.firstTimestamp = parsed.timestamp;
+        }
+        if (result.workspacePath === null) {
+            if (typeof parsed.cwd === 'string' && parsed.cwd)
+                result.workspacePath = parsed.cwd;
+            else if (parsed.type === 'session_meta') {
+                const payload = parsed.payload;
+                if (payload && typeof payload.cwd === 'string' && payload.cwd) {
+                    result.workspacePath = payload.cwd;
+                }
+            }
+        }
+        if (result.firstTimestamp !== null && result.workspacePath !== null)
+            break;
+    }
+}

package/dist/types/observedSessionV1.d.ts

@@ -45,6 +45,8 @@ export interface ObservedAgentSessionV1 {
         costUsd: ObservedValueV1<number | null>;
     };
     pendingUserRequest: PendingUserRequestV1 | null;
+    /** When model/usage content was last read; unchanged on collector cache hits. */
+    contentObservedAt?: string;
     observedAt: string;
 }
 export interface ProviderCapabilitiesV1 {
@@ -67,6 +69,8 @@ export interface ProviderSessionAdapterV1 {
     dispose(): void;
 }
 export declare function derivePendingUserRequestV1(provider: ProviderId, sessionId: string, sourcePath: string, events: SessionEvent[]): PendingUserRequestV1 | null;
-export declare function createProviderSessionAdapterV1(sessionProvider: SessionProviderBase, options?: {
+export interface ProviderSessionAdapterV1Options {
     pollIntervalMs?: number;
-}): ProviderSessionAdapterV1;
+    observationOnly?: boolean;
+}
+export declare function createProviderSessionAdapterV1(sessionProvider: SessionProviderBase, options?: ProviderSessionAdapterV1Options): ProviderSessionAdapterV1;

package/dist/types/observedSessionV1.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.derivePendingUserRequestV1 = derivePendingUserRequestV1;
 exports.createProviderSessionAdapterV1 = createProviderSessionAdapterV1;
 const transcript_1 = require("../transcript");
+const sessionActivityDetector_1 = require("../parsers/sessionActivityDetector");
 function evidence(provider, sessionId, sourcePath, event, eventIndex) {
     return [
         {
@@ -98,13 +99,13 @@ function waitingToolPrompt(input, toolName) {
         return 'Approve the proposed plan?';
     return null;
 }
-function providerCapabilities(provider) {
+function providerCapabilities(provider, observationOnly) {
     const refs = [];
     const known = (value) => observed(value, 'inferred', 1, refs);
     return {
         schemaVersion: 1,
         provider,
-        resume: known(true),
+        resume: known(!observationOnly),
         forkLineage: known(provider !== 'opencode'),
         quotaSource: known(provider === 'claude-code' ? 'api' : provider === 'codex' ? 'mixed' : 'none'),
         assetExtraction: known(true),
@@ -115,7 +116,7 @@ function createProviderSessionAdapterV1(sessionProvider, options = {}) {
     const adapter = {
         schemaVersion: 1,
         provider: sessionProvider.id,
-        capabilities: providerCapabilities(sessionProvider.id),
+        capabilities: providerCapabilities(sessionProvider.id, options.observationOnly === true),
         async discover(cwd) {
             return Promise.all(sessionProvider.findAllSessions(cwd).map((sessionPath) => adapter.read(sessionPath, cwd)));
         },
@@ -129,11 +130,15 @@ function createProviderSessionAdapterV1(sessionProvider, options = {}) {
             });
             const refs = evidence(sessionProvider.id, stats.sessionId, sessionPath);
             const model = Object.entries(stats.modelUsage).sort((left, right) => right[1].calls - left[1].calls)[0]?.[0] ?? null;
-            const metadata = sessionProvider.getSessionMetadata?.(sessionPath);
-            const modifiedAt = metadata?.mtime.getTime() ?? Date.parse(stats.endTime);
-            const recent = Number.isFinite(modifiedAt) && Date.now() - modifiedAt < 2 * 60_000;
+            const activityResult = (0, sessionActivityDetector_1.detectSessionActivity)(sessionPath);
+            const activity = activityResult.state === 'ongoing'
+                ? 'active'
+                : activityResult.state === 'stale'
+                    ? 'idle'
+                    : 'ended';
             const allCostsReported = transcript.usage.costs.length > 0 &&
                 transcript.usage.costs.every((cost) => cost.source === 'provider-reported');
+            const observedAt = new Date().toISOString();
             return {
                 schemaVersion: 1,
                 identity: {
@@ -143,7 +148,7 @@ function createProviderSessionAdapterV1(sessionProvider, options = {}) {
                 },
                 cwd: observed(cwd, 'inferred', cwd ? 0.95 : 0.4, refs),
                 model: observed(model, model ? 'reported' : 'inferred', model ? 1 : 0.2, refs),
-                activity: observed(recent ? 'active' : 'idle', 'inferred', 0.8, refs),
+                activity: observed(activity, 'inferred', 0.85, refs),
                 usage: {
                     inputTokens: observed(stats.tokens.input, 'reported', 1, refs),
                     outputTokens: observed(stats.tokens.output, 'reported', 1, refs),
@@ -157,7 +162,8 @@ function createProviderSessionAdapterV1(sessionProvider, options = {}) {
                             : 'estimated', allCostsReported ? 1 : transcript.usage.totalCostUsd === null ? 0.5 : 0.9, refs),
                 },
                 pendingUserRequest: derivePendingUserRequestV1(sessionProvider.id, stats.sessionId, sessionPath, events),
-                observedAt: new Date().toISOString(),
+                contentObservedAt: observedAt,
+                observedAt,
             };
         },
         watch(sessionPath, listener, cwd) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sidekick-shared",
-  "version": "0.24.5",
+  "version": "0.25.0",
   "description": "Shared data access layer for Sidekick — readers, types, providers, credentials, quota",
   "keywords": [
     "claude-code",
@@ -35,42 +35,62 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.js",
       "default": "./dist/index.js"
     },
     "./browser": {
       "types": "./dist/browser.d.ts",
+      "import": "./dist/browser.js",
+      "require": "./dist/browser.js",
       "default": "./dist/browser.js"
     },
     "./node": {
       "types": "./dist/node.d.ts",
+      "import": "./dist/node.js",
+      "require": "./dist/node.js",
       "default": "./dist/node.js"
     },
     "./schemas": {
       "types": "./dist/schemas/index.d.ts",
+      "import": "./dist/schemas/index.js",
+      "require": "./dist/schemas/index.js",
       "default": "./dist/schemas/index.js"
     },
     "./phrases": {
       "types": "./dist/phrases.d.ts",
+      "import": "./dist/phrases.js",
+      "require": "./dist/phrases.js",
       "default": "./dist/phrases.js"
     },
     "./modelContext": {
       "types": "./dist/modelContext.d.ts",
+      "import": "./dist/modelContext.js",
+      "require": "./dist/modelContext.js",
       "default": "./dist/modelContext.js"
     },
     "./modelInfo": {
       "types": "./dist/modelInfo.d.ts",
+      "import": "./dist/modelInfo.js",
+      "require": "./dist/modelInfo.js",
       "default": "./dist/modelInfo.js"
     },
     "./formatting": {
       "types": "./dist/formatting.d.ts",
+      "import": "./dist/formatting.js",
+      "require": "./dist/formatting.js",
       "default": "./dist/formatting.js"
     },
     "./statusline": {
       "types": "./dist/statusline/index.d.ts",
+      "import": "./dist/statusline/index.js",
+      "require": "./dist/statusline/index.js",
       "default": "./dist/statusline/index.js"
     },
     "./dist/*": {
       "types": "./dist/*.d.ts",
+      "import": "./dist/*.js",
+      "require": "./dist/*.js",
       "default": "./dist/*.js"
     },
     "./package.json": "./package.json"
@@ -131,6 +151,7 @@
     "prettier": "3.8.4",
     "typescript": "^5.7.0",
     "typescript-eslint": "^8.0.0",
+    "vite": "^8.1.0",
     "vitest": "^4.1.9"
   },
   "license": "MIT",