@yefengr/remote-pi 0.7.16 → 0.9.0

package/dist/session/local_config.d.ts

@@ -1,12 +1,7 @@
 export interface LocalConfig {
     agent_name?: string;
-    /** Whether an interactive Pi starts its Relay endpoint automatically. */
-    auto_start_relay?: boolean;
 }
 export declare function localConfigExists(cwd: string): boolean;
 export declare function loadLocalConfig(cwd: string): LocalConfig;
 export declare function saveLocalConfig(cwd: string, patch: Partial<LocalConfig>): void;
-/** Default display name when none is configured. */
 export declare function defaultAgentName(cwd: string): string;
-/** Resolves the default for omitted config values. */
-export declare function effectiveAutoStartRelay(config: LocalConfig): boolean;

package/dist/session/local_config.js

@@ -2,7 +2,6 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, join } from "node:path";
 const LOCAL_DIR = ".pi/remote-pi";
 const LOCAL_FILE = "config.json";
-const DIRECT_CONFIG_ENV = "REMOTE_PI_DIRECT_CONFIG";
 function pathFor(cwd) {
     return join(cwd, LOCAL_DIR, LOCAL_FILE);
 }
@@ -16,29 +15,15 @@ function parseLocalConfig(raw) {
     }
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
         return null;
-    const source = parsed;
-    const config = {};
-    if (typeof source["agent_name"] === "string" && source["agent_name"].trim()) {
-        config.agent_name = source["agent_name"].trim();
-    }
-    if (typeof source["auto_start_relay"] === "boolean") {
-        config.auto_start_relay = source["auto_start_relay"];
-    }
-    return config;
-}
-function directConfig() {
-    const raw = process.env[DIRECT_CONFIG_ENV];
-    if (!raw || raw.trim().length === 0)
-        return null;
-    return parseLocalConfig(raw);
+    const agentName = parsed["agent_name"];
+    return typeof agentName === "string" && agentName.trim()
+        ? { agent_name: agentName.trim() }
+        : {};
 }
 export function localConfigExists(cwd) {
-    return directConfig() !== null || existsSync(pathFor(cwd));
+    return existsSync(pathFor(cwd));
 }
 export function loadLocalConfig(cwd) {
-    const direct = directConfig();
-    if (direct)
-        return direct;
     const path = pathFor(cwd);
     if (!existsSync(path))
         return {};
@@ -51,10 +36,7 @@ export function loadLocalConfig(cwd) {
 }
 export function saveLocalConfig(cwd, patch) {
     const path = pathFor(cwd);
-    const current = loadLocalConfig(cwd);
-    const next = { ...current, ...patch };
-    if (typeof next.auto_start_relay !== "boolean")
-        next.auto_start_relay = true;
+    const next = { ...loadLocalConfig(cwd), ...patch };
     try {
         mkdirSync(dirname(path), { recursive: true });
         writeFileSync(path, JSON.stringify(next, null, 2));
@@ -64,12 +46,7 @@ export function saveLocalConfig(cwd, patch) {
         console.warn(`[remote-pi] could not persist local config ${path}: ${message}`);
     }
 }
-/** Default display name when none is configured. */
 export function defaultAgentName(cwd) {
     return basename(cwd) || "agent";
 }
-/** Resolves the default for omitted config values. */
-export function effectiveAutoStartRelay(config) {
-    return config.auto_start_relay !== false;
-}
 //# sourceMappingURL=local_config.js.map

package/dist/session/local_config.js.map

@@ -1 +1 @@
-{"version":3,"file":"local_config.js","sourceRoot":"","sources":["../../src/session/local_config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"local_config.js","sourceRoot":"","sources":["../../src/session/local_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEpD,MAAM,SAAS,GAAG,eAAe,CAAC;AAClC,MAAM,UAAU,GAAG,aAAa,CAAC;AAMjC,SAAS,OAAO,CAAC,GAAW;IAC1B,OAAO,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAW;IACnC,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IAChF,MAAM,SAAS,GAAI,MAAkC,CAAC,YAAY,CAAC,CAAC;IACpE,OAAO,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,CAAC,IAAI,EAAE;QACtD,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE;QAClC,CAAC,CAAC,EAAE,CAAC;AACT,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAW;IAC3C,OAAO,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAW;IACzC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACjC,IAAI,CAAC;QACH,OAAO,gBAAgB,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAW,EAAE,KAA2B;IACtE,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1B,MAAM,IAAI,GAAgB,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC;IAChE,IAAI,CAAC;QACH,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO,CAAC,IAAI,CAAC,8CAA8C,IAAI,KAAK,OAAO,EAAE,CAAC,CAAC;IACjF,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAW;IAC1C,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC;AAClC,CAAC"}

package/dist/timeline/history.d.ts

@@ -5,7 +5,7 @@ type GenerationProvider = (sessionManager: SessionManager) => string;
 type HistorySyncRequest = {
     requestId: string;
     targetChannelId: string;
-    before: string | null;
+    before: number | null;
     limit?: number;
 };
 export type TimelineHistorySync = HistorySyncRequest;
@@ -14,13 +14,11 @@ export type TimelineHistoryGenerationProvider = GenerationProvider;
 export declare class TimelineHistoryPager {
     private readonly sessionManager;
     private readonly recoverFn;
-    private readonly cursors;
-    private initialBusy;
     private readonly generationProvider;
     constructor(sessionManager: SessionManager, recoverFn: RecoveryFn, generationProvider?: GenerationProvider);
     sync(request: HistorySyncRequest): ServerFrame[];
-    private syncInitial;
-    private page;
+    private validateRequest;
+    private captureSnapshot;
     private snapshotInvalidReason;
     private recoverRecords;
     private selectWindow;
@@ -28,7 +26,6 @@ export declare class TimelineHistoryPager {
     private makeChunk;
     private nonFinalFrameBytes;
     private finalFrameBytes;
-    private issueCursor;
     private protocolError;
     private reset;
 }

package/dist/timeline/history.js

@@ -1,12 +1,8 @@
-import { randomBytes } from "node:crypto";
 import { encodeServerFrameV2, getUtf8ByteLengthV2, MAX_FRAGMENT_DECODE_BYTES, MAX_HISTORY_CHUNK_BYTES, MAX_WINDOW_DECODE_BYTES, TimelineEventSchema, } from "../protocol/v2/index.js";
-const MAX_GROUPS_PER_PAGE = 5;
-const TIMELINE_MARKER = "remote-pi:timeline-v2";
+const DEFAULT_EVENTS_PER_PAGE = 80;
 export class TimelineHistoryPager {
     sessionManager;
     recoverFn;
-    cursors = new Map();
-    initialBusy = false;
     generationProvider;
     constructor(sessionManager, recoverFn, generationProvider) {
         this.sessionManager = sessionManager;
@@ -14,231 +10,125 @@ export class TimelineHistoryPager {
         this.generationProvider = generationProvider ?? ((manager) => manager.getSessionId());
     }
     sync(request) {
-        const sessionId = this.sessionManager.getSessionId();
-        const historyGeneration = this.generationProvider(this.sessionManager);
-        if (request.before === null) {
-            if (this.initialBusy) {
-                return [this.protocolError(request, "invalid_cursor", "initial cursor is busy")];
-            }
-            this.initialBusy = true;
-            try {
-                return this.syncInitial(request, sessionId, historyGeneration);
-            }
-            finally {
-                this.initialBusy = false;
-            }
-        }
-        const cursor = this.cursors.get(request.before);
-        if (!cursor) {
-            return [this.reset(request, sessionId, historyGeneration, "invalid_cursor")];
-        }
-        if (cursor.busy) {
-            return [this.protocolError(request, "invalid_cursor", "cursor is busy")];
-        }
-        if (cursor.used) {
-            return [this.reset(request, sessionId, historyGeneration, "invalid_cursor")];
-        }
-        cursor.busy = true;
-        cursor.used = true;
-        try {
-            if (cursor.sessionId !== sessionId) {
-                return [this.reset(request, sessionId, historyGeneration, "session_replaced")];
-            }
-            if (cursor.historyGeneration !== historyGeneration) {
-                return [this.reset(request, sessionId, historyGeneration, "generation_changed")];
-            }
-            const branchReason = this.snapshotInvalidReason(cursor);
-            if (branchReason) {
-                return [this.reset(request, sessionId, historyGeneration, branchReason)];
-            }
-            return this.page(request, cursor);
-        }
-        finally {
-            cursor.busy = false;
-        }
-    }
-    syncInitial(request, sessionId, historyGeneration) {
-        const branch = this.sessionManager.getBranch();
-        const snapshotHead = this.sessionManager.getLeafId() ?? sessionId;
-        if (branch.length > 0 && branch.at(-1)?.id !== snapshotHead) {
+        const invalidRequest = this.validateRequest(request);
+        if (invalidRequest)
+            return [invalidRequest];
+        const snapshot = this.captureSnapshot();
+        if (!snapshot) {
             return [this.protocolError(request, "reset_required", "session has no current snapshot head")];
         }
-        const cursor = {
-            sessionId,
-            historyGeneration,
-            snapshotHead,
-            branchEntryIds: branch.map((entry) => entry.id),
-            position: branch.length,
-            used: true,
-            busy: true,
-        };
-        try {
-            return this.page(request, cursor);
-        }
-        finally {
-            cursor.busy = false;
-        }
-    }
-    page(request, cursor) {
-        const reason = this.snapshotInvalidReason(cursor);
-        if (reason) {
-            return [this.reset(request, cursor.sessionId, cursor.historyGeneration, reason)];
-        }
         let records;
         try {
-            records = this.recoverRecords(cursor);
+            records = this.recoverRecords(snapshot);
         }
-        catch (error) {
-            if (error instanceof HistoryTooLargeError) {
-                return [this.protocolError(request, "too_large", error.message)];
-            }
+        catch {
             return [this.protocolError(request, "internal_error", "history recovery failed")];
         }
-        const afterRecoveryReason = this.snapshotInvalidReason(cursor);
-        if (afterRecoveryReason) {
-            return [this.reset(request, cursor.sessionId, cursor.historyGeneration, afterRecoveryReason)];
+        const changed = this.snapshotInvalidReason(snapshot);
+        if (changed)
+            return [this.reset(request, snapshot, changed)];
+        const headSeq = records.length;
+        const before = request.before ?? headSeq + 1;
+        if (before > headSeq + 1) {
+            return [this.protocolError(request, "invalid_cursor", "history boundary is beyond the current head")];
         }
-        const window = this.selectWindow(records, cursor.position, request.limit);
+        const window = this.selectWindow(records, before, request.limit ?? DEFAULT_EVENTS_PER_PAGE);
         if (window.kind === "error") {
             return [this.protocolError(request, "too_large", window.message)];
         }
-        const hasOlder = records.some((record) => record.position < window.nextPosition);
-        const nextCursor = hasOlder
-            ? this.issueCursor({
-                sessionId: cursor.sessionId,
-                historyGeneration: cursor.historyGeneration,
-                snapshotHead: cursor.snapshotHead,
-                branchEntryIds: cursor.branchEntryIds,
-                position: window.nextPosition,
-                used: false,
-                busy: false,
-            })
-            : undefined;
+        const nextBefore = window.records[0]?.event.event_seq;
+        const eos = window.records.length === 0 || nextBefore === 1;
         try {
-            const frames = this.fragmentWindow(request, cursor, window.records, nextCursor);
-            if (nextCursor)
-                this.cursors.set(nextCursor, this.cursors.get(nextCursor));
-            return frames;
+            return this.fragmentWindow(request, snapshot, window.records, eos ? undefined : nextBefore);
         }
         catch (error) {
-            if (nextCursor)
-                this.cursors.delete(nextCursor);
             const message = error instanceof Error ? error.message : "history chunk construction failed";
             return [this.protocolError(request, "too_large", message)];
         }
     }
-    snapshotInvalidReason(cursor) {
-        if (this.sessionManager.getSessionId() !== cursor.sessionId)
+    validateRequest(request) {
+        if (request.before !== null && (!Number.isSafeInteger(request.before) || request.before < 1)) {
+            return this.protocolError(request, "invalid_cursor", "history boundary must be a positive safe integer or null");
+        }
+        if (request.limit !== undefined && (!Number.isInteger(request.limit) || request.limit < 1 || request.limit > 80)) {
+            return this.protocolError(request, "invalid_cursor", "history limit must be an integer from 1 through 80");
+        }
+        return null;
+    }
+    captureSnapshot() {
+        const sessionId = this.sessionManager.getSessionId();
+        const branch = this.sessionManager.getBranch();
+        const snapshotHead = this.sessionManager.getLeafId() ?? sessionId;
+        if (branch.length > 0 && branch.at(-1)?.id !== snapshotHead)
+            return null;
+        return {
+            sessionId,
+            historyGeneration: this.generationProvider(this.sessionManager),
+            snapshotHead,
+            branchEntryIds: branch.map((entry) => entry.id),
+        };
+    }
+    snapshotInvalidReason(snapshot) {
+        if (this.sessionManager.getSessionId() !== snapshot.sessionId)
             return "session_replaced";
-        if (this.generationProvider(this.sessionManager) !== cursor.historyGeneration)
+        if (this.generationProvider(this.sessionManager) !== snapshot.historyGeneration)
             return "generation_changed";
-        const currentBranch = this.sessionManager.getBranch();
-        const snapshotIndex = currentBranch.findIndex((entry) => entry.id === cursor.snapshotHead);
-        if (snapshotIndex < 0 && !(cursor.branchEntryIds.length === 0 && cursor.snapshotHead === cursor.sessionId && currentBranch.length === 0))
-            return "branch_changed";
-        const currentPrefix = currentBranch.slice(0, cursor.branchEntryIds.length).map((entry) => entry.id);
-        if (!sameIds(currentPrefix, cursor.branchEntryIds))
+        const currentIds = this.sessionManager.getBranch().map((entry) => entry.id);
+        if (!sameIds(currentIds, snapshot.branchEntryIds))
             return "branch_changed";
-        const frozenBranch = this.sessionManager.getBranch(cursor.snapshotHead).map((entry) => entry.id);
-        if (!sameIds(frozenBranch, cursor.branchEntryIds))
-            return "branch_changed";
-        return null;
+        if (snapshot.branchEntryIds.length === 0 && snapshot.snapshotHead === snapshot.sessionId)
+            return null;
+        const frozenIds = this.sessionManager.getBranch(snapshot.snapshotHead).map((entry) => entry.id);
+        return sameIds(frozenIds, snapshot.branchEntryIds) ? null : "branch_changed";
     }
-    recoverRecords(cursor) {
-        if (cursor.branchEntryIds.length === 0 && cursor.snapshotHead === cursor.sessionId)
-            return [];
-        const branch = this.sessionManager.getBranch(cursor.snapshotHead);
-        const positions = new Map();
-        for (const [position, entry] of branch.entries()) {
-            positions.set(entry.id, position);
-            if (entry.type === "message")
-                positions.set(`legacy:${entry.id}`, position);
-            if (entry.type === "custom" && entry.customType === TIMELINE_MARKER) {
-                const eventId = markerEventId(entry);
-                if (eventId)
-                    positions.set(eventId, position);
-            }
-        }
+    recoverRecords(snapshot) {
         const records = [];
-        const recovered = this.recoverFn(this.sessionManager);
-        for (const [order, rawEvent] of recovered.entries()) {
+        const eventIds = new Set();
+        const sequences = new Set();
+        for (const rawEvent of this.recoverFn(this.sessionManager)) {
             const parsed = TimelineEventSchema.safeParse(rawEvent);
-            if (!parsed.success)
-                throw new Error("recovery returned an invalid timeline event");
+            if (!parsed.success || parsed.data.event_seq === undefined)
+                throw new Error("recovery returned an unsequenced timeline event");
             const event = parsed.data;
-            const position = positions.get(event.event_id);
-            if (position === undefined || position >= cursor.position)
-                continue;
-            records.push({ event, position, order, bytes: getUtf8ByteLengthV2(event) });
-        }
-        return records.sort((left, right) => left.position - right.position || left.order - right.order);
-    }
-    selectWindow(records, position, limit = MAX_GROUPS_PER_PAGE) {
-        const groupLimit = normalizeLimit(limit);
-        const groups = new Map();
-        const systems = [];
-        for (const record of records) {
-            if (isSystemEvent(record.event)) {
-                systems.push(record);
-                continue;
-            }
-            const groupId = record.event.group_id;
-            const existing = groups.get(groupId);
-            if (existing) {
-                existing.records.push(record);
-                existing.bytes += record.bytes;
-            }
-            else {
-                groups.set(groupId, {
-                    groupId,
-                    firstPosition: record.position,
-                    records: [record],
-                    bytes: record.bytes,
-                });
-            }
-        }
-        const orderedGroups = [...groups.values()]
-            .filter((group) => group.firstPosition < position)
-            .sort((left, right) => left.firstPosition - right.firstPosition);
-        let selected = orderedGroups.slice(-groupLimit);
-        if (selected.length > 0) {
-            while (selected.length > 0) {
-                const firstPosition = selected[0].firstPosition;
-                const selectedSystems = systems.filter((record) => record.position >= firstPosition && record.position < position);
-                const selectedRecords = [...selected.flatMap((group) => group.records), ...selectedSystems]
-                    .sort((left, right) => left.position - right.position || left.order - right.order);
-                const bytes = selectedRecords.reduce((total, record) => total + record.bytes, 0);
-                if (bytes <= MAX_WINDOW_DECODE_BYTES) {
-                    return { kind: "ok", records: selectedRecords, nextPosition: firstPosition };
-                }
-                if (selected.length === 1) {
-                    return { kind: "error", message: `group ${selected[0].groupId} exceeds ${MAX_WINDOW_DECODE_BYTES} bytes` };
-                }
-                selected = selected.slice(1);
-            }
-        }
-        const selectedSystems = systems.filter((record) => record.position < position);
-        if (selectedSystems.length === 0) {
-            return { kind: "ok", records: [], nextPosition: 0 };
-        }
-        const systemBytes = selectedSystems.reduce((total, record) => total + record.bytes, 0);
-        if (systemBytes > MAX_WINDOW_DECODE_BYTES) {
-            return { kind: "error", message: `system history exceeds ${MAX_WINDOW_DECODE_BYTES} bytes` };
-        }
-        const nextPosition = Math.min(...selectedSystems.map((record) => record.position));
-        return {
-            kind: "ok",
-            records: [...selectedSystems].sort((left, right) => left.position - right.position || left.order - right.order),
-            nextPosition,
-        };
-    }
-    fragmentWindow(request, cursor, records, nextBefore) {
-        const tailOverhead = this.finalFrameBytes(request, cursor, { events: [], fragments: [] }, nextBefore)
-            - this.nonFinalFrameBytes(request, cursor, { events: [], fragments: [] });
-        const contentLimit = MAX_HISTORY_CHUNK_BYTES - tailOverhead;
+            if (event.session_id !== snapshot.sessionId || event.history_generation !== snapshot.historyGeneration) {
+                throw new Error("recovery returned an event outside the snapshot scope");
+            }
+            if (eventIds.has(event.event_id) || sequences.has(event.event_seq)) {
+                throw new Error("recovery returned duplicate timeline identity");
+            }
+            eventIds.add(event.event_id);
+            sequences.add(event.event_seq);
+            records.push({ event, bytes: getUtf8ByteLengthV2(event) });
+        }
+        records.sort((left, right) => left.event.event_seq - right.event.event_seq);
+        if (records.some((record, index) => record.event.event_seq !== index + 1)) {
+            throw new Error("recovery returned a non-dense timeline sequence");
+        }
+        return records;
+    }
+    selectWindow(records, before, limit) {
+        const lower = Math.max(1, before - limit);
+        const requested = records.filter((record) => record.event.event_seq >= lower && record.event.event_seq < before);
+        const selected = [];
+        let bytes = 0;
+        for (let index = requested.length - 1; index >= 0; index -= 1) {
+            const record = requested[index];
+            if (record.bytes > MAX_WINDOW_DECODE_BYTES) {
+                return { kind: "error", message: `event ${record.event.event_id} exceeds ${MAX_WINDOW_DECODE_BYTES} bytes` };
+            }
+            if (bytes + record.bytes > MAX_WINDOW_DECODE_BYTES)
+                break;
+            selected.unshift(record);
+            bytes += record.bytes;
+        }
+        return { kind: "ok", records: selected };
+    }
+    fragmentWindow(request, snapshot, records, nextBefore) {
+        const tailOverhead = this.finalFrameBytes(request, snapshot, { events: [], fragments: [] }, nextBefore)
+            - this.nonFinalFrameBytes(request, snapshot, { events: [], fragments: [] });
         const items = [];
         for (const record of records) {
-            const fullFrame = this.makeChunk(request, cursor, { events: [record.event], fragments: [] }, true, nextBefore);
+            const fullFrame = this.makeChunk(request, snapshot, { events: [record.event], fragments: [] }, true, nextBefore);
             if (getUtf8ByteLengthV2(fullFrame) <= MAX_HISTORY_CHUNK_BYTES) {
                 items.push({ kind: "event", event: record.event });
                 continue;
@@ -262,7 +152,7 @@ export class TimelineHistoryPager {
         for (const item of items) {
             const repeatedFragment = item.kind === "fragment" && current.fragments.some((fragment) => fragment.event_id === item.eventId);
             const candidate = appendItem(current, item);
-            if (!repeatedFragment && this.nonFinalFrameBytes(request, cursor, candidate) + tailOverhead <= contentLimit + tailOverhead) {
+            if (!repeatedFragment && this.nonFinalFrameBytes(request, snapshot, candidate) + tailOverhead <= MAX_HISTORY_CHUNK_BYTES) {
                 current = candidate;
                 continue;
             }
@@ -276,44 +166,38 @@ export class TimelineHistoryPager {
             payloads.push(current);
         return payloads.map((payload, chunkIndex) => {
             const final = chunkIndex === payloads.length - 1;
-            const frame = this.makeChunk(request, cursor, payload, final, nextBefore, chunkIndex);
-            if (getUtf8ByteLengthV2(frame) > MAX_HISTORY_CHUNK_BYTES) {
+            const frame = this.makeChunk(request, snapshot, payload, final, nextBefore, chunkIndex);
+            if (getUtf8ByteLengthV2(frame) > MAX_HISTORY_CHUNK_BYTES)
                 throw new HistoryTooLargeError("history chunk exceeds 512 KiB");
-            }
             encodeServerFrameV2(frame);
             return frame;
         });
     }
-    makeChunk(request, cursor, payload, final, nextBefore, chunkIndex = 0) {
+    makeChunk(request, snapshot, payload, final, nextBefore, chunkIndex = 0) {
         const tail = final
-            ? nextBefore
-                ? { final_chunk: true, eos: false, next_before: nextBefore }
-                : { final_chunk: true, eos: true }
+            ? nextBefore === undefined
+                ? { final_chunk: true, eos: true }
+                : { final_chunk: true, eos: false, next_before: nextBefore }
             : { final_chunk: false };
         return {
             protocol_version: 2,
             type: "session_history_chunk",
             target_channel_id: request.targetChannelId,
             in_reply_to: request.requestId,
-            session_id: cursor.sessionId,
-            history_generation: cursor.historyGeneration,
-            snapshot_head: cursor.snapshotHead,
+            session_id: snapshot.sessionId,
+            history_generation: snapshot.historyGeneration,
+            snapshot_head: snapshot.snapshotHead,
             chunk_index: chunkIndex,
             events: payload.events,
             fragments: payload.fragments,
             ...tail,
         };
     }
-    nonFinalFrameBytes(request, cursor, payload) {
-        return getUtf8ByteLengthV2(this.makeChunk(request, cursor, payload, false, undefined));
-    }
-    finalFrameBytes(request, cursor, payload, nextBefore) {
-        return getUtf8ByteLengthV2(this.makeChunk(request, cursor, payload, true, nextBefore));
+    nonFinalFrameBytes(request, snapshot, payload) {
+        return getUtf8ByteLengthV2(this.makeChunk(request, snapshot, payload, false, undefined));
     }
-    issueCursor(state) {
-        const token = randomBytes(32).toString("base64url");
-        this.cursors.set(token, state);
-        return token;
+    finalFrameBytes(request, snapshot, payload, nextBefore) {
+        return getUtf8ByteLengthV2(this.makeChunk(request, snapshot, payload, true, nextBefore));
     }
     protocolError(request, code, message) {
         return {
@@ -325,13 +209,13 @@ export class TimelineHistoryPager {
             message,
         };
     }
-    reset(request, sessionId, historyGeneration, reason) {
+    reset(request, snapshot, reason) {
         return {
             protocol_version: 2,
             type: "reset",
             target_channel_id: request.targetChannelId,
-            session_id: sessionId,
-            history_generation: historyGeneration,
+            session_id: this.sessionManager.getSessionId(),
+            history_generation: this.generationProvider(this.sessionManager),
             reason,
         };
     }
@@ -345,37 +229,17 @@ class HistoryTooLargeError extends Error {
 function sameIds(left, right) {
     return left.length === right.length && left.every((id, index) => id === right[index]);
 }
-function normalizeLimit(limit) {
-    if (limit === undefined || !Number.isFinite(limit))
-        return MAX_GROUPS_PER_PAGE;
-    return Math.min(MAX_GROUPS_PER_PAGE, Math.max(1, Math.floor(limit)));
-}
-function markerEventId(entry) {
-    if (entry.type !== "custom" || entry.customType !== TIMELINE_MARKER || !entry.data)
-        return undefined;
-    if (typeof entry.data !== "object" || Array.isArray(entry.data))
-        return undefined;
-    const eventId = entry.data.event_id;
-    return typeof eventId === "string" ? eventId : undefined;
-}
-function isSystemEvent(event) {
-    return event.kind === "compaction" || event.kind === "branch_summary" || event.kind === "custom";
-}
 function appendItem(payload, item) {
-    if (item.kind === "event") {
+    if (item.kind === "event")
         return { events: [...payload.events, item.event], fragments: [...payload.fragments] };
-    }
     return {
         events: [...payload.events],
-        fragments: [
-            ...payload.fragments,
-            {
+        fragments: [...payload.fragments, {
                 event_id: item.eventId,
                 index: item.index,
                 data_base64: item.dataBase64,
                 final: item.final,
-            },
-        ],
+            }],
     };
 }
 //# sourceMappingURL=history.js.map