diff --git a/src/cli/agent.cmake b/src/cli/agent.cmake
index 3d122bb0..bbec6ca8 100644
--- a/src/cli/agent.cmake
+++ b/src/cli/agent.cmake
@@ -36,6 +36,9 @@ set(YAZE_AGENT_SOURCES
   cli/handlers/command_handlers.cc
   cli/handlers/agent/simple_chat_command.cc
   cli/handlers/agent/general_commands.cc
+  cli/handlers/agent/test_commands.cc
+  cli/handlers/agent/conversation_test.cc
+  cli/handlers/agent/common.cc
   cli/handlers/game/overworld_inspect.cc
   cli/handlers/game/message.cc
   cli/handlers/rom/mock_rom.cc
diff --git a/src/cli/handlers/agent.cc b/src/cli/handlers/agent.cc
index b3a613a6..a905b622 100644
--- a/src/cli/handlers/agent.cc
+++ b/src/cli/handlers/agent.cc
@@ -23,7 +23,6 @@ namespace agent {
 absl::Status HandlePlanCommand(const std::vector<std::string>& args);
 absl::Status HandleTestCommand(const std::vector<std::string>& args);
 absl::Status HandleTestConversationCommand(const std::vector<std::string>& args);
-absl::Status HandleGuiCommand(const std::vector<std::string>& args);
 absl::Status HandleLearnCommand(const std::vector<std::string>& args);
 absl::Status HandleListCommand();
 absl::Status HandleDescribeCommand(const std::vector<std::string>& args);
@@ -116,7 +115,10 @@ absl::Status HandleAgentCommand(const std::vector<std::string>& arg_vec) {
   }
   
   if (subcommand == "gui") {
-    return agent::HandleGuiCommand(subcommand_args);
+    // GUI commands are in the registry (gui-place-tile, gui-click, etc.)
+    // Route to registry instead
+    return absl::InvalidArgumentError(
+        "Use 'z3ed gui-<command>' or see 'z3ed --help gui' for available GUI automation commands");
   }
   
   if (subcommand == "learn") {
diff --git a/src/cli/handlers/agent/conversation_test.cc b/src/cli/handlers/agent/conversation_test.cc
index 1b298739..cde2a982 100644
--- a/src/cli/handlers/agent/conversation_test.cc
+++ b/src/cli/handlers/agent/conversation_test.cc
@@ -1,4 +1,3 @@
-#include "cli/handlers/commands.h"
 #include "app/rom.h"
 #include "app/core/project.h"
 #include "cli/handlers/rom/mock_rom.h"
diff --git a/src/cli/handlers/agent/test_commands.cc b/src/cli/handlers/agent/test_commands.cc
index a7755063..5e360902 100644
--- a/src/cli/handlers/agent/test_commands.cc
+++ b/src/cli/handlers/agent/test_commands.cc
@@ -1,5 +1,3 @@
-#include "cli/handlers/commands.h"
-
 #include <filesystem>
 #include <fstream>
 #include <iostream>