@@ -10,22 +10,19 @@ import {
1010 MCP_TOOL_RESULT_CONTENT_COUNT_ATTRIBUTE ,
1111 MCP_TOOL_RESULT_IS_ERROR_ATTRIBUTE ,
1212} from './attributes' ;
13- import { filterMediaFromContentArray , filterMediaFromContentItem } from './mediaFiltering' ;
1413import { isValidContentItem } from './validation' ;
1514
1615function buildAllContentItemAttributes ( content : unknown [ ] ) : Record < string , string | number | boolean > {
17- const filteredContent = filterMediaFromContentArray ( content ) ;
18-
1916 const attributes : Record < string , string | number > = {
20- [ MCP_TOOL_RESULT_CONTENT_COUNT_ATTRIBUTE ] : filteredContent . length ,
17+ [ MCP_TOOL_RESULT_CONTENT_COUNT_ATTRIBUTE ] : content . length ,
2118 } ;
2219
23- for ( const [ i , item ] of filteredContent . entries ( ) ) {
20+ for ( const [ i , item ] of content . entries ( ) ) {
2421 if ( ! isValidContentItem ( item ) ) {
2522 continue ;
2623 }
2724
28- const prefix = filteredContent . length === 1 ? 'mcp.tool.result' : `mcp.tool.result.${ i } ` ;
25+ const prefix = content . length === 1 ? 'mcp.tool.result' : `mcp.tool.result.${ i } ` ;
2926
3027 const safeSet = ( key : string , value : unknown ) : void => {
3128 if ( typeof value === 'string' ) {
@@ -91,22 +88,19 @@ export function extractPromptResultAttributes(result: unknown): Record<string, s
9188 }
9289
9390 if ( Array . isArray ( result . messages ) ) {
94- const filteredMessages = result . messages
95- . map ( message => filterMediaFromContentItem ( message ) )
96- . filter ( message => message !== null ) ;
97-
98- attributes [ MCP_PROMPT_RESULT_MESSAGE_COUNT_ATTRIBUTE ] = filteredMessages . length ;
91+ attributes [ MCP_PROMPT_RESULT_MESSAGE_COUNT_ATTRIBUTE ] = result . messages . length ;
9992
100- for ( const [ i , message ] of filteredMessages . entries ( ) ) {
93+ const messages = result . messages ;
94+ for ( const [ i , message ] of messages . entries ( ) ) {
10195 if ( ! isValidContentItem ( message ) ) {
10296 continue ;
10397 }
10498
105- const prefix = filteredMessages . length === 1 ? 'mcp.prompt.result' : `mcp.prompt.result.${ i } ` ;
99+ const prefix = messages . length === 1 ? 'mcp.prompt.result' : `mcp.prompt.result.${ i } ` ;
106100
107101 const safeSet = ( key : string , value : unknown ) : void => {
108102 if ( typeof value === 'string' ) {
109- const attrName = filteredMessages . length === 1 ? `${ prefix } .message_${ key } ` : `${ prefix } .${ key } ` ;
103+ const attrName = messages . length === 1 ? `${ prefix } .message_${ key } ` : `${ prefix } .${ key } ` ;
110104 attributes [ attrName ] = value ;
111105 }
112106 } ;
0 commit comments