@@ -216,13 +216,34 @@ describe("orchestrator MCP toolkit", () => {
216216 } ,
217217 CodexOrchestratorReplayHarness ,
218218 ) ;
219+ // SQL spans carry no bound parameters, so this records which thread each tool read.
220+ const threadRecordReads : Array < {
221+ readonly threadId : ThreadId ;
222+ readonly fields : ReadonlyArray < string > ;
223+ } > = [ ] ;
219224 const layerOrchestration = Layer . merge (
220225 layerOrchestrator ,
221- ThreadManagementService . layer . pipe (
222- Layer . provide ( layerOrchestrator ) ,
223- Layer . provide ( ServerSettings . layerTest ( ) ) ,
226+ Layer . effect (
227+ ThreadManagementService . ThreadManagementService ,
228+ Effect . gen ( function * ( ) {
229+ const service = yield * ThreadManagementService . ThreadManagementService ;
230+ return ThreadManagementService . ThreadManagementService . of ( {
231+ ...service ,
232+ getThreadRecords : ( threadId , fields , filter ) =>
233+ Effect . sync ( ( ) => threadRecordReads . push ( { threadId, fields } ) ) . pipe (
234+ Effect . andThen ( service . getThreadRecords ( threadId , fields , filter ) ) ,
235+ ) ,
236+ } ) ;
237+ } ) ,
238+ ) . pipe (
224239 Layer . provide (
225- CommandReceiptStore . layer . pipe ( Layer . provide ( SqlitePersistence . layerMemory ) ) ,
240+ ThreadManagementService . layer . pipe (
241+ Layer . provide ( layerOrchestrator ) ,
242+ Layer . provide ( ServerSettings . layerTest ( ) ) ,
243+ Layer . provide (
244+ CommandReceiptStore . layer . pipe ( Layer . provide ( SqlitePersistence . layerMemory ) ) ,
245+ ) ,
246+ ) ,
226247 ) ,
227248 ) ,
228249 ) ;
@@ -603,6 +624,9 @@ describe("orchestrator MCP toolkit", () => {
603624 ) ;
604625 const transferReads : Array < string > = [ ] ;
605626 const messageReads : Array < string > = [ ] ;
627+ const runReads : Array < string > = [ ] ;
628+ const projectionTableReads : Array < string > = [ ] ;
629+ const acknowledgementReads : Array < string > = [ ] ;
606630 const tracer = Tracer . make ( {
607631 span ( options ) {
608632 const span = new Tracer . NativeSpan ( options ) ;
@@ -611,11 +635,29 @@ describe("orchestrator MCP toolkit", () => {
611635 end ( endTime , exit ) ;
612636 const query = span . attributes . get ( "db.query.text" ) ;
613637 if ( typeof query !== "string" ) return ;
638+ let parent = Option . getOrUndefined ( span . parent ) ;
639+ while ( parent ?. _tag === "Span" ) {
640+ if (
641+ parent . name === "Orchestrator.dispatchDelegatedTaskCompletionDeliveryResolution"
642+ ) {
643+ acknowledgementReads . push ( query ) ;
644+ break ;
645+ }
646+ parent = Option . getOrUndefined ( parent . parent ) ;
647+ }
648+ for ( const [ , table ] of query . matchAll (
649+ / F R O M o r c h e s t r a t i o n _ v 2 _ p r o j e c t i o n _ ( \w + ) / gi,
650+ ) ) {
651+ projectionTableReads . push ( table ! ) ;
652+ }
614653 if (
615654 / S E L E C T [ \s \S ] * F R O M o r c h e s t r a t i o n _ v 2 _ p r o j e c t i o n _ c o n t e x t _ t r a n s f e r s / i. test ( query )
616655 ) {
617656 transferReads . push ( query ) ;
618657 }
658+ if ( / S E L E C T \s + p a y l o a d _ j s o n \s + F R O M o r c h e s t r a t i o n _ v 2 _ p r o j e c t i o n _ r u n s / i. test ( query ) ) {
659+ runReads . push ( query ) ;
660+ }
619661 if (
620662 / S E L E C T \s + p a y l o a d _ j s o n \s + F R O M o r c h e s t r a t i o n _ v 2 _ p r o j e c t i o n _ m e s s a g e s / i. test ( query )
621663 ) {
@@ -687,18 +729,53 @@ describe("orchestrator MCP toolkit", () => {
687729 expect ( read . isError ) . not . toBe ( true ) ;
688730 expect ( transferReads . length ) . toBeGreaterThan ( 0 ) ;
689731 expect ( read . structuredContent ) . toEqual ( parentlessRead . structuredContent ) ;
732+ // The acknowledgement reads the task and its spawning run by id, not the parent's history.
733+ expect ( acknowledgementReads . length ) . toBeGreaterThan ( 0 ) ;
734+ expect (
735+ acknowledgementReads . filter (
736+ ( query ) =>
737+ / F R O M o r c h e s t r a t i o n _ v 2 _ p r o j e c t i o n _ ( n o d e s | r u n _ a t t e m p t s ) \b / . test ( query ) ||
738+ ( / F R O M o r c h e s t r a t i o n _ v 2 _ p r o j e c t i o n _ r u n s \b / . test ( query ) &&
739+ ! query . includes ( "AND run_id IN" ) ) ||
740+ ( / F R O M o r c h e s t r a t i o n _ v 2 _ p r o j e c t i o n _ s u b a g e n t s \b / . test ( query ) &&
741+ ! query . includes ( "AND subagent_id IN" ) ) ,
742+ ) ,
743+ ) . toEqual ( [ ] ) ;
690744 const afterRead = yield * orchestrator . getThreadProjection ( parentThreadId ) ;
691745 expect (
692746 afterRead . subagents . find ( ( task ) => task . id === queuedFollowup . taskId )
693747 ?. completionDelivery ?. state ,
694748 ) . toBe ( "acknowledged" ) ;
695749
696750 const messageReadsBeforeCapabilities = messageReads . length ;
751+ const tableReadsBeforeCapabilities = projectionTableReads . length ;
697752 const capabilities = yield * invoke ( "orchestrator_capabilities" , { } ) . pipe (
698753 Effect . withTracer ( tracer ) ,
699754 ) ;
700755 expect ( capabilities . isError ) . not . toBe ( true ) ;
701756 expect ( messageReads ) . toHaveLength ( messageReadsBeforeCapabilities ) ;
757+ // The caller check reads only the thread row, never its history.
758+ expect ( new Set ( projectionTableReads . slice ( tableReadsBeforeCapabilities ) ) ) . toEqual (
759+ new Set ( [ "threads" ] ) ,
760+ ) ;
761+ const runReadsBeforeStatus = runReads . length ;
762+ const transferReadsBeforeStatus = transferReads . length ;
763+ const threadRecordReadsBeforeStatus = threadRecordReads . length ;
764+ const statusAgain = yield * invoke ( "task_status" , { taskId : delegated . taskId } ) . pipe (
765+ Effect . withTracer ( tracer ) ,
766+ ) ;
767+ expect ( statusAgain . isError ) . not . toBe ( true ) ;
768+ // A task wait reads result transfers and runs from the child; the parent's stay unread.
769+ expect ( runReads ) . toHaveLength ( runReadsBeforeStatus + 1 ) ;
770+ expect ( transferReads ) . toHaveLength ( transferReadsBeforeStatus + 1 ) ;
771+ expect (
772+ threadRecordReads
773+ . slice ( threadRecordReadsBeforeStatus )
774+ . filter (
775+ ( { fields } ) => fields . includes ( "runs" ) || fields . includes ( "contextTransfers" ) ,
776+ )
777+ . map ( ( { threadId } ) => threadId ) ,
778+ ) . toEqual ( [ delegated . childThreadId ] ) ;
702779 } ) . pipe ( Effect . provide ( layerTest ) ) ;
703780 } ) ,
704781 ) ,
0 commit comments