55 ThreadId ,
66 type OrchestrationV2ThreadShell ,
77} from "@t3tools/contracts" ;
8+ import * as Deferred from "effect/Deferred" ;
89import * as Effect from "effect/Effect" ;
910import * as Fiber from "effect/Fiber" ;
1011import * as Layer from "effect/Layer" ;
@@ -96,6 +97,7 @@ it.effect.each(
9697 ) . map ( ( scenario ) => [ scenario . label , scenario ] as const ) ,
9798) ( "%s" , ( [ , scenario ] ) => {
9899 const refreshed : string [ ] = [ ] ;
100+ const lookedUp = Deferred . makeUnsafe < void > ( ) ;
99101 const threadId = ThreadId . make ( "thread-pr-refresh" ) ;
100102 const runId = RunId . make ( "completed-run" ) ;
101103 const layer = RunFinalization . layerObserver . pipe (
@@ -117,11 +119,11 @@ it.effect.each(
117119 } ) ,
118120 refreshStatus : ( ) =>
119121 Effect . die ( "turn completion must preserve known PRs and lookup backoff" ) ,
120- refreshPullRequestStatus : ( cwd ) =>
121- Effect . sync ( ( ) => {
122- refreshed . push ( cwd ) ;
123- return null ;
124- } ) ,
122+ // Requested synchronously by refresh; the lookup itself runs in the background.
123+ refreshPullRequestStatus : ( cwd ) => {
124+ refreshed . push ( cwd ) ;
125+ return Deferred . succeed ( lookedUp , undefined ) . pipe ( Effect . as ( null ) ) ;
126+ } ,
125127 } ) ,
126128 Layer . mock ( ProjectionStore . ProjectionStoreV2 ) ( {
127129 getThreadShell : ( ) =>
@@ -137,6 +139,7 @@ it.effect.each(
137139 return Effect . gen ( function * ( ) {
138140 const observer = yield * RunFinalization . RunFinalizationObserver ;
139141 yield * observer . refresh ( { cwd : "/repo" , threadId, runId } ) ;
142+ if ( scenario . expected . length > 0 ) yield * Deferred . await ( lookedUp ) ;
140143 assert . deepEqual ( refreshed , [ ...scenario . expected ] ) ;
141144 } ) . pipe ( Effect . provide ( layer ) ) ;
142145} ) ;
@@ -187,3 +190,54 @@ it.effect("returns from the post-turn refresh without waiting for the PR lookup"
187190 ) ;
188191 } ) . pipe ( Effect . provide ( layer ) ) ;
189192} ) ;
193+
194+ it . effect ( "replaces a still-running PR lookup when a newer turn finishes" , ( ) => {
195+ const threadId = ThreadId . make ( "thread-back-to-back" ) ;
196+ const runId = RunId . make ( "completed-run" ) ;
197+ const firstInterrupted = Deferred . makeUnsafe < void > ( ) ;
198+ const secondLookedUp = Deferred . makeUnsafe < void > ( ) ;
199+ let lookups = 0 ;
200+ const layer = RunFinalization . layerObserver . pipe (
201+ Layer . provide (
202+ Layer . mergeAll (
203+ Layer . mock ( WorkspaceEntries . WorkspaceEntries ) ( { refresh : ( ) => Effect . void } ) ,
204+ Layer . mock ( PullRequestService . PullRequestService ) ( {
205+ refreshAfterTurn : ( ) => Effect . void ,
206+ } ) ,
207+ Layer . mock ( VcsStatusBroadcaster . VcsStatusBroadcaster ) ( {
208+ refreshLocalStatus : ( ) =>
209+ Effect . succeed ( {
210+ isRepo : true ,
211+ hasPrimaryRemote : true ,
212+ isDefaultRef : false ,
213+ refName : "feature" ,
214+ hasWorkingTreeChanges : false ,
215+ workingTree : { files : [ ] , insertions : 0 , deletions : 0 } ,
216+ } ) ,
217+ refreshPullRequestStatus : ( ) =>
218+ ++ lookups === 1
219+ ? Effect . never . pipe (
220+ Effect . onInterrupt ( ( ) => Deferred . succeed ( firstInterrupted , undefined ) ) ,
221+ )
222+ : Deferred . succeed ( secondLookedUp , undefined ) . pipe ( Effect . as ( null ) ) ,
223+ } ) ,
224+ Layer . mock ( ProjectionStore . ProjectionStoreV2 ) ( {
225+ getThreadShell : ( ) =>
226+ Effect . succeed ( {
227+ id : threadId ,
228+ branch : "feature" ,
229+ activeRunId : null ,
230+ } as OrchestrationV2ThreadShell ) ,
231+ } ) ,
232+ ) ,
233+ ) ,
234+ ) ;
235+ return Effect . gen ( function * ( ) {
236+ const observer = yield * RunFinalization . RunFinalizationObserver ;
237+ yield * observer . refresh ( { cwd : "/repo" , threadId, runId } ) ;
238+ yield * observer . refresh ( { cwd : "/repo" , threadId, runId } ) ;
239+ yield * Deferred . await ( firstInterrupted ) ;
240+ yield * Deferred . await ( secondLookedUp ) ;
241+ assert . strictEqual ( lookups , 2 ) ;
242+ } ) . pipe ( Effect . provide ( layer ) ) ;
243+ } ) ;
0 commit comments