tool registration

Author: davidmosterd

ai-command.php

@@ -2,6 +2,7 @@
 
 namespace WP_CLI\AiCommand;
 
+use WP_CLI\AiCommand\ToolRepository\CollectionToolRepository;
 use WP_CLI;
 
 if ( ! class_exists( '\WP_CLI' ) ) {
@@ -19,6 +20,13 @@
 
 	// TODO Register your tool here and add it to the collection
 
-	$ai_command = new AiCommand( $tools );
+	// WordPress REST calls
+	$rest_tools = new MapRESTtoMCP();
+
+	foreach( $rest_tools->map_rest_to_mcp() as $tool ) {
+		$tools->add( $tool );
+	}
+
+	$ai_command = new AiCommand( new CollectionToolRepository( $tools ) );
 	$ai_command( $args, $assoc_args );
 } );

src/AiCommand.php

@@ -2,6 +2,7 @@
 
 namespace WP_CLI\AiCommand;
 
+use WP_CLI\AiCommand\ToolRepository\CollectionToolRepository;
 use WP_CLI\AiCommand\Tools\FileTools;
 use WP_CLI\AiCommand\Tools\URLTools;
 use WP_CLI;
@@ -24,7 +25,7 @@
 class AiCommand extends WP_CLI_Command {
 
 	public function __construct(
-		private ToolCollection $tools,
+		private CollectionToolRepository $tools,
 	) {
 		parent::__construct();
 	}
@@ -66,7 +67,16 @@ public function __invoke( $args, $assoc_args ) {
 	}
 
 	// Register tools for AI processing
-	private function register_tools($server, $client) {
+	private function register_tools($server, $client) : void {
+		$filters = apply_filters( 'wp_cli/ai_command/command/filters', [] );
+
+		foreach( $this->tools->find_all( $filters ) as $tool ) {
+			$server->register_tool( $tool->get_data() );
+		}
+
+		return;
+
+		// TODO move this
 		$server->register_tool(
 			[
 				'name'        => 'list_tools',
@@ -95,8 +105,7 @@ private function register_tools($server, $client) {
 			]
 		);
 
-		$map_rest_to_mcp = new MapRESTtoMCP();
-		$map_rest_to_mcp->map_rest_to_mcp( $server );
+
 
 		new FileTools( $server );
 		new URLTools( $server );

src/Entity/Tool.php

@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace WP_CLI\AiCommand\Entity;
+
 final class Tool
 {
 

src/MapRESTtoMCP.php

@@ -2,8 +2,8 @@
 
 namespace WP_CLI\AiCommand;
 
+use WP_CLI\AiCommand\Entity\Tool;
 use WP_CLI;
-use WP_CLI\AiCommand\MCP\Server;
 use WP_REST_Request;
 
 
@@ -75,9 +75,10 @@ protected function sanitize_type( $type) {
 
 	}
 
-	public function map_rest_to_mcp( Server $mcp_server ) {
+	public function map_rest_to_mcp() : array {
 		$server = rest_get_server();
 		$routes = $server->get_routes();
+		$tools = [];
 
 		foreach ( $routes as $route => $endpoints ) {
 			foreach ( $endpoints as $endpoint ) {
@@ -92,19 +93,21 @@ public function map_rest_to_mcp( Server $mcp_server ) {
 						continue;
 					}
 
-					$tool = [
+					$tool = new Tool( [
 						'name' => $information->get_sanitized_route_name(),
 						'description' => $this->generate_description( $information ),
 						'inputSchema' => $this->args_to_schema( $endpoint['args'] ),
 						'callable' => function ( $inputs ) use ( $route, $method_name, $server ){
 							return $this->rest_callable( $inputs, $route, $method_name, $server );
 						},
-					];
+					] );
 
-					$mcp_server->register_tool($tool);
+					$tools[] = $tool;
 				}
 			}
 		}
+
+		return $tools;
 	}
 
 	/**

src/ToolCollection.php

@@ -4,7 +4,7 @@
 
 namespace WP_CLI\AiCommand;
 
-use Tool;
+use WP_CLI\AiCommand\Entity\Tool;
 
 final class ToolCollection extends Collection
 {

src/ToolRepository.php

@@ -4,7 +4,7 @@
 
 namespace WP_CLI\AiCommand;
 
-use Tool;
+use WP_CLI\AiCommand\Entity\Tool;
 
 interface ToolRepository
 {

src/ToolRepository/CollectionToolRepository.php

@@ -2,6 +2,9 @@
 
 declare(strict_types=1);
 
+namespace WP_CLI\AiCommand\ToolRepository;
+
+use WP_CLI\AiCommand\Entity\Tool;
 use WP_CLI\AiCommand\ToolCollection;
 use WP_CLI\AiCommand\ToolRepository;
 
@@ -33,10 +36,12 @@ public function find_all(array $filters = []): ToolCollection
 
 		$filters = array_merge($defaults, $filters);
 
-		$all = iterator_to_array($this->collection);
-		$filtered = [];
+		$filtered = iterator_to_array($this->collection);
 
 		if ($filters['include'] !== 'all') {
+			$all = $filtered;
+			$filtered = [];
+
 			foreach ($filters['include'] as $tag_to_include) {
 				foreach ($all as $tool) {
 					foreach ($tool->get_tags() as $tag_to_check) {