Skip to content

The agent that grows with you

refactor(desktop): one shape for the resume-barrier re-read

Tekniumde24ff0bcb32
diff --git a/apps/desktop/src/app/session/hooks/use-session-actions/index.ts b/apps/desktop/src/app/session/hooks/use-session-actions/index.ts
index 84a9716b76f..b4a268c1765 100644
--- a/apps/desktop/src/app/session/hooks/use-session-actions/index.ts
+++ b/apps/desktop/src/app/session/hooks/use-session-actions/index.ts
@@ -171,7 +171,7 @@ import {
type GraftedTranscriptPage,
graftTranscriptPage,
prefetchServesResume,
- settlePrefetchAtResumeBarrier
+ rereadPageAfterResumeBarrier
} from './resume-barrier-reread'
import { clearResumeLatches, clearResumeToasts, notifyResumeFailed, type ResumeAttemptOptions } from './resume-latches'
import {
@@ -2072,12 +2072,11 @@ export function useSessionActions({
const resumed = await resumePromise
- ;({ localSnapshot, prefetchedResult, prefetchedTranscriptMessages } = await settlePrefetchAtResumeBarrier(
- resumed,
- { localSnapshot, prefetchedPage, prefetchedResult, prefetchedTranscriptMessages },
- storedSessionId,
- sessionRestScope
- ))
+ const reread = await rereadPageAfterResumeBarrier(resumed, prefetchedPage, storedSessionId, sessionRestScope)
+
+ if (reread) {
+ ;({ page: prefetchedResult, snapshot: localSnapshot, transcript: prefetchedTranscriptMessages } = reread)
+ }
if (!isCurrentResume()) {
return
diff --git a/apps/desktop/src/app/session/hooks/use-session-actions/resume-barrier-reread.ts b/apps/desktop/src/app/session/hooks/use-session-actions/resume-barrier-reread.ts
index ca2fc145181..1a60d2eae1f 100644
--- a/apps/desktop/src/app/session/hooks/use-session-actions/resume-barrier-reread.ts
+++ b/apps/desktop/src/app/session/hooks/use-session-actions/resume-barrier-reread.ts
@@ -47,7 +47,7 @@ export async function graftTranscriptPage(
* once it returns), so a snapshot whose tail is still a local row is read once
* more.
*/
-async function rereadPageAfterResumeBarrier(
+export async function rereadPageAfterResumeBarrier(
resumed: Pick<SessionResumeResult, 'inflight' | 'messages' | 'queued'> & { running?: boolean },
early: GraftedTranscriptPage | null,
storedSessionId: string,
@@ -72,32 +72,6 @@ async function rereadPageAfterResumeBarrier(
return graftTranscriptPage(page, early.snapshot, storedSessionId, scope)
}
-export interface ColdPrefetchState {
- localSnapshot: ChatMessage[]
- prefetchedPage: GraftedTranscriptPage | null
- prefetchedResult: SessionMessagesResponse | null
- prefetchedTranscriptMessages: ChatMessage[] | null
-}
-
-/** The cold resume's prefetch state once the resume answered: re-read past the barrier when it raced the commit. */
-export async function settlePrefetchAtResumeBarrier(
- resumed: Pick<SessionResumeResult, 'inflight' | 'messages' | 'queued'> & { running?: boolean },
- state: ColdPrefetchState,
- storedSessionId: string,
- scope: ProfileScope
-): Promise<ColdPrefetchState> {
- const reread = await rereadPageAfterResumeBarrier(resumed, state.prefetchedPage, storedSessionId, scope)
-
- return reread
- ? {
- localSnapshot: reread.snapshot,
- prefetchedPage: reread,
- prefetchedResult: reread.page,
- prefetchedTranscriptMessages: reread.transcript
- }
- : state
-}
-
const durableRowId = ({ id, row_id }: SessionMessage): number | undefined => {
const value = row_id ?? id