@cloudcli-ai/cloudcli 1.37.2 → 1.37.3

package/dist-server/server/modules/providers/services/session-history-cache.service.js

@@ -0,0 +1,87 @@
+import fsp from 'node:fs/promises';
+/**
+ * A transcript entry's heap cost is roughly the file it was parsed from, so
+ * the budget is expressed in file bytes. The newest entry is always retained
+ * even when it alone exceeds the budget — evicting it would just re-parse the
+ * same file on the next request.
+ */
+const MAX_CACHED_TRANSCRIPT_FILE_BYTES = 256 * 1024 * 1024;
+const MAX_CACHE_ENTRIES = 8;
+export function createSessionHistoryCache(maxTotalFileBytes = MAX_CACHED_TRANSCRIPT_FILE_BYTES, maxEntries = MAX_CACHE_ENTRIES) {
+    const entries = new Map();
+    const pendingLoads = new Map();
+    function evictOverBudget() {
+        let totalBytes = 0;
+        for (const entry of entries.values()) {
+            totalBytes += entry.size;
+        }
+        for (const key of entries.keys()) {
+            if (entries.size <= 1 || (totalBytes <= maxTotalFileBytes && entries.size <= maxEntries)) {
+                break;
+            }
+            totalBytes -= entries.get(key).size;
+            entries.delete(key);
+        }
+    }
+    return {
+        /**
+         * Returns the session's full transcript through the cache, or null when
+         * the session is not cacheable (no transcript path, or the file cannot be
+         * stat'ed) — the caller then falls back to a plain provider read.
+         */
+        async getFullHistory({ sessionId, transcriptPath, loadFull }) {
+            if (!transcriptPath) {
+                return null;
+            }
+            let stat;
+            try {
+                stat = await fsp.stat(transcriptPath);
+            }
+            catch {
+                entries.delete(sessionId);
+                return null;
+            }
+            if (!stat.isFile()) {
+                entries.delete(sessionId);
+                return null;
+            }
+            const cached = entries.get(sessionId);
+            if (cached
+                && cached.transcriptPath === transcriptPath
+                && cached.mtimeMs === stat.mtimeMs
+                && cached.size === stat.size) {
+                // Re-insert to mark as most recently used.
+                entries.delete(sessionId);
+                entries.set(sessionId, cached);
+                return cached.full;
+            }
+            // Concurrent requests for the same session share one parse. The file may
+            // gain rows while the load runs; the pre-load stat is what the entry is
+            // keyed by, so the next request would see a changed stat and re-read.
+            const pending = pendingLoads.get(sessionId);
+            if (pending) {
+                return pending;
+            }
+            const load = loadFull().then((full) => {
+                entries.delete(sessionId);
+                entries.set(sessionId, {
+                    transcriptPath,
+                    mtimeMs: stat.mtimeMs,
+                    size: stat.size,
+                    full,
+                });
+                evictOverBudget();
+                return full;
+            });
+            pendingLoads.set(sessionId, load);
+            try {
+                return await load;
+            }
+            finally {
+                pendingLoads.delete(sessionId);
+            }
+        },
+    };
+}
+export const sessionHistoryCache = createSessionHistoryCache();
+//# sourceMappingURL=session-history-cache.service.js.map

package/dist-server/server/modules/providers/services/session-history-cache.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-history-cache.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/session-history-cache.service.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/providers/services/session-synchronizer.service.js

@@ -1,44 +1,117 @@
-import { scanStateDb } from '../../../modules/database/index.js';
+import path from 'node:path';
+import { access } from 'node:fs/promises';
+import { scanStateDb, sessionsDb } from '../../../modules/database/index.js';
 import { providerRegistry } from '../../../modules/providers/provider.registry.js';
