@@ -622,6 +622,7 @@ export const layer: Layer.Layer<
622622 readonly shouldFinalizeRun ?: ( ) => Effect . Effect < boolean , ProjectionStoreV2Error > ;
623623 readonly hasUnpairedRunInterruptRequest ?: ( ) => Effect . Effect < boolean , never > ;
624624 readonly openRunOwnedSubagents ?: OpenRunOwnedSubagentProjection ;
625+ readonly interruptedProviderTurn ?: OrchestrationV2ProviderTurn ;
625626 readonly terminal : ProviderTerminalEvent ;
626627 readonly completedAt ?: DateTime . Utc ;
627628 readonly failureItemPersisted : boolean ;
@@ -743,6 +744,24 @@ export const layer: Layer.Layer<
743744 : [ ] ,
744745 events : [
745746 ...cascadedSubagentEvents ,
747+ ...( input . interruptedProviderTurn === undefined
748+ ? [ ]
749+ : [
750+ {
751+ id : yield * allocateEventId ( ) ,
752+ type : "provider-turn.updated" as const ,
753+ threadId : input . run . threadId ,
754+ runId : input . run . id ,
755+ nodeId : input . rootNode . id ,
756+ providerInstanceId : input . run . providerInstanceId ,
757+ occurredAt : completedAt ,
758+ payload : {
759+ ...input . interruptedProviderTurn ,
760+ status : "interrupted" as const ,
761+ completedAt,
762+ } ,
763+ } ,
764+ ] ) ,
746765 ...( finalizedAttempt === null
747766 ? [ ]
748767 : [
@@ -962,6 +981,7 @@ export const layer: Layer.Layer<
962981 const terminalEvent = yield * Ref . make < ProviderTerminalEvent | null > ( null ) ;
963982 const latestTurnItemOrdinal = yield * Ref . make ( input . providerTurnOrdinal * 100 ) ;
964983 const latestProviderThread = yield * Ref . make ( input . providerThread ) ;
984+ const latestRootProviderTurn = yield * Ref . make < OrchestrationV2ProviderTurn | null > ( null ) ;
965985 const routeIdentity : ProviderEventRouteIdentity = {
966986 threadId : input . run . threadId ,
967987 runId : input . run . id ,
@@ -1318,6 +1338,13 @@ export const layer: Layer.Layer<
13181338 Stream . tap ( ( { event, accepted } ) =>
13191339 Effect . gen ( function * ( ) {
13201340 if ( ! accepted ) return ;
1341+ if (
1342+ event . type === "provider_turn.updated" &&
1343+ event . providerTurn . runAttemptId === input . attempt . id &&
1344+ event . providerTurn . providerThreadId === input . providerThread . id
1345+ ) {
1346+ yield * Ref . set ( latestRootProviderTurn , event . providerTurn ) ;
1347+ }
13211348 let storedEventCount = 0 ;
13221349 const deliveredEvent = filterAssistantEvent (
13231350 event ,
@@ -1437,24 +1464,26 @@ export const layer: Layer.Layer<
14371464 if ( yield * Ref . get ( rootRunFinalized ) ) return ;
14381465 const providerThread = yield * Ref . get ( latestProviderThread ) ;
14391466 const routing = yield * Ref . get ( eventRouting ) ;
1440- // Failed ingestion can leave the provider running after its run settles.
1441- if ( routing . rootProviderTurnId !== null && ! routing . rootTurnEnded ) {
1442- yield * input . session
1443- . interruptTurn ( {
1444- providerThread,
1445- providerTurnId : routing . rootProviderTurnId ,
1446- } )
1447- . pipe (
1448- Effect . catchCauseIf (
1449- ( interruptCause ) => ! Cause . hasInterruptsOnly ( interruptCause ) ,
1450- ( interruptCause ) =>
1451- Effect . logWarning (
1452- "orchestration V2 failed to interrupt turn after ingestion failure" ,
1453- { runId : input . run . id , cause : interruptCause } ,
1467+ // The failed consumer cannot persist the adapter's terminal event.
1468+ const interruptedProviderTurn =
1469+ routing . rootProviderTurnId !== null && ! routing . rootTurnEnded
1470+ ? yield * input . session
1471+ . interruptTurn ( {
1472+ providerThread,
1473+ providerTurnId : routing . rootProviderTurnId ,
1474+ } )
1475+ . pipe (
1476+ Effect . as ( yield * Ref . get ( latestRootProviderTurn ) ) ,
1477+ Effect . catchCauseIf (
1478+ ( interruptCause ) => ! Cause . hasInterruptsOnly ( interruptCause ) ,
1479+ ( interruptCause ) =>
1480+ Effect . logWarning (
1481+ "orchestration V2 failed to interrupt turn after ingestion failure" ,
1482+ { runId : input . run . id , cause : interruptCause } ,
1483+ ) . pipe ( Effect . as ( null ) ) ,
14541484 ) ,
1455- ) ,
1456- ) ;
1457- }
1485+ )
1486+ : null ;
14581487 const latestItemOrdinal = yield * Ref . get ( latestTurnItemOrdinal ) ;
14591488 const openSubagents = yield * Ref . get ( openRunOwnedSubagents ) ;
14601489 let nextRetryWarningAt = completedAt ;
@@ -1469,6 +1498,7 @@ export const layer: Layer.Layer<
14691498 expectedStatus : "running" ,
14701499 } ,
14711500 openRunOwnedSubagents : openSubagents ,
1501+ ...( interruptedProviderTurn === null ? { } : { interruptedProviderTurn } ) ,
14721502 completedAt,
14731503 terminal : makeFailedTerminalEvent (
14741504 makeProviderFailure ( { cause : Cause . squash ( cause ) , class : "unknown" } ) ,
0 commit comments