diff --git a/src/app/zelda3/music/tracker.cc b/src/app/zelda3/music/tracker.cc
index ce4de26d..f226b382 100644
--- a/src/app/zelda3/music/tracker.cc
+++ b/src/app/zelda3/music/tracker.cc
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "app/rom.h"
-#include "app/zelda3/hyrule_magic.h"
+#include "util/hyrule_magic.h"
 #include "util/macro.h"
 
 namespace yaze {
diff --git a/src/cli/cli.cc b/src/cli/cli.cc
index 25a32583..f1fb3552 100644
--- a/src/cli/cli.cc
+++ b/src/cli/cli.cc
@@ -11,6 +11,11 @@
 namespace yaze {
 namespace cli {
 
+// Forward declaration
+namespace handlers {
+absl::Status HandleAgentCommand(const std::vector<std::string>& args);
+}
+
 ModernCLI::ModernCLI() {
   // Commands are now managed by CommandRegistry singleton
   // SetupCommands() is no longer needed
@@ -58,8 +63,7 @@ absl::Status ModernCLI::Run(int argc, char* argv[]) {
   // Special case: "agent" command routes to HandleAgentCommand
   if (args[0] == "agent") {
     std::vector<std::string> agent_args(args.begin() + 1, args.end());
-    std::cout << "Agent args: " << absl::StrJoin(agent_args, " ") << std::endl;
-    args = agent_args;
+    return handlers::HandleAgentCommand(agent_args);
   }
 
   // Use CommandRegistry for unified command execution