ceos/opencode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(session): make message reads effectful (#27291)

Browse source
This commit is contained in:
Shoubhit Dash 2026-05-13 14:40:12 +05:30 • committed by GitHub
commit ccf93f3523
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 60 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

41
packages/opencode/src/session/message-v2.ts
View file

@ -919,7 +919,11 @@ export function toModelMessages(
return Effect.runPromise(toModelMessagesEffect(input, model, options).pipe(Effect.provide(EffectLogger.layer)))
}
export function page(input: { sessionID: SessionID; limit: number; before?: string }) {
export const page = Effect.fn("MessageV2.page")(function* (input: {
sessionID: SessionID
limit: number
before?: string
}) {
const before = input.before ? cursor.decode(input.before) : undefined
const where = before
? and(eq(MessageTable.session_id, input.sessionID), older(before))
@ -937,7 +941,7 @@ export function page(input: { sessionID: SessionID; limit: number; before?: stri
const row = Database.use((db) =>
db.select({ id: SessionTable.id }).from(SessionTable).where(eq(SessionTable.id, input.sessionID)).get(),
)
if (!row) throw new NotFoundError({ message: `Session not found: ${input.sessionID}` })
if (!row) return yield* new NotFoundError({ message: `Session not found: ${input.sessionID}` })
return {
items: [] as WithParts[],
more: false,
@ -954,24 +958,19 @@ export function page(input: { sessionID: SessionID; limit: number; before?: stri
more,
cursor: more && tail ? cursor.encode({ id: tail.id, time: tail.time_created }) : undefined,
}
}
export const pageEffect = Effect.fn("MessageV2.pageEffect")(function* (input: {
sessionID: SessionID
limit: number
before?: string
}) {
return yield* Effect.try({
try: () => page(input),
catch: (error) => error,
}).pipe(Effect.catch((error) => (NotFoundError.isInstance(error) ? Effect.fail(error) : Effect.die(error))))
})
export function* stream(sessionID: SessionID) {
const size = 50
let before: string | undefined
while (true) {
const next = page({ sessionID, limit: size, before })
const next = Effect.runSync(
page({ sessionID, limit: size, before }).pipe(
Effect.catchIf(NotFoundError.isInstance, () =>
Effect.succeed({ items: [] as WithParts[], more: false, cursor: undefined }),
),
),
)
if (next.items.length === 0) break
for (let i = next.items.length - 1; i >= 0; i--) {
yield next.items[i]
@ -996,7 +995,7 @@ export function parts(message_id: MessageID) {
)
}
export function get(input: { sessionID: SessionID; messageID: MessageID }): WithParts {
export const get = Effect.fn("MessageV2.get")(function* (input: { sessionID: SessionID; messageID: MessageID }) {
const row = Database.use((db) =>
db
.select()
@ -1004,21 +1003,11 @@ export function get(input: { sessionID: SessionID; messageID: MessageID }): With
.where(and(eq(MessageTable.id, input.messageID), eq(MessageTable.session_id, input.sessionID)))
.get(),
)
if (!row) throw new NotFoundError({ message: `Message not found: ${input.messageID}` })
if (!row) return yield* new NotFoundError({ message: `Message not found: ${input.messageID}` })
return {
info: info(row),
parts: parts(input.messageID),
}
}
export const getEffect = Effect.fn("MessageV2.getEffect")(function* (input: {
sessionID: SessionID
messageID: MessageID
}) {
return yield* Effect.try({
try: () => get(input),
catch: (error) => error,
}).pipe(Effect.catch((error) => (NotFoundError.isInstance(error) ? Effect.fail(error) : Effect.die(error))))
})
export function filterCompacted(msgs: Iterable<WithParts>) {