@@ -247,7 +247,7 @@ type OpenCodeRoutedRequestEvent = OpenCodeAskedRequestEvent | OpenCodeTerminalRe
247247
248248type OpenCodeChildSessionEvent = Extract <
249249 OpenCodeSubscribedEvent ,
250- { readonly type : "session.created" | "session.updated" | "session.deleted" }
250+ { readonly type : "session.created" | "session.updated" | "session.deleted" | "session.status" }
251251> ;
252252
253253interface OpenCodeRequestRelationRetry {
@@ -256,6 +256,7 @@ interface OpenCodeRequestRelationRetry {
256256}
257257
258258interface OpenCodeSessionRelationRetry {
259+ readonly events : Array < OpenCodeChildSessionEvent > ;
259260 fiber ?: Fiber . Fiber < void , never > ;
260261}
261262
@@ -2055,62 +2056,75 @@ export function makeOpenCodeAdapter(
20552056
20562057 const scheduleChildSessionRelationRetry = Effect . fn ( "scheduleChildSessionRelationRetry" ) (
20572058 function * ( context : OpenCodeSessionContext , event : OpenCodeChildSessionEvent ) {
2058- const session = event . properties . info ;
2059- if ( context . sessionRelationRetries . has ( session . id ) ) return ;
2060- const retry : OpenCodeSessionRelationRetry = { } ;
2061- context . sessionRelationRetries . set ( session . id , retry ) ;
2059+ const sessionId = openCodeEventSessionId ( event ) ;
2060+ if ( sessionId === undefined ) return ;
2061+ const existing = context . sessionRelationRetries . get ( sessionId ) ;
2062+ if ( existing ) {
2063+ existing . events . push ( event ) ;
2064+ return ;
2065+ }
2066+ const retry : OpenCodeSessionRelationRetry = { events : [ event ] } ;
2067+ context . sessionRelationRetries . set ( sessionId , retry ) ;
20622068 const run = Effect . gen ( function * ( ) {
20632069 let retryCount = 0 ;
2064- while ( context . sessionRelationRetries . get ( session . id ) === retry ) {
2065- const related = yield * isRelatedOpenCodeSession ( context , session . id ) . pipe (
2070+ while ( context . sessionRelationRetries . get ( sessionId ) === retry ) {
2071+ const related = yield * isRelatedOpenCodeSession ( context , sessionId ) . pipe (
20662072 Effect . orElseSucceed ( ( ) => false ) ,
20672073 ) ;
2068- if ( context . sessionRelationRetries . get ( session . id ) !== retry ) return ;
2074+ if ( context . sessionRelationRetries . get ( sessionId ) !== retry ) return ;
20692075 if ( related ) {
2070- context . sessionRelationRetries . delete ( session . id ) ;
2071- const turnId = context . activeTurnId ;
2072- const base = yield * buildEventBase ( {
2073- threadId : context . session . threadId ,
2074- turnId,
2075- itemId : session . id ,
2076- raw : event ,
2077- } ) ;
2078- if ( event . type === "session.created" ) {
2079- yield * emit ( {
2080- ...base ,
2081- type : "task.started" ,
2082- payload : {
2083- taskId : session . id ,
2084- taskType : "local_agent" ,
2085- title : session . title ,
2086- description : session . title ,
2087- } ,
2088- } ) ;
2089- } else if ( event . type === "session.updated" ) {
2090- yield * emit ( {
2091- ...base ,
2092- type : "task.progress" ,
2093- payload : {
2094- taskId : session . id ,
2095- taskType : "local_agent" ,
2096- title : session . title ,
2097- description : session . title ,
2098- summary : session . title ,
2099- status : "running" ,
2100- } ,
2101- } ) ;
2102- } else {
2103- yield * emit ( {
2104- ...base ,
2105- type : "task.completed" ,
2106- payload : {
2107- taskId : session . id ,
2108- taskType : "local_agent" ,
2109- status : "completed" ,
2110- summary : session . title ,
2111- } ,
2076+ context . sessionRelationRetries . delete ( sessionId ) ;
2077+ for ( const replayEvent of retry . events ) {
2078+ const replaySession =
2079+ replayEvent . type === "session.status" ? undefined : replayEvent . properties . info ;
2080+ const base = yield * buildEventBase ( {
2081+ threadId : context . session . threadId ,
2082+ turnId : context . activeTurnId ,
2083+ itemId : sessionId ,
2084+ raw : replayEvent ,
21122085 } ) ;
2113- context . relatedSessionIds . delete ( session . id ) ;
2086+ if ( replayEvent . type === "session.created" ) {
2087+ yield * emit ( {
2088+ ...base ,
2089+ type : "task.started" ,
2090+ payload : {
2091+ taskId : sessionId ,
2092+ taskType : "local_agent" ,
2093+ title : replaySession . title ,
2094+ description : replaySession . title ,
2095+ } ,
2096+ } ) ;
2097+ } else if ( replayEvent . type === "session.updated" ) {
2098+ yield * emit ( {
2099+ ...base ,
2100+ type : "task.progress" ,
2101+ payload : {
2102+ taskId : sessionId ,
2103+ taskType : "local_agent" ,
2104+ title : replaySession . title ,
2105+ description : replaySession . title ,
2106+ summary : replaySession . title ,
2107+ status : "running" ,
2108+ } ,
2109+ } ) ;
2110+ } else if (
2111+ replayEvent . type === "session.status" &&
2112+ replayEvent . properties . status . type !== "idle"
2113+ ) {
2114+ continue ;
2115+ } else {
2116+ yield * emit ( {
2117+ ...base ,
2118+ type : "task.completed" ,
2119+ payload : {
2120+ taskId : sessionId ,
2121+ taskType : "local_agent" ,
2122+ status : "completed" ,
2123+ summary : replaySession ?. title ?? "Completed" ,
2124+ } ,
2125+ } ) ;
2126+ context . relatedSessionIds . delete ( sessionId ) ;
2127+ }
21142128 }
21152129 return ;
21162130 }
@@ -2122,8 +2136,8 @@ export function makeOpenCodeAdapter(
21222136 Effect . catchCause ( ( ) => Effect . void ) ,
21232137 Effect . ensuring (
21242138 Effect . sync ( ( ) => {
2125- if ( context . sessionRelationRetries . get ( session . id ) === retry ) {
2126- context . sessionRelationRetries . delete ( session . id ) ;
2139+ if ( context . sessionRelationRetries . get ( sessionId ) === retry ) {
2140+ context . sessionRelationRetries . delete ( sessionId ) ;
21272141 }
21282142 } ) ,
21292143 ) ,
@@ -2315,7 +2329,8 @@ export function makeOpenCodeAdapter(
23152329 if (
23162330 event . type === "session.created" ||
23172331 event . type === "session.updated" ||
2318- event . type === "session.deleted"
2332+ event . type === "session.deleted" ||
2333+ event . type === "session.status"
23192334 ) {
23202335 yield * scheduleChildSessionRelationRetry ( context , event ) ;
23212336 return ;
0 commit comments