@@ -3,7 +3,13 @@ import { getCurrentScope, withScope } from '../../../../src/currentScopes';
33import { wrapMcpServerWithSentry } from '../../../../src/integrations/mcp-server' ;
44import { Scope } from '../../../../src/scope' ;
55import * as tracingModule from '../../../../src/tracing/trace' ;
6- import { createMockClient , createMockMcpServer , createMockTransport } from './testUtils' ;
6+ import type { DataCollection } from '../../../../src/types/datacollection' ;
7+ import {
8+ createMockClient ,
9+ createMockClientWithDataCollection ,
10+ createMockMcpServer ,
11+ createMockTransport ,
12+ } from './testUtils' ;
713
814describe ( 'MCP Server Capture Policy' , ( ) => {
915 type MockTransport = ReturnType < typeof createMockTransport > ;
@@ -416,4 +422,50 @@ describe('MCP Server Capture Policy', () => {
416422 ) ;
417423 expectToolResult ( span ) ;
418424 } ) ;
425+
426+ describe ( 'dataCollection precedence' , ( ) => {
427+ it . each < [ string , DataCollection , { inputs : boolean ; outputs : boolean } ] > ( [
428+ [ 'records by default' , { } , { inputs : true , outputs : true } ] ,
429+ [ 'uses mcp' , { mcp : { inputs : false , outputs : false } } , { inputs : false , outputs : false } ] ,
430+ // TODO(v12): Remove the genAI fallback cases.
431+ [
432+ 'falls back to genAI when mcp is unset' ,
433+ { genAI : { inputs : false , outputs : false } } ,
434+ { inputs : false , outputs : false } ,
435+ ] ,
436+ [
437+ 'prefers mcp over genAI' ,
438+ { mcp : { inputs : true , outputs : true } , genAI : { inputs : false , outputs : false } } ,
439+ { inputs : true , outputs : true } ,
440+ ] ,
441+ [
442+ 'prefers a disabled mcp over an enabled genAI' ,
443+ { mcp : { inputs : false , outputs : false } , genAI : { inputs : true , outputs : true } } ,
444+ { inputs : false , outputs : false } ,
445+ ] ,
446+ [
447+ 'falls back to genAI per field' ,
448+ { mcp : { inputs : true } , genAI : { inputs : false , outputs : false } } ,
449+ { inputs : true , outputs : false } ,
450+ ] ,
451+ ] ) ( '%s' , async ( _ , dataCollection , expected ) => {
452+ const sessionId = `data-collection-${ JSON . stringify ( dataCollection ) } ` ;
453+ const transport = await connectWrappedServer ( sessionId ) ;
454+ const scope = new Scope ( ) ;
455+ scope . setClient ( createMockClientWithDataCollection ( dataCollection ) ) ;
456+ const span = queueInactiveSpan ( ) ;
457+
458+ receiveToolCall ( transport , scope , { id : 'precedence-request' , location : 'Vienna, Austria' } ) ;
459+ await sendToolResult ( transport , scope , { id : 'precedence-request' , text : 'Forecast for Vienna' } ) ;
460+
461+ expect ( startInactiveSpanSpy ) . toHaveBeenCalledWith (
462+ buildToolSpanConfig ( {
463+ id : 'precedence-request' ,
464+ sessionId,
465+ ...( expected . inputs && { location : 'Vienna, Austria' } ) ,
466+ } ) ,
467+ ) ;
468+ expectToolResult ( span , expected . outputs ? 'Forecast for Vienna' : undefined ) ;
469+ } ) ;
470+ } ) ;
419471} ) ;
0 commit comments