Merged
[mirror] openJiuwen-ai/agent-protocol#90: fix(mcp): advertise tools capabilities by default #307
[mirror] openJiuwen-ai/agent-protocol#90: fix(mcp): advertise tools capabilities by default #307
Merged
openjiuwen-syncAdd on Sep 15
Total: 4 files changed+93-0
@@ -110,6 +110,7 @@ struct ServerConfig {
110 uint32_t workerThreads{1};110 uint32_t workerThreads{1};
111 std::size_t toolsPageSize{DEFAULT_TOOLS_PAGE_SIZE};111 std::size_t toolsPageSize{DEFAULT_TOOLS_PAGE_SIZE};
112 std::size_t resourcesPageSize{DEFAULT_RESOURCES_PAGE_SIZE};112 std::size_t resourcesPageSize{DEFAULT_RESOURCES_PAGE_SIZE};
113+ // Capabilities follow registration (see McpServerImplement::Add*).
113 ServerCapabilities capabilities{};114 ServerCapabilities capabilities{};
114};115};
115 116 
@@ -491,6 +491,9 @@ void McpServerImplement::AddTool(const std::string& name, ToolFunc fn, AddToolOp
491 ServerTool tool(name, fn, params.title, params.description, params.inputSchema, params.outputSchema,491 ServerTool tool(name, fn, params.title, params.description, params.inputSchema, params.outputSchema,
492 params.structuredOutput, params.annotations, params.icons);492 params.structuredOutput, params.annotations, params.icons);
493 toolManager_.AddTool(tool);493 toolManager_.AddTool(tool);
494+ if (!config_.capabilities.tools.has_value()) {
495+ config_.capabilities.tools = ToolsCapabilities{};
496+ }
maoqiming
maoqimingmaoqimingOct 13

【review】逻辑一致性。capabilities 只在 AddTool/AddPrompt/AddResource 中置位,RemoveTool/RemovePrompt/RemoveResource 不会清除对应能力;删除最后一个 tool/prompt/resource 后,服务端仍会在 initialize 中声明该能力,与“能力随注册变化”的设计目标相矛盾。在 Remove* 中当对应管理器已无同类项时把 config_.capabilities 中相应项复位为 std::nullopt,或改为由 GetCapabilities 依据管理器当前内容动态推导。

likedislike
494}497}
495 498 
496void McpServerImplement::RemoveTool(const std::string& name)499void McpServerImplement::RemoveTool(const std::string& name)
@@ -498,6 +501,9 @@ void McpServerImplement::RemoveTool(const std::string& name)
498 CheckServerState();501 CheckServerState();
499 502 
500 toolManager_.RemoveTool(name);503 toolManager_.RemoveTool(name);
504+ if (toolManager_.ListTools().tools.empty()) {
505+ config_.capabilities.tools.reset();
506+ }
501}507}
502 508 
503void McpServerImplement::AddPrompt(const std::string& name, RenderPromptFunc handler, AddPromptOptionalParams params)509void McpServerImplement::AddPrompt(const std::string& name, RenderPromptFunc handler, AddPromptOptionalParams params)
@@ -520,6 +526,9 @@ void McpServerImplement::AddPrompt(const std::string& name, RenderPromptFunc han
520 }526 }
521 527 
522 promptManager_.AddPrompt(prompt, handler);528 promptManager_.AddPrompt(prompt, handler);
529+ if (!config_.capabilities.prompts.has_value()) {
530+ config_.capabilities.prompts = PromptsCapabilities{};
maoqiming
maoqimingmaoqimingOct 13

【review】并发安全。Add* 直接就地修改 config_.capabilities,而 CheckServerState 仅拒绝 STOPPED 状态,允许在 RUNNING 期间调用;若此时有 worker 线程读取能力(处理 initialize 或调用 GetCapabilities),构成无同步的数据竞争。用互斥量或原子保护 capabilities 的读/写,或在文档中明确要求 Add* 必须在 Run() 之前完成并据此在 RUNNING 状态下拒绝调用。

likedislike
531+ }
523}532}
524 533 
525void McpServerImplement::RemovePrompt(const std::string& name)534void McpServerImplement::RemovePrompt(const std::string& name)
@@ -527,6 +536,9 @@ void McpServerImplement::RemovePrompt(const std::string& name)
527 CheckServerState();536 CheckServerState();
528 537 
529 promptManager_.RemovePrompt(name);538 promptManager_.RemovePrompt(name);
539+ if (promptManager_.ListPrompts().prompts.empty()) {
540+ config_.capabilities.prompts.reset();
541+ }
530}542}
531 543 
532void McpServerImplement::AddResource(const std::string& uri, const std::string& name, ReadResourceFunc readFunc,544void McpServerImplement::AddResource(const std::string& uri, const std::string& name, ReadResourceFunc readFunc,
@@ -557,6 +569,9 @@ void McpServerImplement::AddResource(const std::string& uri, const std::string&
557 }569 }
558 570 
559 resourceManager_.AddResource(resource, readFunc);571 resourceManager_.AddResource(resource, readFunc);
572+ if (!config_.capabilities.resources.has_value()) {
573+ config_.capabilities.resources = ResourcesCapabilities{};
574+ }
560}575}
561 576 
562void McpServerImplement::RemoveResource(const std::string& uri)577void McpServerImplement::RemoveResource(const std::string& uri)
@@ -564,6 +579,9 @@ void McpServerImplement::RemoveResource(const std::string& uri)
564 CheckServerState();579 CheckServerState();
565 580 
566 resourceManager_.RemoveResource(uri);581 resourceManager_.RemoveResource(uri);
582+ if (resourceManager_.ListResources().resources.empty()) {
583+ config_.capabilities.resources.reset();
584+ }
567}585}
568 586 
569void McpServerImplement::AddResourceTemplate(const std::string& uriTemplate, const std::string& name,587void McpServerImplement::AddResourceTemplate(const std::string& uriTemplate, const std::string& name,
@@ -67,6 +67,12 @@ public:
67 setLevelHandler_ = std::move(h);67 setLevelHandler_ = std::move(h);
68 }68 }
69 69 
70+ /** Advertised server capabilities (updated when tools/prompts/resources are registered). */
71+ const ServerCapabilities& GetCapabilities() const
72+ {
73+ return config_.capabilities;
74+ }
75+ 
70private:76private:
71 void ReceiveIncomingMessages(const RequestId& requestId, const Request& request, ServerRequestContext& ctx);77 void ReceiveIncomingMessages(const RequestId& requestId, const Request& request, ServerRequestContext& ctx);
72 void HandleToolsList(const RequestId& requestId, const Request& request, ServerRequestContext& ctx);78 void HandleToolsList(const RequestId& requestId, const Request& request, ServerRequestContext& ctx);
@@ -280,6 +280,72 @@ TEST(McpServerImplementTest, ToolManagement_AddTool)
280 EXPECT_NO_THROW(server.AddTool(tool.name, tool.func, toolParams));280 EXPECT_NO_THROW(server.AddTool(tool.name, tool.func, toolParams));
281}281}
282 282 
283+TEST(McpServerImplementTest, CapabilitiesFollowRegistration)
284+{
285+ auto config = CreateValidStdioConfig();
286+ ASSERT_FALSE(config.capabilities.tools.has_value());
287+ ASSERT_FALSE(config.capabilities.prompts.has_value());
288+ ASSERT_FALSE(config.capabilities.resources.has_value());
289+ 
290+ McpServerImplement server(config);
291+ EXPECT_FALSE(server.GetCapabilities().tools.has_value());
292+ EXPECT_FALSE(server.GetCapabilities().prompts.has_value());
293+ EXPECT_FALSE(server.GetCapabilities().resources.has_value());
294+ 
295+ auto tool = CreateTestTool();
296+ Mcp::AddToolOptionalParams toolParams;
297+ toolParams.description = tool.description;
298+ toolParams.inputSchema = tool.inputSchema;
299+ toolParams.outputSchema = tool.outputSchema;
300+ ASSERT_NO_THROW(server.AddTool(tool.name, tool.func, toolParams));
301+ EXPECT_TRUE(server.GetCapabilities().tools.has_value());
302+ EXPECT_FALSE(server.GetCapabilities().prompts.has_value());
303+ EXPECT_FALSE(server.GetCapabilities().resources.has_value());
304+ 
305+ auto prompt = CreateTestPrompt();
306+ std::string promptDescription = PROMPT_DESCRIPTION;
307+ Mcp::AddPromptOptionalParams promptParams;
308+ promptParams.description = std::cref(promptDescription);
309+ ASSERT_NO_THROW(server.AddPrompt(
310+ prompt.name,
311+ [](const ServerContext &, const std::string &,
312+ const std::optional<std::string> &) -> Mcp::GetPromptResult {
313+ return Mcp::GetPromptResult{};
314+ },
315+ promptParams));
316+ EXPECT_TRUE(server.GetCapabilities().tools.has_value());
317+ EXPECT_TRUE(server.GetCapabilities().prompts.has_value());
318+ EXPECT_FALSE(server.GetCapabilities().resources.has_value());
319+ 
320+ auto resource = CreateTestResource();
321+ std::string resourceDescription = RESOURCE_DESCRIPTION;
322+ std::string resourceMimeType = RESOURCE_MIME_TYPE;
323+ Mcp::AddResourceOptionalParams resourceParams;
324+ resourceParams.description = std::cref(resourceDescription);
325+ resourceParams.mimeType = std::cref(resourceMimeType);
326+ Mcp::ReadResourceFunc readResourceFunc =
327+ [](const ServerContext &, const std::string &) -> Mcp::ReadResourceResult {
328+ return Mcp::ReadResourceResult{};
329+ };
330+ ASSERT_NO_THROW(
331+ server.AddResource(resource.uri, resource.name, readResourceFunc, resourceParams));
332+ EXPECT_TRUE(server.GetCapabilities().tools.has_value());
333+ EXPECT_TRUE(server.GetCapabilities().prompts.has_value());
334+ EXPECT_TRUE(server.GetCapabilities().resources.has_value());
335+ 
336+ EXPECT_NO_THROW(server.RemoveTool(tool.name));
337+ EXPECT_FALSE(server.GetCapabilities().tools.has_value());
338+ EXPECT_TRUE(server.GetCapabilities().prompts.has_value());
339+ EXPECT_TRUE(server.GetCapabilities().resources.has_value());
340+ 
341+ EXPECT_NO_THROW(server.RemovePrompt(prompt.name));
342+ EXPECT_FALSE(server.GetCapabilities().prompts.has_value());
343+ EXPECT_TRUE(server.GetCapabilities().resources.has_value());
344+ 
345+ EXPECT_NO_THROW(server.RemoveResource(resource.uri));
346+ EXPECT_FALSE(server.GetCapabilities().resources.has_value());
347+}
348+ 
283TEST(McpServerImplementTest, ToolManagement_RemoveTool)349TEST(McpServerImplementTest, ToolManagement_RemoveTool)
284{350{
285 auto config = CreateValidStdioConfig();351 auto config = CreateValidStdioConfig();
@@ -293,7 +359,9 @@ TEST(McpServerImplementTest, ToolManagement_RemoveTool)
293 toolParams.outputSchema = tool.outputSchema;359 toolParams.outputSchema = tool.outputSchema;
294 360 
295 EXPECT_NO_THROW(server.AddTool(tool.name, tool.func, toolParams));361 EXPECT_NO_THROW(server.AddTool(tool.name, tool.func, toolParams));
362+ EXPECT_TRUE(server.GetCapabilities().tools.has_value());
296 EXPECT_NO_THROW(server.RemoveTool(tool.name));363 EXPECT_NO_THROW(server.RemoveTool(tool.name));
364+ EXPECT_FALSE(server.GetCapabilities().tools.has_value());
297}365}
298 366 
299TEST(McpServerImplementTest, ToolManagement_AddMultipleTools) {367TEST(McpServerImplementTest, ToolManagement_AddMultipleTools) {