Merge pull request #15 from 0xeb/feature/proxy-title-icons

Add title and icons fields to client types

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)

examples/context_introspection.cpp

@@ -27,16 +27,28 @@ int main()
     resources::ResourceManager resource_mgr;
 
     // Register some sample resources
-    resources::Resource doc1{Id{"file://docs/readme.txt"}, resources::Kind::File,
-                             Json{{"description", "Project README"}, {"size", 1024}}};
+    resources::Resource doc1;
+    doc1.uri = "file://docs/readme.txt";
+    doc1.name = "readme.txt";
+    doc1.id = Id{"file://docs/readme.txt"};
+    doc1.kind = resources::Kind::File;
+    doc1.metadata = Json{{"description", "Project README"}, {"size", 1024}};
     resource_mgr.register_resource(doc1);
 
-    resources::Resource doc2{Id{"file://docs/api.txt"}, resources::Kind::File,
-                             Json{{"description", "API Documentation"}, {"size", 2048}}};
+    resources::Resource doc2;
+    doc2.uri = "file://docs/api.txt";
+    doc2.name = "api.txt";
+    doc2.id = Id{"file://docs/api.txt"};
+    doc2.kind = resources::Kind::File;
+    doc2.metadata = Json{{"description", "API Documentation"}, {"size", 2048}};
     resource_mgr.register_resource(doc2);
 
-    resources::Resource config{Id{"config://app.json"}, resources::Kind::Json,
-                               Json{{"description", "Application config"}}};
+    resources::Resource config;
+    config.uri = "config://app.json";
+    config.name = "app.json";
+    config.id = Id{"config://app.json"};
+    config.kind = resources::Kind::Json;
+    config.metadata = Json{{"description", "Application config"}};
     resource_mgr.register_resource(config);
 
     // ============================================================================
@@ -71,9 +83,9 @@ int main()
     std::cout << "\n2. Listing Prompts:\n";
     std::cout << "   " << std::string(40, '-') << "\n";
     auto prompts = ctx.list_prompts();
-    for (const auto& [name, prompt] : prompts)
+    for (const auto& prompt : prompts)
     {
-        std::cout << "   - Name: " << name << "\n";
+        std::cout << "   - Name: " << prompt.name << "\n";
         std::cout << "     Template: " << prompt.template_string() << "\n\n";
     }
 

examples/tool_injection_middleware.cpp

@@ -28,13 +28,21 @@ int main()
     prompts::PromptManager prompt_mgr;
 
     // Register some resources
-    resource_mgr.register_resource(resources::Resource{Id{"file://docs/readme.md"},
-                                                       resources::Kind::File,
-                                                       Json{{"description", "Project README"}}});
-
-    resource_mgr.register_resource(resources::Resource{Id{"file://docs/api.md"},
-                                                       resources::Kind::File,
-                                                       Json{{"description", "API Documentation"}}});
+    resources::Resource res1;
+    res1.uri = "file://docs/readme.md";
+    res1.name = "readme.md";
+    res1.id = Id{"file://docs/readme.md"};
+    res1.kind = resources::Kind::File;
+    res1.metadata = Json{{"description", "Project README"}};
+    resource_mgr.register_resource(res1);
+
+    resources::Resource res2;
+    res2.uri = "file://docs/api.md";
+    res2.name = "api.md";
+    res2.id = Id{"file://docs/api.md"};
+    res2.kind = resources::Kind::File;
+    res2.metadata = Json{{"description", "API Documentation"}};
+    resource_mgr.register_resource(res2);
 
     // Register some prompts
     prompt_mgr.add("greeting", prompts::Prompt("Hello {{name}}!"));

include/fastmcpp/client/client.hpp

@@ -731,6 +731,28 @@ class Client
                     rt.mimeType = r["mimeType"].get<std::string>();
                 if (r.contains("annotations"))
                     rt.annotations = r["annotations"];
+                if (r.contains("title"))
+                    rt.title = r["title"].get<std::string>();
+                if (r.contains("icons"))
+                {
+                    std::vector<fastmcpp::Icon> icons;
+                    for (const auto& icon : r["icons"])
+                    {
+                        fastmcpp::Icon i;
+                        i.src = icon.at("src").get<std::string>();
+                        if (icon.contains("mimeType"))
+                            i.mime_type = icon["mimeType"].get<std::string>();
+                        if (icon.contains("sizes"))
+                        {
+                            std::vector<std::string> sizes;
+                            for (const auto& s : icon["sizes"])
+                                sizes.push_back(s.get<std::string>());
+                            i.sizes = sizes;
+                        }
+                        icons.push_back(i);
+                    }
+                    rt.icons = icons;
+                }
                 result.resourceTemplates.push_back(rt);
             }
         }
