Compare commits

...

1 Commits

Author SHA1 Message Date
suyao
18cd611316 fix: update @modelcontextprotocol/sdk to v1.23.0 and enhance MCP tool schemas 2025-12-02 04:39:24 +08:00
5 changed files with 70 additions and 14 deletions

View File

@@ -162,7 +162,7 @@
"@langchain/core": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch", "@langchain/core": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch",
"@langchain/openai": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch", "@langchain/openai": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch",
"@mistralai/mistralai": "^1.7.5", "@mistralai/mistralai": "^1.7.5",
"@modelcontextprotocol/sdk": "^1.17.5", "@modelcontextprotocol/sdk": "^1.23.0",
"@mozilla/readability": "^0.6.0", "@mozilla/readability": "^0.6.0",
"@notionhq/client": "^2.2.15", "@notionhq/client": "^2.2.15",
"@openrouter/ai-sdk-provider": "^1.2.8", "@openrouter/ai-sdk-provider": "^1.2.8",

View File

@@ -42,11 +42,14 @@ import {
type MCPPrompt, type MCPPrompt,
type MCPResource, type MCPResource,
type MCPServer, type MCPServer,
type MCPTool type MCPTool,
MCPToolInputSchema,
MCPToolOutputSchema
} from '@types' } from '@types'
import { app, net } from 'electron' import { app, net } from 'electron'
import { EventEmitter } from 'events' import { EventEmitter } from 'events'
import { v4 as uuidv4 } from 'uuid' import { v4 as uuidv4 } from 'uuid'
import * as z from 'zod'
import { CacheService } from './CacheService' import { CacheService } from './CacheService'
import DxtService from './DxtService' import DxtService from './DxtService'
@@ -620,6 +623,8 @@ class McpService {
tools.map((tool: SDKTool) => { tools.map((tool: SDKTool) => {
const serverTool: MCPTool = { const serverTool: MCPTool = {
...tool, ...tool,
inputSchema: z.parse(MCPToolInputSchema, tool.inputSchema),
outputSchema: tool.outputSchema ? z.parse(MCPToolOutputSchema, tool.outputSchema) : undefined,
id: buildFunctionCallToolName(server.name, tool.name, server.id), id: buildFunctionCallToolName(server.name, tool.name, server.id),
serverId: server.id, serverId: server.id,
serverName: server.name, serverName: server.name,

View File

@@ -34,6 +34,15 @@ export const MCPToolInputSchema = z
required: z.array(z.string()).optional() required: z.array(z.string()).optional()
}) })
.loose() .loose()
.transform((schema) => {
if (!schema.properties) {
schema.properties = {}
}
if (!schema.required) {
schema.required = []
}
return schema
})
export interface BuiltinTool extends BaseTool { export interface BuiltinTool extends BaseTool {
inputSchema: z.infer<typeof MCPToolInputSchema> inputSchema: z.infer<typeof MCPToolInputSchema>

View File

@@ -136,7 +136,10 @@ export async function callMCPTool(
topicId?: string, topicId?: string,
modelName?: string modelName?: string
): Promise<MCPCallToolResponse> { ): Promise<MCPCallToolResponse> {
logger.info(`Calling Tool: ${toolResponse.tool.serverName} ${toolResponse.tool.name}`, toolResponse.tool) logger.info(
`Calling Tool: ${toolResponse.id} ${toolResponse.tool.serverName} ${toolResponse.tool.name}`,
toolResponse.tool
)
try { try {
const server = getMcpServerByTool(toolResponse.tool) const server = getMcpServerByTool(toolResponse.tool)

View File

@@ -4747,11 +4747,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@modelcontextprotocol/sdk@npm:^1.17.5": "@modelcontextprotocol/sdk@npm:^1.23.0":
version: 1.17.5 version: 1.23.0
resolution: "@modelcontextprotocol/sdk@npm:1.17.5" resolution: "@modelcontextprotocol/sdk@npm:1.23.0"
dependencies: dependencies:
ajv: "npm:^6.12.6" ajv: "npm:^8.17.1"
ajv-formats: "npm:^3.0.1"
content-type: "npm:^1.0.5" content-type: "npm:^1.0.5"
cors: "npm:^2.8.5" cors: "npm:^2.8.5"
cross-spawn: "npm:^7.0.5" cross-spawn: "npm:^7.0.5"
@@ -4761,9 +4762,17 @@ __metadata:
express-rate-limit: "npm:^7.5.0" express-rate-limit: "npm:^7.5.0"
pkce-challenge: "npm:^5.0.0" pkce-challenge: "npm:^5.0.0"
raw-body: "npm:^3.0.0" raw-body: "npm:^3.0.0"
zod: "npm:^3.23.8" zod: "npm:^3.25 || ^4.0"
zod-to-json-schema: "npm:^3.24.1" zod-to-json-schema: "npm:^3.25.0"
checksum: 10c0/182b92b5e7c07da428fd23c6de22021c4f9a91f799c02a8ef15def07e4f9361d0fc22303548658fec2a700623535fd44a9dc4d010fb5d803a8f80e3c6c64a45e peerDependencies:
"@cfworker/json-schema": ^4.1.1
zod: ^3.25 || ^4.0
peerDependenciesMeta:
"@cfworker/json-schema":
optional: true
zod:
optional: false
checksum: 10c0/b0291f921ad9bda06bbf1a61b1bb61ceca1173da5d74d39a411c40428d6ca50a95f0de3a1631f25a44b439220b15c30c1306600bf48bef665ab7ad118d528260
languageName: node languageName: node
linkType: hard linkType: hard
@@ -10046,7 +10055,7 @@ __metadata:
"@libsql/client": "npm:0.14.0" "@libsql/client": "npm:0.14.0"
"@libsql/win32-x64-msvc": "npm:^0.4.7" "@libsql/win32-x64-msvc": "npm:^0.4.7"
"@mistralai/mistralai": "npm:^1.7.5" "@mistralai/mistralai": "npm:^1.7.5"
"@modelcontextprotocol/sdk": "npm:^1.17.5" "@modelcontextprotocol/sdk": "npm:^1.23.0"
"@mozilla/readability": "npm:^0.6.0" "@mozilla/readability": "npm:^0.6.0"
"@napi-rs/system-ocr": "patch:@napi-rs/system-ocr@npm%3A1.0.2#~/.yarn/patches/@napi-rs-system-ocr-npm-1.0.2-59e7a78e8b.patch" "@napi-rs/system-ocr": "patch:@napi-rs/system-ocr@npm%3A1.0.2#~/.yarn/patches/@napi-rs-system-ocr-npm-1.0.2-59e7a78e8b.patch"
"@notionhq/client": "npm:^2.2.15" "@notionhq/client": "npm:^2.2.15"
@@ -10403,6 +10412,20 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"ajv-formats@npm:^3.0.1":
version: 3.0.1
resolution: "ajv-formats@npm:3.0.1"
dependencies:
ajv: "npm:^8.0.0"
peerDependencies:
ajv: ^8.0.0
peerDependenciesMeta:
ajv:
optional: true
checksum: 10c0/168d6bca1ea9f163b41c8147bae537e67bd963357a5488a1eaf3abe8baa8eec806d4e45f15b10767e6020679315c7e1e5e6803088dfb84efa2b4e9353b83dd0a
languageName: node
linkType: hard
"ajv-keywords@npm:^3.4.1": "ajv-keywords@npm:^3.4.1":
version: 3.5.2 version: 3.5.2
resolution: "ajv-keywords@npm:3.5.2" resolution: "ajv-keywords@npm:3.5.2"
@@ -10412,7 +10435,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"ajv@npm:^6.10.0, ajv@npm:^6.12.0, ajv@npm:^6.12.4, ajv@npm:^6.12.6": "ajv@npm:^6.10.0, ajv@npm:^6.12.0, ajv@npm:^6.12.4":
version: 6.12.6 version: 6.12.6
resolution: "ajv@npm:6.12.6" resolution: "ajv@npm:6.12.6"
dependencies: dependencies:
@@ -10424,7 +10447,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"ajv@npm:^8.0.0, ajv@npm:^8.6.3": "ajv@npm:^8.0.0, ajv@npm:^8.17.1, ajv@npm:^8.6.3":
version: 8.17.1 version: 8.17.1
resolution: "ajv@npm:8.17.1" resolution: "ajv@npm:8.17.1"
dependencies: dependencies:
@@ -26353,6 +26376,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"zod-to-json-schema@npm:^3.25.0":
version: 3.25.0
resolution: "zod-to-json-schema@npm:3.25.0"
peerDependencies:
zod: ^3.25 || ^4
checksum: 10c0/2d2cf6ca49752bf3dc5fb37bc8f275eddbbc4020e7958d9c198ea88cd197a5f527459118188a0081b889da6a6474d64c4134cd60951fa70178c125138761c680
languageName: node
linkType: hard
"zod-validation-error@npm:^3.4.0": "zod-validation-error@npm:^3.4.0":
version: 3.4.0 version: 3.4.0
resolution: "zod-validation-error@npm:3.4.0" resolution: "zod-validation-error@npm:3.4.0"
@@ -26362,13 +26394,20 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"zod@npm:^3.22.4, zod@npm:^3.23.8, zod@npm:^3.24.1": "zod@npm:^3.22.4, zod@npm:^3.24.1":
version: 3.25.56 version: 3.25.56
resolution: "zod@npm:3.25.56" resolution: "zod@npm:3.25.56"
checksum: 10c0/3800f01d4b1df932b91354eb1e648f69cc7e5561549e6d2bf83827d930a5f33bbf92926099445f6fc1ebb64ca9c6513ef9ae5e5409cfef6325f354bcf6fc9a24 checksum: 10c0/3800f01d4b1df932b91354eb1e648f69cc7e5561549e6d2bf83827d930a5f33bbf92926099445f6fc1ebb64ca9c6513ef9ae5e5409cfef6325f354bcf6fc9a24
languageName: node languageName: node
linkType: hard linkType: hard
"zod@npm:^3.25 || ^4.0":
version: 4.1.13
resolution: "zod@npm:4.1.13"
checksum: 10c0/d7e74e82dba81a91ffc3239cd85bc034abe193a28f7087a94ab258a3e48e9a7ca4141920cac979a0d781495b48fc547777394149f26be04c3dc642f58bbc3941
languageName: node
linkType: hard
"zod@npm:^3.25.0 || ^4.0.0, zod@npm:^3.25.76 || ^4": "zod@npm:^3.25.0 || ^4.0.0, zod@npm:^3.25.76 || ^4":
version: 4.1.12 version: 4.1.12
resolution: "zod@npm:4.1.12" resolution: "zod@npm:4.1.12"