@@ -278,6 +278,97 @@ describe("OrchestratorMcpService", () => {
278278 } ) ,
279279 ) ;
280280
281+ it . effect ( "reports the steered turn's result transfer for a follow-up promoted to Steer" , ( ) =>
282+ Effect . gen ( function * ( ) {
283+ const parentThreadId = ThreadId . make ( "thread:mcp-steer-parent" ) ;
284+ const childThreadId = ThreadId . make ( "thread:mcp-steer-child" ) ;
285+ const steeredTaskId = NodeId . make ( "node:mcp-steer-steered" ) ;
286+ const promotedTaskId = NodeId . make ( "node:mcp-steer-promoted" ) ;
287+ const steeredRunId = RunId . make ( "run:mcp-steer-steered" ) ;
288+ const promotedMessageId = "message:mcp-steer-promoted" ;
289+ const task = ( id : NodeId ) => ( {
290+ id,
291+ threadId : parentThreadId ,
292+ origin : "app_owned" ,
293+ childThreadId,
294+ driver : "codex" ,
295+ model : "gpt-5.6-terra" ,
296+ status : "completed" ,
297+ result : "Merged both branches." ,
298+ completionDelivery : { state : "delivered" } ,
299+ } ) ;
300+ const parentProjection = {
301+ thread : { id : parentThreadId } ,
302+ runs : [ ] ,
303+ contextTransfers : [
304+ {
305+ id : "context-transfer:mcp-steer-result" ,
306+ type : "subagent_result" ,
307+ sourceThreadId : childThreadId ,
308+ targetThreadId : parentThreadId ,
309+ sourcePoint : { runId : steeredRunId } ,
310+ } ,
311+ ] ,
312+ subagents : [ task ( steeredTaskId ) , task ( promotedTaskId ) ] ,
313+ } as unknown as OrchestrationV2ThreadProjection ;
314+ const childProjection = {
315+ thread : { id : childThreadId } ,
316+ runs : [
317+ { id : steeredRunId , ordinal : 1 , status : "completed" , delegatedTaskId : steeredTaskId } ,
318+ {
319+ id : RunId . make ( "run:mcp-steer-promoted" ) ,
320+ ordinal : 2 ,
321+ status : "cancelled" ,
322+ delegatedTaskId : promotedTaskId ,
323+ userMessageId : promotedMessageId ,
324+ } ,
325+ ] ,
326+ contextTransfers : [ ] ,
327+ // Promoting the follow-up moved its message into the steered run.
328+ messages : [ { id : promotedMessageId , role : "user" , runId : steeredRunId } ] ,
329+ subagents : [ ] ,
330+ providerThreads : [ ] ,
331+ turnItems : [ ] ,
332+ } as unknown as OrchestrationV2ThreadProjection ;
333+ const layerDependencies = Layer . mergeAll (
334+ NodeServices . layer ,
335+ Layer . mock ( ThreadManagementService . ThreadManagementService ) ( {
336+ getThreadRecords : ( threadId ) =>
337+ Effect . succeed ( threadId === parentThreadId ? parentProjection : childProjection ) ,
338+ delegatedTaskResultPending : ( ) => Effect . succeed ( false ) ,
339+ dispatch : ( ) => Effect . succeed ( { } as never ) ,
340+ } ) ,
341+ ServerSettings . layerTest ( ) ,
342+ Layer . mock ( ProviderRegistry . ProviderRegistry ) ( { getProviders : Effect . succeed ( [ ] ) } ) ,
343+ Layer . mock ( ProviderAdapterRegistry . ProviderAdapterRegistryV2 ) ( {
344+ list : ( ) => Effect . succeed ( [ ] ) ,
345+ } ) ,
346+ Layer . mock ( ProjectService . ProjectService ) ( { } ) ,
347+ Layer . mock ( SecretRequests . SecretRequests ) ( { } ) ,
348+ Layer . mock ( ScheduledTaskService . ScheduledTaskService ) ( { } ) ,
349+ ) ;
350+ const scope : McpInvocationScope = {
351+ environmentId : EnvironmentId . make ( "environment:mcp-steer" ) ,
352+ requestNamespace : "provider-session:mcp-steer" ,
353+ thread : {
354+ threadId : parentThreadId ,
355+ providerSessionId : "provider-session:mcp-steer" ,
356+ providerInstanceId : ProviderInstanceId . make ( "codex" ) ,
357+ } ,
358+ client : undefined ,
359+ capabilities : new Set ( [ "orchestration" ] ) ,
360+ issuedAt : 1 ,
361+ } ;
362+
363+ yield * Effect . gen ( function * ( ) {
364+ const service = yield * OrchestratorMcpService . OrchestratorMcpService ;
365+ const promoted = yield * service . taskStatus ( scope , promotedTaskId ) ;
366+ assert . equal ( promoted . status , "completed" ) ;
367+ assert . equal ( promoted . resultContextTransferId , "context-transfer:mcp-steer-result" ) ;
368+ } ) . pipe ( Effect . provide ( layerOrchestratorService . pipe ( Layer . provide ( layerDependencies ) ) ) ) ;
369+ } ) ,
370+ ) ;
371+
281372 it . effect ( "does not dispose delivery when a nonterminal task has no active child run" , ( ) =>
282373 Effect . gen ( function * ( ) {
283374 const parentThreadId = ThreadId . make ( "thread:mcp-cancel-parent" ) ;
0 commit comments