@@ -172,6 +172,10 @@ const { McpAuth } = await import("../../src/mcp/auth")
172172const { McpOAuthProvider } = await import ( "../../src/mcp/oauth-provider" )
173173const { FSUtil } = await import ( "@opencode-ai/core/fs-util" )
174174const { CrossSpawnSpawner } = await import ( "@opencode-ai/core/cross-spawn-spawner" )
175+ // altimate_change start — the callback server, held to order two sign-in starts
176+ const { McpOAuthCallback } = await import ( "../../src/mcp/oauth-callback" )
177+ const { spyOn } = await import ( "bun:test" )
178+ // altimate_change end
175179
176180const mcpTest = testEffect (
177181 Layer . mergeAll (
@@ -539,4 +543,44 @@ mcpTest.instance(
539543 } ) ,
540544 { config : config ( "test-oauth-superseded-start" ) } ,
541545)
546+
547+ mcpTest . instance (
548+ "an older startAuth that resumes after a newer one leaves the newer flow's state and flow" ,
549+ ( ) =>
550+ Effect . gen ( function * ( ) {
551+ const mcp = yield * MCP . Service
552+ const auth = yield * McpAuth . Service
553+ const name = "test-oauth-older-start"
554+ yield * mcp . add ( name , { type : "remote" , url : "https://example.com/mcp" } )
555+
556+ // Hold the older call before it stores its state; the newer call runs to completion.
557+ let taken ! : ( ) => void
558+ const wasTaken = new Promise < void > ( ( resolve ) => ( taken = resolve ) )
559+ let release ! : ( ) => void
560+ const held = new Promise < void > ( ( resolve ) => ( release = resolve ) )
561+ const ensureRunning = McpOAuthCallback . ensureRunning
562+ const spy = spyOn ( McpOAuthCallback , "ensureRunning" ) . mockImplementationOnce ( async ( uri ) => {
563+ taken ( )
564+ await held
565+ return ensureRunning ( uri )
566+ } )
567+ try {
568+ const older = yield * Effect . forkChild ( mcp . startAuth ( name ) )
569+ yield * Effect . promise ( ( ) => wasTaken )
570+ const newer = yield * mcp . startAuth ( name )
571+ expect ( newer . authorizationUrl ) . not . toBe ( "" )
572+ release ( )
573+ const olderResult = yield * Fiber . join ( older )
574+
575+ expect ( olderResult . authorizationUrl ) . toBe ( "" )
576+ expect ( yield * auth . getOAuthState ( name ) ) . toBe ( newer . oauthState )
577+ connectSucceedsImmediately = true
578+ expect ( ( yield * mcp . finishAuth ( name , "code" ) ) . status ) . toBe ( "connected" )
579+ expect ( tokenExchanges ) . toBe ( 1 )
580+ } finally {
581+ spy . mockRestore ( )
582+ }
583+ } ) ,
584+ { config : config ( "test-oauth-older-start" ) } ,
585+ )
542586// altimate_change end
0 commit comments