DI for the AIcommand

Author: davidmosterd

ai-command.php

@@ -16,6 +16,9 @@
 }
 
 WP_CLI::add_command( 'ai', function ( $args, $assoc_args ) {
+	$server = new MCP\Server();
+	$client = new MCP\Client($server);
+
 	$tools = new ToolCollection();
 
 	// TODO Register your tool here and add it to the collection
@@ -27,6 +30,10 @@
 		$tools->add( $tool );
 	}
 
-	$ai_command = new AiCommand( new CollectionToolRepository( $tools ) );
+	$ai_command = new AiCommand(
+		new CollectionToolRepository( $tools ),
+		$server,
+		$client
+	);
 	$ai_command( $args, $assoc_args );
 } );

src/AiCommand.php

@@ -26,6 +26,8 @@ class AiCommand extends WP_CLI_Command {
 
 	public function __construct(
 		private CollectionToolRepository $tools,
+		private WP_CLI\AiCommand\MCP\Server $server,
+		private WP_CLI\AiCommand\MCP\Client $client
 	) {
 		parent::__construct();
 	}
@@ -54,20 +56,16 @@ public function __construct(
 	 * @param array $assoc_args Associative array of associative arguments.
 	 */
 	public function __invoke( $args, $assoc_args ) {
-		$server = new MCP\Server();
-		$client = new MCP\Client($server);
+		$this->register_tools($this->server);
+		$this->register_resources($this->server);
 
-		$this->register_tools($server, $client);
-
-		$this->register_resources($server);
-
-		$result = $client->call_ai_service_with_prompt( $args[0] );
+		$result = $this->client->call_ai_service_with_prompt( $args[0] );
 
 		WP_CLI::success( $result );
 	}
 
 	// Register tools for AI processing
-	private function register_tools($server, $client) : void {
+	private function register_tools($server) : void {
 		$filters = apply_filters( 'wp_cli/ai_command/command/filters', [] );
 
 		foreach( $this->tools->find_all( $filters ) as $tool ) {