Skip to content

Commit 89182b2

Browse files
committed
feat(es-app): tail-first transcript load (anomalyco#167)
Navigation snapshots request the newest 80 messages (limit + X-Next-Cursor) instead of the whole transcript; older history loads on demand via a 'Load earlier messages' control or scrolling to the top, preserving the viewport. Refresh snapshots keep already-loaded older messages; events for messages outside the loaded window are ignored while older pages remain. Measured on the 942-message main Session: paint 10 s -> 0.25 s, DOM 51k -> 5k.
1 parent 7f3672d commit 89182b2

8 files changed

Lines changed: 299 additions & 26 deletions

File tree

‎packages/es-app/src/api.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,15 @@ export const oc = {
9090
messagesTail: (id: string, directory: string, limit: number, signal?: AbortSignal): Promise<MessageWithParts[]> =>
9191
fetch(`/oc/session/${id}/message?${q(directory)}&summaryPatches=false&limit=${limit}`, { signal }).then(json<MessageWithParts[]>),
9292

93+
messagesPage: async (id: string, directory: string, limit: number, before?: string, signal?: AbortSignal) => {
94+
const res = await fetch(
95+
`/oc/session/${id}/message?${q(directory)}&summaryPatches=false&limit=${limit}${before ? `&before=${encodeURIComponent(before)}` : ""}`,
96+
{ signal },
97+
)
98+
const items = await json<MessageWithParts[]>(res)
99+
return { items, cursor: res.headers.get("X-Next-Cursor") ?? undefined }
100+
},
101+
93102
status: (directory: string, signal?: AbortSignal): Promise<Record<string, { type: string }>> =>
94103
fetch(`/oc/session/status?${q(directory)}`, { signal }).then(json<Record<string, { type: string }>>),
95104

‎packages/es-app/src/index.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,8 +1053,16 @@ td { padding: 4px 10px 4px 0; border-bottom: 1px solid var(--surface0); }
10531053
.session-page .transcript {
10541054
flex: 1;
10551055
overflow-y: auto;
1056+
overflow-anchor: none;
10561057
padding: 16px 4px 16px 0;
10571058
}
1059+
.transcript-older {
1060+
display: block;
1061+
margin: 0 auto 12px;
1062+
padding: 4px 10px;
1063+
font-size: 12px;
1064+
color: var(--subtext1);
1065+
}
10581066
[data-component="dialog-overlay"]:has(+ [data-dialog-layer] .subagent-transcript-dialog) {
10591067
background: color-mix(in srgb, var(--crust) 65%, transparent);
10601068
}

‎packages/es-app/src/live-session.test.ts‎

Lines changed: 78 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { afterEach, beforeEach, expect, spyOn, test, type Mock } from "bun:test"
22
import { createComputed, createRoot } from "solid-js"
3-
import { createLiveSession } from "./live-session"
3+
import { createLiveSession, TAIL } from "./live-session"
44

55
const failure = "Cannot connect to API: Unable to connect. Is the computer able to access the url?"
66
const modelError = { name: "UnknownError", data: { message: failure } }
@@ -46,7 +46,15 @@ let statuses: Record<string, unknown>
4646

4747
const response = (input: string | URL | Request) => {
4848
const path = String(input).split("?")[0]
49-
if (path === "/oc/session/ses_current/message") return Response.json(snapshot)
49+
if (path === "/oc/session/ses_current/message") {
50+
const query = new URL(String(input), "http://fixture").searchParams
51+
const before = query.get("before")
52+
const eligible = before ? snapshot.filter((message) => (message.info as { id: string }).id < before) : snapshot
53+
const items = query.has("limit") ? eligible.slice(-Number(query.get("limit"))) : eligible
54+
return Response.json(items, {
55+
headers: eligible.length > items.length ? { "X-Next-Cursor": (items[0]?.info as { id: string }).id } : {},
56+
})
57+
}
5058
if (path === "/oc/session/status") return Response.json(statuses)
5159
if (path === "/oc/session/ses_current") return Response.json({ id: "ses_current", title: "Test" })
5260
throw new Error(`Unexpected fetch: ${path}`)
@@ -85,6 +93,74 @@ test("model connection failure stops thinking without waiting for an idle event"
8593
expect(live.connectionError()).toBe("")
8694
})
8795

96+
test("initial snapshot requests 80 messages and retains the older-page cursor", async () => {
97+
snapshot = Array.from({ length: 162 }, (_, index) => ({ info: user(`msg_${String(index).padStart(3, "0")}`), parts: [] }))
98+
const live = start()
99+
await live.load()
100+
expect(TAIL).toBe(80)
101+
expect(fetchSpy.mock.calls.filter(([input]) => String(input).includes("/message?"))).toHaveLength(1)
102+
expect(new URL(String(fetchSpy.mock.calls.find(([input]) => String(input).includes("/message?"))![0]), "http://fixture").searchParams.get("limit")).toBe("80")
103+
expect(live.data.message.ses_current?.[0]?.id).toBe("msg_082")
104+
expect(live.hasOlder()).toBe(true)
105+
})
106+
107+
test("older pages prepend in order without duplicates and stop at the first message", async () => {
108+
snapshot = Array.from({ length: 162 }, (_, index) => ({ info: user(`msg_${String(index).padStart(3, "0")}`), parts: [] }))
109+
const live = start()
110+
await live.load()
111+
SessionEvents.current.send("message.updated", { info: user("msg_090") })
112+
await live.older()
113+
expect(live.data.message.ses_current).toHaveLength(160)
114+
expect(live.data.message.ses_current?.[0]?.id).toBe("msg_002")
115+
expect(live.hasOlder()).toBe(true)
116+
await live.older()
117+
expect(live.data.message.ses_current?.map((message) => message.id)).toEqual(
118+
snapshot.map((message) => (message.info as { id: string }).id),
119+
)
120+
expect(live.hasOlder()).toBe(false)
121+
expect(live.loadingOlder()).toBe(false)
122+
expect(fetchSpy.mock.calls.filter(([input]) => String(input).includes("/message?"))).toHaveLength(3)
123+
})
124+
125+
test("older SSE updates do not open gaps until older history is loaded", async () => {
126+
snapshot = Array.from({ length: 81 }, (_, index) => ({ info: user(`msg_${String(index).padStart(3, "0")}`), parts: [] }))
127+
const live = start()
128+
await live.load()
129+
SessionEvents.current.send("message.updated", { info: user("msg_000") })
130+
expect(live.data.message.ses_current?.[0]?.id).toBe("msg_001")
131+
await live.older()
132+
expect(live.hasOlder()).toBe(false)
133+
SessionEvents.current.send("message.updated", { info: user("msg_000") })
134+
expect(live.data.message.ses_current?.[0]?.id).toBe("msg_000")
135+
})
136+
137+
test("refresh retains older pages and their cursor while updating the new tail", async () => {
138+
snapshot = Array.from({ length: 162 }, (_, index) => ({ info: user(`msg_${String(index).padStart(3, "0")}`), parts: [] }))
139+
const live = start()
140+
await live.load()
141+
await live.older()
142+
snapshot.push({ info: user("msg_162"), parts: [] })
143+
await live.load()
144+
expect(live.data.message.ses_current).toHaveLength(161)
145+
expect(live.data.message.ses_current?.[0]?.id).toBe("msg_002")
146+
expect(live.data.message.ses_current?.at(-1)?.id).toBe("msg_162")
147+
expect(live.hasOlder()).toBe(true)
148+
await live.older()
149+
expect(live.data.message.ses_current).toHaveLength(163)
150+
expect(live.hasOlder()).toBe(false)
151+
})
152+
153+
test("refresh clears an old cursor when its complete tail reaches the first message", async () => {
154+
snapshot = Array.from({ length: 81 }, (_, index) => ({ info: user(`msg_${String(index).padStart(3, "0")}`), parts: [] }))
155+
const live = start()
156+
await live.load()
157+
expect(live.hasOlder()).toBe(true)
158+
snapshot = snapshot.slice(1)
159+
await live.load()
160+
expect(live.data.message.ses_current?.[0]?.id).toBe("msg_001")
161+
expect(live.hasOlder()).toBe(false)
162+
})
163+
88164
test("snapshot and live updates retain summary metadata without unused patch bodies", async () => {
89165
const summary = {
90166
title: "Changes",

‎packages/es-app/src/live-session.ts‎

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import type { Message, Part, Session, SessionStatus } from "@opencode-ai/sdk/v2"
88
import { oc } from "./api"
99
import { createServerEvents, type ServerEvents } from "./event-source"
1010

11+
export const TAIL = 80
1112
const SKIP_PARTS = new Set(["patch", "step-start", "step-finish"])
1213
// Keep diff statistics without retaining patch bodies unused by this transcript.
1314
const visibleMessage = (info: Message): Message => {
@@ -81,6 +82,9 @@ export function createLiveSession(
8182
const [clearedThrough, setClearedThrough] = createSignal("")
8283
const [connection, setConnection] = createStore({ stream: "", snapshot: "", event: "" })
8384
const [loading, setLoading] = createSignal(false)
85+
const [loadingOlder, setLoadingOlder] = createSignal(false)
86+
const [olderCursor, setOlderCursor] = createSignal<string | undefined>()
87+
const hasOlder = () => olderCursor() !== undefined
8488
const latest = () => data.message[sessionID]?.at(-1)
8589
const error = () => {
8690
const message = latest()
@@ -136,28 +140,43 @@ export function createLiveSession(
136140
}
137141
if (disposed) return
138142
snapshotStarted = true
139-
const [session, messages, status] = await Promise.all([
143+
const [session, page, status] = await Promise.all([
140144
oc.session(sessionID, directory, controller.signal),
141-
oc.messages(sessionID, directory, controller.signal),
145+
oc.messagesPage(sessionID, directory, TAIL, undefined, controller.signal),
142146
oc.status(directory, controller.signal),
143147
])
144148
if (disposed) return
145149
const events = duringLoad!
146150
duringLoad = undefined
147-
messages.sort((a, b) => a.info.id.localeCompare(b.info.id))
151+
const messages = page.items.sort((a, b) => a.info.id.localeCompare(b.info.id))
148152
batch(() => {
149153
const previous = latest()
150154
if (previous && (messages.findLast((m) => m.info.role === "user")?.info.id ?? "") > previous.id) clearFailure()
155+
const existing = data.message[sessionID] ?? []
156+
const first = messages[0]?.info.id
157+
// A fresh tail supersedes its overlapping window; already-loaded older
158+
// messages remain available across reconnects and explicit refreshes.
159+
const retained = olderCursor() || page.cursor
160+
? existing.filter((message) => !first || message.id < first)
161+
: []
162+
const merged = [...retained, ...messages.map((message) => visibleMessage(message.info))]
163+
const cursor = !page.cursor && first && (!existing.length || first <= existing[0]!.id)
164+
? undefined
165+
: olderCursor() ?? (existing.length ? undefined : page.cursor)
151166
// Reconnect snapshots must not remount the unchanged transcript.
152167
setData("session", reconcile([session]))
153168
setData("session_status", reconcile({ ...status, [sessionID]: status[sessionID] ?? { type: "idle" } }))
154-
setData("message", sessionID, reconcile(messages.map((m) => visibleMessage(m.info))))
169+
setData("message", sessionID, reconcile(merged))
155170
setData(
156171
"part",
157172
reconcile(
158-
Object.fromEntries(messages.map((m) => [m.info.id, m.parts.filter((p) => !SKIP_PARTS.has(p.type))])),
173+
Object.fromEntries([
174+
...retained.map((message) => [message.id, data.part[message.id] ?? []] as const),
175+
...messages.map((message) => [message.info.id, message.parts.filter((part) => !SKIP_PARTS.has(part.type))] as const),
176+
]),
159177
),
160178
)
179+
setOlderCursor(cursor)
161180
setData("part_text_accum_delta", reconcile({}))
162181
const bases = new Set<string>()
163182
uncertainParts.clear()
@@ -214,6 +233,30 @@ export function createLiveSession(
214233
return activeLoad
215234
}
216235

236+
const older = async (): Promise<void> => {
237+
if (disposed || loadingOlder() || !hasOlder()) return
238+
setLoadingOlder(true)
239+
try {
240+
if (activeLoad) await activeLoad
241+
const before = olderCursor()
242+
if (disposed || !before) return
243+
const page = await oc.messagesPage(sessionID, directory, TAIL, before, controller.signal)
244+
if (disposed) return
245+
batch(() => {
246+
const existing = data.message[sessionID] ?? []
247+
const byID = new Map(existing.map((message) => [message.id, message]))
248+
page.items.forEach((message) => byID.set(message.info.id, visibleMessage(message.info)))
249+
setData("message", sessionID, reconcile([...byID.values()].sort((a, b) => a.id.localeCompare(b.id))))
250+
page.items.forEach((message) =>
251+
setData("part", message.info.id, reconcile(message.parts.filter((part) => !SKIP_PARTS.has(part.type)))),
252+
)
253+
setOlderCursor(page.cursor)
254+
})
255+
} finally {
256+
setLoadingOlder(false)
257+
}
258+
}
259+
217260
const refresh = () => {
218261
if (activeLoad || duringLoad) {
219262
refreshAfterLoad = true
@@ -241,6 +284,7 @@ export function createLiveSession(
241284
case "message.updated": {
242285
const info: Message = props.info
243286
if (info.sessionID !== sessionID) break
287+
if (hasOlder() && data.message[sessionID]?.[0] && info.id < data.message[sessionID]![0]!.id) break
244288
setData(
245289
produce((draft) => {
246290
draft.message[sessionID] ??= []
@@ -265,7 +309,7 @@ export function createLiveSession(
265309
}
266310
case "message.part.updated": {
267311
const part: Part = props.part
268-
if (part.sessionID !== sessionID || SKIP_PARTS.has(part.type)) break
312+
if (part.sessionID !== sessionID || SKIP_PARTS.has(part.type) || !data.message[sessionID]?.some((message) => message.id === part.messageID)) break
269313
setData(
270314
produce((draft) => {
271315
delete draft.part_text_accum_delta[part.id]
@@ -383,5 +427,5 @@ export function createLiveSession(
383427
source?.close()
384428
})
385429

386-
return { data, load, apply, error, connectionError, loading, retry }
430+
return { data, load, older, hasOlder, loadingOlder, apply, error, connectionError, loading, retry }
387431
}

‎packages/es-app/src/pages/session.tsx‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,21 @@ function SessionView(props: { sessionID: string; directory: string }) {
175175
const pin = () => {
176176
if (transcriptEl && !inspecting) transcriptEl.scrollTop = transcriptEl.scrollHeight
177177
}
178+
let userScroll = false
179+
const loadEarlier = async () => {
180+
if (!transcriptEl || !live.hasOlder() || live.loadingOlder()) return
181+
stick = false
182+
userScroll = false
183+
const height = transcriptEl.scrollHeight
184+
const top = transcriptEl.scrollTop
185+
try {
186+
await live.older()
187+
await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()))
188+
if (transcriptEl) transcriptEl.scrollTop = top + transcriptEl.scrollHeight - height
189+
} catch (failure) {
190+
setError(`Unable to load earlier messages: ${errorText(failure)}`)
191+
}
192+
}
178193
const inspectSubagent = (id: string) => {
179194
if (inspecting || !/^ses_[A-Za-z0-9]+$/.test(id) || id === sessionID) return
180195
// Only Task metadata authorizes child inspection, never IDs in prose/output.
@@ -206,17 +221,23 @@ function SessionView(props: { sessionID: string; directory: string }) {
206221
"scroll",
207222
() => {
208223
if (!inspecting && atBottom()) stick = true
224+
if (userScroll && transcriptEl && transcriptEl.scrollTop <= 200) void loadEarlier()
225+
userScroll = false
209226
},
210227
{ passive: true },
211228
)
212229
transcriptEl?.addEventListener(
213230
"wheel",
214231
(e) => {
215-
if (e.deltaY < 0) stick = false
232+
if (e.deltaY < 0) {
233+
stick = false
234+
userScroll = true
235+
if (transcriptEl?.scrollTop === 0) void loadEarlier()
236+
}
216237
},
217238
{ passive: true },
218239
)
219-
transcriptEl?.addEventListener("touchmove", () => (stick = false), { passive: true })
240+
transcriptEl?.addEventListener("touchmove", () => { stick = false; userScroll = true }, { passive: true })
220241
const observer = new ResizeObserver(() => {
221242
if (stick) pin()
222243
})
@@ -633,6 +654,7 @@ function SessionView(props: { sessionID: string; directory: string }) {
633654
const scrollTranscript = (dir: 1 | -1) => {
634655
if (!transcriptEl) return
635656
stick = false
657+
userScroll = true
636658
transcriptEl.scrollBy({ top: (dir * transcriptEl.clientHeight) / 2, behavior: "instant" as ScrollBehavior })
637659
}
638660

@@ -657,6 +679,7 @@ function SessionView(props: { sessionID: string; directory: string }) {
657679
: [...nodes].reverse().find((n) => offset(n) < top - 30)
658680
if (target) {
659681
stick = false
682+
userScroll = true
660683
transcriptEl.scrollTo({ top: offset(target) - 8, behavior: "instant" as ScrollBehavior })
661684
}
662685
}
@@ -975,6 +998,11 @@ function SessionView(props: { sessionID: string; directory: string }) {
975998

976999
<div class="transcript" ref={transcriptEl}>
9771000
<div ref={inner} class="transcript-inner">
1001+
<Show when={live.hasOlder()}>
1002+
<button class="transcript-older" disabled={live.loadingOlder()} onClick={loadEarlier}>
1003+
{live.loadingOlder() ? "Loading…" : "Load earlier messages"}
1004+
</button>
1005+
</Show>
9781006
<DataProvider data={live.data} directory={directory} sessionID={sessionID} onNavigateToSession={inspectSubagent}>
9791007
<For each={messages()}>
9801008
{(m) => (

‎packages/es-app/test/composer-fixture.mjs‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ export const createFixture = async () => {
111111
directory: url.searchParams.get("directory"),
112112
es: url.searchParams.get("es"),
113113
limit: url.searchParams.get("limit"),
114+
before: url.searchParams.get("before"),
114115
generate: url.searchParams.get("generate"),
115116
body,
116117
})
@@ -340,10 +341,8 @@ export const createFixture = async () => {
340341
}
341342
if (action === "/message") {
342343
const limit = url.searchParams.get("limit")
343-
const slice = (list) => limit ? list.slice(-Number(limit)) : list
344-
const messages = slice(
345-
id === "ses_a"
346-
? (fixture.messages ?? [
344+
const all = id === "ses_a"
345+
? (fixture.messages ?? [
347346
{
348347
info: {
349348
id: "msg_user",
@@ -372,17 +371,25 @@ export const createFixture = async () => {
372371
},
373372
parts: [],
374373
},
375-
])
376-
: fixture.messagesB,
377-
)
374+
])
375+
: fixture.messagesB
376+
const before = url.searchParams.get("before")
377+
const eligible = before ? all.filter((message) => message.info.id < before) : all
378+
const messages = limit ? eligible.slice(-Number(limit)) : eligible
379+
const cursor = limit && eligible.length > messages.length ? messages[0]?.info.id : undefined
380+
const send = () => {
381+
if (cursor) response.setHeader("X-Next-Cursor", cursor)
382+
response.setHeader("Access-Control-Expose-Headers", "X-Next-Cursor")
383+
json(messages)
384+
}
378385
if (fixture.holdMessages.has(id)) {
379386
response.on("close", () => {
380387
if (!response.writableEnded) fixture.abortedMessages.push(id)
381388
})
382-
fixture.messageReplies.push(() => json(messages))
389+
fixture.messageReplies.push(send)
383390
return
384391
}
385-
return json(messages)
392+
return send()
386393
}
387394
if (action === "/prompt_async" && request.method === "POST") {
388395
if (fixture.rejectImages && body.parts.some((part) => part.type === "file"))

0 commit comments

Comments
 (0)