@@ -42,6 +42,10 @@ interface FindDocument extends FindRow {
4242 readonly runId : OrchestrationV2TurnItem [ "runId" ] ;
4343 readonly count : number ;
4444}
45+ interface RenderedDocument extends Omit < FindDocument , "count" > {
46+ readonly segments : readonly string [ ] ;
47+ readonly sourceLength : number ;
48+ }
4549type CompletedScans = Map <
4650 string ,
4751 {
@@ -50,6 +54,17 @@ type CompletedScans = Map<
5054 sourceThreadIds : readonly ThreadId [ ] ;
5155 }
5256> ;
57+ // Segments may retain slices of their source text, so the budget includes both.
58+ interface RenderedSnapshot {
59+ current :
60+ | {
61+ key : string ;
62+ sequence : number ;
63+ documents : readonly RenderedDocument [ ] ;
64+ sourceThreadIds : readonly ThreadId [ ] ;
65+ }
66+ | undefined ;
67+ }
5368class TextKey extends Data . Class < {
5469 text : string ;
5570 role : "user" | "assistant" | "plan" ;
@@ -190,7 +205,7 @@ export const makeThreadFind = Effect.fn("makeThreadFind")(function* (
190205 Schema . Struct ( {
191206 threadId : ThreadId ,
192207 cwd : Schema . optional ( Schema . String ) ,
193- query : Schema . String ,
208+ query : Schema . optional ( Schema . String ) ,
194209 skills : OrchestrationV2SearchThreadInput . fields . skills ,
195210 } ) ,
196211 ) ,
@@ -262,6 +277,7 @@ export const makeThreadFind = Effect.fn("makeThreadFind")(function* (
262277 // Bounded separately because each entry can hold a large body; typing reuses the parse.
263278 largeText : makeTextCache ( 32 ) ,
264279 scans : Effect . sync ( ( ) : CompletedScans => new Map ( ) ) ,
280+ rendered : Effect . sync ( ( ) : RenderedSnapshot => ( { current : undefined } ) ) ,
265281 } ) ,
266282 idleTimeToLive : "1 minute" ,
267283 } ) ;
@@ -288,7 +304,11 @@ export const makeThreadFind = Effect.fn("makeThreadFind")(function* (
288304 return revision [ 0 ] ?. sequence ?? 0 ;
289305 } ) ;
290306 const snapshot = Effect . fn ( "ThreadFind.snapshot" ) (
291- function * ( input : OrchestrationV2SearchThreadInput , scans : CompletedScans ) {
307+ function * (
308+ input : OrchestrationV2SearchThreadInput ,
309+ scans : CompletedScans ,
310+ renderedSnapshot : RenderedSnapshot ,
311+ ) {
292312 const { threadId } = input ;
293313 const active = yield * sql < { cwd : string | null } > `
294314 SELECT COALESCE(json_extract(t.payload_json, '$.worktreePath'), p.workspace_root) AS cwd
@@ -310,6 +330,25 @@ export const makeThreadFind = Effect.fn("makeThreadFind")(function* (
310330 scans . set ( cacheKey , cached ) ;
311331 return { result : resultForSelection ( selected , cached . documents , cached . sequence ) } ;
312332 }
333+ const documentKey = yield * encodeCacheKey ( {
334+ threadId,
335+ cwd,
336+ skills : input . skills ?? [ ] ,
337+ } ) ;
338+ const rendered = renderedSnapshot . current ;
339+ if (
340+ rendered ?. key === documentKey &&
341+ rendered . sequence === ( yield * readRevision ( rendered . sourceThreadIds ) )
342+ ) {
343+ return {
344+ rendered : rendered . documents ,
345+ cwd,
346+ sequence : rendered . sequence ,
347+ cacheKey,
348+ documentKey,
349+ sourceThreadIds : rendered . sourceThreadIds ,
350+ } ;
351+ }
313352 const index = yield * readIndex ( threadId ) ;
314353 const sourceThreadIds = [ ...new Set ( [ threadId , ...index . map ( ( row ) => row . sourceThreadId ) ] ) ] ;
315354 const sequence = yield * readRevision ( sourceThreadIds ) ;
@@ -346,7 +385,7 @@ export const makeThreadFind = Effect.fn("makeThreadFind")(function* (
346385 emptyReplyRunIds . has ( row . item . runId ) ,
347386 ) ,
348387 ) ;
349- return { payloads, toolPayloads, cwd, sequence, cacheKey, sourceThreadIds } ;
388+ return { payloads, toolPayloads, cwd, sequence, cacheKey, documentKey , sourceThreadIds } ;
350389 } ,
351390 ( effect ) => sql . withTransaction ( effect ) . pipe ( NodeSqliteClient . readOnly ) ,
352391 ( effect , input ) =>
@@ -361,11 +400,13 @@ export const makeThreadFind = Effect.fn("makeThreadFind")(function* (
361400 const searchThreadStream = ( input : OrchestrationV2SearchThreadInput ) =>
362401 Stream . unwrap (
363402 Effect . gen ( function * ( ) {
364- const { scans, ...textCache } = yield * RcRef . get ( findCaches ) ;
403+ const { scans, rendered : renderedSnapshot , ...textCache } = yield * RcRef . get ( findCaches ) ;
365404 // Release SQLite before decoding and parsing. Both frames describe one snapshot.
366- const data = yield * snapshot ( input , scans ) ;
405+ const data = yield * snapshot ( input , scans , renderedSnapshot ) ;
367406 if ( data . result ) return Stream . succeed ( data . result ) ;
368- const { payloads, toolPayloads, cwd, sequence, cacheKey, sourceThreadIds } = data ;
407+ const { cwd, sequence, cacheKey, documentKey, sourceThreadIds } = data ;
408+ const payloads = data . payloads ?? [ ] ;
409+ const toolPayloads = data . toolPayloads ?? [ ] ;
369410 const decode = ( row : FindPayload ) =>
370411 decodeItem ( row . payload ) . pipe (
371412 Effect . map ( ( item ) => ( { ...row , item } ) ) ,
@@ -392,40 +433,62 @@ export const makeThreadFind = Effect.fn("makeThreadFind")(function* (
392433 )
393434 embeddedResultRunIds . add ( item . runId ) ;
394435 }
395- const rows = payloads . filter (
396- ( row ) =>
397- row . type !== "user_input_request" &&
398- ! ( row . type === "user_message" && foldedAnswerRunIds . get ( row . entryId ) === row . runId ) ,
399- ) ;
400- const documents = new Map < number , FindDocument > ( ) ;
401- const count = Effect . fnUntraced ( function * ( row : FindPayload ) {
436+ const rows =
437+ data . rendered ??
438+ payloads . filter (
439+ ( row ) =>
440+ row . type !== "user_input_request" &&
441+ ! ( row . type === "user_message" && foldedAnswerRunIds . get ( row . entryId ) === row . runId ) ,
442+ ) ;
443+ const documents = new Map < number , FindDocument & RenderedDocument > ( ) ;
444+ const count = Effect . fnUntraced ( function * ( row : FindPayload | RenderedDocument ) {
402445 const cached = documents . get ( row . position ) ;
403446 if ( cached ) return cached ;
404- const decoded = yield * decode ( row ) ;
405- if (
406- decoded . item . type === "assistant_message" &&
407- decoded . item . text === "" &&
408- embeddedResultRunIds . has ( decoded . item . runId )
409- ) {
410- const document = documentFor ( decoded , 0 ) ;
411- documents . set ( row . position , document ) ;
412- return document ;
447+ let rendered : RenderedDocument ;
448+ if ( "segments" in row ) {
449+ rendered = row ;
450+ } else {
451+ const decoded = yield * decode ( row ) ;
452+ const key = textKey ( decoded . item , cwd , input . skills ?? [ ] ) ;
453+ const segments =
454+ decoded . item . type === "assistant_message" &&
455+ decoded . item . text === "" &&
456+ embeddedResultRunIds . has ( decoded . item . runId )
457+ ? [ ]
458+ : yield * Cache . get (
459+ key . text . length <= 32_768 ? textCache . text : textCache . largeText ,
460+ key ,
461+ ) ;
462+ rendered = { ...documentFor ( decoded , 0 ) , segments, sourceLength : key . text . length } ;
413463 }
414- const key = textKey ( decoded . item , cwd , input . skills ?? [ ] ) ;
415- const segments = yield * Cache . get (
416- key . text . length <= 32_768 ? textCache . text : textCache . largeText ,
417- key ,
418- ) ;
419- const document = documentFor ( decoded , countSegments ( segments , input . query ) ) ;
464+ const document = {
465+ ...rendered ,
466+ count : countSegments ( rendered . segments , input . query ) ,
467+ } ;
420468 documents . set ( row . position , document ) ;
421469 yield * Effect . yieldNow ;
422470 return document ;
423471 } ) ;
424472 const finish = Effect . gen ( function * ( ) {
425473 for ( const row of rows ) yield * count ( row ) ;
426474 const ordered = rows . map ( ( row ) => documents . get ( row . position ) ! ) ;
475+ renderedSnapshot . current =
476+ ordered . length <= 8192 &&
477+ ordered . reduce (
478+ ( size , doc ) =>
479+ size + doc . sourceLength + doc . segments . reduce ( ( sum , text ) => sum + text . length , 0 ) ,
480+ 0 ,
481+ ) <= 2_097_152
482+ ? { key : documentKey , sequence, documents : ordered , sourceThreadIds }
483+ : undefined ;
427484 scans . delete ( cacheKey ) ;
428- scans . set ( cacheKey , { sequence, documents : ordered , sourceThreadIds } ) ;
485+ scans . set ( cacheKey , {
486+ sequence,
487+ documents : ordered . map (
488+ ( { segments : _segments , sourceLength : _sourceLength , ...document } ) => document ,
489+ ) ,
490+ sourceThreadIds,
491+ } ) ;
429492 if ( scans . size > 8 ) {
430493 const oldest = scans . keys ( ) . next ( ) . value ;
431494 if ( oldest !== undefined ) scans . delete ( oldest ) ;
0 commit comments