11import { describe , expect } from "bun:test"
2- import { Cause , DateTime , Deferred , Effect , Exit , Fiber , Layer , Option , Schema , Stream } from "effect"
2+ import { Cause , DateTime , Deferred , Effect , Exit , Fiber , Layer , Option , Ref , Schema , Stream } from "effect"
33import { EventV2 } from "@opencode-ai/core/event"
44import { Event } from "@opencode-ai/schema/event"
55import { Session } from "@opencode-ai/schema/session"
@@ -80,9 +80,7 @@ const durableData = (sessionID: Session.ID, text: string) => ({
8080
8181/** Followed log read without markers: the old `durable` stream shape. */
8282const tail = ( events : EventV2 . Interface , input : { aggregateID : string ; after ?: number } ) =>
83- events
84- . log ( { ...input , follow : true } )
85- . pipe ( Stream . filter ( ( item ) : item is EventV2 . Payload => ! EventV2 . isCaughtUp ( item ) ) )
83+ events . log ( { ...input , follow : true } ) . pipe ( Stream . filter ( ( item ) : item is EventV2 . Payload => ! EventV2 . isSynced ( item ) ) )
8684
8785const it = testEffect (
8886 AppNodeBuilder . build ( LayerNode . group ( [ Database . node , EventV2 . node , Location . node ] ) , [ [ Location . node , locationLayer ] ] ) ,
@@ -1128,7 +1126,7 @@ describe("EventV2", () => {
11281126 } ) ,
11291127 )
11301128
1131- it . effect ( "log without follow replays events and completes with a caught-up marker" , ( ) =>
1129+ it . effect ( "log without follow replays events and completes with a synced marker" , ( ) =>
11321130 Effect . gen ( function * ( ) {
11331131 const events = yield * EventV2 . Service
11341132 const aggregateID = Session . ID . create ( )
@@ -1137,16 +1135,16 @@ describe("EventV2", () => {
11371135
11381136 const items = Array . from ( yield * Stream . runCollect ( events . log ( { aggregateID } ) ) )
11391137
1140- expect ( items . map ( ( item ) => ( EventV2 . isCaughtUp ( item ) ? item . type : item . durable ?. seq ) ) ) . toEqual ( [
1138+ expect ( items . map ( ( item ) => ( EventV2 . isSynced ( item ) ? item . type : item . durable ?. seq ) ) ) . toEqual ( [
11411139 EventV2 . Seq . make ( 0 ) ,
11421140 EventV2 . Seq . make ( 1 ) ,
1143- "log.caught_up " ,
1141+ "log.synced " ,
11441142 ] )
1145- expect ( items . at ( - 1 ) ) . toEqual ( { type : "log.caught_up " , aggregateID, seq : EventV2 . Seq . make ( 1 ) } )
1143+ expect ( items . at ( - 1 ) ) . toEqual ( { type : "log.synced " , aggregateID, seq : EventV2 . Seq . make ( 1 ) } )
11461144 } ) ,
11471145 )
11481146
1149- it . effect ( "log caught-up marker omits seq for an empty log and keeps the cursor otherwise" , ( ) =>
1147+ it . effect ( "log synced marker omits seq for an empty log and keeps the cursor otherwise" , ( ) =>
11501148 Effect . gen ( function * ( ) {
11511149 const events = yield * EventV2 . Service
11521150 const aggregateID = Session . ID . create ( )
@@ -1155,13 +1153,13 @@ describe("EventV2", () => {
11551153 yield * events . publish ( DurableMessage , durableData ( aggregateID , "zero" ) )
11561154 const drained = Array . from ( yield * Stream . runCollect ( events . log ( { aggregateID, after : 0 } ) ) )
11571155
1158- expect ( empty ) . toEqual ( [ { type : "log.caught_up " , aggregateID } ] )
1156+ expect ( empty ) . toEqual ( [ { type : "log.synced " , aggregateID } ] )
11591157 expect ( empty [ 0 ] ) . not . toHaveProperty ( "seq" )
1160- expect ( drained ) . toEqual ( [ { type : "log.caught_up " , aggregateID, seq : EventV2 . Seq . make ( 0 ) } ] )
1158+ expect ( drained ) . toEqual ( [ { type : "log.synced " , aggregateID, seq : EventV2 . Seq . make ( 0 ) } ] )
11611159 } ) ,
11621160 )
11631161
1164- it . effect ( "log with follow emits the caught-up marker at the replay-to-live boundary" , ( ) =>
1162+ it . effect ( "log with follow emits the synced marker at the replay-to-live boundary" , ( ) =>
11651163 Effect . gen ( function * ( ) {
11661164 const events = yield * EventV2 . Service
11671165 const aggregateID = Session . ID . create ( )
@@ -1174,14 +1172,79 @@ describe("EventV2", () => {
11741172 yield * events . publish ( DurableMessage , durableData ( aggregateID , "one" ) )
11751173
11761174 const items = Array . from ( yield * Fiber . join ( fiber ) )
1177- expect ( items . map ( ( item ) => ( EventV2 . isCaughtUp ( item ) ? item : item . durable ?. seq ) ) ) . toEqual ( [
1175+ expect ( items . map ( ( item ) => ( EventV2 . isSynced ( item ) ? item : item . durable ?. seq ) ) ) . toEqual ( [
11781176 EventV2 . Seq . make ( 0 ) ,
1179- { type : "log.caught_up " , aggregateID, seq : EventV2 . Seq . make ( 0 ) } ,
1177+ { type : "log.synced " , aggregateID, seq : EventV2 . Seq . make ( 0 ) } ,
11801178 EventV2 . Seq . make ( 1 ) ,
11811179 ] )
11821180 } ) ,
11831181 )
11841182
1183+ it . effect ( "log replays across configured read pages" , ( ) =>
1184+ Effect . gen ( function * ( ) {
1185+ const eventLayer = EventV2 . layerWith ( { logReadPageSize : 2 } ) . pipe ( Layer . provide ( LayerNode . compile ( Database . node ) ) )
1186+
1187+ yield * Effect . gen ( function * ( ) {
1188+ const events = yield * EventV2 . Service
1189+ const aggregateID = Session . ID . create ( )
1190+ yield * events . publish ( DurableMessage , durableData ( aggregateID , "zero" ) )
1191+ yield * events . publish ( DurableMessage , durableData ( aggregateID , "one" ) )
1192+ yield * events . publish ( DurableMessage , durableData ( aggregateID , "two" ) )
1193+ yield * events . publish ( DurableMessage , durableData ( aggregateID , "three" ) )
1194+ yield * events . publish ( DurableMessage , durableData ( aggregateID , "four" ) )
1195+
1196+ const items = Array . from ( yield * Stream . runCollect ( events . log ( { aggregateID } ) ) )
1197+
1198+ expect ( items . map ( ( item ) => ( EventV2 . isSynced ( item ) ? item . type : item . durable ?. seq ) ) ) . toEqual ( [
1199+ EventV2 . Seq . make ( 0 ) ,
1200+ EventV2 . Seq . make ( 1 ) ,
1201+ EventV2 . Seq . make ( 2 ) ,
1202+ EventV2 . Seq . make ( 3 ) ,
1203+ EventV2 . Seq . make ( 4 ) ,
1204+ "log.synced" ,
1205+ ] )
1206+ expect ( items . at ( - 1 ) ) . toEqual ( { type : "log.synced" , aggregateID, seq : EventV2 . Seq . make ( 4 ) } )
1207+ } ) . pipe ( Effect . provide ( Layer . merge ( LayerNode . compile ( Database . node ) , eventLayer ) ) )
1208+ } ) ,
1209+ )
1210+
1211+ it . effect ( "log with follow emits events committed during replay after the synced marker" , ( ) =>
1212+ Effect . gen ( function * ( ) {
1213+ const readStarted = yield * Deferred . make < void > ( )
1214+ const releaseRead = yield * Deferred . make < void > ( )
1215+ const firstRead = yield * Ref . make ( true )
1216+ const eventLayer = EventV2 . layerWith ( {
1217+ beforeAggregateRead : ( ) =>
1218+ Ref . getAndSet ( firstRead , false ) . pipe (
1219+ Effect . flatMap ( ( shouldBlock ) => {
1220+ if ( ! shouldBlock ) return Effect . void
1221+ return Deferred . succeed ( readStarted , undefined ) . pipe ( Effect . andThen ( Deferred . await ( releaseRead ) ) )
1222+ } ) ,
1223+ ) ,
1224+ } ) . pipe ( Layer . provide ( LayerNode . compile ( Database . node ) ) )
1225+
1226+ yield * Effect . gen ( function * ( ) {
1227+ const events = yield * EventV2 . Service
1228+ const aggregateID = Session . ID . create ( )
1229+ yield * events . publish ( DurableMessage , durableData ( aggregateID , "zero" ) )
1230+ const fiber = yield * events
1231+ . log ( { aggregateID, follow : true } )
1232+ . pipe ( Stream . take ( 3 ) , Stream . runCollect , Effect . forkScoped )
1233+
1234+ yield * Deferred . await ( readStarted )
1235+ yield * events . publish ( DurableMessage , durableData ( aggregateID , "one" ) )
1236+ yield * Deferred . succeed ( releaseRead , undefined )
1237+
1238+ const items = Array . from ( yield * Fiber . join ( fiber ) )
1239+ expect ( items . map ( ( item ) => ( EventV2 . isSynced ( item ) ? item : item . durable ?. seq ) ) ) . toEqual ( [
1240+ EventV2 . Seq . make ( 0 ) ,
1241+ { type : "log.synced" , aggregateID, seq : EventV2 . Seq . make ( 0 ) } ,
1242+ EventV2 . Seq . make ( 1 ) ,
1243+ ] )
1244+ } ) . pipe ( Effect . provide ( Layer . merge ( LayerNode . compile ( Database . node ) , eventLayer ) ) )
1245+ } ) ,
1246+ )
1247+
11851248 it . effect ( "changes emits sweep-required on subscribe then coalesced hints per aggregate" , ( ) =>
11861249 Effect . gen ( function * ( ) {
11871250 const events = yield * EventV2 . Service
0 commit comments