@@ -22,6 +22,72 @@ import { createApi, createEventStream, createFetch, json } from "../../fixture/t
2222import { emptyThemeSource , tmpdir } from "../../fixture/fixture"
2323import { TestTuiContexts } from "../../fixture/tui-environment"
2424import { 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+ expect ( calls ) . toHaveLength ( 2 )
44+ for ( const call of calls ) expect ( call ) . toMatchObject ( { archived : false } )
45+ } )
46+
47+ test ( "session picker exhausts empty terminal pages and deduplicates session IDs" , async ( ) => {
48+ let calls = 0
49+ const pager = createDialogSessionPager ( {
50+ list : async ( query ) => {
51+ calls ++
52+ if ( query . cursor === "empty" ) return { data : [ ] , cursor : { } }
53+ return { data : [ { id : "ses_same" } ] , cursor : { next : "empty" } }
54+ } ,
55+ } )
56+ const first = await pager . load ( "all" , { } , true )
57+ expect ( first ?. data . map ( ( session ) => session . id ) ) . toEqual ( [ "ses_same" ] )
58+ const exhausted = await pager . load ( "all" , { } )
59+ expect ( exhausted ?. data . map ( ( session ) => session . id ) ) . toEqual ( [ "ses_same" ] )
60+ expect ( exhausted ?. cursor ) . toBeUndefined ( )
61+ await pager . load ( "all" , { } )
62+ expect ( calls ) . toBe ( 2 )
63+ } )
64+
65+ test ( "session picker discards pages from a stale search" , async ( ) => {
66+ let resolveOld ! : ( value : { data : { id : string } [ ] ; cursor : { next ?: string | null } } ) => void
67+ const pager = createDialogSessionPager < { id : string } > ( {
68+ list : ( query ) => query . search === "old"
69+ ? new Promise < { data : { id : string } [ ] ; cursor : { next ?: string | null } } > ( ( resolve ) => { resolveOld = resolve } )
70+ : Promise . resolve ( { data : [ { id : "ses_new" } ] , cursor : { } } ) ,
71+ } )
72+ const old = pager . load ( "old" , { search : "old" } , true )
73+ const current = await pager . load ( "new" , { search : "new" } , true )
74+ resolveOld ( { data : [ { id : "ses_old" } ] , cursor : { } } )
75+ await old
76+ expect ( current ?. data . map ( ( session ) => session . id ) ) . toEqual ( [ "ses_new" ] )
77+ } )
78+
79+ test ( "deleted sessions stay removed when another cursor page is appended" , async ( ) => {
80+ const pager = createDialogSessionPager ( {
81+ list : async ( query ) => query . cursor
82+ ? { data : [ { id : "ses_deleted" } , { id : "ses_keep" } ] , cursor : { } }
83+ : { data : [ { id : "ses_deleted" } ] , cursor : { next : "older" } } ,
84+ } )
85+ const query = { }
86+ await pager . load ( "all" , query , true )
87+ pager . remove ( "ses_deleted" )
88+ const result = await pager . load ( "all" , query )
89+ expect ( result ?. data . map ( ( session ) => session . id ) ) . toEqual ( [ "ses_keep" ] )
90+ } )
2591
2692test ( "scopes sessions to the active session location" , async ( ) => {
2793 const active = "/tmp/opencode/project-b"
@@ -128,3 +194,74 @@ test("scopes sessions to the active session location", async () => {
128194 await temporary [ Symbol . asyncDispose ] ( )
129195 }
130196} )
197+
198+ test ( "navigates into cursor-loaded sessions and selects the page-two session" , async ( ) => {
199+ const events = createEventStream ( )
200+ const temporary = await tmpdir ( )
201+ let storage ! : ReturnType < typeof useStorage >
202+ let route ! : ReturnType < typeof useRoute >
203+ let sessionCalls = 0
204+ const calls = createFetch ( ( url ) => {
205+ if ( url . pathname === "/api/location" ) {
206+ const directory = url . searchParams . get ( "location[directory]" ) ?? process . cwd ( )
207+ return json ( { directory, project : { id : "project-a" , directory, canonical : directory } } )
208+ }
209+ if ( url . pathname !== "/api/session" ) return undefined
210+ const parentID = url . searchParams . get ( "parentID" )
211+ if ( parentID && parentID !== "null" ) return json ( { data : [ ] , cursor : { } } )
212+ sessionCalls ++
213+ const pageTwo = url . searchParams . get ( "cursor" ) === "older"
214+ const data = Array . from ( { length : 50 } , ( _ , index ) => ( {
215+ id : pageTwo ? `ses_page2_${ index } ` : `ses_page1_${ index } ` ,
216+ projectID : "project-a" ,
217+ cost : 0 ,
218+ tokens : { input : 0 , output : 0 , reasoning : 0 , cache : { read : 0 , write : 0 } } ,
219+ time : { created : 1_700_000_000_000 + index , updated : 1_700_000_000_000 + index } ,
220+ title : pageTwo ? `Page two session ${ index } ` : `Page one session ${ index } ` ,
221+ location : { directory : process . cwd ( ) } ,
222+ } ) )
223+ return json ( { data, cursor : pageTwo ? { } : { next : "older" } } )
224+ } , events )
225+
226+ function Probe ( ) {
227+ const dialog = useDialog ( )
228+ route = useRoute ( )
229+ storage = useStorage ( )
230+ onMount ( ( ) => dialog . replace ( ( ) => < DialogSessionList /> ) )
231+ return null
232+ }
233+
234+ const app = await testRender (
235+ ( ) => (
236+ < TestTuiContexts paths = { { state : temporary . path } } >
237+ < TuiAppProvider value = { { name : "test" , version : "test" , channel : "test" } } >
238+ < StorageProvider > < ArgsProvider > < ConfigProvider config = { createTuiResolvedConfig ( ) } > < Keymap . Provider >
239+ < ToastProvider > < RouteProvider > < ClientProvider api = { createApi ( calls . fetch ) } > < PermissionProvider >
240+ < DataProvider directory = { process . cwd ( ) } > < LocationProvider > < SessionTabsProvider >
241+ < ThemeProvider mode = "dark" source = { emptyThemeSource } > < LocalProvider > < DialogProvider > < Probe /> </ DialogProvider > </ LocalProvider > </ ThemeProvider >
242+ </ SessionTabsProvider > </ LocationProvider > </ DataProvider >
243+ </ PermissionProvider > </ ClientProvider > </ RouteProvider > </ ToastProvider >
244+ </ Keymap . Provider > </ ConfigProvider > </ ArgsProvider > </ StorageProvider >
245+ </ TuiAppProvider >
246+ </ TestTuiContexts >
247+ ) ,
248+ { width : 100 , height : 30 , kittyKeyboard : true } ,
249+ )
250+ app . renderer . start ( )
251+ try {
252+ await app . waitForFrame ( ( frame ) => frame . includes ( "Page one session 0" ) )
253+ for ( let page = 0 ; page < 4 ; page ++ ) app . mockInput . pressKey ( "\u001B[6~" )
254+ await app . waitForFrame ( ( frame ) => frame . includes ( "Page one session 40" ) )
255+ await new Promise ( ( resolve ) => setTimeout ( resolve , 25 ) )
256+ await app . renderOnce ( )
257+ expect ( sessionCalls ) . toBe ( 2 )
258+ app . mockInput . pressKey ( "\u001B[6~" )
259+ app . mockInput . pressEnter ( )
260+ await app . waitForFrame ( ( ) => route . data . type === "session" && route . data . sessionID === "ses_page2_0" )
261+ expect ( route . data ) . toMatchObject ( { type : "session" , sessionID : "ses_page2_0" } )
262+ } finally {
263+ app . renderer . destroy ( )
264+ await storage . flush ( )
265+ await temporary [ Symbol . asyncDispose ] ( )
266+ }
267+ } )
0 commit comments