@@ -446,6 +446,85 @@ def test_merge_headers_keeps_custom_user_agent(self):
446446 assert merged ["user-agent" ].startswith ("google-adk/" )
447447 assert merged ["user-agent" ].endswith (" my-app/1.0" )
448448
449+ @pytest .mark .parametrize (
450+ "base_headers, additional" ,
451+ [
452+ (
453+ {
454+ "user-agent" : "base-client/1" ,
455+ "x-goog-api-client" : "base-sdk/1" ,
456+ "X-Custom" : "base" ,
457+ },
458+ {
459+ "user-agent" : "extra-client/1" ,
460+ "x-goog-api-client" : "extra-sdk/1" ,
461+ "X-Custom" : "extra" ,
462+ },
463+ ),
464+ (
465+ {
466+ "User-Agent" : "base-client/1" ,
467+ "X-Goog-Api-Client" : "base-sdk/1" ,
468+ "X-Custom" : "base" ,
469+ },
470+ {
471+ "user-agent" : "extra-client/1" ,
472+ "x-goog-api-client" : "extra-sdk/1" ,
473+ "X-Custom" : "extra" ,
474+ },
475+ ),
476+ (
477+ {
478+ "user-agent" : "base-client/1" ,
479+ "x-goog-api-client" : "base-sdk/1" ,
480+ "X-Custom" : "base" ,
481+ },
482+ {
483+ "User-Agent" : "extra-client/1" ,
484+ "X-Goog-Api-Client" : "extra-sdk/1" ,
485+ "X-Custom" : "extra" ,
486+ },
487+ ),
488+ (
489+ {
490+ "User-Agent" : "base-client/1" ,
491+ "user-agent" : "base-client/2" ,
492+ "X-Goog-Api-Client" : "base-sdk/1" ,
493+ "x-goog-api-client" : "base-sdk/2" ,
494+ "X-Custom" : "base" ,
495+ },
496+ {
497+ "User-Agent" : "extra-client/1" ,
498+ "X-Goog-Api-Client" : "extra-sdk/1" ,
499+ "X-Custom" : "extra" ,
500+ },
501+ ),
502+ ],
503+ )
504+ def test_merge_headers_additional_overrides_base_tracking_headers (
505+ self , base_headers , additional
506+ ):
507+ """Additional tracking headers replace base ones regardless of casing."""
508+ original_base = base_headers .copy ()
509+ original_additional = additional .copy ()
510+ manager = MCPSessionManager (
511+ SseConnectionParams (url = "https://example.com/mcp" , headers = base_headers )
512+ )
513+
514+ merged = manager ._merge_headers (additional )
515+
516+ assert merged == merge_tracking_headers ({
517+ "user-agent" : "extra-client/1" ,
518+ "x-goog-api-client" : "extra-sdk/1" ,
519+ "X-Custom" : "extra" ,
520+ })
521+ assert "base-client/" not in merged ["user-agent" ]
522+ assert merged ["user-agent" ].endswith (" extra-client/1" )
523+ assert "base-sdk/" not in merged ["x-goog-api-client" ]
524+ assert merged ["x-goog-api-client" ].endswith (" extra-sdk/1" )
525+ assert base_headers == original_base
526+ assert additional == original_additional
527+
449528 def test_is_session_disconnected (self ):
450529 """Test session disconnection detection."""
451530 manager = MCPSessionManager (self .mock_stdio_connection_params )
0 commit comments