@@ -25,6 +25,58 @@ import { withTimestampedFallback } from "@opencode/util/session-title-fallback"
2525import { projectName } from "../util/project"
2626import { 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+
2880export 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 ) }
0 commit comments