@@ -790,6 +812,11 @@ class Client
                         tc.text = m["content"].get<std::string>();
                         msg.content.push_back(tc);
                     }
+                    else if (m["content"].is_object())
+                    {
+                        // Handle single content object (Python fastmcp format)
+                        msg.content.push_back(parse_content_block(m["content"]));
+                    }
                 }
                 result.messages.push_back(msg);
             }

include/fastmcpp/client/transports.hpp

@@ -2,10 +2,17 @@
 #include "fastmcpp/client/client.hpp"
 #include "fastmcpp/types.hpp"
 
+#include <atomic>
+#include <condition_variable>
 #include <filesystem>
+#include <future>
+#include <memory>
+#include <mutex>
 #include <optional>
 #include <ostream>
 #include <string>
+#include <thread>
+#include <unordered_map>
 #include <vector>
 
 namespace fastmcpp::client
@@ -82,4 +89,52 @@ class StdioTransport : public ITransport
     std::ostream* log_stream_ = nullptr;
 };
 
+/// SSE client transport for connecting to MCP servers using Server-Sent Events protocol.
+/// This transport is compatible with Python fastmcp servers and other SSE-based MCP servers.
+///
+/// The SSE protocol works as follows:
+/// 1. Client connects to /sse endpoint (GET) to establish event stream
+/// 2. Client sends JSON-RPC requests to /messages endpoint (POST)
+/// 3. Server sends JSON-RPC responses back via the SSE stream
+class SseClientTransport : public ITransport
+{
+  public:
+    /// Construct an SSE client transport
+    /// @param base_url The base URL of the MCP server (e.g., "http://127.0.0.1:8766")
+    ///                 Will connect to {base_url}/sse and post to {base_url}/messages
+    /// @param sse_path Path for SSE endpoint (default: "/sse")
+    /// @param messages_path Path for message endpoint (default: "/messages")
+    explicit SseClientTransport(std::string base_url, std::string sse_path = "/sse",
+                                std::string messages_path = "/messages");
+
+    ~SseClientTransport();
+
+    /// Send a JSON-RPC request and wait for response
+    fastmcpp::Json request(const std::string& route, const fastmcpp::Json& payload) override;
+
+    /// Check if connected to SSE stream
+    bool is_connected() const;
+
+  private:
+    void start_sse_listener();
+    void stop_sse_listener();
+    void process_sse_event(const fastmcpp::Json& event);
+
+    std::string base_url_;
+    std::string sse_path_;
+    std::string messages_path_;
+    std::string endpoint_path_; // Endpoint path from SSE with session_id
+
+    // SSE listener thread and state
+    std::unique_ptr<std::thread> sse_thread_;
+    std::atomic<bool> running_{false};
+    std::atomic<bool> connected_{false};
+
+    // Request/response matching
+    std::atomic<int64_t> next_id_{1};
+    std::mutex pending_mutex_;
+    std::condition_variable pending_cv_;
+    std::unordered_map<int64_t, std::promise<fastmcpp::Json>> pending_requests_;
+};
+
 } // namespace fastmcpp::client

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)

include/fastmcpp/mcp/handler.hpp

@@ -1,4 +1,6 @@
 #pragma once
+#include "fastmcpp/prompts/manager.hpp"
+#include "fastmcpp/resources/manager.hpp"
 #include "fastmcpp/server/server.hpp"
 #include "fastmcpp/tools/manager.hpp"
 #include "fastmcpp/types.hpp"
@@ -35,4 +37,11 @@ make_mcp_handler(const std::string& server_name, const std::string& version,
                  const server::Server& server, const tools::ToolManager& tools,
                  const std::unordered_map<std::string, std::string>& descriptions = {});
 
+// Full MCP handler with tools, resources, and prompts support
+std::function<fastmcpp::Json(const fastmcpp::Json&)>
+make_mcp_handler(const std::string& server_name, const std::string& version,
+                 const server::Server& server, const tools::ToolManager& tools,
+                 const resources::ResourceManager& resources, const prompts::PromptManager& prompts,
+                 const std::unordered_map<std::string, std::string>& descriptions = {});
+
 } // namespace fastmcpp::mcp