@@ -6183,15 +6183,15 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
61836183 } ) ,
61846184 ) ;
61856185
6186- it . effect (
6187- "resumes an armed continuation early and preserves its reset fallback with global auto-resume off" ,
6188- ( ) =>
6186+ it . effect . each ( [ true , false ] ) (
6187+ "preserves early recovery with global auto-resume off when retry reports reset: %s " ,
6188+ ( retryReportsReset ) =>
61896189 Effect . gen ( function * ( ) {
61906190 const orchestrator = yield * Orchestrator . OrchestratorV2 ;
61916191 const events = yield * EventSink . EventSinkV2 ;
61926192 const projections = yield * ProjectionStore . ProjectionStoreV2 ;
6193- const threadId = ThreadId . make ( " recovery:early-reset" ) ;
6194- const projectId = ProjectId . make ( " recovery:project:early-reset" ) ;
6193+ const threadId = ThreadId . make ( ` recovery:early-reset: ${ retryReportsReset } ` ) ;
6194+ const projectId = ProjectId . make ( ` recovery:project:early-reset: ${ retryReportsReset } ` ) ;
61956195 const now = yield * DateTime . now ;
61966196 yield * seedProject ( {
61976197 projectId,
@@ -6202,7 +6202,7 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
62026202 } ) ;
62036203 yield * orchestrator . dispatch ( {
62046204 type : "thread.create" ,
6205- commandId : CommandId . make ( " recovery:create:early-reset" ) ,
6205+ commandId : CommandId . make ( ` recovery:create:early-reset: ${ retryReportsReset } ` ) ,
62066206 threadId,
62076207 projectId,
62086208 title : "Limited thread" ,
@@ -6216,9 +6216,9 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
62166216 } ) ;
62176217 yield * orchestrator . dispatch ( {
62186218 type : "message.dispatch" ,
6219- commandId : CommandId . make ( " recovery:message:early-reset" ) ,
6219+ commandId : CommandId . make ( ` recovery:message:early-reset: ${ retryReportsReset } ` ) ,
62206220 threadId,
6221- messageId : MessageId . make ( " recovery:message:early-reset" ) ,
6221+ messageId : MessageId . make ( ` recovery:message:early-reset: ${ retryReportsReset } ` ) ,
62226222 text : "Work on this." ,
62236223 attachments : [ ] ,
62246224 dispatchMode : { type : "defer_start" } ,
@@ -6230,19 +6230,19 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
62306230 yield * events . write ( {
62316231 events : [
62326232 {
6233- id : EventId . make ( " recovery:run:early-reset" ) ,
6233+ id : EventId . make ( ` recovery:run:early-reset: ${ retryReportsReset } ` ) ,
62346234 type : "run.updated" ,
62356235 threadId,
62366236 occurredAt : now ,
62376237 payload : { ...run , status : "failed" , completedAt : now } ,
62386238 } ,
62396239 {
6240- id : EventId . make ( " recovery:error:early-reset" ) ,
6240+ id : EventId . make ( ` recovery:error:early-reset: ${ retryReportsReset } ` ) ,
62416241 type : "turn-item.updated" ,
62426242 threadId,
62436243 occurredAt : now ,
62446244 payload : {
6245- id : TurnItemId . make ( " recovery:error:early-reset" ) ,
6245+ id : TurnItemId . make ( ` recovery:error:early-reset: ${ retryReportsReset } ` ) ,
62466246 type : "error" ,
62476247 threadId,
62486248 runId : run . id ,
@@ -6347,7 +6347,7 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
63476347 assert ( staleResume ?. type === "message.dispatch" ) ;
63486348 yield * orchestrator . dispatch ( {
63496349 type : "thread.metadata.update" ,
6350- commandId : CommandId . make ( " recovery:cancel:early-reset" ) ,
6350+ commandId : CommandId . make ( ` recovery:cancel:early-reset: ${ retryReportsReset } ` ) ,
63516351 threadId,
63526352 limitRecovery : { runId : run . id , resetAt, autoResume : false } ,
63536353 } ) ;
@@ -6356,7 +6356,7 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
63566356 assert . lengthOf ( ( yield * orchestrator . getThreadProjection ( threadId ) ) . runs , 1 ) ;
63576357 yield * orchestrator . dispatch ( {
63586358 type : "thread.metadata.update" ,
6359- commandId : CommandId . make ( " recovery:rearm:early-reset" ) ,
6359+ commandId : CommandId . make ( ` recovery:rearm:early-reset: ${ retryReportsReset } ` ) ,
63606360 threadId,
63616361 limitRecovery : { runId : run . id , resetAt, autoResume : true } ,
63626362 } ) ;
@@ -6370,7 +6370,7 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
63706370 const nodeId = run . rootNodeId ;
63716371 assert ( nodeId !== null ) ;
63726372 const request = {
6373- id : RuntimeRequestId . make ( " recovery:pending-race" ) ,
6373+ id : RuntimeRequestId . make ( ` recovery:pending-race: ${ retryReportsReset } ` ) ,
63746374 nodeId,
63756375 providerTurnId : null ,
63766376 nativeRequestRef : null ,
@@ -6383,7 +6383,7 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
63836383 yield * events . write ( {
63846384 events : [
63856385 {
6386- id : EventId . make ( " recovery:pending-race" ) ,
6386+ id : EventId . make ( ` recovery:pending-race: ${ retryReportsReset } ` ) ,
63876387 type : "runtime-request.updated" ,
63886388 threadId,
63896389 nodeId,
@@ -6397,7 +6397,7 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
63976397 yield * events . write ( {
63986398 events : [
63996399 {
6400- id : EventId . make ( " recovery:pending-race:resolved" ) ,
6400+ id : EventId . make ( ` recovery:pending-race:resolved: ${ retryReportsReset } ` ) ,
64016401 type : "runtime-request.updated" ,
64026402 threadId,
64036403 nodeId,
@@ -6414,23 +6414,25 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
64146414 // The reading can omit the limit that stopped the run, such as a
64156415 // per-model weekly limit. The early run then fails on the same limit.
64166416 const earlyRun = resumed . runs [ 1 ] ! ;
6417- const retryResetAt = DateTime . formatIso ( DateTime . add ( now , { hours : 4 } ) ) ;
6417+ const retryResetAt = retryReportsReset
6418+ ? DateTime . formatIso ( DateTime . add ( now , { hours : 4 } ) )
6419+ : resetAt ;
64186420 yield * events . write ( {
64196421 events : [
64206422 {
6421- id : EventId . make ( " recovery:run:early-reset:again" ) ,
6423+ id : EventId . make ( ` recovery:run:early-reset:again: ${ retryReportsReset } ` ) ,
64226424 type : "run.updated" ,
64236425 threadId,
64246426 occurredAt : checkedNow ,
64256427 payload : { ...earlyRun , status : "failed" , completedAt : checkedNow } ,
64266428 } ,
64276429 {
6428- id : EventId . make ( " recovery:error:early-reset:again" ) ,
6430+ id : EventId . make ( ` recovery:error:early-reset:again: ${ retryReportsReset } ` ) ,
64296431 type : "turn-item.updated" ,
64306432 threadId,
64316433 occurredAt : checkedNow ,
64326434 payload : {
6433- id : TurnItemId . make ( " recovery:error:early-reset:again" ) ,
6435+ id : TurnItemId . make ( ` recovery:error:early-reset:again: ${ retryReportsReset } ` ) ,
64346436 type : "error" ,
64356437 threadId,
64366438 runId : earlyRun . id ,
@@ -6450,7 +6452,7 @@ it.layer(layerTest)("usage-limit recovery", (it) => {
64506452 message : "Plan limit reached." ,
64516453 code : "usageLimitExceeded" ,
64526454 retryable : null ,
6453- resetAt : retryResetAt ,
6455+ resetAt : retryReportsReset ? retryResetAt : null ,
64546456 } ,
64556457 } ,
64566458 } ,
0 commit comments