+const pathExists = async (target) => {
+    try {
+        await access(target);
+        return true;
+    }
+    catch {
+        return false;
+    }
+};
+/**
+ * Removes indexed sessions whose transcript file has disappeared from disk.
+ *
+ * Nothing else deletes these rows: the synchronizers only ever upsert, and the
+ * watcher reacts to `add`/`change` but not `unlink`. A transcript removed by
+ * hand — or written by a test run that pointed at the real `~/.claude` — left a
+ * permanent sidebar entry that opened an empty "Untitled" session.
+ *
+ * A row is only dropped when its *containing directory* still exists. That
+ * keeps an unmounted or not-yet-created home from being read as "every
+ * transcript was deleted" and wiping the whole index.
+ */
+const pruneOrphanedSessions = async () => {
+    const knownDirectoryExists = new Map();
+    let pruned = 0;
+    for (const { session_id: sessionId, jsonl_path: jsonlPath } of sessionsDb.getSessionsWithTranscriptPath()) {
+        if (await pathExists(jsonlPath)) {
+            continue;
+        }
+        const directory = path.dirname(jsonlPath);
+        let directoryExists = knownDirectoryExists.get(directory);
+        if (directoryExists === undefined) {
+            directoryExists = await pathExists(directory);
+            knownDirectoryExists.set(directory, directoryExists);
+        }
+        if (!directoryExists) {
+            continue;
+        }
+        if (sessionsDb.deleteSessionById(sessionId)) {
+            pruned += 1;
+        }
+    }
+    return pruned;
+};
+/**
+ * The scan that every `synchronizeSessions()` caller shares while it runs.
+ *
+ * Opening the UI fires `/api/projects` and `/api/projects/archived` at once,
+ * and each used to start its own full provider scan from the same
+ * `last_scanned_at` cursor: identical work over identical transcripts,
+ * contending for the same synchronous SQLite writes and doubling how long the
+ * sidebar sits on its loading screen. Callers that arrive while a scan is
+ * already running now await that scan instead of starting another.
+ */
+let inFlightSynchronization = null;
+/**
+ * Runs all provider synchronizers and updates scan_state.last_scanned_at.
+ */
+async function runSessionSynchronization() {
+    const lastScanAt = scanStateDb.getLastScannedAt();
+    const scanBoundary = new Date();
+    const processedByProvider = {
+        claude: 0,
+        codex: 0,
+        cursor: 0,
+        opencode: 0,
+    };
+    const failures = [];
+    const results = await Promise.allSettled(providerRegistry.listProviders().map(async (provider) => ({
+        provider: provider.id,
+        processed: await provider.sessionSynchronizer.synchronize(lastScanAt ?? undefined),
+    })));
+    for (const result of results) {
+        if (result.status === 'fulfilled') {
+            processedByProvider[result.value.provider] = result.value.processed;
+            continue;
+        }
+        const reason = result.reason instanceof Error ? result.reason.message : String(result.reason);
+        failures.push(reason);
+    }
+    // Pruning is skipped after a partial sync: a provider that just failed may
+    // not have re-indexed transcripts it would otherwise have re-created.
+    const prunedOrphans = failures.length === 0 ? await pruneOrphanedSessions() : 0;
+    if (failures.length === 0) {
+        scanStateDb.updateLastScannedAt(scanBoundary);
+    }
+    else {
+        console.warn(`[Sessions] Skipping scan_state cursor advance because ${failures.length} provider sync(s) failed.`);
+    }
+    return {
+        processedByProvider,
+        prunedOrphans,
+        failures,
+    };
+}
 /**
  * Orchestrates provider-specific session indexers and indexed-session lifecycle operations.
  */
 export const sessionSynchronizerService = {
     /**
-     * Runs all provider synchronizers and updates scan_state.last_scanned_at.
+     * Scans every provider for new or changed sessions, coalescing concurrent
+     * callers onto a single scan.
      */
     async synchronizeSessions() {
-        const lastScanAt = scanStateDb.getLastScannedAt();
-        const scanBoundary = new Date();
-        const processedByProvider = {
-            claude: 0,
-            codex: 0,
-            cursor: 0,
-            opencode: 0,
-        };
-        const failures = [];
-        const results = await Promise.allSettled(providerRegistry.listProviders().map(async (provider) => ({
-            provider: provider.id,
-            processed: await provider.sessionSynchronizer.synchronize(lastScanAt ?? undefined),
-        })));
-        for (const result of results) {
-            if (result.status === 'fulfilled') {
-                processedByProvider[result.value.provider] = result.value.processed;
-                continue;
-            }
-            const reason = result.reason instanceof Error ? result.reason.message : String(result.reason);
-            failures.push(reason);
+        if (inFlightSynchronization) {
+            return inFlightSynchronization;
         }
-        if (failures.length === 0) {
-            scanStateDb.updateLastScannedAt(scanBoundary);
-        }
-        else {
-            console.warn(`[Sessions] Skipping scan_state cursor advance because ${failures.length} provider sync(s) failed.`);
-        }
-        return {
-            processedByProvider,
-            failures,
-        };
+        inFlightSynchronization = runSessionSynchronization().finally(() => {
+            inFlightSynchronization = null;
+        });
+        return inFlightSynchronization;
     },
     /**
      * Indexes one provider artifact file without running a full provider rescan.

package/dist-server/server/modules/providers/services/session-synchronizer.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-synchronizer.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/session-synchronizer.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAQ5E;;GAEG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC;;OAEG;IACH,KAAK,CAAC,mBAAmB;QACvB,MAAM,UAAU,GAAG,WAAW,CAAC,gBAAgB,EAAE,CAAC;QAClD,MAAM,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;QAChC,MAAM,mBAAmB,GAAgC;YACvD,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;YACT,QAAQ,EAAE,CAAC;SACZ,CAAC;QACF,MAAM,QAAQ,GAAa,EAAE,CAAC;QAE9B,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACtC,gBAAgB,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;YACxD,QAAQ,EAAE,QAAQ,CAAC,EAAE;YACrB,SAAS,EAAE,MAAM,QAAQ,CAAC,mBAAmB,CAAC,WAAW,CAAC,UAAU,IAAI,SAAS,CAAC;SACnF,CAAC,CAAC,CACJ,CAAC;QAEF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBAClC,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;gBACpE,SAAS;YACX,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC9F,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,WAAW,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CACV,yDAAyD,QAAQ,CAAC,MAAM,2BAA2B,CACpG,CAAC;QACJ,CAAC;QAED,OAAO;YACL,mBAAmB;YACnB,QAAQ;SACT,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,uBAAuB,CAC3B,QAAqB,EACrB,QAAgB;QAEhB,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QACpE,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,mBAAmB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QACvF,OAAO;YACL,QAAQ;YACR,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC;YAC3B,SAAS;SACV,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"session-synchronizer.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/session-synchronizer.service.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/providers/services/sessions-watcher.service.js

@@ -2,10 +2,8 @@ import os from 'node:os';
 import path from 'node:path';
 import { promises as fsPromises } from 'node:fs';
 import chokidar from 'chokidar';
-import { projectsDb, sessionsDb } from '../../../modules/database/index.js';
 import { sessionSynchronizerService } from '../../../modules/providers/services/session-synchronizer.service.js';
-import { WS_OPEN_STATE, connectedClients } from '../../../modules/websocket/index.js';
-import { generateDisplayName } from '../../../modules/projects/index.js';
+import { broadcastSessionUpsertedBatch } from '../../../modules/websocket/index.js';
 const PROVIDER_WATCH_PATHS = [
     {
         provider: 'claude',
@@ -89,47 +87,6 @@ function queuePendingWatcherUpdate(eventType, provider, updatedSessionId) {
     }
     schedulePendingWatcherFlush();
 }
-/**
- * Builds one `session_upserted` delta event for a provider-native session id.
- *
- * The event carries everything a sidebar needs to upsert the session in place
- * (session summary plus owning-project metadata), so clients never need a full
- * project-list refetch when a transcript file changes on disk. Returns `null`
- * when the id cannot be resolved to an indexed session row.
- */
-async function buildSessionUpsertedEvent(updatedProviderSessionId) {
-    const row = sessionsDb.getSessionByProviderSessionId(updatedProviderSessionId)
-        ?? sessionsDb.getSessionById(updatedProviderSessionId);
-    if (!row || row.isArchived) {
-        return null;
-    }
-    const projectPath = row.project_path;
-    const project = projectPath ? projectsDb.getProjectPath(projectPath) : null;
-    const displayName = project?.custom_project_name?.trim()
-        ? project.custom_project_name
-        : await generateDisplayName(path.basename(projectPath ?? '') || (projectPath ?? ''), projectPath);
-    return JSON.stringify({
-        kind: 'session_upserted',
-        sessionId: row.session_id,
-        provider: row.provider,
-        session: {
-            id: row.session_id,
-            summary: row.custom_name || '',
-            messageCount: 0,
-            lastActivity: row.updated_at ?? row.created_at ?? new Date().toISOString(),
-        },
-        project: project
-            ? {
-                projectId: project.project_id,
-                path: project.project_path,
-                fullPath: project.project_path,
-                displayName,
-                isStarred: Boolean(project.isStarred),
-            }
-            : null,
-        timestamp: new Date().toISOString(),
-    });
-}
 async function flushPendingWatcherUpdate() {
     clearPendingWatcherFlushTimer();
     if (!pendingWatcherUpdate) {
@@ -147,22 +104,7 @@ async function flushPendingWatcherUpdate() {
         // Per-session deltas instead of full project snapshots: an upsert of one
         // session can never clobber unrelated client state, so the frontend needs
         // no "suppress updates while a run is active" protection logic.
-        const events = [];
-        for (const updatedSessionId of queuedUpdate.updatedSessionIds) {
-            const event = await buildSessionUpsertedEvent(updatedSessionId);
-            if (event) {
-                events.push(event);
-            }
-        }
-        if (events.length > 0) {
-            connectedClients.forEach(client => {
-                if (client.readyState === WS_OPEN_STATE) {
-                    for (const event of events) {
-                        client.send(event);
-                    }
-                }
-            });
-        }
+        await broadcastSessionUpsertedBatch(queuedUpdate.updatedSessionIds);
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -211,6 +153,7 @@ export async function initializeSessionsWatcher() {
     const initialSync = await sessionSynchronizerService.synchronizeSessions();
     console.log('Initial session synchronization complete', {
         processedByProvider: initialSync.processedByProvider,
+        prunedOrphans: initialSync.prunedOrphans,
         failures: initialSync.failures,
     });
     for (const { provider, rootPath } of PROVIDER_WATCH_PATHS) {

package/dist-server/server/modules/providers/services/sessions-watcher.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"sessions-watcher.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/sessions-watcher.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sessions-watcher.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/sessions-watcher.service.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/providers/services/sessions.service.js

@@ -2,9 +2,10 @@ import { randomUUID } from 'node:crypto';
 import fsp from 'node:fs/promises';
 import path from 'node:path';
 import { projectsDb, sessionsDb } from '../../../modules/database/index.js';
-import { chatRunRegistry } from '../../../modules/websocket/index.js';
+import { broadcastSessionUpserted, chatRunRegistry } from '../../../modules/websocket/index.js';
 import { providerRegistry } from '../../../modules/providers/provider.registry.js';
-import { AppError } from '../../../shared/utils.js';
+import { sessionHistoryCache } from '../../../modules/providers/services/session-history-cache.service.js';
+import { AppError, sliceTailPage } from '../../../shared/utils.js';
 const MAX_CLOUDCLI_SESSION_NAME_WORDS = 4;
 function buildCloudCliSessionName(initialMessage) {
     const words = initialMessage.trim().split(/\s+/).filter(Boolean);
@@ -145,6 +146,68 @@ export const sessionsService = {
             sessionName,
         };
     },
+    /**
+     * Branches a session into an independent one containing its conversation up
+     * to `upToAnchorId` (the whole thing when omitted).
+     *
+     * The source is left completely untouched — this is the "try two approaches"
+     * action, not a destructive one.
+     */
+    async forkSessionById(sessionId, options = {}) {
+        const source = sessionsDb.getSessionById(sessionId);
+        if (!source) {
+            throw new AppError(`Session "${sessionId}" was not found.`, {
+                code: 'SESSION_NOT_FOUND',
+                statusCode: 404,
+            });
+        }
+        const provider = source.provider;
+        const fork = providerRegistry.resolveProvider(provider).fork;
+        if (!fork) {
+            throw new AppError(`Sessions cannot be forked for provider "${provider}".`, {
+                code: 'FORK_NOT_SUPPORTED',
+                statusCode: 409,
+            });
+        }
+        // A session that has never run has no transcript to copy, so there is
+        // nothing a fork of it could resume from.
+        if (!source.provider_session_id || !source.jsonl_path) {
+            throw new AppError('This session has not produced a transcript yet.', {
+                code: 'FORK_SOURCE_NOT_READY',
+                statusCode: 409,
+            });
+        }
+        const sessionName = options.title?.trim()
+            || `${source.custom_name?.trim() || 'Session'} (fork)`;
+        const forked = await fork.forkSession({
+            providerSessionId: source.provider_session_id,
+            jsonlPath: source.jsonl_path,
+            projectPath: source.project_path ?? '',
+            upToAnchorId: options.upToAnchorId,
+            title: sessionName,
+        });
+        const forkSessionId = randomUUID();
+        sessionsDb.createForkedSession({
+            sessionId: forkSessionId,
+            provider,
+            projectPath: source.project_path ?? '',
+            customName: sessionName,
+            providerSessionId: forked.providerSessionId,
+            jsonlPath: forked.jsonlPath,
+            forkedFromSessionId: sessionId,
+            // A fork that silently dropped to the catalog default would answer
+            // differently from the conversation it was branched from.
+            model: source.model,
+            effort: source.effort,
+        });
+        await broadcastSessionUpserted(forkSessionId);
+        return {
+            sessionId: forkSessionId,
+            provider,
+            projectPath: source.project_path ?? '',
+            sessionName,
+        };
+    },
     /**
      * Resolves the provider-native id only for an explicit user copy action.
      * Normal session payloads continue to expose only the stable app id.
@@ -174,6 +237,63 @@ export const sessionsService = {
      * and every returned message is remapped back to the app session id so
      * provider ids never reach the frontend.
      */
+    /**
+     * Resolves where a conversation must resume from so that one already-sent
+     * message, and everything after it, is replaced.
+     *
+     * Returns `null` when the provider cannot do this at all, which is how the
+     * chat gateway knows to refuse the request rather than silently sending the
+     * edit as a new message at the end of the conversation.
+     */
+    async resolveEditAnchor(sessionId, anchorId) {
+        const session = sessionsDb.getSessionById(sessionId);
+        if (!session) {
+            throw new AppError(`Session "${sessionId}" was not found.`, {
+                code: 'SESSION_NOT_FOUND',
+                statusCode: 404,
+            });
+        }
+        const sessions = providerRegistry.resolveProvider(session.provider).sessions;
+        if (!sessions.resolveEditAnchor) {
+            return null;
+        }
+        return sessions.resolveEditAnchor(sessionId, anchorId);
+    },
+    /**
+     * Whether editing a message on this session's provider means rewinding it on
+     * disk first, rather than handing the anchor to the runtime as a resume
+     * option.
+     *
+     * Answering this without doing anything is the point: the rewind moves the
+     * session onto a different provider transcript and cannot be undone, so the
+     * gateway has to know which shape the run takes before it commits to one.
+     */
+    providerRewindsForEdit(sessionId) {
+        const session = sessionsDb.getSessionById(sessionId);
+        if (!session) {
+            throw new AppError(`Session "${sessionId}" was not found.`, {
+                code: 'SESSION_NOT_FOUND',
+                statusCode: 404,
+            });
+        }
+        return Boolean(providerRegistry.resolveProvider(session.provider).sessions.rewindSession);
+    },
+    /**
+     * Rewinds a session on disk so `keepThroughId` is the last row it holds.
+     *
+     * Only call this once the run is admitted — see `providerRewindsForEdit`.
+     */
+    async rewindSessionForEdit(sessionId, keepThroughId) {
+        const session = sessionsDb.getSessionById(sessionId);
+        if (!session) {
+            throw new AppError(`Session "${sessionId}" was not found.`, {
+                code: 'SESSION_NOT_FOUND',
+                statusCode: 404,
+            });
+        }
+        const sessions = providerRegistry.resolveProvider(session.provider).sessions;
+        await sessions.rewindSession?.(sessionId, keepThroughId);
+    },
     async fetchHistory(sessionId, options = {}) {
         const session = sessionsDb.getSessionById(sessionId);
         if (!session) {
@@ -194,12 +314,50 @@ export const sessionsService = {
             };
         }
         const provider = session.provider;
-        const result = await providerRegistry.resolveProvider(provider).sessions.fetchHistory(sessionId, {
-            limit: options.limit ?? null,
-            offset: options.offset ?? 0,
-            projectPath: session.project_path ?? '',
-            providerSessionId: session.provider_session_id,
+        const providerSessions = providerRegistry.resolveProvider(provider).sessions;
+        const providerSessionId = session.provider_session_id;
+        const projectPath = session.project_path ?? '';
+        const requestedLimit = options.limit ?? null;
+        const requestedOffset = options.offset ?? 0;
+        // Claude and Codex history readers parse `jsonl_path` itself, so a page
+        // can be sliced from the stat-validated full-transcript cache instead of
+        // re-parsing the whole file per request. Cursor and OpenCode read their
+        // messages from elsewhere (store.db / shared SQLite), so that file's stat
+        // says nothing about their history — they stay on the direct path.
+        const transcriptPath = provider === 'claude' || provider === 'codex'
+            ? session.jsonl_path
+            : null;
+        const fullHistory = await sessionHistoryCache.getFullHistory({
+            sessionId,
+            transcriptPath,
+            loadFull: () => providerSessions.fetchHistory(sessionId, {
+                limit: null,
+                offset: 0,
+                projectPath,
+                providerSessionId,
+            }),
         });
+        let result;
+        if (fullHistory) {
+            // Providers slice with this same helper, so a cached page is identical
+            // to what a direct `(limit, offset)` read would have returned.
+            const { page, hasMore } = sliceTailPage(fullHistory.messages, requestedLimit, Math.max(0, requestedOffset));
+            result = {
+                ...fullHistory,
+                messages: page,
+                hasMore,
+                offset: requestedOffset,
+                limit: requestedLimit,
+            };
+        }
+        else {
+            result = await providerSessions.fetchHistory(sessionId, {
+                limit: requestedLimit,
+                offset: requestedOffset,
+                projectPath,
+                providerSessionId,
+            });
+        }
         return {
             ...result,
             messages: result.messages.map((message) => ({
@@ -301,9 +459,21 @@ export const sessionsService = {
             };
         }
         let removedFromDisk = false;
-        if (options.deletedFromDisk && session.jsonl_path) {
-            removedFromDisk = await removeFileIfExists(session.jsonl_path);
+        if (options.deletedFromDisk) {
+            // Every file the conversation has lived in, not just the one the row
+            // points at now: editing a message on a provider that rewinds by
+            // branching moves the session onto a copy and leaves the earlier
+            // transcript behind. Deleting only the current one would leave the
+            // replaced turns on disk, and unreachable through the app.
+            const transcripts = [
+                ...(session.jsonl_path ? [session.jsonl_path] : []),
+                ...sessionsDb.getSupersededTranscriptPaths(sessionId),
+            ];
+            for (const transcript of transcripts) {
+                removedFromDisk = (await removeFileIfExists(transcript)) || removedFromDisk;
+            }
         }
+        sessionsDb.clearSupersededProviderSessions(sessionId);
         const deleted = sessionsDb.deleteSessionById(sessionId);
         if (!deleted) {
             throw new AppError(`Session "${sessionId}" was not found.`, {