Skip to content

Commit ca16f7c

Browse files
committed
feat: implement pagination
Based on anomalyco#30587
1 parent 89f1e64 commit ca16f7c

13 files changed

Lines changed: 375 additions & 114 deletions

File tree

‎packages/core/src/filesystem/search.ts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import path from "path"
55
import { Context, Effect, Layer, Scope } from "effect"
66
import { Fff } from "#fff"
77
import fuzzysort from "fuzzysort"
8-
import { FileSystem } from "../filesystem"
8+
import type { FileSystem } from "../filesystem"
9+
import { Entry, Match } from "@opencode-ai/schema/filesystem"
910
import { FSUtil } from "../fs-util"
1011
import { Location } from "../location"
1112
import { Ripgrep } from "../ripgrep"
@@ -61,7 +62,7 @@ export const ripgrepLayer = Layer.effect(
6162
.pipe(
6263
Effect.map((result) =>
6364
result.map((entry) =>
64-
FileSystem.Entry.make({
65+
Entry.make({
6566
...entry,
6667
path: RelativePath.make(path.relative(location.directory, path.resolve(cwd, entry.path))),
6768
}),
@@ -86,9 +87,9 @@ export const ripgrepLayer = Layer.effect(
8687
.pipe(
8788
Effect.map((result) =>
8889
result.map((match) =>
89-
FileSystem.Match.make({
90+
Match.make({
9091
...match,
91-
entry: FileSystem.Entry.make({
92+
entry: Entry.make({
9293
...match.entry,
9394
path: RelativePath.make(path.relative(location.directory, path.resolve(cwd, match.entry.path))),
9495
}),
@@ -109,7 +110,7 @@ export const ripgrepLayer = Layer.effect(
109110
return fuzzysort.go(input.query, items, { limit: input.limit ?? 50 }).map((item) => {
110111
const relative = item.target
111112
const type = relative.endsWith(path.sep) ? ("directory" as const) : ("file" as const)
112-
return FileSystem.Entry.make({
113+
return Entry.make({
113114
path: RelativePath.make(relative),
114115
type,
115116
})
@@ -154,7 +155,7 @@ export const fffLayer = Layer.effect(
154155
})
155156
if (!found.ok) throw found.error
156157
return found.value.items.map((item) =>
157-
FileSystem.Entry.make({
158+
Entry.make({
158159
path: RelativePath.make(item.relativePath.replaceAll("\\", "/")),
159160
type: "file",
160161
}),
@@ -172,8 +173,8 @@ export const fffLayer = Layer.effect(
172173
if (!found.ok) throw found.error
173174
return found.value.items.map((match) => {
174175
const bytes = Buffer.from(match.lineContent)
175-
return FileSystem.Match.make({
176-
entry: FileSystem.Entry.make({
176+
return Match.make({
177+
entry: Entry.make({
177178
path: RelativePath.make(match.relativePath.replaceAll("\\", "/")),
178179
type: "file",
179180
}),
@@ -222,7 +223,7 @@ export const fffLayer = Layer.effect(
222223
.sort((a, b) => b.score - a.score || a.path.length - b.path.length)
223224
.map((item) => {
224225
const relative = item.path.replaceAll("\\", "/").replace(/\/$/, "")
225-
return FileSystem.Entry.make({
226+
return Entry.make({
226227
path: RelativePath.make(relative + (item.type === "directory" ? path.sep : "")),
227228
type: item.type,
228229
})

‎packages/opencode/src/server/routes/instance/httpapi/groups/session.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ export const MessagesQuery = Schema.Struct({
4444
...WorkspaceRoutingQueryFields,
4545
limit: Schema.optional(Schema.NumberFromString.check(Schema.isInt(), Schema.isGreaterThanOrEqualTo(0))),
4646
before: Schema.optional(Schema.String),
47+
after: Schema.optional(Schema.String),
4748
})
4849
export const StatusMap = Schema.Record(Schema.String, SessionStatus.Info)
4950
export const UpdatePayload = Schema.Struct({

‎packages/opencode/src/server/routes/instance/httpapi/handlers/session.ts‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { PermissionV1 } from "@opencode-ai/core/v1/permission"
2+
import { Database } from "@opencode-ai/core/database/database"
23
import { Agent } from "@/agent/agent"
34
import { SessionV1 } from "@opencode-ai/core/v1/session"
45
import { EventV2Bridge } from "@/event-v2-bridge"
@@ -48,6 +49,7 @@ const tryParseJson = (text: string) =>
4849
export const sessionHandlers = HttpApiBuilder.group(InstanceHttpApi, "session", (handlers) =>
4950
Effect.gen(function* () {
5051
const session = yield* Session.Service
52+
const database = yield* Database.Service
5153
const shareSvc = yield* SessionShare.Service
5254
const promptSvc = yield* SessionPrompt.Service
5355
const revertSvc = yield* SessionRevert.Service
@@ -107,11 +109,13 @@ export const sessionHandlers = HttpApiBuilder.group(InstanceHttpApi, "session",
107109
params: { sessionID: SessionID }
108110
query: typeof MessagesQuery.Type
109111
}) {
110-
if (ctx.query.before && ctx.query.limit === undefined) return yield* new HttpApiError.BadRequest({})
111-
if (ctx.query.before) {
112-
const before = ctx.query.before
112+
if ((ctx.query.before || ctx.query.after) && ctx.query.limit === undefined)
113+
return yield* new HttpApiError.BadRequest({})
114+
if (ctx.query.before && ctx.query.after) return yield* new HttpApiError.BadRequest({})
115+
const cursor = ctx.query.before ?? ctx.query.after
116+
if (cursor) {
113117
yield* Effect.try({
114-
try: () => MessageV2.cursor.decode(before),
118+
try: () => MessageV2.cursor.decode(cursor),
115119
catch: () => new HttpApiError.BadRequest({}),
116120
})
117121
}
@@ -125,7 +129,8 @@ export const sessionHandlers = HttpApiBuilder.group(InstanceHttpApi, "session",
125129
sessionID: ctx.params.sessionID,
126130
limit: ctx.query.limit,
127131
before: ctx.query.before,
128-
}),
132+
after: ctx.query.after,
133+
}).pipe(Effect.provideService(Database.Service, database)),
129134
)
130135
if (!page.cursor) return page.items
131136

@@ -134,7 +139,8 @@ export const sessionHandlers = HttpApiBuilder.group(InstanceHttpApi, "session",
134139
// header echoes the real origin instead of a hard-coded localhost.
135140
const url = Option.getOrElse(HttpServerRequest.toURL(request), () => new URL(request.url, "http://localhost"))
136141
url.searchParams.set("limit", ctx.query.limit.toString())
137-
url.searchParams.set("before", page.cursor)
142+
const direction = ctx.query.after ? "after" : "before"
143+
url.searchParams.set(direction, page.cursor)
138144
return HttpServerResponse.jsonUnsafe(page.items, {
139145
headers: {
140146
"Access-Control-Expose-Headers": "Link, X-Next-Cursor",

‎packages/opencode/src/session/message-v2.ts‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import { desc } from "drizzle-orm"
2626
import { eq } from "drizzle-orm"
2727
import { inArray } from "drizzle-orm"
2828
import { lt } from "drizzle-orm"
29+
import { gt } from "drizzle-orm"
30+
import { asc } from "drizzle-orm"
2931
import { or } from "drizzle-orm"
3032
import { MessageTable, PartTable, SessionTable } from "@opencode-ai/core/session/sql"
3133
import { ProviderError } from "@/provider/error"
@@ -95,11 +97,15 @@ const part = (row: typeof PartTable.$inferSelect) =>
9597
const 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

‎packages/opencode/test/session/messages-pagination.test.ts‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,46 @@ describe("MessageV2.page", () => {
291291
}),
292292
)
293293

294+
it.instance("pages forward with after cursor", () =>
295+
withSession(({ sessionID }) =>
296+
Effect.gen(function* () {
297+
const ids = yield* fill(sessionID, 6)
298+
299+
// Anchor at "before everything": all messages are newer than time 0
300+
const anchor = MessageV2.cursor.encode({ id: MessageID.ascending(), time: 0 })
301+
302+
const a = yield* MessageV2.page({ sessionID, limit: 2, after: anchor })
303+
expect(a.items.map((item) => item.info.id)).toEqual(ids.slice(0, 2))
304+
expect(a.more).toBe(true)
305+
expect(a.cursor).toBeTruthy()
306+
307+
const b = yield* MessageV2.page({ sessionID, limit: 2, after: a.cursor! })
308+
expect(b.items.map((item) => item.info.id)).toEqual(ids.slice(2, 4))
309+
expect(b.more).toBe(true)
310+
expect(b.cursor).toBeTruthy()
311+
312+
const c = yield* MessageV2.page({ sessionID, limit: 2, after: b.cursor! })
313+
expect(c.items.map((item) => item.info.id)).toEqual(ids.slice(4, 6))
314+
expect(c.more).toBe(false)
315+
expect(c.cursor).toBeUndefined()
316+
}),
317+
),
318+
)
319+
320+
it.instance("rejects requests with both before and after", () =>
321+
withSession(({ sessionID }) =>
322+
Effect.gen(function* () {
323+
yield* fill(sessionID, 2)
324+
const dummyCursor = MessageV2.cursor.encode({ id: MessageID.ascending(), time: 0 })
325+
326+
const exit = yield* Effect.exit(
327+
MessageV2.page({ sessionID, limit: 2, before: dummyCursor, after: dummyCursor }),
328+
)
329+
expect(exit._tag).toBe("Failure")
330+
}),
331+
),
332+
)
333+
294334
it.instance("large limit returns all messages without cursor", () =>
295335
withSession(({ sessionID }) =>
296336
Effect.gen(function* () {

‎packages/sdk/js/src/gen/types.gen.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2556,6 +2556,8 @@ export type SessionMessagesData = {
25562556
query?: {
25572557
directory?: string
25582558
limit?: number
2559+
before?: string
2560+
after?: string
25592561
}
25602562
url: "/session/{id}/message"
25612563
}

‎packages/sdk/js/src/v2/gen/sdk.gen.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3710,6 +3710,7 @@ export class Session2 extends HeyApiClient {
37103710
workspace?: string
37113711
limit?: number
37123712
before?: string
3713+
after?: string
37133714
},
37143715
options?: Options<never, ThrowOnError>,
37153716
) {
@@ -3723,6 +3724,7 @@ export class Session2 extends HeyApiClient {
37233724
{ in: "query", key: "workspace" },
37243725
{ in: "query", key: "limit" },
37253726
{ in: "query", key: "before" },
3727+
{ in: "query", key: "after" },
37263728
],
37273729
},
37283730
],

‎packages/sdk/js/src/v2/gen/types.gen.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9765,6 +9765,7 @@ export type SessionMessagesData = {
97659765
workspace?: string
97669766
limit?: number
97679767
before?: string
9768+
after?: string
97689769
}
97699770
url: "/session/{sessionID}/message"
97709771
}

‎packages/sdk/openapi.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6133,6 +6133,14 @@
61336133
"type": "string"
61346134
},
61356135
"required": false
6136+
},
6137+
{
6138+
"name": "after",
6139+
"in": "query",
6140+
"schema": {
6141+
"type": "string"
6142+
},
6143+
"required": false
61366144
}
61376145
],
61386146
"responses": {

0 commit comments

Comments
 (0)