cleanup

Author: davidmosterd

settings/rest-routes.php

@@ -87,10 +87,7 @@ private function register_tools($server, $client) {
 			]
 		);
 
-		$map_rest_to_mcp = new MapRESTtoMCP(
-			require __DIR__ . '/../settings/rest-routes.php'
-		);
-
+		$map_rest_to_mcp = new MapRESTtoMCP();
 		$map_rest_to_mcp->map_rest_to_mcp( $server );
 
 		$server->register_tool(

src/AiCommand.php

@@ -2,18 +2,13 @@
 
 namespace WP_CLI\AiCommand;
 
-use WP_CLI\AiCommand\RouteInformation;
 use WP_CLI;
 use WP_CLI\AiCommand\MCP\Server;
 use WP_REST_Request;
 
 
 class MapRESTtoMCP {
 
-    public function __construct(
-        private array $rest_routes
-    ) {}
-
 	public function args_to_schema( $args = [] ) {
 		$schema   = [];
 		$required = [];
@@ -80,27 +75,12 @@ protected function sanitize_type( $type) {
 
 	}
 
-	protected function is_route_allowed( $route ) {
-		if(! \str_starts_with($route, '/wp/v2')) {
-			return false; // Block all non wp/v2 routes for now.
-		}
-
-		return ! in_array( $route, $this->rest_routes, true );
-	}
-
 	public function map_rest_to_mcp( Server $mcp_server ) {
-		/**
-		 * @var \WP_REST_Server $server
-		 */
 		$server = rest_get_server();
 		$routes = $server->get_routes();
 
 		foreach ( $routes as $route => $endpoints ) {
 			foreach ( $endpoints as $endpoint ) {
-				if ( ! $this->is_route_allowed($route) ) {
-					continue; // This route is the block list.
-				}
-
 				foreach( $endpoint['methods'] as $method_name => $enabled ) {
 					$information = new RouteInformation(
 						$route,
@@ -123,22 +103,12 @@ public function map_rest_to_mcp( Server $mcp_server ) {
 
 					$mcp_server->register_tool($tool);
 				}
-
 			}
 		}
-
-	}
-
-	protected function generate_tool_name($route, $method_name) {
-		$singular = '';
-		if ( \str_contains( $route, '(?P<' ) ) {
-			$singular = 'singular_';
-		}
-		return sanitize_title($route) . '_' . $singular . strtolower( $method_name );
 	}
 
 	/**
-	 * Create desciptrion based on route and method.
+	 * Create description based on route and method.
 	 *
 	 *
 	 * Get a list of posts             GET /wp/v2/posts

src/MapRESTtoMCP.php

@@ -30,7 +30,7 @@ public function get_sanitized_route_name(): string
 			$route = preg_replace('/(\(\?P<' . $match . '>.*\))/', 'p_' . $match, $route, 1);
 		}
 
-		return $this->method . '_' . sanitize_title( $route );
+		return $this->method . '_' . sanitize_title($route);
 	}
 
 	public function get_method(): string
@@ -80,6 +80,11 @@ public function is_list(): bool
 
 	public function is_wp_rest_controller(): bool
 	{
+		// The callback form for a WP_REST_Controller is [ WP_REST_Controller, method ]
+		if ( ! is_array( $this->callback ) ) {
+			return false;
+		}
+
 		$allowed = [
 			WP_REST_Posts_Controller::class,
 			WP_REST_Users_Controller::class,