MCP: improve controller tool

Author: drhelius

MCP_README.md

@@ -166,7 +166,7 @@ Once configured, you can ask your AI assistant:
 - "Pause execution and show me all sprites"
 - "Step through the next 5 instructions"
 - "Capture a screenshot of the current frame"
-- "Press the up button on player 1 controller"
+- "Tap the up button on player 1 controller"
 - "Set player 1 controller to avenue pad 6 type"
 
 ### Advanced Debugging Workflows
@@ -217,7 +217,7 @@ The server exposes tools organized in the following categories:
 - `memory_search` - Search memory with operators (<, >, ==, !=, <=, >=), compare types (previous, value, address), and data types (hex, signed, unsigned)
 
 ### Disassembly & Debugging
-- `get_disassembly` - Get disassembly around PC or specified address
+- `get_disassembly` - Get disassembly for specified address range
 - `add_symbol` - Add symbol (label) at specified address
 - `remove_symbol` - Remove symbol
 - `list_symbols` - List all defined symbols
@@ -263,8 +263,7 @@ The server exposes tools organized in the following categories:
 - `toggle_fast_forward` - Toggle fast forward mode on/off
 
 ### Controller Input
-- `controller_press_button` - Press a button on a controller (player 1-5). Buttons: up, down, left, right, select, run, i, ii, iii, iv, v, vi
-- `controller_release_button` - Release a button on a controller (player 1-5)
+- `controller_button` - Control a button on a controller (player 1-5). Use action 'press' to hold the button, 'release' to let it go, or 'press_and_release' to simulate a quick tap. Buttons: up, down, left, right, select, run, I, II, III, IV, V, VI
 - `controller_set_type` - Set controller type for a player: standard (2 buttons), avenue_pad_3 (3 buttons), avenue_pad_6 (6 buttons)
 - `controller_get_type` - Get the current controller type for a player (returns: standard, avenue_pad_3, or avenue_pad_6)
 - `controller_set_turbo_tap` - Enable or disable Turbo Tap (multitap) for 5-player support

platforms/shared/desktop/mcp/mcp_debug_adapter.cpp

@@ -1496,50 +1496,16 @@ json DebugAdapter::ToggleFastForward(bool enabled)
     return result;
 }
 
-json DebugAdapter::ControllerPressButton(int player, const std::string& button)
+json DebugAdapter::ControllerButton(int player, const std::string& button, const std::string& action)
 {
     json result;
 
-    // Convert player 1-5 to GG_Controllers enum (0-4)
-    if (player < 1 || player > 5)
+    // Validate action
+    if (action != "press" && action != "release" && action != "press_and_release")
     {
-        result["error"] = "Invalid player number (must be 1-5)";
+        result["error"] = "Invalid action (must be: press, release, press_and_release)";
         return result;
     }
-    GG_Controllers controller = static_cast<GG_Controllers>(player - 1);
-
-    // Convert button string to GG_Keys enum
-    GG_Keys key = GG_KEY_NONE;
-    if (button == "i") key = GG_KEY_I;
-    else if (button == "ii") key = GG_KEY_II;
-    else if (button == "select") key = GG_KEY_SELECT;
-    else if (button == "run") key = GG_KEY_RUN;
-    else if (button == "up") key = GG_KEY_UP;
-    else if (button == "right") key = GG_KEY_RIGHT;
-    else if (button == "down") key = GG_KEY_DOWN;
-    else if (button == "left") key = GG_KEY_LEFT;
-    else if (button == "iii") key = GG_KEY_III;
-    else if (button == "iv") key = GG_KEY_IV;
-    else if (button == "v") key = GG_KEY_V;
-    else if (button == "vi") key = GG_KEY_VI;
-    else
-    {
-        result["error"] = "Invalid button name";
-        return result;
-    }
-
-    emu_key_pressed(controller, key);
-
-    result["success"] = true;
-    result["player"] = player;
-    result["button"] = button;
-
-    return result;
-}
-
-json DebugAdapter::ControllerReleaseButton(int player, const std::string& button)
-{
-    json result;
 
     // Convert player 1-5 to GG_Controllers enum (0-4)
     if (player < 1 || player > 5)
@@ -1569,11 +1535,25 @@ json DebugAdapter::ControllerReleaseButton(int player, const std::string& button
         return result;
     }
 
-    emu_key_released(controller, key);
+    if (action == "press")
+    {
+        emu_key_pressed(controller, key);
+    }
+    else if (action == "release")
+    {
+        emu_key_released(controller, key);
+    }
+    else if (action == "press_and_release")
+    {
+        emu_key_pressed(controller, key);
+        // Mark for delayed release - McpManager will handle releasing after some frames
+        result["__delayed_release"] = true;
+    }
 
     result["success"] = true;
     result["player"] = player;
     result["button"] = button;
+    result["action"] = action;
 
     return result;
 }

platforms/shared/desktop/mcp/mcp_debug_adapter.h

@@ -144,8 +144,7 @@ class DebugAdapter
     json ToggleFastForward(bool enabled);
 
     // Controller input
-    json ControllerPressButton(int player, const std::string& button);
-    json ControllerReleaseButton(int player, const std::string& button);
+    json ControllerButton(int player, const std::string& button, const std::string& action);
     json ControllerSetType(int player, const std::string& type);
     json ControllerSetTurboTap(bool enabled);
     json ControllerGetType(int player);

platforms/shared/desktop/mcp/mcp_manager.h

