@@ -51,7 +51,12 @@ const stopEarlierBackgroundWork = ({
5151 readonly failedStart ?: boolean ;
5252 readonly stopWithQueue ?: "thread.stop" | "run.interrupt" ;
5353 readonly olderStart ?: boolean ;
54- readonly stalledRun ?: "missing-session" | "returned-interrupt" | "superseded-attempt" ;
54+ readonly stalledRun ?:
55+ | "missing-session"
56+ | "missing-session-terminal"
57+ | "returned-interrupt"
58+ | "returned-interrupt-terminal"
59+ | "superseded-attempt" ;
5560} ) =>
5661 Effect . scoped (
5762 Effect . gen ( function * ( ) {
@@ -218,7 +223,7 @@ const stopEarlierBackgroundWork = ({
218223 const run = before . runs [ 0 ] ! ;
219224 const node = before . nodes . find ( ( candidate ) => candidate . id === run . rootNodeId ) ! ;
220225 const attempt = before . attempts [ 0 ] ! ;
221- if ( stalledRun === "missing-session" ) {
226+ if ( stalledRun === "missing-session" || stalledRun === "missing-session-terminal" ) {
222227 const sessions = yield * ProviderSessionManager . ProviderSessionManagerV2 ;
223228 const failed = yield * watch (
224229 ( event ) => event . type === "run.updated" && event . payload . status === "failed" ,
@@ -258,6 +263,31 @@ const stopEarlierBackgroundWork = ({
258263 const messageId = MessageId . make ( "partial-output" ) ;
259264 const item = before . turnItems . find ( ( candidate ) => candidate . id === devServerId ) ! ;
260265 assert . ok ( item . type === "command_execution" ) ;
266+ const terminalProviderTurn = stalledRun . endsWith ( "-terminal" ) ;
267+ if ( terminalProviderTurn ) {
268+ yield * sink . write ( {
269+ events : [
270+ {
271+ id : EventId . make ( "terminal-provider-turn" ) ,
272+ type : "provider-turn.updated" ,
273+ threadId,
274+ occurredAt : now ,
275+ payload : { ...codexTurn , status : "completed" , completedAt : now } ,
276+ } ,
277+ ...( stalledRun === "missing-session-terminal"
278+ ? [
279+ {
280+ id : EventId . make ( "completed-dev-server" ) ,
281+ type : "turn-item.updated" as const ,
282+ threadId,
283+ occurredAt : now ,
284+ payload : { ...item , status : "completed" as const , completedAt : now } ,
285+ } ,
286+ ]
287+ : [ ] ) ,
288+ ] ,
289+ } ) ;
290+ }
261291 yield * sink . write ( {
262292 events : [
263293 {
@@ -333,7 +363,10 @@ const stopEarlierBackgroundWork = ({
333363 const interrupted = stalledRun !== "superseded-attempt" ;
334364 assert . equal ( after . runs [ 0 ] ?. status , interrupted ? "interrupted" : "running" ) ;
335365 assert . equal ( after . attempts [ 0 ] ?. status , interrupted ? "interrupted" : "running" ) ;
336- assert . equal ( after . providerTurns [ 0 ] ?. status , interrupted ? "interrupted" : "running" ) ;
366+ assert . equal (
367+ after . providerTurns [ 0 ] ?. status ,
368+ terminalProviderTurn ? "completed" : interrupted ? "interrupted" : "running" ,
369+ ) ;
337370 assert . equal (
338371 after . nodes . find ( ( candidate ) => candidate . id === node . id ) ?. status ,
339372 interrupted ? "interrupted" : "running" ,
@@ -343,7 +376,11 @@ const stopEarlierBackgroundWork = ({
343376 assert . equal ( output . text , "Partial output" ) ;
344377 assert . equal (
345378 after . turnItems . find ( ( candidate ) => candidate . id === devServerId ) ?. status ,
346- interrupted ? "interrupted" : "running" ,
379+ stalledRun === "missing-session-terminal"
380+ ? "completed"
381+ : interrupted
382+ ? "interrupted"
383+ : "running" ,
347384 ) ;
348385 assert . equal (
349386 after . turnItems . find ( ( candidate ) => candidate . type === "assistant_message" ) ?. status ,
@@ -746,7 +783,13 @@ it.effect.each(["thread.stop", "run.interrupt"] as const)(
746783 ( stopType ) => stopEarlierBackgroundWork ( { stopWithQueue : stopType , olderStart : true } ) ,
747784) ;
748785
749- it . effect . each ( [ "missing-session" , "returned-interrupt" , "superseded-attempt" ] as const ) (
786+ it . effect . each ( [
787+ "missing-session" ,
788+ "missing-session-terminal" ,
789+ "returned-interrupt" ,
790+ "returned-interrupt-terminal" ,
791+ "superseded-attempt" ,
792+ ] as const ) (
750793 "Stop recovers a stalled run after %s without changing a newer attempt" ,
751794 ( stalledRun ) => stopEarlierBackgroundWork ( { stalledRun } ) ,
752795) ;
0 commit comments