Add title and icons fields to client types

- Add `title` and `icons` fields to client types: ToolInfo, ResourceInfo,
  ResourceTemplate, PromptInfo
- Add JSON serialization/deserialization for new fields
- Add `to_json`/`from_json` for ResourceTemplate (was missing)
- Add comprehensive unit tests for title/icons serialization
- Add integration tests (api_icons.cpp) for round-trip verification:
  - Tools with icons from server to client
  - Resources with icons
  - Resource templates with icons
  - Prompts with icons

Author: 0xeb

CMakeLists.txt

@@ -293,6 +293,10 @@ if(FASTMCPP_BUILD_TESTS)
   target_link_libraries(fastmcpp_client_api_advanced PRIVATE fastmcpp_core)
   add_test(NAME fastmcpp_client_api_advanced COMMAND fastmcpp_client_api_advanced)
 
+  add_executable(fastmcpp_client_api_icons tests/client/api_icons.cpp)
+  target_link_libraries(fastmcpp_client_api_icons PRIVATE fastmcpp_core)
+  add_test(NAME fastmcpp_client_api_icons COMMAND fastmcpp_client_api_icons)
+
   add_executable(fastmcpp_server_middleware tests/server/middleware.cpp)
   target_link_libraries(fastmcpp_server_middleware PRIVATE fastmcpp_core)
   add_test(NAME fastmcpp_server_middleware COMMAND fastmcpp_server_middleware)

include/fastmcpp/client/types.hpp

@@ -56,9 +56,11 @@ using ContentBlock = std::variant<TextContent, ImageContent, EmbeddedResourceCon
 struct ToolInfo
 {
     std::string name;
+    std::optional<std::string> title; ///< Human-readable title
     std::optional<std::string> description;
-    fastmcpp::Json inputSchema;                 ///< JSON Schema for tool input
-    std::optional<fastmcpp::Json> outputSchema; ///< JSON Schema for structured output
+    fastmcpp::Json inputSchema;                       ///< JSON Schema for tool input
+    std::optional<fastmcpp::Json> outputSchema;       ///< JSON Schema for structured output
+    std::optional<std::vector<fastmcpp::Icon>> icons; ///< Icons for UI display
 };
 
 /// Result of tools/list request
@@ -120,9 +122,11 @@ struct ResourceInfo
 {
     std::string uri;
     std::string name;
+    std::optional<std::string> title; ///< Human-readable title
     std::optional<std::string> description;
     std::optional<std::string> mimeType;
     std::optional<fastmcpp::Json> annotations;
+    std::optional<std::vector<fastmcpp::Icon>> icons; ///< Icons for UI display
 };
 
 /// Resource template information
@@ -131,9 +135,11 @@ struct ResourceTemplate
 {
     std::string uriTemplate;
     std::string name;
+    std::optional<std::string> title; ///< Human-readable title
     std::optional<std::string> description;
     std::optional<std::string> mimeType;
     std::optional<fastmcpp::Json> annotations;
+    std::optional<std::vector<fastmcpp::Icon>> icons; ///< Icons for UI display
 };
 
 /// Text resource content
@@ -195,8 +201,10 @@ struct PromptArgument
 struct PromptInfo
 {
     std::string name;
+    std::optional<std::string> title; ///< Human-readable title
     std::optional<std::string> description;
     std::optional<std::vector<PromptArgument>> arguments;
+    std::optional<std::vector<fastmcpp::Icon>> icons; ///< Icons for UI display
 };
 
 /// Prompt message role
