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

feat: update npm scope default value and enhance error handling in MCP tool calls (#3440)

Browse Source
This commit is contained in:
LiuVaayne 2025-03-17 12:45:35 +08:00 committed by GitHub
parent 7096f81234
commit 486563062c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/src/pages/settings/MCPSettings/NpxSearch.tsx
View File

@ -24,7 +24,7 @@ const NpxSearch: FC = () => {
const { Paragraph, Text } = Typography const { Paragraph, Text } = Typography
// Add new state variables for npm scope search // Add new state variables for npm scope search
const [npmScope, setNpmScope] = useState('') const [npmScope, setNpmScope] = useState('@modelcontextprotocol')
const [searchLoading, setSearchLoading] = useState(false) const [searchLoading, setSearchLoading] = useState(false)
const [searchResults, setSearchResults] = useState<SearchResult[]>([]) const [searchResults, setSearchResults] = useState<SearchResult[]>([])

2
src/renderer/src/providers/OpenAIProvider.ts
View File

@ -33,7 +33,7 @@ import {
openAIToolsToMcpTool, openAIToolsToMcpTool,
upsertMCPToolResponse upsertMCPToolResponse
} from '@renderer/utils/mcp-tools' } from '@renderer/utils/mcp-tools'
import { isString, takeRight } from 'lodash' import { takeRight } from 'lodash'
import OpenAI, { AzureOpenAI } from 'openai' import OpenAI, { AzureOpenAI } from 'openai'
import { import {
ChatCompletionAssistantMessageParam, ChatCompletionAssistantMessageParam,

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

@ -77,13 +77,26 @@ export function openAIToolsToMcpTool(
export async function callMCPTool(tool: MCPTool): Promise<any> { export async function callMCPTool(tool: MCPTool): Promise<any> {
console.log(`[MCP] Calling Tool: ${tool.serverName} ${tool.name}`, tool) console.log(`[MCP] Calling Tool: ${tool.serverName} ${tool.name}`, tool)
const resp = await window.api.mcp.callTool({ try {
client: tool.serverName, const resp = await window.api.mcp.callTool({
name: tool.name, client: tool.serverName,
args: tool.inputSchema name: tool.name,
}) args: tool.inputSchema
console.log(`[MCP] Tool called: ${tool.serverName} ${tool.name}`, resp) })
return resp console.log(`[MCP] Tool called: ${tool.serverName} ${tool.name}`, resp)
return resp
} catch (e) {
console.error(`[MCP] Error calling Tool: ${tool.serverName} ${tool.name}`, e)
return Promise.resolve({
isError: true,
content: [
{
type: 'text',
text: `Error calling tool ${tool.name}: ${JSON.stringify(e)}`
}
]
})
}
} }
export function mcpToolsToAnthropicTools(mcpTools: MCPTool[]): Array<ToolUnion> { export function mcpToolsToAnthropicTools(mcpTools: MCPTool[]): Array<ToolUnion> {