cc2cf5c7d0
Restrict the supersede sweep to compactions on the path from the current leaf so a newer compaction never rewrites a sibling branch's still-current summary or drops its preserveData. Streaming load now collects the active-branch ids before eliding instead of trampling sibling compactions encountered in file order. Refs #3789
252 lines
8.5 KiB
TypeScript
252 lines
8.5 KiB
TypeScript
import * as fs from "node:fs";
|
|
import * as readline from "node:readline";
|
|
import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
|
|
import { getBlobsDir, isEnoent, parseJsonlLenient } from "@oh-my-pi/pi-utils";
|
|
import { BlobStore, isBlobRef, resolveImageData, resolveImageDataUrl } from "./blob-store";
|
|
import { buildSessionContext } from "./session-context";
|
|
import {
|
|
type CompactionEntry,
|
|
type FileEntry,
|
|
type RawFileEntry,
|
|
SESSION_TITLE_SLOT_BYTES,
|
|
type SessionEntry,
|
|
type SessionHeader,
|
|
type SessionTitleSlotEntry,
|
|
} from "./session-entries";
|
|
import { migrateToCurrentVersion } from "./session-migrations";
|
|
import { isImageBlock, isImageDataPayload } from "./session-persistence";
|
|
import { FileSessionStorage, type SessionStorage } from "./session-storage";
|
|
import {
|
|
parseTitleSlotFromContent,
|
|
parseTitleSlotLine,
|
|
type SessionTitleUpdate,
|
|
titleUpdateFromSlot,
|
|
} from "./session-title-slot";
|
|
|
|
const STREAM_LOAD_THRESHOLD_BYTES = 8 * 1024 * 1024;
|
|
const ELIDED_COMPACTION_SUMMARY = "[Superseded compaction summary elided during session load]";
|
|
const ELIDED_COMPACTION_SHORT_SUMMARY = "Superseded compaction elided";
|
|
|
|
function splitTitleSlot(content: string): { body: string; slot: SessionTitleUpdate | undefined } {
|
|
const slot = titleUpdateFromSlot(parseTitleSlotFromContent(content));
|
|
if (!slot) return { body: content, slot: undefined };
|
|
const newlineIndex = content.indexOf("\n");
|
|
return { body: content.slice(newlineIndex + 1), slot };
|
|
}
|
|
|
|
function foldTitleSlot(entries: FileEntry[], slot: SessionTitleUpdate | undefined): FileEntry[] {
|
|
if (!slot || entries.length === 0) return entries;
|
|
const header = entries[0] as SessionHeader;
|
|
if (header.type !== "session" || typeof header.id !== "string") return entries;
|
|
if (slot.title && slot.title.length > 0) {
|
|
header.title = slot.title;
|
|
} else {
|
|
delete header.title;
|
|
}
|
|
if (slot.source) {
|
|
header.titleSource = slot.source;
|
|
} else {
|
|
delete header.titleSource;
|
|
}
|
|
return entries;
|
|
}
|
|
|
|
/** Parse session JSONL while stripping and folding the optional fixed title slot. */
|
|
export function parseSessionContent(content: string): {
|
|
entries: FileEntry[];
|
|
titleSlot: SessionTitleUpdate | undefined;
|
|
} {
|
|
const { body, slot } = splitTitleSlot(content);
|
|
const entries = parseJsonlLenient<RawFileEntry>(body) as FileEntry[];
|
|
return { entries: foldTitleSlot(entries, slot), titleSlot: slot };
|
|
}
|
|
|
|
function elideCompactionSummary(entry: CompactionEntry | undefined): boolean {
|
|
if (!entry) return false;
|
|
if (
|
|
entry.summary === ELIDED_COMPACTION_SUMMARY &&
|
|
entry.shortSummary === ELIDED_COMPACTION_SHORT_SUMMARY &&
|
|
entry.preserveData === undefined
|
|
) {
|
|
return false;
|
|
}
|
|
entry.summary = ELIDED_COMPACTION_SUMMARY;
|
|
entry.shortSummary = ELIDED_COMPACTION_SHORT_SUMMARY;
|
|
entry.preserveData = undefined;
|
|
return true;
|
|
}
|
|
|
|
function collectActiveBranchIds(entries: FileEntry[]): Set<string> {
|
|
const byId = new Map<string, SessionEntry>();
|
|
for (const entry of entries) {
|
|
const id = (entry as SessionEntry).id;
|
|
if (typeof id === "string") byId.set(id, entry as SessionEntry);
|
|
}
|
|
const branchIds = new Set<string>();
|
|
let cursor = entries[entries.length - 1] as SessionEntry | undefined;
|
|
while (cursor && typeof cursor.id === "string" && !branchIds.has(cursor.id)) {
|
|
branchIds.add(cursor.id);
|
|
const parentId = cursor.parentId;
|
|
cursor = parentId ? byId.get(parentId) : undefined;
|
|
}
|
|
return branchIds;
|
|
}
|
|
|
|
function elideSupersededCompactionEntries(entries: FileEntry[]): void {
|
|
const branchIds = collectActiveBranchIds(entries);
|
|
let previousCompaction: CompactionEntry | undefined;
|
|
for (const entry of entries) {
|
|
if (entry.type !== "compaction") continue;
|
|
if (!branchIds.has(entry.id)) continue;
|
|
elideCompactionSummary(previousCompaction);
|
|
previousCompaction = entry;
|
|
}
|
|
}
|
|
|
|
async function loadEntriesFromFileStream(filePath: string): Promise<{
|
|
entries: FileEntry[];
|
|
titleSlot: SessionTitleUpdate | undefined;
|
|
}> {
|
|
const entries: FileEntry[] = [];
|
|
let titleSlot: SessionTitleUpdate | undefined;
|
|
let sawBodyLine = false;
|
|
const input = fs.createReadStream(filePath, { encoding: "utf8" });
|
|
const lines = readline.createInterface({ input, crlfDelay: Infinity });
|
|
|
|
try {
|
|
for await (const rawLine of lines) {
|
|
const line = rawLine.trim();
|
|
if (!line) continue;
|
|
if (!sawBodyLine) {
|
|
const slot = parseTitleSlotLine(line);
|
|
if (slot) {
|
|
titleSlot = titleUpdateFromSlot(slot);
|
|
sawBodyLine = true;
|
|
continue;
|
|
}
|
|
sawBodyLine = true;
|
|
}
|
|
|
|
let entry: FileEntry;
|
|
try {
|
|
entry = JSON.parse(line) as FileEntry;
|
|
} catch {
|
|
continue;
|
|
}
|
|
entries.push(entry);
|
|
}
|
|
} catch (err) {
|
|
input.destroy();
|
|
if (isEnoent(err)) return { entries: [], titleSlot: undefined };
|
|
throw err;
|
|
}
|
|
|
|
return { entries: foldTitleSlot(entries, titleSlot), titleSlot };
|
|
}
|
|
|
|
/** Read only the fixed-size head window to detect a physical title slot. */
|
|
export async function readTitleSlotFromFile(
|
|
filePath: string,
|
|
storage: SessionStorage = new FileSessionStorage(),
|
|
): Promise<SessionTitleSlotEntry | undefined> {
|
|
let head: string;
|
|
try {
|
|
[head] = await storage.readTextSlices(filePath, SESSION_TITLE_SLOT_BYTES, 0);
|
|
} catch (err) {
|
|
if (isEnoent(err)) return undefined;
|
|
throw err;
|
|
}
|
|
const newlineIndex = head.indexOf("\n");
|
|
if (newlineIndex < 0) return undefined;
|
|
return parseTitleSlotLine(head.slice(0, newlineIndex));
|
|
}
|
|
/** Exported for compaction.test.ts */
|
|
export function parseSessionEntries(content: string): FileEntry[] {
|
|
return parseSessionContent(content).entries;
|
|
}
|
|
|
|
/** Exported for testing */
|
|
export async function loadEntriesFromFile(
|
|
filePath: string,
|
|
storage: SessionStorage = new FileSessionStorage(),
|
|
): Promise<FileEntry[]> {
|
|
let loaded: { entries: FileEntry[]; titleSlot: SessionTitleUpdate | undefined };
|
|
try {
|
|
const stat = storage.statSync(filePath);
|
|
loaded =
|
|
storage instanceof FileSessionStorage && stat.size >= STREAM_LOAD_THRESHOLD_BYTES
|
|
? await loadEntriesFromFileStream(filePath)
|
|
: parseSessionContent(await storage.readText(filePath));
|
|
} catch (err) {
|
|
if (isEnoent(err)) return [];
|
|
throw err;
|
|
}
|
|
const { entries } = loaded;
|
|
elideSupersededCompactionEntries(entries);
|
|
|
|
// Validate session header
|
|
if (entries.length === 0) return entries;
|
|
const header = entries[0] as SessionHeader;
|
|
if (header.type !== "session" || typeof header.id !== "string") {
|
|
return [];
|
|
}
|
|
|
|
return entries;
|
|
}
|
|
|
|
/**
|
|
* Resolve blob references in loaded entries, restoring both session image blocks and persisted
|
|
* provider image URLs back to the inline data expected by downstream transports. Mutates entries in place.
|
|
*/
|
|
function hasImageUrl(value: unknown): value is { image_url: string } {
|
|
return typeof value === "object" && value !== null && "image_url" in value && typeof value.image_url === "string";
|
|
}
|
|
|
|
function shouldResolveImagePayload(value: unknown, key: string | undefined): value is { data: string } {
|
|
if (!isImageDataPayload(value) || !isBlobRef(value.data)) return false;
|
|
return (key === "content" && isImageBlock(value)) || key === "images";
|
|
}
|
|
|
|
async function resolvePersistedBlobRefs(value: unknown, blobStore: BlobStore, key?: string): Promise<void> {
|
|
if (shouldResolveImagePayload(value, key)) {
|
|
value.data = await resolveImageData(blobStore, value.data);
|
|
return;
|
|
}
|
|
|
|
if (Array.isArray(value)) {
|
|
await Promise.all(value.map(item => resolvePersistedBlobRefs(item, blobStore, key)));
|
|
return;
|
|
}
|
|
|
|
if (typeof value !== "object" || value === null) return;
|
|
|
|
if (hasImageUrl(value) && isBlobRef(value.image_url)) {
|
|
value.image_url = await resolveImageDataUrl(blobStore, value.image_url);
|
|
}
|
|
|
|
await Promise.all(
|
|
Object.entries(value).map(([childKey, item]) => resolvePersistedBlobRefs(item, blobStore, childKey)),
|
|
);
|
|
}
|
|
|
|
export async function resolveBlobRefsInEntries(entries: FileEntry[], blobStore: BlobStore): Promise<void> {
|
|
await Promise.all(
|
|
entries.filter(entry => entry.type !== "session").map(entry => resolvePersistedBlobRefs(entry, blobStore)),
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Read-only message view of a session file: load entries, migrate to the
|
|
* current version, resolve blob refs, and build the context along the
|
|
* persisted leaf path (last entry). Does NOT create a writer or take the
|
|
* session lock — safe to call against a file another session is writing.
|
|
*/
|
|
export async function loadSessionMessagesReadOnly(filePath: string): Promise<AgentMessage[]> {
|
|
const entries = await loadEntriesFromFile(filePath);
|
|
if (entries.length === 0) return [];
|
|
migrateToCurrentVersion(entries);
|
|
await resolveBlobRefsInEntries(entries, new BlobStore(getBlobsDir()));
|
|
const sessionEntries = entries.filter((e): e is SessionEntry => e.type !== "session");
|
|
return buildSessionContext(sessionEntries).messages;
|
|
}
|