@@ -5763,6 +5763,23 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
57635763 : row . sourceItemId === options . itemId ,
57645764 ) ;
57655765 const page = matching . slice ( 0 , options . limit ) ;
5766+ const sources = yield * encodeTimelineSources (
5767+ page
5768+ . filter ( ( row ) => row . synthetic === undefined )
5769+ . map ( ( row ) => ( { threadId : row . sourceThreadId , id : row . sourceItemId } ) ) ,
5770+ ) ;
5771+ const payloads = yield * sql < {
5772+ thread_id : string ;
5773+ turn_item_id : string ;
5774+ payload_json : string ;
5775+ } > `
5776+ SELECT item.thread_id, item.turn_item_id, item.payload_json
5777+ FROM orchestration_v2_projection_turn_items item JOIN json_each(${ sources } ) wanted
5778+ ON item.thread_id = json_extract(wanted.value, '$.threadId')
5779+ AND item.turn_item_id = json_extract(wanted.value, '$.id')` ;
5780+ const byIdentity = new Map (
5781+ payloads . map ( ( row ) => [ `${ row . thread_id } :${ row . turn_item_id } ` , row . payload_json ] ) ,
5782+ ) ;
57665783 const items = yield * Effect . forEach ( page , ( row ) =>
57675784 Effect . gen ( function * ( ) {
57685785 if ( row . synthetic !== undefined )
@@ -5773,19 +5790,18 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
57735790 visibility : row . visibility ,
57745791 item : row . synthetic ,
57755792 } ;
5776- const payloads =
5777- yield * sql < PayloadRow > `SELECT payload_json FROM orchestration_v2_projection_turn_items
5778- WHERE thread_id = ${ row . sourceThreadId } AND turn_item_id = ${ row . sourceItemId } ` ;
5779- const decoded = yield * decodeRows (
5780- decodeTurnItemPayload ,
5781- row . sourceThreadId ,
5782- ) ( payloads ) ;
5783- const item = decoded [ 0 ] ;
5784- if ( item === undefined )
5793+ const payload = byIdentity . get ( `${ row . sourceThreadId } :${ row . sourceItemId } ` ) ;
5794+ if ( payload === undefined )
57855795 return yield * new ProjectionStoreReadError ( {
57865796 threadId,
57875797 cause : "Timeline item disappeared during snapshot" ,
57885798 } ) ;
5799+ const item = yield * decodeTurnItemPayload ( payload ) . pipe (
5800+ Effect . mapError (
5801+ ( cause ) =>
5802+ new ProjectionStoreReadError ( { threadId : row . sourceThreadId , cause } ) ,
5803+ ) ,
5804+ ) ;
57895805 return {
57905806 position : row . position ,
57915807 sourceThreadId : row . sourceThreadId ,
0 commit comments