@@ -21,6 +21,7 @@ import {
2121 type ProviderThreadId ,
2222 type ProviderTurnId ,
2323 type RunAttemptId ,
24+ type RuntimeRequestId ,
2425 type ThreadId ,
2526 type TurnItemId ,
2627} from "@t3tools/contracts" ;
@@ -152,6 +153,11 @@ export function selectInheritedBackgroundTurnItems(input: {
152153
153154type SubagentTurnItem = Extract < OrchestrationV2TurnItem , { readonly type : "subagent" } > ;
154155
156+ type PendingRequestTurn = {
157+ readonly threadId : ThreadId ;
158+ readonly providerTurnId : ProviderTurnId ;
159+ } ;
160+
155161type OpenRunOwnedSubagentProjection = {
156162 readonly subagents : ReadonlyMap < NodeId , OrchestrationV2Subagent > ;
157163 readonly turnItems : ReadonlyMap < NodeId , SubagentTurnItem > ;
@@ -635,6 +641,7 @@ export const layer: Layer.Layer<
635641 readonly terminal : ProviderTerminalEvent ;
636642 readonly completedAt ?: DateTime . Utc ;
637643 readonly failureItemPersisted : boolean ;
644+ readonly pendingRequestTurns ?: ReadonlyArray < PendingRequestTurn > ;
638645 readonly refreshAfterTurn : Effect . Effect < void > ;
639646 readonly writeIfRunCurrent ?: {
640647 readonly activeAttemptId : RunAttemptId ;
@@ -740,20 +747,33 @@ export const layer: Layer.Layer<
740747 `command:effect:checkpoint.capture:${ input . run . id } ` ,
741748 ) ;
742749 // Failed turns without continuing children have no consumer for their pending callbacks.
743- const cancelledRequestEvents =
744- input . terminal . status === "failed" && ! childTurnsContinue ( input . terminal )
745- ? ( yield * providerEventIngestor . normalize ( {
746- providerSessionId : input . providerSessionId ,
747- providerInstanceId : input . run . providerInstanceId ,
748- threadId : input . run . threadId ,
749- runId : input . run . id ,
750- nodeId : input . rootNode . id ,
751- event : input . terminal ,
752- withdrawApprovals : true ,
753- } ) ) . filter (
750+ const cancelledRequestEvents : Array < OrchestrationV2DomainEvent > = [ ] ;
751+ if ( input . terminal . status === "failed" && ! childTurnsContinue ( input . terminal ) ) {
752+ const turns = new Map < ThreadId , Set < ProviderTurnId > > ( ) ;
753+ for ( const turn of [
754+ { threadId : input . run . threadId , providerTurnId : input . terminal . providerTurnId } ,
755+ ...( input . pendingRequestTurns ?? [ ] ) ,
756+ ] ) {
757+ const seen = turns . get ( turn . threadId ) ?? new Set < ProviderTurnId > ( ) ;
758+ if ( seen . has ( turn . providerTurnId ) ) continue ;
759+ seen . add ( turn . providerTurnId ) ;
760+ turns . set ( turn . threadId , seen ) ;
761+ const events = yield * providerEventIngestor . normalize ( {
762+ providerSessionId : input . providerSessionId ,
763+ providerInstanceId : input . run . providerInstanceId ,
764+ threadId : turn . threadId ,
765+ runId : input . run . id ,
766+ nodeId : input . rootNode . id ,
767+ event : { ...input . terminal , providerTurnId : turn . providerTurnId } ,
768+ withdrawApprovals : true ,
769+ } ) ;
770+ cancelledRequestEvents . push (
771+ ...events . filter (
754772 ( event ) => event . type !== "turn-item.updated" || event . payload . type !== "error" ,
755- )
756- : [ ] ;
773+ ) ,
774+ ) ;
775+ }
776+ }
757777 const finalization = {
758778 guardPendingRuntimeRequestCancellations : true ,
759779 // Stopped runs capture rollback points for the next message; enqueue before later starts on this effect lane.
@@ -1083,6 +1103,13 @@ export const layer: Layer.Layer<
10831103 : { relatedProviderThreadIds : input . relatedProviderThreadIds } ) ,
10841104 } ) ,
10851105 ) ;
1106+ const pendingRequestTurns = new Map < RuntimeRequestId , PendingRequestTurn > ( ) ;
1107+ const ownedPendingRequestTurns = ( routing : ProviderEventRoutingState ) =>
1108+ [ ...pendingRequestTurns . values ( ) ] . filter (
1109+ ( turn ) =>
1110+ routing . ownedProviderTurns . has ( turn . providerTurnId ) ||
1111+ ( turn . threadId !== input . run . threadId && routing . ownedThreadIds . has ( turn . threadId ) ) ,
1112+ ) ;
10861113 const rootTerminalSeen = yield * Ref . make ( false ) ;
10871114 const rootRunFinalized = yield * Ref . make ( false ) ;
10881115 const providerThreadOwnerLost = yield * Ref . make ( false ) ;
@@ -1128,6 +1155,7 @@ export const layer: Layer.Layer<
11281155 ? { }
11291156 : { loadRunInterruptReason : input . loadRunInterruptReason } ) ,
11301157 openRunOwnedSubagents : openSubagents ,
1158+ pendingRequestTurns : ownedPendingRequestTurns ( yield * Ref . get ( eventRouting ) ) ,
11311159 terminal,
11321160 failureItemPersisted : terminal . status === "failed" ,
11331161 refreshAfterTurn,
@@ -1145,6 +1173,15 @@ export const layer: Layer.Layer<
11451173 deliverable : boolean ,
11461174 ) {
11471175 const routing = yield * Ref . get ( eventRouting ) ;
1176+ if ( event . type === "runtime_request.updated" ) {
1177+ const request = event . runtimeRequest ;
1178+ if ( request . status === "pending" && request . providerTurnId !== null ) {
1179+ pendingRequestTurns . set ( request . id , {
1180+ threadId : event . threadId ?? input . run . threadId ,
1181+ providerTurnId : request . providerTurnId ,
1182+ } ) ;
1183+ } else pendingRequestTurns . delete ( request . id ) ;
1184+ }
11481185 if ( event . type === "provider_turn.updated" ) {
11491186 const isRoot =
11501187 event . providerTurn . runAttemptId === input . attempt . id ||
@@ -1633,6 +1670,7 @@ export const layer: Layer.Layer<
16331670 expectedStatus : "running" ,
16341671 } ,
16351672 openRunOwnedSubagents : openSubagents ,
1673+ pendingRequestTurns : ownedPendingRequestTurns ( routing ) ,
16361674 ...( abandonedProviderTurn === null ? { } : { abandonedProviderTurn } ) ,
16371675 completedAt,
16381676 terminal : makeFailedTerminalEvent (
0 commit comments