@@ -23,6 +23,7 @@
 #include "mcp_server.h"
 #include "mcp_transport.h"
 #include "mcp_debug_adapter.h"
+#include <vector>
 
 extern bool g_mcp_stdio_mode;
 
@@ -32,6 +33,13 @@ enum McpTransportMode
     MCP_TRANSPORT_TCP
 };
 
+struct DelayedButtonRelease
+{
+    int player;
+    std::string button;
+    int frames_remaining;
+};
+
 class McpManager
 {
 public:
@@ -115,6 +123,18 @@ class McpManager
 
     void PumpCommands()
     {
+        for (size_t i = 0; i < m_delayedReleases.size(); )
+        {
+            m_delayedReleases[i].frames_remaining--;
+            if (m_delayedReleases[i].frames_remaining <= 0)
+            {
+                m_debugAdapter->ControllerButton(m_delayedReleases[i].player, m_delayedReleases[i].button, "release");
+                m_delayedReleases.erase(m_delayedReleases.begin() + i);
+            }
+            else
+                i++;
+        }
+
         DebugCommand* cmd = NULL;
         while ((cmd = m_commandQueue.Pop()) != NULL)
         {
@@ -131,6 +151,17 @@ class McpManager
                 resp->errorMessage = resp->result["error"];
             }
 
+            if (resp->result.contains("__delayed_release") && resp->result["__delayed_release"] == true)
+            {
+                DelayedButtonRelease release;
+                release.player = resp->result["player"];
+                release.button = resp->result["button"];
+                release.frames_remaining = 10;
+                m_delayedReleases.push_back(release);
+
+                resp->result.erase("__delayed_release");
+            }
+
             m_responseQueue.Push(resp);
             SafeDelete(cmd);
         }
@@ -143,6 +174,7 @@ class McpManager
     ResponseQueue m_responseQueue;
     McpTransportMode m_transport_mode;
     int m_tcp_port;
+    std::vector<DelayedButtonRelease> m_delayedReleases;
 };
 
 #endif /* MCP_MANAGER_H */

platforms/shared/desktop/mcp/mcp_server.cpp

@@ -746,8 +746,8 @@ void McpServer::HandleToolsList(const json& request)
 
     // Controller input tools
     tools.push_back({
-        {"name", "controller_press_button"},
-        {"description", "Press a button on a controller (player 1-5). Buttons: up, down, left, right, select, run, i, ii, iii, iv, v, vi"},
+        {"name", "controller_button"},
+        {"description", "Control a button on a controller (player 1-5). Use action 'press' to hold the button down, 'release' to let it go, or 'press_and_release' to simulate a quick button tap (presses and automatically releases after a few frames). Buttons: up, down, left, right, select, run, I, II, III, IV, V, VI"},
         {"inputSchema", {
             {"type", "object"},
             {"properties", {
@@ -759,33 +759,16 @@ void McpServer::HandleToolsList(const json& request)
                 }},
                 {"button", {
                     {"type", "string"},
-                    {"description", "Button name: up, down, left, right, select, run, i, ii, iii, iv, v, vi"},
-                    {"enum", json::array({"up", "down", "left", "right", "select", "run", "i", "ii", "iii", "iv", "v", "vi"})}
-                }}
-            }},
-            {"required", json::array({"player", "button"})}
-        }}
-    });
-
-    tools.push_back({
-        {"name", "controller_release_button"},
-        {"description", "Release a button on a controller (player 1-5). Buttons: up, down, left, right, select, run, i, ii, iii, iv, v, vi"},
-        {"inputSchema", {
-            {"type", "object"},
-            {"properties", {
-                {"player", {
-                    {"type", "integer"},
-                    {"description", "Player number (1-5)"},
-                    {"minimum", 1},
-                    {"maximum", 5}
+                    {"description", "Button name: up, down, left, right, select, run, I, II, III, IV, V, VI"},
+                    {"enum", json::array({"up", "down", "left", "right", "select", "run", "I", "II", "III", "IV", "V", "VI"})}
                 }},
-                {"button", {
+                {"action", {
                     {"type", "string"},
-                    {"description", "Button name: up, down, left, right, select, run, i, ii, iii, iv, v, vi"},
-                    {"enum", json::array({"up", "down", "left", "right", "select", "run", "i", "ii", "iii", "iv", "v", "vi"})}
+                    {"description", "Action to perform: 'press' holds the button, 'release' lets it go, 'press_and_release' simulates a quick tap"},
+                    {"enum", json::array({"press", "release", "press_and_release"})}
                 }}
             }},
-            {"required", json::array({"player", "button"})}
+            {"required", json::array({"player", "button", "action"})}
         }}
     });
 
@@ -1665,17 +1648,12 @@ json McpServer::ExecuteCommand(const std::string& toolName, const json& argument
         bool enabled = arguments["enabled"];
         return m_debugAdapter.ToggleFastForward(enabled);
     }
-    else if (normalizedTool == "controller_press_button")
-    {
-        int player = arguments["player"];
-        std::string button = arguments["button"];
-        return m_debugAdapter.ControllerPressButton(player, button);
-    }
-    else if (normalizedTool == "controller_release_button")
+    else if (normalizedTool == "controller_button")
     {
         int player = arguments["player"];
         std::string button = arguments["button"];
-        return m_debugAdapter.ControllerReleaseButton(player, button);
+        std::string action = arguments["action"];
+        return m_debugAdapter.ControllerButton(player, button, action);
     }
     else if (normalizedTool == "controller_set_type")
     {