@@ -304,6 +304,7 @@ interface SubagentRequest {
304304 readonly topLevelThreadId : ThreadId ;
305305 readonly request : PendingSubagentRequest ;
306306 readonly requestId : RuntimeRequestId ;
307+ readonly changeOrder : number ;
307308}
308309
309310function resolveAgentAwarenessRelayPublishSnapshot ( input : {
@@ -408,6 +409,7 @@ export const make = Effect.gen(function* () {
408409 new Map < ThreadId , { readonly identity : string ; readonly updatedAt : string } > ( ) ,
409410 ) ;
410411 const subagentRequests = new Map < ThreadId , SubagentRequest > ( ) ;
412+ let subagentRequestChangeOrder = 0 ;
411413 // Environments that never publish skip the extra shell read while paused.
412414 // Set by the first publish or by a startup snapshot, even an empty one.
413415 let hasPublished = false ;
@@ -727,7 +729,12 @@ export const make = Effect.gen(function* () {
727729 const topLevelThreadId =
728730 previous ?. topLevelThreadId ?? ( yield * findTopLevelThreadId ( threadShell ) ) ;
729731 if ( topLevelThreadId === null ) return ;
730- subagentRequests . set ( threadId , { topLevelThreadId, request, requestId } ) ;
732+ subagentRequests . set ( threadId , {
733+ topLevelThreadId,
734+ request,
735+ requestId,
736+ changeOrder : ++ subagentRequestChangeOrder ,
737+ } ) ;
731738 yield * enqueueTopLevelPublish ( topLevelThreadId ) ;
732739 } ) ;
733740
@@ -742,6 +749,7 @@ export const make = Effect.gen(function* () {
742749 // unlinked, so each waiting child is re-read before its parent is published.
743750 const currentSubagentRequestFor = Effect . fnUntraced ( function * ( topLevelThreadId : ThreadId ) {
744751 let pending : SubagentRequestAwareness | null = null ;
752+ let pendingChangeOrder = 0 ;
745753 for ( const [ childId , entry ] of [ ...subagentRequests ] ) {
746754 if ( entry . topLevelThreadId !== topLevelThreadId ) continue ;
747755 const child = yield * threads . getThreadShell ( childId ) ;
@@ -752,19 +760,29 @@ export const make = Effect.gen(function* () {
752760 subagentRequests . delete ( childId ) ;
753761 continue ;
754762 }
763+ let changeOrder = entry . changeOrder ;
755764 if ( request !== entry . request || pendingRequest . id !== entry . requestId ) {
756- subagentRequests . set ( childId , { ...entry , request, requestId : pendingRequest . id } ) ;
765+ changeOrder = ++ subagentRequestChangeOrder ;
766+ subagentRequests . set ( childId , {
767+ ...entry ,
768+ request,
769+ requestId : pendingRequest . id ,
770+ changeOrder,
771+ } ) ;
757772 }
758773 const current = { kind : request , requestId : pendingRequest . id , updatedAt : child . updatedAt } ;
759774 // Approval outranks input; within a kind the newest wait is the one to
760- // announce, so a second child asking still reaches the phone .
775+ // announce. Request-change order breaks ties within one millisecond .
761776 if (
762777 pending === null ||
763778 ( current . kind === "approval" && pending . kind !== "approval" ) ||
764779 ( current . kind === pending . kind &&
765- DateTime . isGreaterThan ( current . updatedAt , pending . updatedAt ) )
780+ ( DateTime . isGreaterThan ( current . updatedAt , pending . updatedAt ) ||
781+ ( current . updatedAt . epochMilliseconds === pending . updatedAt . epochMilliseconds &&
782+ changeOrder > pendingChangeOrder ) ) )
766783 ) {
767784 pending = current ;
785+ pendingChangeOrder = changeOrder ;
768786 }
769787 }
770788 return pending ;
0 commit comments