Skip to content

Commit 5c10634

Browse files
committed
fix(tui): page older v2 sessions
1 parent 8a8bd62 commit 5c10634

2 files changed

Lines changed: 238 additions & 9 deletions

File tree

‎packages/tui/src/component/dialog-session-list.tsx‎

Lines changed: 103 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,58 @@ import { withTimestampedFallback } from "@opencode/util/session-title-fallback"
2525
import { projectName } from "../util/project"
2626
import { useLocation } from "../context/location"
2727

28+
type DialogSessionListQuery = { directory?: string; project?: string; subpath?: string; search?: string }
29+
30+
export function createDialogSessionPager<T extends { id: string }>(input: {
31+
list: (query: DialogSessionListQuery & { limit: number; order: "desc"; parentID: null; cursor?: string }) => Promise<{ data: T[]; cursor: { next?: string | null } }>
32+
}) {
33+
let generation = 0
34+
let key = ""
35+
let cursor: string | null | undefined
36+
let exhausted = false
37+
let active: number | undefined
38+
let pending: Promise<{ data: T[]; cursor?: string } | undefined> | undefined
39+
const entries = new Map<string, T>()
40+
const removed = new Set<string>()
41+
const load = async (nextKey: string, query: DialogSessionListQuery, reset = false) => {
42+
if (reset || key !== nextKey) {
43+
generation++
44+
key = nextKey
45+
cursor = undefined
46+
exhausted = false
47+
entries.clear()
48+
}
49+
if (active === generation) return pending
50+
if (exhausted) return { data: [...entries.values()], cursor }
51+
const requestGeneration = generation
52+
active = requestGeneration
53+
const request = (async () => {
54+
while (true) {
55+
const response = await input.list({ ...query, limit: 50, order: "desc", parentID: null, ...(cursor ? { cursor } : {}) })
56+
if (requestGeneration !== generation) return
57+
const previousSize = entries.size
58+
for (const item of response.data) if (!removed.has(item.id)) entries.set(item.id, item)
59+
cursor = response.cursor.next
60+
exhausted = !cursor
61+
if (entries.size > previousSize || exhausted) break
62+
}
63+
if (requestGeneration !== generation) return
64+
return { data: [...entries.values()], cursor: cursor ?? undefined }
65+
})().finally(() => {
66+
if (active === requestGeneration) active = undefined
67+
})
68+
pending = request
69+
return request
70+
}
71+
return {
72+
load,
73+
remove: (id: string) => {
74+
entries.delete(id)
75+
removed.add(id)
76+
},
77+
}
78+
}
79+
2880
export function DialogSessionList() {
2981
const dialog = useDialog()
3082
const route = useRoute()
@@ -44,6 +96,9 @@ export function DialogSessionList() {
4496
initial: { allProjects: config.tabs?.scope !== "cwd" },
4597
})
4698
const allProjects = () => prefs.allProjects
99+
const pager = createDialogSessionPager<SessionInfo>({ list: (query) => client.api.session.list(query) })
100+
const [loadingMore, setLoadingMore] = createSignal(false)
101+
let searchGeneration = 0
47102
const pickerLocation = () =>
48103
(route.data.type === "session" ? data.session.get(route.data.sessionID)?.location : undefined) ??
49104
activeLocation.ref ??
@@ -56,11 +111,13 @@ export function DialogSessionList() {
56111
location: pickerLocation(),
57112
}),
58113
async ({ query, allProjects, location }) => {
114+
const generation = ++searchGeneration
59115
try {
60116
if (!data.location.info(location)) await data.location.sync(location)
117+
if (generation !== searchGeneration) return { query, allProjects, sessions: [] as SessionInfo[], cursor: undefined, error: undefined }
61118
const current = data.location.info(location)
62119
if (!current) throw new Error("Location unavailable")
63-
const response = await client.api.session.list({
120+
const params = {
64121
...(allProjects
65122
? {}
66123
: current.project.id === Project.ID.global
@@ -70,15 +127,16 @@ export function DialogSessionList() {
70127
subpath: path.relative(current.project.directory, current.directory).replaceAll("\\", "/"),
71128
}),
72129
...(query ? { search: query } : {}),
73-
limit: 50,
74-
order: "desc",
75-
parentID: null,
76-
})
77-
return { query, allProjects, sessions: response.data, error: undefined }
130+
}
131+
const key = JSON.stringify([query, allProjects, location.directory, params])
132+
const response = await pager.load(key, params, true)
133+
if (generation !== searchGeneration) return { query, allProjects, sessions: [] as SessionInfo[], cursor: undefined, error: undefined }
134+
return { query, allProjects, key, params, locationDirectory: location.directory, generation, sessions: response?.data ?? [], cursor: response?.cursor, error: undefined }
78135
} catch (error) {
136+
if (generation !== searchGeneration) return { query, allProjects, sessions: [] as SessionInfo[], cursor: undefined, error: undefined }
79137
// A transient transport failure must degrade search, not crash the TUI
80138
// through the root ErrorBoundary when the errored resource is read.
81-
return { query, allProjects, sessions: [] as SessionInfo[], error }
139+
return { query, allProjects, sessions: [] as SessionInfo[], cursor: undefined, error }
82140
}
83141
},
84142
)
@@ -121,6 +179,20 @@ export function DialogSessionList() {
121179
return { message: query ? "No sessions found" : "No sessions available", error: false }
122180
})
123181

