Upload Source/Plugin/McpServer.cpp

Source/Plugin/McpServer.cpp

@@ -1,6 +1,5 @@
 #include "McpServer.h"
-#include "HelperConnection.h"
-#include "../Shared/IPCProtocol.h"
+#include "PluginBridgeProcessor.h"
 
 #define CPPHTTPLIB_THREAD_POOL_COUNT 2
 #include "httplib.h"
@@ -8,8 +7,8 @@
 
 using json = nlohmann::json;
 
-McpServer::McpServer(int port, HelperConnection& helper)
-    : server(std::make_unique<httplib::Server>()), port(port), helper(helper)
+McpServer::McpServer(int port, PluginBridgeProcessor& processor)
+    : server(std::make_unique<httplib::Server>()), port(port), processor(processor)
 {
     setupRoutes();
 }
@@ -61,7 +60,8 @@ void McpServer::setupRoutes()
             {"status", "ok"},
             {"port", port},
             {"initialized", initialized},
-            {"helper", helper.isHelperRunning() ? "connected" : "disconnected"}
+            {"plugin", processor.isPluginLoaded() ? processor.getLoadedPluginName().toStdString() : "none"},
+            {"params", processor.getLoadedPluginParamCount()}
         };
         res.set_content(health.dump(), "application/json");
     });
@@ -94,8 +94,6 @@ void McpServer::stop()
 
 bool McpServer::isRunning() const { return running.load(); }
 
-// --- Protocol Handlers ---
-
 std::string McpServer::handleInitialize(const std::string& requestBody)
 {
     auto body = json::parse(requestBody);
@@ -107,7 +105,7 @@ std::string McpServer::handleInitialize(const std::string& requestBody)
         {"result", {
             {"protocolVersion","2025-06-18"},
             {"capabilities",{{"tools",{{"listChanged",false}}}}},
-            {"serverInfo",{{"name","PluginBridge"},{"version","0.2.0"}}}
+            {"serverInfo",{{"name","PluginBridge"},{"version","0.3.0"}}}
         }}
     };
     return response.dump();
@@ -121,24 +119,21 @@ std::string McpServer::handleToolsList(const std::string& requestBody)
         {"id", body.value("id", json(nullptr))},
         {"result",{
             {"tools", json::array({
-                {{"name","list_plugins"},{"description","List loaded plugin"},
+                {{"name","list_plugins"},{"description","Show loaded plugin info"},
                  {"inputSchema",{{"type","object"},{"properties",json::object()}}}},
                 {{"name","search_param"},{"description","Search params by keyword"},
                  {"inputSchema",{{"type","object"},{"properties",{
-                    {"plugin",{{"type","string"}}},
                     {"keyword",{{"type","string"},{"description","e.g. 'gain', 'band 1', 'cutoff'"}}}
-                 }},{"required",json::array({"plugin","keyword"})}}}},
-                {{"name","get_params"},{"description","Get param values by ID"},
+                 }},{"required",json::array({"keyword"})}}}},
+                {{"name","get_params"},{"description","Get param values by index"},
                  {"inputSchema",{{"type","object"},{"properties",{
-                    {"plugin",{{"type","string"}}},
                     {"ids",{{"type","array"},{"items",{{"type","integer"}}}}}
-                 }},{"required",json::array({"plugin","ids"})}}}},
+                 }},{"required",json::array({"ids"})}}}},
                 {{"name","set_params"},{"description","Set params (batch, 0.0-1.0)"},
                  {"inputSchema",{{"type","object"},{"properties",{
-                    {"plugin",{{"type","string"}}},
-                    {"values",{{"type","object"},{"description","id→value"}}}
-                 }},{"required",json::array({"plugin","values"})}}}},
-                {{"name","get_analysis"},{"description","Real-time audio analysis"},
+                    {"values",{{"type","object"},{"description","index→value map"}}}
+                 }},{"required",json::array({"values"})}}}},
+                {{"name","get_analysis"},{"description","Real-time audio analysis (future)"},
                  {"inputSchema",{{"type","object"},{"properties",json::object()}}}}
             })}
         }}
@@ -156,54 +151,64 @@ std::string McpServer::handleToolsCall(const std::string& requestBody)
     std::string resultText;
     bool isError = false;
 
-    if (!helper.isHelperRunning())
+    if (!processor.isPluginLoaded())
     {
-        resultText = "helper not connected";
+        resultText = "no plugin loaded";
         isError = true;
     }
     else if (toolName == "list_plugins")
     {
-        // Query helper for loaded plugin name
-        auto resp = helper.sendCommand("{\"cmd\":\"search_param\",\"keyword\":\"\"}");
-        // Just return what's loaded
-        resultText = "[\"loaded plugin\"]"; // simplified — actual name comes from processor
+        json info = {
+            {"name", processor.getLoadedPluginName().toStdString()},
+            {"params", processor.getLoadedPluginParamCount()},
+            {"path", processor.getLastPluginPath().toStdString()}
+        };
+        resultText = info.dump();
     }
     else if (toolName == "search_param")
     {
-        json cmd = {{"cmd","search_param"},{"keyword", args.value("keyword","")}};
-        auto resp = helper.sendCommand(cmd.dump());
-        try {
-            auto j = json::parse(resp);
-            if (j.value("ok", false))
-                resultText = j["results"].dump();
-            else
-                resultText = j.value("error", "search failed");
-        } catch (...) { resultText = "parse error"; isError = true; }
+        auto keyword = args.value("keyword", "");
+        auto results = processor.searchParams(juce::String(keyword));
+
+        json arr = json::array();
+        for (auto& p : results)
+        {
+            arr.push_back({
+                {"i", p.index},
+                {"id", p.id.toStdString()},
+                {"n", p.name.toStdString()},
+                {"v", std::round(p.value * 1000.0f) / 1000.0f},
+                {"t", p.displayText.toStdString()}
+            });
+        }
+        resultText = arr.dump();
     }
     else if (toolName == "get_params")
     {
-        json cmd = {{"cmd","get_params"},{"ids", args.value("ids", json::array())}};
-        auto resp = helper.sendCommand(cmd.dump());
-        try {
-            auto j = json::parse(resp);
-            if (j.value("ok", false))
-                resultText = j["values"].dump();
-            else
-                resultText = "get failed";
-        } catch (...) { resultText = "parse error"; isError = true; }
+        std::vector<int> ids;
+        for (auto& id : args["ids"])
+            ids.push_back(id.get<int>());
+
+        auto results = processor.getParams(ids);
+
+        json values = json::object();
+        for (auto& [idx, val] : results)
+            values[std::to_string(idx)] = std::round(val * 1000.0f) / 1000.0f;
+
+        resultText = values.dump();
     }
     else if (toolName == "set_params")
     {
-        json cmd = {{"cmd","set_params"},{"values", args.value("values", json::object())}};
-        auto resp = helper.sendCommand(cmd.dump());
-        try {
-            auto j = json::parse(resp);
-            resultText = j.value("ok", false) ? "ok" : "set failed";
-        } catch (...) { resultText = "parse error"; isError = true; }
+        std::map<int, float> values;
+        for (auto& [key, val] : args["values"].items())
+            values[std::stoi(key)] = val.get<float>();
+
+        bool ok = processor.setParams(values);
+        resultText = ok ? "ok" : "set failed";
     }
     else if (toolName == "get_analysis")
     {
-        resultText = "silent"; // Phase 4
+        resultText = "silent"; // Sprint 4
     }
     else
     {