@@ -145,9 +145,9 @@ describe("native main token refresh", () => {
145145 const homeA = mkdtempSync ( join ( tmpdir ( ) , "ocx-home-a-" ) ) ;
146146 const homeB = mkdtempSync ( join ( tmpdir ( ) , "ocx-home-b-" ) ) ;
147147 const previousOcxHome = process . env . OPENCODEX_HOME ;
148- // Overlap is observed, not assumed: each refresh records when it entered and
149- // left, so a serialized pair reads enter/leave/enter and a concurrent one
150- // reads enter/enter .
148+ // The first refresh records its entry and exit. A concurrent second refresh would
149+ // add enter:b before the first release; the serialized follower instead rereads
150+ // fresh credentials and does not refresh the now-rotated grant itself .
151151 const order : string [ ] = [ ] ;
152152 let release : ( ( ) => void ) | undefined ;
153153 const firstEntered = Promise . withResolvers < void > ( ) ;
@@ -160,8 +160,8 @@ describe("native main token refresh", () => {
160160 }
161161 order . push ( `leave:${ label } ` ) ;
162162 return {
163- accessToken : `fresh-${ label } ` ,
164- refreshToken : `rotated-${ label } ` ,
163+ access : `fresh-${ label } ` ,
164+ refresh : `rotated-${ label } ` ,
165165 expires : Date . now ( ) + 3_600_000 ,
166166 accountId : "account-main" ,
167167 } ;
@@ -176,13 +176,12 @@ describe("native main token refresh", () => {
176176 // this entered immediately; now it waits on the shared claim.
177177 process . env . OPENCODEX_HOME = homeB ;
178178 const second = getValidMainAccountToken ( { refreshToken : refreshFor ( "b" , false ) } ) ;
179- await Bun . sleep ( 50 ) ;
180179 expect ( order ) . toEqual ( [ "enter:a" ] ) ;
181180
182181 release ?.( ) ;
183182 await first ;
184- await second . catch ( ( ) => null ) ;
185- expect ( order . slice ( 0 , 3 ) ) . toEqual ( [ "enter:a" , "leave:a" , "enter:b "] ) ;
183+ await second ;
184+ expect ( order ) . toEqual ( [ "enter:a" , "leave:a" ] ) ;
186185 } finally {
187186 release ?.( ) ;
188187 if ( previousOcxHome === undefined ) delete process . env . OPENCODEX_HOME ;
@@ -191,4 +190,60 @@ describe("native main token refresh", () => {
191190 rmSync ( homeB , { recursive : true , force : true } ) ;
192191 }
193192 } ) ;
193+
194+ test ( "aborts a contended native-main refresh before it retries" , async ( ) => {
195+ const authPath = join ( home , "auth.json" ) ;
196+ writeFileSync ( authPath , JSON . stringify ( {
197+ tokens : { access_token : expiredJwt ( ) , refresh_token : "old-refresh" , account_id : "account-main" } ,
198+ } ) ) ;
199+
200+ const homeA = mkdtempSync ( join ( tmpdir ( ) , "ocx-home-a-" ) ) ;
201+ const homeB = mkdtempSync ( join ( tmpdir ( ) , "ocx-home-b-" ) ) ;
202+ const previousOcxHome = process . env . OPENCODEX_HOME ;
203+ const firstEntered = Promise . withResolvers < void > ( ) ;
204+ const releaseFirst = Promise . withResolvers < void > ( ) ;
205+ const abort = new AbortController ( ) ;
206+ const abortReason = new Error ( "refresh cancelled while native-main claim was busy" ) ;
207+ let secondRefreshStarted = false ;
208+
209+ try {
210+ process . env . OPENCODEX_HOME = homeA ;
211+ const first = getValidMainAccountToken ( {
212+ refreshToken : async ( ) => {
213+ firstEntered . resolve ( ) ;
214+ await releaseFirst . promise ;
215+ return {
216+ access : "fresh-a" ,
217+ refresh : "rotated-a" ,
218+ expires : Date . now ( ) + 3_600_000 ,
219+ accountId : "account-main" ,
220+ } ;
221+ } ,
222+ } ) ;
223+ await firstEntered . promise ;
224+
225+ // The first refresh holds the CODEX_HOME claim. Cancellation must release the
226+ // second caller from that wait instead of letting it refresh after the holder exits.
227+ process . env . OPENCODEX_HOME = homeB ;
228+ const second = getValidMainAccountToken ( {
229+ signal : abort . signal ,
230+ refreshToken : async ( ) => {
231+ secondRefreshStarted = true ;
232+ throw new Error ( "must not refresh after cancellation" ) ;
233+ } ,
234+ } ) ;
235+ abort . abort ( abortReason ) ;
236+ releaseFirst . resolve ( ) ;
237+
238+ await expect ( second ) . rejects . toBe ( abortReason ) ;
239+ await expect ( first ) . resolves . toEqual ( { accessToken : "fresh-a" , chatgptAccountId : "account-main" } ) ;
240+ expect ( secondRefreshStarted ) . toBe ( false ) ;
241+ } finally {
242+ releaseFirst . resolve ( ) ;
243+ if ( previousOcxHome === undefined ) delete process . env . OPENCODEX_HOME ;
244+ else process . env . OPENCODEX_HOME = previousOcxHome ;
245+ rmSync ( homeA , { recursive : true , force : true } ) ;
246+ rmSync ( homeB , { recursive : true , force : true } ) ;
247+ }
248+ } ) ;
194249} ) ;
0 commit comments