@prestyj/cli 5.8.0 → 5.9.0

package/dist/core/session-manager.d.ts

@@ -1,6 +1,7 @@
 import { type Message, type Provider, type Usage } from "@prestyj/ai";
 import type { AgentTurnTiming } from "@prestyj/agent";
 import type { CompletedItem } from "../ui/app-items.js";
+import { type StorageNormalizationMetrics } from "./session-storage.js";
 interface BaseEntry {
     id: string;
     parentId: string | null;
@@ -122,6 +123,15 @@ export interface SessionInfo {
     cwd: string;
     messageCount: number;
 }
+export interface SessionMaintenanceMetrics extends StorageNormalizationMetrics {
+    deletedFiles: number;
+    deletedBytes: number;
+    archivedFiles: number;
+    archivedSourceBytes: number;
+    archivedBytes: number;
+    bytesSaved: number;
+    failures: number;
+}
 export interface BranchInfo {
     /** The entry ID where this branch diverges from its parent branch */
     branchPointId: string;
@@ -133,6 +143,8 @@ export interface BranchInfo {
     timestamp: string;
 }
 export declare class SessionManager {
+    private static activePathsByRoot;
+    private static maintenanceByRoot;
     private sessionsDir;
     private warnedPersistCodes;
     /** Called once per error code when session persistence fails (e.g. ENOSPC). */
@@ -153,20 +165,22 @@ export declare class SessionManager {
         path: string;
         header: SessionHeader;
     }>;
+    registerActivePath(sessionPath: string): void;
+    unregisterActivePath(sessionPath: string): void;
+    private protectedSessionBases;
     load(sessionPath: string): Promise<{
         header: SessionHeader;
         entries: SessionEntry[];
+        path: string;
     }>;
+    private readSessionInfo;
+    private sessionCandidates;
     list(cwd: string): Promise<SessionInfo[]>;
     getMostRecent(cwd: string): Promise<string | null>;
     findById(cwd: string, sessionId: string): Promise<string | null>;
-    /**
-     * Delete session files older than `maxAgeDays` across ALL project dirs.
-     * Age is judged by file mtime, so a session that's still being appended to
-     * is never considered old. Best-effort: per-file errors are skipped so a
-     * locked or vanished file can't break startup. Empty project dirs left
-     * behind are removed. Returns what was freed for logging.
-     */
+    private storageDirectories;
+    private logicalSessionBases;
+    private removeStoragePath;
     pruneOldSessions(options: {
         maxAgeDays: number;
         keepPaths?: string[];
@@ -174,6 +188,12 @@ export declare class SessionManager {
         deletedFiles: number;
         freedBytes: number;
     }>;
+    runMaintenance(options: {
+        retentionDays: number;
+        keepPaths?: string[];
+        now?: number;
+    }): Promise<SessionMaintenanceMetrics>;
+    private runMaintenanceUnsafe;
     appendEntry(sessionPath: string, entry: SessionEntry): Promise<void>;
     appendTurnMetric(sessionPath: string, payload: TurnMetricPayload): Promise<void>;
     updateLeaf(sessionPath: string, leafId: string): Promise<void>;

package/dist/core/session-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/core/session-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/core/session-manager.ts"],"names":[],"mappings":"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"}

package/dist/core/session-manager.js

@@ -1,11 +1,11 @@
 import fs from "node:fs/promises";
-import { createReadStream } from "node:fs";
 import { createInterface } from "node:readline";
 import path from "node:path";
 import crypto from "node:crypto";
 import { environmentSecrets, redactValue, } from "@prestyj/ai";
 import { log } from "./logger.js";
 import { encodeCwd } from "./encode-cwd.js";
+import { archiveColdSession, archiveSessionPath, cleanupOldSessionTemps, COLD_SESSION_AGE_DAYS, emptyStorageNormalizationMetrics, hydrateSessionEntry, isSessionPath, normalizeSessionEntryForStorage, openSessionReadStream, plainSessionPath, resolveSessionPath, sessionAssetDir, thawSessionArchive, } from "./session-storage.js";
 export const DISPLAY_ITEM_CUSTOM_KIND = "display_item";
 export const TURN_METRIC_CUSTOM_KIND = "turn_metric";
 function finiteNumber(value) {
@@ -79,12 +79,14 @@ function isCompletedItemLike(value) {
 }
 // ── Session Manager ────────────────────────────────────────
 export class SessionManager {
+    static activePathsByRoot = new Map();
+    static maintenanceByRoot = new Map();
     sessionsDir;
     warnedPersistCodes = new Set();
     /** Called once per error code when session persistence fails (e.g. ENOSPC). */
     onPersistError;
     constructor(sessionsDir) {
-        this.sessionsDir = sessionsDir;
+        this.sessionsDir = path.resolve(sessionsDir);
     }
     /**
      * Session persistence must never crash a live session. Disk-full (ENOSPC),
@@ -132,16 +134,40 @@ export class SessionManager {
         await fs.appendFile(filePath, JSON.stringify(header) + "\n", "utf-8");
         return { id, path: filePath, header };
     }
+    registerActivePath(sessionPath) {
+        const root = this.sessionsDir;
+        const active = SessionManager.activePathsByRoot.get(root) ?? new Map();
+        const basePath = path.resolve(plainSessionPath(sessionPath));
+        active.set(basePath, (active.get(basePath) ?? 0) + 1);
+        SessionManager.activePathsByRoot.set(root, active);
+    }
+    unregisterActivePath(sessionPath) {
+        const active = SessionManager.activePathsByRoot.get(this.sessionsDir);
+        if (!active)
+            return;
+        const basePath = path.resolve(plainSessionPath(sessionPath));
+        const registrations = active.get(basePath) ?? 0;
+        if (registrations <= 1)
+            active.delete(basePath);
+        else
+            active.set(basePath, registrations - 1);
+        if (active.size === 0)
+            SessionManager.activePathsByRoot.delete(this.sessionsDir);
+    }
+    protectedSessionBases(keepPaths = []) {
+        return new Set([
+            ...(SessionManager.activePathsByRoot.get(this.sessionsDir)?.keys() ?? []),
+            ...keepPaths.map((sessionPath) => path.resolve(plainSessionPath(sessionPath))),
+        ]);
+    }
     async load(sessionPath) {
-        // Stream the JSONL file line-by-line instead of loading the entire
-        // file into memory. For large sessions (100MB+) this avoids holding
-        // the raw string, the split array, and the parsed objects all at once.
+        // Resuming is a write operation, so transparently thaw a gzip archive and
+        // return the effective plain path every future append must use.
+        const effectivePath = await thawSessionArchive(sessionPath);
+        const { stream } = await openSessionReadStream(effectivePath);
         let header = null;
         const entries = [];
-        const rl = createInterface({
-            input: createReadStream(sessionPath, { encoding: "utf-8" }),
-            crlfDelay: Infinity,
-        });
+        const rl = createInterface({ input: stream, crlfDelay: Infinity });
         for await (const line of rl) {
             if (!line)
                 continue;
@@ -152,12 +178,12 @@ export class SessionManager {
                         header = parsed;
                     }
                     else {
-                        // Upgrade v1 to v2
                         const v1 = parsed;
                         header = {
                             type: "session",
                             version: 2,
                             id: v1.id,
+                            conversationId: v1.id,
                             timestamp: v1.timestamp,
                             cwd: v1.cwd,
                             provider: v1.provider,
@@ -165,164 +191,270 @@ export class SessionManager {
                             leafId: null,
                         };
                     }
+                    continue;
                 }
-                else if (parsed.type === "message") {
-                    // v1 compat: entries without id/parentId
-                    const entry = parsed;
-                    if (!entry.id) {
-                        entry.id = crypto.randomUUID();
-                        entry.parentId = null;
-                    }
-                    entries.push(entry);
-                }
-                else {
-                    entries.push(parsed);
+                const entry = parsed;
+                if (entry.type === "message" && !entry.id) {
+                    entry.id = crypto.randomUUID();
+                    entry.parentId = null;
                 }
+                entries.push(await hydrateSessionEntry(entry, effectivePath));
             }
             catch {
-                // Skip malformed JSON lines — a corrupt line shouldn't crash the session
+                // Skip malformed JSON lines — cold migration preserves their raw bytes
+                // so a future recovery tool still has a chance to repair them.
             }
         }
         if (!header) {
             throw new Error(`Invalid session file: no header found in ${sessionPath}`);
         }
-        return { header, entries };
+        return { header, entries, path: effectivePath };
     }
-    async list(cwd) {
-        const dir = this.dirForCwd(cwd);
+    async readSessionInfo(candidatePath) {
+        try {
+            const resolvedPath = await resolveSessionPath(candidatePath);
+            const { stream } = await openSessionReadStream(resolvedPath);
+            const rl = createInterface({ input: stream, crlfDelay: Infinity });
+            let first = null;
+            let messageCount = 0;
+            let lastActivity = null;
+            for await (const line of rl) {
+                if (!line)
+                    continue;
+                try {
+                    const parsed = JSON.parse(line);
+                    if (!first) {
+                        if (parsed.type !== "session")
+                            break;
+                        first = parsed;
+                    }
+                    else if (parsed.type === "message") {
+                        messageCount += 1;
+                        if (parsed.timestamp)
+                            lastActivity = parsed.timestamp;
+                    }
+                }
+                catch {
+                    // Skip malformed lines while retaining readable entries around them.
+                }
+            }
+            if (!first || first.type !== "session")
+                return null;
+            return {
+                id: first.id,
+                conversationId: first.version === 2
+                    ? (first.conversationId ?? first.id)
+                    : first.id,
+                path: resolvedPath,
+                timestamp: first.timestamp,
+                lastActivity: lastActivity ?? first.timestamp,
+                cwd: first.cwd,
+                messageCount,
+            };
+        }
+        catch {
+            return null;
+        }
+    }
+    async sessionCandidates(directory) {
         let files;
         try {
-            files = await fs.readdir(dir);
+            files = await fs.readdir(directory);
         }
         catch {
             return [];
         }
-        const sessions = [];
-        for (const file of files) {
-            if (!file.endsWith(".jsonl"))
+        return files.filter(isSessionPath).map((file) => path.join(directory, file));
+    }
+    async list(cwd) {
+        const candidates = await this.sessionCandidates(this.dirForCwd(cwd));
+        const summaries = await Promise.all(candidates.map((file) => this.readSessionInfo(file)));
+        const byConversation = new Map();
+        const seenResolvedPaths = new Set();
+        for (const summary of summaries) {
+            if (!summary || seenResolvedPaths.has(summary.path))
                 continue;
-            const filePath = path.join(dir, file);
-            try {
-                // Stream line-by-line to avoid loading entire file for listing
-                const rl = createInterface({
-                    input: createReadStream(filePath, { encoding: "utf-8" }),
-                    crlfDelay: Infinity,
-                });
-                let first = null;
-                let messageCount = 0;
-                let lastActivity = null;
-                for await (const line of rl) {
-                    if (!line)
-                        continue;
-                    try {
-                        const parsed = JSON.parse(line);
-                        if (!first) {
-                            if (parsed.type !== "session")
-                                break;
-                            first = parsed;
-                        }
-                        else if (parsed.type === "message") {
-                            messageCount++;
-                            if (parsed.timestamp)
-                                lastActivity = parsed.timestamp;
-                        }
-                    }
-                    catch {
-                        // Skip malformed lines
-                    }
-                }
-                if (!first || first.type !== "session")
-                    continue;
-                sessions.push({
-                    id: first.id,
-                    path: filePath,
-                    timestamp: first.timestamp,
-                    lastActivity: lastActivity ?? first.timestamp,
-                    cwd: first.cwd,
-                    messageCount,
-                });
-            }
-            catch {
-                // Skip corrupt files
+            seenResolvedPaths.add(summary.path);
+            const current = byConversation.get(summary.conversationId);
+            if (!current || summary.lastActivity > current.lastActivity) {
+                const { conversationId: _conversationId, ...info } = summary;
+                byConversation.set(summary.conversationId, info);
             }
         }
-        // Sort by last activity descending (the session most recently spoken in first)
-        sessions.sort((a, b) => b.lastActivity.localeCompare(a.lastActivity));
-        return sessions;
+        return [...byConversation.values()].sort((a, b) => b.lastActivity.localeCompare(a.lastActivity));
     }
     async getMostRecent(cwd) {
         const sessions = await this.list(cwd);
-        const withMessages = sessions.find((s) => s.messageCount > 0);
-        return withMessages?.path ?? null;
+        return sessions.find((session) => session.messageCount > 0)?.path ?? null;
     }
     async findById(cwd, sessionId) {
-        const sessions = await this.list(cwd);
-        return sessions.find((session) => session.id === sessionId)?.path ?? null;
+        const candidates = await this.sessionCandidates(this.dirForCwd(cwd));
+        for (const candidate of candidates) {
+            const summary = await this.readSessionInfo(candidate);
+            if (summary?.id === sessionId || summary?.conversationId === sessionId)
+                return summary.path;
+        }
+        return null;
     }
-    /**
-     * Delete session files older than `maxAgeDays` across ALL project dirs.
-     * Age is judged by file mtime, so a session that's still being appended to
-     * is never considered old. Best-effort: per-file errors are skipped so a
-     * locked or vanished file can't break startup. Empty project dirs left
-     * behind are removed. Returns what was freed for logging.
-     */
-    async pruneOldSessions(options) {
-        const result = { deletedFiles: 0, freedBytes: 0 };
-        if (options.maxAgeDays <= 0)
-            return result;
-        const cutoffMs = Date.now() - options.maxAgeDays * 86_400_000;
-        const keep = new Set((options.keepPaths ?? []).map((p) => path.resolve(p)));
-        let cwdDirs;
+    async storageDirectories() {
+        let entries;
         try {
-            cwdDirs = await fs.readdir(this.sessionsDir);
+            entries = await fs.readdir(this.sessionsDir, { withFileTypes: true });
         }
         catch {
-            return result;
+            return [];
         }
-        for (const dirName of cwdDirs) {
-            const dir = path.join(this.sessionsDir, dirName);
-            let files;
-            try {
-                const stat = await fs.stat(dir);
-                if (!stat.isDirectory())
-                    continue;
-                files = await fs.readdir(dir);
+        return entries
+            .filter((entry) => entry.isDirectory())
+            .map((entry) => path.join(this.sessionsDir, entry.name));
+    }
+    async logicalSessionBases(directory) {
+        let entries;
+        try {
+            entries = await fs.readdir(directory, { withFileTypes: true });
+        }
+        catch {
+            return [];
+        }
+        const bases = new Set();
+        for (const entry of entries) {
+            const entryPath = path.join(directory, entry.name);
+            if (entry.isFile() && isSessionPath(entry.name)) {
+                bases.add(path.resolve(plainSessionPath(entryPath)));
             }
-            catch {
-                continue;
+            else if (entry.isDirectory() && entry.name.endsWith(".jsonl.assets")) {
+                bases.add(path.resolve(entryPath.slice(0, -".assets".length)));
             }
-            let remaining = files.length;
-            for (const file of files) {
-                if (!file.endsWith(".jsonl"))
-                    continue;
-                const filePath = path.join(dir, file);
-                if (keep.has(path.resolve(filePath)))
+        }
+        return [...bases];
+    }
+    async removeStoragePath(targetPath) {
+        let stat;
+        try {
+            stat = await fs.lstat(targetPath);
+        }
+        catch {
+            return { deletedFiles: 0, deletedBytes: 0 };
+        }
+        if (stat.isDirectory()) {
+            const result = { deletedFiles: 0, deletedBytes: 0 };
+            for (const name of await fs.readdir(targetPath)) {
+                const removed = await this.removeStoragePath(path.join(targetPath, name));
+                result.deletedFiles += removed.deletedFiles;
+                result.deletedBytes += removed.deletedBytes;
+            }
+            await fs.rmdir(targetPath).catch(() => { });
+            return result;
+        }
+        await fs.unlink(targetPath);
+        return { deletedFiles: 1, deletedBytes: stat.size };
+    }
+    async pruneOldSessions(options) {
+        const result = { deletedFiles: 0, freedBytes: 0 };
+        if (options.maxAgeDays <= 0)
+            return result;
+        const cutoffMs = Date.now() - options.maxAgeDays * 86_400_000;
+        for (const directory of await this.storageDirectories()) {
+            for (const basePath of await this.logicalSessionBases(directory)) {
+                if (this.protectedSessionBases(options.keepPaths).has(basePath))
                     continue;
                 try {
-                    const stat = await fs.stat(filePath);
+                    const resolved = await resolveSessionPath(basePath);
+                    const stat = await fs.stat(resolved);
                     if (stat.mtimeMs >= cutoffMs)
                         continue;
-                    await fs.unlink(filePath);
-                    result.deletedFiles += 1;
-                    result.freedBytes += stat.size;
-                    remaining -= 1;
+                    for (const target of [
+                        basePath,
+                        archiveSessionPath(basePath),
+                        sessionAssetDir(basePath),
+                    ]) {
+                        const removed = await this.removeStoragePath(target);
+                        result.deletedFiles += removed.deletedFiles;
+                        result.freedBytes += removed.deletedBytes;
+                    }
                 }
                 catch {
-                    // Skip files we can't stat/delete — pruning is best-effort
+                    // A raced, corrupt, or inaccessible logical group is skipped safely.
                 }
             }
-            if (remaining === 0) {
-                await fs.rmdir(dir).catch(() => { });
-            }
+            await fs.rmdir(directory).catch(() => { });
         }
         return result;
     }
+    async runMaintenance(options) {
+        const existing = SessionManager.maintenanceByRoot.get(this.sessionsDir);
+        if (existing)
+            return existing;
+        const maintenance = this.runMaintenanceUnsafe(options).finally(() => {
+            SessionManager.maintenanceByRoot.delete(this.sessionsDir);
+        });
+        SessionManager.maintenanceByRoot.set(this.sessionsDir, maintenance);
+        return maintenance;
+    }
+    async runMaintenanceUnsafe(options) {
+        const metrics = {
+            deletedFiles: 0,
+            deletedBytes: 0,
+            archivedFiles: 0,
+            archivedSourceBytes: 0,
+            archivedBytes: 0,
+            bytesSaved: 0,
+            failures: 0,
+            ...emptyStorageNormalizationMetrics(),
+        };
+        const pruned = await this.pruneOldSessions({
+            maxAgeDays: options.retentionDays,
+            keepPaths: options.keepPaths,
+        });
+        metrics.deletedFiles = pruned.deletedFiles;
+        metrics.deletedBytes = pruned.freedBytes;
+        const now = options.now ?? Date.now();
+        const coldCutoff = now - COLD_SESSION_AGE_DAYS * 86_400_000;
+        for (const directory of await this.storageDirectories()) {
+            const tempCleanup = await cleanupOldSessionTemps(directory, now - 86_400_000);
+            metrics.deletedFiles += tempCleanup.deletedFiles;
+            metrics.deletedBytes += tempCleanup.freedBytes;
+            for (const basePath of await this.logicalSessionBases(directory)) {
+                if (this.protectedSessionBases(options.keepPaths).has(basePath))
+                    continue;
+                try {
+                    const resolved = await resolveSessionPath(basePath);
+                    const stat = await fs.stat(resolved);
+                    if (stat.mtimeMs >= coldCutoff || resolved.endsWith(".jsonl.gz"))
+                        continue;
+                    const archived = await archiveColdSession(resolved);
+                    if (!archived.archived)
+                        continue;
+                    metrics.archivedFiles += 1;
+                    metrics.archivedSourceBytes += archived.sourceBytes;
+                    metrics.archivedBytes += archived.archiveBytes;
+                    metrics.bytesSaved += archived.bytesSaved;
+                    metrics.truncatedToolTexts += archived.truncatedToolTexts;
+                    metrics.externalizedMedia += archived.externalizedMedia;
+                    metrics.omittedPathMedia += archived.omittedPathMedia;
+                    metrics.removedDisplayItems += archived.removedDisplayItems;
+                }
+                catch (error) {
+                    metrics.failures += 1;
+                    log("WARN", "session", "Cold session maintenance failed", {
+                        path: basePath,
+                        message: error instanceof Error ? error.message : String(error),
+                    });
+                }
+            }
+        }
+        return metrics;
+    }
     async appendEntry(sessionPath, entry) {
         try {
-            // Persist a sanitized clone. The live conversation remains untouched so
-            // credentials can still be used by the current in-memory run.
+            // Persist a sanitized, bounded clone. The live conversation remains
+            // untouched so the current turn keeps full tool output and media.
             const safeEntry = redactValue(entry, { secrets: environmentSecrets(process.env) });
-            await fs.appendFile(sessionPath, JSON.stringify(safeEntry) + "\n", "utf-8");
+            const writablePath = await thawSessionArchive(sessionPath);
+            const normalized = await normalizeSessionEntryForStorage(safeEntry, writablePath);
+            if (normalized === null)
+                return;
+            await fs.appendFile(writablePath, `${JSON.stringify(normalized)}\n`, "utf-8");
         }
         catch (error) {
             this.handlePersistError(error, "appendEntry");
@@ -341,7 +473,8 @@ export class SessionManager {
     }
     async updateLeaf(sessionPath, leafId) {
         try {
-            await this.updateLeafUnsafe(sessionPath, leafId);
+            const writablePath = await thawSessionArchive(sessionPath);
+            await this.updateLeafUnsafe(writablePath, leafId);
         }
         catch (error) {
             this.handlePersistError(error, "updateLeaf");