@@ -26,6 +26,8 @@ import { desc } from "drizzle-orm"
2626import { eq } from "drizzle-orm"
2727import { inArray } from "drizzle-orm"
2828import { lt } from "drizzle-orm"
29+ import { gt } from "drizzle-orm"
30+ import { asc } from "drizzle-orm"
2931import { or } from "drizzle-orm"
3032import { MessageTable , PartTable , SessionTable } from "@opencode-ai/core/session/sql"
3133import { ProviderError } from "@/provider/error"
@@ -95,11 +97,15 @@ const part = (row: typeof PartTable.$inferSelect) =>
9597const older = ( row : Cursor ) =>
9698 or ( lt ( MessageTable . time_created , row . time ) , and ( eq ( MessageTable . time_created , row . time ) , lt ( MessageTable . id , row . id ) ) )
9799
98- function hydrate ( db : Database . Interface [ "db" ] , rows : ( typeof MessageTable . $inferSelect ) [ ] ) {
100+ const newer = ( row : Cursor ) =>
101+ or ( gt ( MessageTable . time_created , row . time ) , and ( eq ( MessageTable . time_created , row . time ) , gt ( MessageTable . id , row . id ) ) )
102+
103+ function hydrate ( rows : ( typeof MessageTable . $inferSelect ) [ ] ) {
99104 const ids = rows . map ( ( row ) => row . id )
100105 const partByMessage = new Map < string , Part [ ] > ( )
101106 return Effect . gen ( function * ( ) {
102107 if ( ids . length > 0 ) {
108+ const { db } = yield * Database . Service
103109 const partRows = yield * db
104110 . select ( )
105111 . from ( PartTable )
@@ -426,17 +432,25 @@ export const page = Effect.fn("MessageV2.page")(function* (input: {
426432 sessionID : SessionID
427433 limit : number
428434 before ?: string
435+ after ?: string
429436} ) {
437+ if ( input . before && input . after ) throw new Error ( "page: only one of `before` or `after` may be provided" )
430438 const { db } = yield * Database . Service
431439 const before = input . before ? cursor . decode ( input . before ) : undefined
440+ const after = input . after ? cursor . decode ( input . after ) : undefined
432441 const where = before
433442 ? and ( eq ( MessageTable . session_id , input . sessionID ) , older ( before ) )
434- : eq ( MessageTable . session_id , input . sessionID )
443+ : after
444+ ? and ( eq ( MessageTable . session_id , input . sessionID ) , newer ( after ) )
445+ : eq ( MessageTable . session_id , input . sessionID )
435446 const rows = yield * db
436447 . select ( )
437448 . from ( MessageTable )
438449 . where ( where )
439- . orderBy ( desc ( MessageTable . time_created ) , desc ( MessageTable . id ) )
450+ . orderBy (
451+ after ? asc ( MessageTable . time_created ) : desc ( MessageTable . time_created ) ,
452+ after ? asc ( MessageTable . id ) : desc ( MessageTable . id ) ,
453+ )
440454 . limit ( input . limit + 1 )
441455 . all ( )
442456 . pipe ( Effect . orDie )
@@ -456,13 +470,13 @@ export const page = Effect.fn("MessageV2.page")(function* (input: {
456470
457471 const more = rows . length > input . limit
458472 const slice = more ? rows . slice ( 0 , input . limit ) : rows
459- const items = yield * hydrate ( db , slice )
460- items . reverse ( )
461- const tail = slice . at ( - 1 )
473+ const items = yield * hydrate ( slice )
474+ if ( ! after ) items . reverse ( )
475+ const cursorRow = slice . at ( - 1 )
462476 return {
463477 items,
464478 more,
465- cursor : more && tail ? cursor . encode ( { id : tail . id , time : tail . time_created } ) : undefined ,
479+ cursor : more && cursorRow ? cursor . encode ( { id : cursorRow . id , time : cursorRow . time_created } ) : undefined ,
466480 }
467481} )
468482
0 commit comments