whai/cherry-studio
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(mcp-tools): enhance tool lookup to match by name in addition to ID (#4323)

Browse Source
This commit is contained in:
LiuVaayne 2025-04-02 23:20:07 +08:00 committed by GitHub
parent a42283e789
commit b53dbcbb30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/renderer/src/utils/mcp-tools.ts
View File

@ -1,16 +1,19 @@
import { Tool, ToolUnion, ToolUseBlock } from '@anthropic-ai/sdk/resources' import { Tool, ToolUnion, ToolUseBlock } from '@anthropic-ai/sdk/resources'
import { FunctionCall, FunctionDeclaration, SchemaType, Tool as geminiTool } from '@google/generative-ai'
import { import {
ArraySchema, ArraySchema,
BaseSchema, BaseSchema,
BooleanSchema, BooleanSchema,
EnumStringSchema, EnumStringSchema,
FunctionCall,
FunctionDeclaration,
FunctionDeclarationSchema, FunctionDeclarationSchema,
FunctionDeclarationSchemaProperty, FunctionDeclarationSchemaProperty,
IntegerSchema, IntegerSchema,
NumberSchema, NumberSchema,
ObjectSchema, ObjectSchema,
SimpleStringSchema SchemaType,
SimpleStringSchema,
Tool as geminiTool
} from '@google/generative-ai' } from '@google/generative-ai'
import { nanoid } from '@reduxjs/toolkit' import { nanoid } from '@reduxjs/toolkit'
import store from '@renderer/store' import store from '@renderer/store'
@ -182,7 +185,9 @@ export function openAIToolsToMcpTool(
return undefined return undefined
} }
const tool = mcpTools.find((mcptool) => mcptool.id === llmTool.function.name) const tool = mcpTools.find(
(mcptool) => mcptool.id === llmTool.function.name || mcptool.name === llmTool.function.name
)
if (!tool) { if (!tool) {
console.warn('No MCP Tool found for tool call:', llmTool) console.warn('No MCP Tool found for tool call:', llmTool)