@@ -309,48 +317,97 @@ inline void from_json(const fastmcpp::Json& j, ImageContent& c)
 inline void to_json(fastmcpp::Json& j, const ToolInfo& t)
 {
     j = fastmcpp::Json{{"name", t.name}, {"inputSchema", t.inputSchema}};
+    if (t.title)
+        j["title"] = *t.title;
     if (t.description)
         j["description"] = *t.description;
     if (t.outputSchema)
         j["outputSchema"] = *t.outputSchema;
+    if (t.icons)
+        j["icons"] = *t.icons;
 }
 
 inline void from_json(const fastmcpp::Json& j, ToolInfo& t)
 {
     t.name = j.at("name").get<std::string>();
+    if (j.contains("title"))
+        t.title = j["title"].get<std::string>();
     if (j.contains("description"))
         t.description = j["description"].get<std::string>();
     t.inputSchema = j.value("inputSchema", fastmcpp::Json::object());
     if (j.contains("outputSchema"))
         t.outputSchema = j["outputSchema"];
+    if (j.contains("icons"))
+        t.icons = j["icons"].get<std::vector<fastmcpp::Icon>>();
 }
 
 inline void to_json(fastmcpp::Json& j, const ResourceInfo& r)
 {
     j = fastmcpp::Json{{"uri", r.uri}, {"name", r.name}};
+    if (r.title)
+        j["title"] = *r.title;
     if (r.description)
         j["description"] = *r.description;
     if (r.mimeType)
         j["mimeType"] = *r.mimeType;
     if (r.annotations)
         j["annotations"] = *r.annotations;
+    if (r.icons)
+        j["icons"] = *r.icons;
 }
 
 inline void from_json(const fastmcpp::Json& j, ResourceInfo& r)
 {
     r.uri = j.at("uri").get<std::string>();
     r.name = j.at("name").get<std::string>();
+    if (j.contains("title"))
+        r.title = j["title"].get<std::string>();
     if (j.contains("description"))
         r.description = j["description"].get<std::string>();
     if (j.contains("mimeType"))
         r.mimeType = j["mimeType"].get<std::string>();
     if (j.contains("annotations"))
         r.annotations = j["annotations"];
+    if (j.contains("icons"))
+        r.icons = j["icons"].get<std::vector<fastmcpp::Icon>>();
+}
+
+inline void to_json(fastmcpp::Json& j, const ResourceTemplate& t)
+{
+    j = fastmcpp::Json{{"uriTemplate", t.uriTemplate}, {"name", t.name}};
+    if (t.title)
+        j["title"] = *t.title;
+    if (t.description)
+        j["description"] = *t.description;
+    if (t.mimeType)
+        j["mimeType"] = *t.mimeType;
+    if (t.annotations)
+        j["annotations"] = *t.annotations;
+    if (t.icons)
+        j["icons"] = *t.icons;
+}
+
+inline void from_json(const fastmcpp::Json& j, ResourceTemplate& t)
+{
+    t.uriTemplate = j.at("uriTemplate").get<std::string>();
+    t.name = j.at("name").get<std::string>();
+    if (j.contains("title"))
+        t.title = j["title"].get<std::string>();
+    if (j.contains("description"))
+        t.description = j["description"].get<std::string>();
+    if (j.contains("mimeType"))
+        t.mimeType = j["mimeType"].get<std::string>();
+    if (j.contains("annotations"))
+        t.annotations = j["annotations"];
+    if (j.contains("icons"))
+        t.icons = j["icons"].get<std::vector<fastmcpp::Icon>>();
 }
 
 inline void to_json(fastmcpp::Json& j, const PromptInfo& p)
 {
     j = fastmcpp::Json{{"name", p.name}};
+    if (p.title)
+        j["title"] = *p.title;
     if (p.description)
         j["description"] = *p.description;
     if (p.arguments)
@@ -364,11 +421,15 @@ inline void to_json(fastmcpp::Json& j, const PromptInfo& p)
             j["arguments"].push_back(argJson);
         }
     }
+    if (p.icons)
+        j["icons"] = *p.icons;
 }
 
 inline void from_json(const fastmcpp::Json& j, PromptInfo& p)
 {
     p.name = j.at("name").get<std::string>();
+    if (j.contains("title"))
+        p.title = j["title"].get<std::string>();
     if (j.contains("description"))
         p.description = j["description"].get<std::string>();
     if (j.contains("arguments"))
@@ -384,6 +445,8 @@ inline void from_json(const fastmcpp::Json& j, PromptInfo& p)
             p.arguments->push_back(arg);
         }
     }
+    if (j.contains("icons"))
+        p.icons = j["icons"].get<std::vector<fastmcpp::Icon>>();
 }
 
 inline void from_json(const fastmcpp::Json& j, TextResourceContent& c)

tests/client/api_icons.cpp