182+
const loadMore = async () => {
183+
const result = searchResults.latest
184+
if (!result?.cursor || !result.params || !result.key || result.generation !== searchGeneration || result.query !== filter().trim() || result.allProjects !== allProjects() || result.locationDirectory !== pickerLocation().directory || loadingMore()) return
185+
setLoadingMore(true)
186+
try {
187+
const next = await pager.load(result.key, result.params)
188+
if (next && result.generation === searchGeneration) setSearchResults((current) => current?.key === result.key ? { ...current, sessions: next.data, cursor: next.cursor } : current)
189+
} catch (error) {
190+
toast.show({ message: `Failed to load older sessions: ${errorMessage(error)}`, variant: "error", duration: 5000 })
191+
} finally {
192+
setLoadingMore(false)
193+
}
194+
}
195+
124196
const quickSwitchHint = createMemo(() => {
125197
if (sessionTabs.enabled()) return
126198
const first = shortcuts.get("session.quick_switch.1")
@@ -207,12 +279,19 @@ export function DialogSessionList() {
207279
}
208280
options={options()}
209281
skipFilter={true}
282+
preserveSelection={true}
210283
current={currentSessionID()}
211284
onFilter={(query) => {
212285
setFilter(query)
213286
setSearch(query)
214287
}}
215288
bindings={[
289+
{
290+
bind: "ctrl+shift+down",
291+
title: "Load older sessions",
292+
group: "Dialog",
293+
run: () => void loadMore(),
294+
},
216295
{
217296
bind: "ctrl+a",
218297
title: allProjects() ? "Show current directory sessions" : "Show all project sessions",
@@ -238,7 +317,21 @@ export function DialogSessionList() {
238317
</text>
239318
</box>
240319
}
241-
onMove={() => setToDelete(undefined)}
320+
onMove={(option) => {
321+
setToDelete(undefined)
322+
const list = options()
323+
const index = list.findIndex((item) => item.value === option.value)
324+
if (index >= list.length - 10) void loadMore()
325+
}}
326+
footer={
327+
<Show when={searchResults.latest?.cursor}>
328+
<text fg={theme.text.muted} onMouseUp={() => void loadMore()} onKeyDown={(event: { name: string; preventDefault(): void }) => {
329+
if (event.name !== "return") return
330+
event.preventDefault()
331+
void loadMore()
332+
}}>{loadingMore() ? "Loading older sessions…" : "↓ Load older sessions · Ctrl+Shift+↓ or click"}</text>
333+
</Show>
334+
}
242335
onSelect={(option) => {
243336
route.navigate({ type: "session", sessionID: option.value })
244337
dialog.clear()
@@ -260,7 +353,8 @@ export function DialogSessionList() {
260353
}
261354
void client.api.session
262355
.remove({ sessionID: option.value })
263-
.then(() => {
356+
.then(() => {
357+
pager.remove(option.value)
264358
setSearchResults((result) =>
265359
result
266360
? { ...result, sessions: result.sessions.filter((session) => session.id !== option.value) }

‎packages/tui/test/cli/tui/dialog-session-list.test.tsx‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,70 @@ import { createApi, createEventStream, createFetch, json } from "../../fixture/t
2222
import { emptyThemeSource, tmpdir } from "../../fixture/fixture"
2323
import { TestTuiContexts } from "../../fixture/tui-environment"
2424
import { createTuiResolvedConfig } from "../../fixture/tui-runtime"
25+
import { createDialogSessionPager } from "../../../src/component/dialog-session-list"
26+
27+
test("session picker appends cursor pages without losing the active filters", async () => {
28+
const calls: { cursor?: string; search?: string; project?: string; parentID?: null; limit?: number; order?: string }[] = []
29+
const pager = createDialogSessionPager({
30+
list: async (query) => {
31+
calls.push(query)
32+
return query.cursor
33+
? { data: [{ id: "ses_50" }, ...Array.from({ length: 50 }, (_, index) => ({ id: `ses_${index + 51}` }))], cursor: {} }
34+
: { data: Array.from({ length: 50 }, (_, index) => ({ id: `ses_${index}` })), cursor: { next: "older" } }
35+
},
36+
})
37+
const query = { project: "project-a", search: "work" }
38+
expect((await pager.load("project-a:work", query, true))?.data).toHaveLength(50)
39+
expect((await pager.load("project-a:work", query))?.data).toHaveLength(101)
40+
expect(calls[1]).toMatchObject({ cursor: "older", project: "project-a", search: "work", parentID: null, order: "desc" })
41+
expect(calls[1]?.limit).toBe(50)
42+
expect(calls[1]?.cursor).toBe("older")
43+
})
44+
45+
test("session picker exhausts empty terminal pages and deduplicates session IDs", async () => {
46+
let calls = 0
47+
const pager = createDialogSessionPager({
48+
list: async (query) => {
49+
calls++
50+
if (query.cursor === "empty") return { data: [], cursor: {} }
51+
return { data: [{ id: "ses_same" }], cursor: { next: "empty" } }
52+
},
53+
})
54+
const first = await pager.load("all", {}, true)
55+
expect(first?.data.map((session) => session.id)).toEqual(["ses_same"])
56+
const exhausted = await pager.load("all", {})
57+
expect(exhausted?.data.map((session) => session.id)).toEqual(["ses_same"])
58+
expect(exhausted?.cursor).toBeUndefined()
59+
await pager.load("all", {})
60+
expect(calls).toBe(2)
61+
})
62+
63+
test("session picker discards pages from a stale search", async () => {
64+
let resolveOld!: (value: { data: { id: string }[]; cursor: { next?: string | null } }) => void
65+
const pager = createDialogSessionPager<{ id: string }>({
66+
list: (query) => query.search === "old"
67+
? new Promise<{ data: { id: string }[]; cursor: { next?: string | null } }>((resolve) => { resolveOld = resolve })
68+
: Promise.resolve({ data: [{ id: "ses_new" }], cursor: {} }),
69+
})
70+
const old = pager.load("old", { search: "old" }, true)
71+
const current = await pager.load("new", { search: "new" }, true)
72+
resolveOld({ data: [{ id: "ses_old" }], cursor: {} })
73+
await old
74+
expect(current?.data.map((session) => session.id)).toEqual(["ses_new"])
75+
})
76+
77+
test("deleted sessions stay removed when another cursor page is appended", async () => {
78+
const pager = createDialogSessionPager({
79+
list: async (query) => query.cursor
80+
? { data: [{ id: "ses_deleted" }, { id: "ses_keep" }], cursor: {} }
81+
: { data: [{ id: "ses_deleted" }], cursor: { next: "older" } },
82+
})
83+
const query = {}
84+
await pager.load("all", query, true)
85+
pager.remove("ses_deleted")
86+
const result = await pager.load("all", query)
87+
expect(result?.data.map((session) => session.id)).toEqual(["ses_keep"])
88+
})
2589

2690
test("scopes sessions to the active session location", async () => {
2791
const active = "/tmp/opencode/project-b"
@@ -128,3 +192,74 @@ test("scopes sessions to the active session location", async () => {
128192
await temporary[Symbol.asyncDispose]()
129193
}
130194
})
195+
196+
test("navigates into cursor-loaded sessions and selects the page-two session", async () => {
197+
const events = createEventStream()
198+
const temporary = await tmpdir()
199+
let storage!: ReturnType<typeof useStorage>
200+
let route!: ReturnType<typeof useRoute>
201+
let sessionCalls = 0
202+
const calls = createFetch((url) => {
203+
if (url.pathname === "/api/location") {
204+
const directory = url.searchParams.get("location[directory]") ?? process.cwd()
205+
return json({ directory, project: { id: "project-a", directory, canonical: directory } })
206+
}
207+
if (url.pathname !== "/api/session") return undefined
208+
const parentID = url.searchParams.get("parentID")
209+
if (parentID && parentID !== "null") return json({ data: [], cursor: {} })
210+
sessionCalls++
211+
const pageTwo = url.searchParams.get("cursor") === "older"
212+
const data = Array.from({ length: 50 }, (_, index) => ({
213+
id: pageTwo ? `ses_page2_${index}` : `ses_page1_${index}`,
214+
projectID: "project-a",
215+
cost: 0,
216+
tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
217+
time: { created: 1_700_000_000_000 + index, updated: 1_700_000_000_000 + index },
218+
title: pageTwo ? `Page two session ${index}` : `Page one session ${index}`,
219+
location: { directory: process.cwd() },
220+
}))
221+
return json({ data, cursor: pageTwo ? {} : { next: "older" } })
222+
}, events)
223+
224+
function Probe() {
225+
const dialog = useDialog()
226+
route = useRoute()
227+
storage = useStorage()
228+
onMount(() => dialog.replace(() => <DialogSessionList />))
229+
return null
230+
}
231+
232+
const app = await testRender(
233+
() => (
234+
<TestTuiContexts paths={{ state: temporary.path }}>
235+
<TuiAppProvider value={{ name: "test", version: "test", channel: "test" }}>
236+
<StorageProvider><ArgsProvider><ConfigProvider config={createTuiResolvedConfig()}><Keymap.Provider>
237+
<ToastProvider><RouteProvider><ClientProvider api={createApi(calls.fetch)}><PermissionProvider>
238+
<DataProvider directory={process.cwd()}><LocationProvider><SessionTabsProvider>
239+
<ThemeProvider mode="dark" source={emptyThemeSource}><LocalProvider><DialogProvider><Probe /></DialogProvider></LocalProvider></ThemeProvider>
240+
</SessionTabsProvider></LocationProvider></DataProvider>
241+
</PermissionProvider></ClientProvider></RouteProvider></ToastProvider>
242+
</Keymap.Provider></ConfigProvider></ArgsProvider></StorageProvider>
243+
</TuiAppProvider>
244+
</TestTuiContexts>
245+
),
246+
{ width: 100, height: 30, kittyKeyboard: true },
247+
)
248+
app.renderer.start()
249+
try {
250+
await app.waitForFrame((frame) => frame.includes("Page one session 0"))
251+
for (let page = 0; page < 4; page++) app.mockInput.pressKey("\u001B[6~")
252+
await app.waitForFrame((frame) => frame.includes("Page one session 40"))
253+
await new Promise((resolve) => setTimeout(resolve, 25))
254+
await app.renderOnce()
255+
expect(sessionCalls).toBe(2)
256+
app.mockInput.pressKey("\u001B[6~")
257+
app.mockInput.pressEnter()
258+
await app.waitForFrame(() => route.data.type === "session" && route.data.sessionID === "ses_page2_0")
259+
expect(route.data).toMatchObject({ type: "session", sessionID: "ses_page2_0" })
260+
} finally {
261+
app.renderer.destroy()
262+
await storage.flush()
263+
await temporary[Symbol.asyncDispose]()
264+
}
265+
})

0 commit comments

Comments
 (0)