@@ -33,6 +33,7 @@ import * as EventStore from "./EventStore.ts";
3333import * as IdAllocator from "./IdAllocator.ts" ;
3434import * as ProjectionStore from "./ProjectionStore.ts" ;
3535import * as ProviderEventIngestor from "./ProviderEventIngestor.ts" ;
36+ import * as ThreadCommandExecutor from "./ThreadCommandExecutor.ts" ;
3637import { makeProviderFailure } from "./ProviderFailure.ts" ;
3738import {
3839 makeProviderEventRoutingState ,
@@ -54,8 +55,16 @@ const TestLayer = Layer.mergeAll(
5455 TestStoresLayer ,
5556 TestEventSinkLayer ,
5657 IdAllocator . layer ,
58+ ThreadCommandExecutor . layer ,
5759 ProviderEventIngestor . layer . pipe (
58- Layer . provide ( Layer . mergeAll ( TestStoresLayer , TestEventSinkLayer , IdAllocator . layer ) ) ,
60+ Layer . provide (
61+ Layer . mergeAll (
62+ TestStoresLayer ,
63+ TestEventSinkLayer ,
64+ IdAllocator . layer ,
65+ ThreadCommandExecutor . layer ,
66+ ) ,
67+ ) ,
5968 ) ,
6069) ;
6170const modelSelection = {
@@ -1234,4 +1243,99 @@ layer("ProviderEventIngestorV2", (it) => {
12341243 assert . equal ( messageEvents [ 0 ] ?. threadId , childThreadId ) ;
12351244 } ) ,
12361245 ) ;
1246+
1247+ it . effect ( "moves a native subagent's thread to the model its provider reports later" , ( ) =>
1248+ Effect . gen ( function * ( ) {
1249+ const now = yield * DateTime . now ;
1250+ const eventSink = yield * EventSink . EventSinkV2 ;
1251+ const projectionStore = yield * ProjectionStore . ProjectionStoreV2 ;
1252+ const ingestor = yield * ProviderEventIngestor . ProviderEventIngestorV2 ;
1253+ const idAllocator = yield * IdAllocator . IdAllocatorV2 ;
1254+ const rootEvent = yield * threadCreatedEvent ( now ) ;
1255+ if ( rootEvent . type !== "thread.created" ) {
1256+ throw new Error ( "Expected a thread.created fixture event" ) ;
1257+ }
1258+ const childThreadId = idAllocator . derive . threadFromProviderThread ( {
1259+ driver : CODEX_DRIVER ,
1260+ nativeThreadId : "native-late-model-subagent" ,
1261+ } ) ;
1262+ const providerSessionId = yield * idAllocator . allocate . providerSession ( {
1263+ providerInstanceId : modelSelection . instanceId ,
1264+ threadId : rootEvent . threadId ,
1265+ } ) ;
1266+ const ingest = ( event : ProviderEventIngestor . ProviderEventIngestInput [ "event" ] ) =>
1267+ ingestor . ingestNormalized ( {
1268+ providerSessionId,
1269+ providerInstanceId : modelSelection . instanceId ,
1270+ threadId : rootEvent . threadId ,
1271+ event,
1272+ } ) ;
1273+ yield * eventSink . write ( { events : [ rootEvent ] } ) ;
1274+ // The subagent's thread starts on the parent's model and options.
1275+ yield * ingest ( {
1276+ type : "app_thread.created" ,
1277+ driver : CODEX_DRIVER ,
1278+ appThread : {
1279+ ...rootEvent . payload ,
1280+ id : childThreadId ,
1281+ title : "review design" ,
1282+ modelSelection : {
1283+ ...modelSelection ,
1284+ options : [ { id : "reasoningEffort" , value : "xhigh" } ] ,
1285+ } ,
1286+ activeProviderThreadId : null ,
1287+ lineage : {
1288+ parentThreadId : rootEvent . threadId ,
1289+ relationshipToParent : "subagent" ,
1290+ rootThreadId : rootEvent . threadId ,
1291+ } ,
1292+ } ,
1293+ } ) ;
1294+ const subagentUpdated = {
1295+ type : "subagent.updated" ,
1296+ driver : CODEX_DRIVER ,
1297+ subagent : {
1298+ id : NodeId . make ( "node:late-model-subagent" ) ,
1299+ threadId : rootEvent . threadId ,
1300+ runId : null ,
1301+ parentNodeId : NodeId . make ( "node:root" ) ,
1302+ origin : "provider_native" ,
1303+ createdBy : "agent" ,
1304+ driver : CODEX_DRIVER ,
1305+ providerInstanceId : modelSelection . instanceId ,
1306+ providerThreadId : null ,
1307+ childThreadId,
1308+ nativeTaskRef : null ,
1309+ prompt : "Review the design" ,
1310+ title : "review design" ,
1311+ model : "gpt-6.1-sol" ,
1312+ status : "running" ,
1313+ result : null ,
1314+ startedAt : now ,
1315+ completedAt : null ,
1316+ updatedAt : now ,
1317+ } ,
1318+ } satisfies ProviderEventIngestor . ProviderEventIngestInput [ "event" ] ;
1319+
1320+ const first = yield * ingest ( subagentUpdated ) ;
1321+ const repeated = yield * ingest ( subagentUpdated ) ;
1322+ const childThread = yield * projectionStore . getThread ( childThreadId ) ;
1323+
1324+ assert . deepEqual (
1325+ first . map ( ( stored ) => [ stored . event . type , stored . event . threadId ] ) ,
1326+ [
1327+ [ "subagent.updated" , rootEvent . threadId ] ,
1328+ [ "thread.model-selection-updated" , childThreadId ] ,
1329+ ] ,
1330+ ) ;
1331+ assert . deepEqual (
1332+ repeated . map ( ( stored ) => stored . event . type ) ,
1333+ [ "subagent.updated" ] ,
1334+ ) ;
1335+ assert . deepEqual ( childThread . modelSelection , {
1336+ instanceId : modelSelection . instanceId ,
1337+ model : "gpt-6.1-sol" ,
1338+ } ) ;
1339+ } ) ,
1340+ ) ;
12371341} ) ;
0 commit comments