@@ -0,0 +1,146 @@
+/// @file tests/client/api_icons.cpp
+/// @brief Integration tests for title and icons fields on client types
+
+#include "test_helpers.hpp"
+
+void test_tool_with_icons()
+{
+    std::cout << "Test: tool with title and icons...\n";
+
+    auto srv = create_tool_server();
+    client::Client c(std::make_unique<client::LoopbackTransport>(srv));
+
+    auto tools = c.list_tools();
+
+    // Find the icon_tool
+    auto it = std::find_if(tools.begin(), tools.end(),
+                           [](const auto& t) { return t.name == "icon_tool"; });
+
+    assert(it != tools.end());
+    assert(it->title.has_value());
+    assert(*it->title == "My Icon Tool");
+    assert(it->icons.has_value());
+    assert(it->icons->size() == 2);
+
+    // Check first icon (URL)
+    assert((*it->icons)[0].src == "https://example.com/icon.png");
+    assert((*it->icons)[0].mime_type.has_value());
+    assert(*(*it->icons)[0].mime_type == "image/png");
+    assert(!(*it->icons)[0].sizes.has_value());
+
+    // Check second icon (data URI with sizes)
+    assert((*it->icons)[1].src == "data:image/svg+xml;base64,PHN2Zz48L3N2Zz4=");
+    assert((*it->icons)[1].mime_type.has_value());
+    assert(*(*it->icons)[1].mime_type == "image/svg+xml");
+    assert((*it->icons)[1].sizes.has_value());
+    assert((*it->icons)[1].sizes->size() == 2);
+    assert((*(*it->icons)[1].sizes)[0] == "48x48");
+    assert((*(*it->icons)[1].sizes)[1] == "any");
+
+    std::cout << "  [PASS] Tool with title and icons round-trips correctly\n";
+}
+
+void test_tool_without_icons()
+{
+    std::cout << "Test: tool without icons...\n";
+
+    auto srv = create_tool_server();
+    client::Client c(std::make_unique<client::LoopbackTransport>(srv));
+
+    auto tools = c.list_tools();
+
+    // Find the add tool (has no icons)
+    auto it =
+        std::find_if(tools.begin(), tools.end(), [](const auto& t) { return t.name == "add"; });
+
+    assert(it != tools.end());
+    assert(!it->title.has_value());
+    assert(!it->icons.has_value());
+
+    std::cout << "  [PASS] Tool without icons has nullopt fields\n";
+}
+
+void test_resource_with_icons()
+{
+    std::cout << "Test: resource with title and icons...\n";
+
+    auto srv = create_resource_server();
+    client::Client c(std::make_unique<client::LoopbackTransport>(srv));
+
+    auto resources = c.list_resources();
+
+    // Find the icon_resource
+    auto it = std::find_if(resources.begin(), resources.end(),
+                           [](const auto& r) { return r.name == "icon_resource"; });
+
+    assert(it != resources.end());
+    assert(it->title.has_value());
+    assert(*it->title == "Resource With Icons");
+    assert(it->icons.has_value());
+    assert(it->icons->size() == 1);
+    assert((*it->icons)[0].src == "https://example.com/res.png");
+
+    std::cout << "  [PASS] Resource with title and icons round-trips correctly\n";
+}
+
+void test_resource_template_with_icons()
+{
+    std::cout << "Test: resource template with title and icons...\n";
+
+    auto srv = create_resource_server();
+    client::Client c(std::make_unique<client::LoopbackTransport>(srv));
+
+    auto templates = c.list_resource_templates();
+
+    // Find the icon_template
+    auto it = std::find_if(templates.begin(), templates.end(),
+                           [](const auto& t) { return t.name == "icon_template"; });
+
+    assert(it != templates.end());
+    assert(it->title.has_value());
+    assert(*it->title == "Template With Icons");
+    assert(it->icons.has_value());
+    assert(it->icons->size() == 1);
+    assert((*it->icons)[0].src == "https://example.com/tpl.svg");
+    assert((*it->icons)[0].mime_type.has_value());
+    assert(*(*it->icons)[0].mime_type == "image/svg+xml");
+
+    std::cout << "  [PASS] Resource template with title and icons round-trips correctly\n";
+}
+
+void test_prompt_with_icons()
+{
+    std::cout << "Test: prompt with title and icons...\n";
+
+    auto srv = create_prompt_server();
+    client::Client c(std::make_unique<client::LoopbackTransport>(srv));
+
+    auto prompts = c.list_prompts();
+
+    // Find the icon_prompt
+    auto it = std::find_if(prompts.begin(), prompts.end(),
+                           [](const auto& p) { return p.name == "icon_prompt"; });
+
+    assert(it != prompts.end());
+    assert(it->title.has_value());
+    assert(*it->title == "Prompt With Icons");
+    assert(it->icons.has_value());
+    assert(it->icons->size() == 1);
+    assert((*it->icons)[0].src == "https://example.com/prompt.png");
+
+    std::cout << "  [PASS] Prompt with title and icons round-trips correctly\n";
+}
+
+int main()
+{
+    std::cout << "\n=== Client API Icons Integration Tests ===\n\n";
+
+    test_tool_with_icons();
+    test_tool_without_icons();
+    test_resource_with_icons();
+    test_resource_template_with_icons();
+    test_prompt_with_icons();
+
+    std::cout << "\n=== All Icon Integration Tests Passed ===\n\n";
+    return 0;
+}