@@ -263,14 +263,19 @@ const baseLayer: Layer.Layer<
263263
264264 // A user can answer after cleanup reads the pending request.
265265 // Recheck inside the write transaction so stale cleanup cannot erase answers.
266- const guardRuntimeRequestRetirements = ( events : ReadonlyArray < OrchestrationV2DomainEvent > ) =>
266+ const guardRuntimeRequestRetirements = (
267+ events : ReadonlyArray < OrchestrationV2DomainEvent > ,
268+ includeAllRetirements = false ,
269+ ) =>
267270 Effect . gen ( function * ( ) {
268271 const staleRequests = new Set < RuntimeRequestId > ( ) ;
269272 const staleNodes = new Set < NodeId > ( ) ;
270273 for ( const event of events ) {
271274 if (
272275 event . type !== "runtime-request.updated" ||
273- ( event . payload . status !== "cancelled" && event . payload . status !== "expired" )
276+ ( includeAllRetirements
277+ ? event . payload . status !== "cancelled" && event . payload . status !== "expired"
278+ : event . payload . kind !== "user_input" || event . payload . status !== "cancelled" )
274279 )
275280 continue ;
276281 const current = yield * projectionStore . getRuntimeRequest (
@@ -280,7 +285,7 @@ const baseLayer: Layer.Layer<
280285 if (
281286 current ?. status !== "pending" ||
282287 current . kind !== event . payload . kind ||
283- current . nodeId !== event . payload . nodeId ||
288+ ( includeAllRetirements && current . nodeId !== event . payload . nodeId ) ||
284289 current . providerTurnId !== event . payload . providerTurnId ||
285290 current . responseCapability . type === "message"
286291 ) {
@@ -292,15 +297,16 @@ const baseLayer: Layer.Layer<
292297 switch ( event . type ) {
293298 case "runtime-request.updated" :
294299 return (
295- ( event . payload . status !== "cancelled" && event . payload . status !== "expired" ) ||
300+ ( event . payload . status !== "cancelled" &&
301+ ( ! includeAllRetirements || event . payload . status !== "expired" ) ) ||
296302 ! staleRequests . has ( event . payload . id )
297303 ) ;
298304 case "node.updated" :
299305 return event . payload . status !== "cancelled" || ! staleNodes . has ( event . payload . id ) ;
300306 case "turn-item.updated" :
301307 return (
302308 ( event . payload . type !== "user_input_request" &&
303- event . payload . type !== "approval_request" ) ||
309+ ( ! includeAllRetirements || event . payload . type !== "approval_request" ) ) ||
304310 event . payload . status !== "cancelled" ||
305311 ! staleRequests . has ( event . payload . requestId )
306312 ) ;
@@ -541,7 +547,7 @@ const baseLayer: Layer.Layer<
541547
542548 const normalized = yield * normalizeEvents (
543549 input . guardPendingRuntimeRequestRetirements === true
544- ? yield * guardRuntimeRequestRetirements ( input . events )
550+ ? yield * guardRuntimeRequestRetirements ( input . events , true )
545551 : input . events ,
546552 ) ;
547553 const storedEvents = yield * eventStore . append ( {
0 commit comments