Merge pull request #17 from Automattic/extra-tools

Extra MCP tools and improved HandleToolsCall

Author: galatanovidiu

includes/Core/McpProxyRoutes.php

@@ -210,15 +210,27 @@ public function call_tool( array $params ): WP_Error|WP_REST_Response {
 		// Implement a tool calling logic here.
 		$result = HandleToolsCall::run( $params );
 
-		return rest_ensure_response(
-			array(
-				'content' => array(
-					array(
-						'type' => 'text',
-						'text' => wp_json_encode( $result ),
-					),
+		$response = array(
+			'content' => array(
+				array(
+					'type' => 'text',
 				),
-			)
+			),
+		);
+
+		// @todo: add support for EmbeddedResource schema.ts:619.
+		if ( isset( $result['type'] ) && 'image' === $result['type'] ) {
+			$response['content'][0]['type'] = 'image';
+			$response['content'][0]['data'] = base64_encode( $result['results'] ); //phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode
+
+			// @todo: improve this ?!.
+			$response['content'][0]['mimeType'] = $result['mimeType'] ?? 'image/png';
+		} else {
+			$response['content'][0]['text'] = wp_json_encode( $result );
+		}
+
+		return rest_ensure_response(
+			$response
 		);
 	}
 

includes/Core/RegisterMcpTool.php

@@ -53,11 +53,11 @@ private function get_args_from_rest_api(): void {
 
 		// get a list of all registered rest routes.
 		$routes = rest_get_server()->get_routes();
-		// maybe use:  rest_get_server()->get_route_options( $route ) );
+		// maybe use:  rest_get_server()->get_route_options( $route ) );.
 		$rest_route = $routes[ $route ] ?? null;
 		if ( ! $rest_route ) {
 			// translators: %s: Route.
-			throw new InvalidArgumentException( sprintf( esc_html__( 'The route %s does not exist.', 'wordpress-mcp' ), esc_html( $route ) ) );
+			throw new InvalidArgumentException( sprintf( esc_html__( 'The route %1$s with method %2$s does not exist.', 'wordpress-mcp' ), $route, $method ) ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped
 		}
 
 		$rest_api = null;
@@ -124,6 +124,10 @@ private function get_args_from_rest_api(): void {
 			}
 		}
 
+		// Convert required array to object.
+		$input_schema['properties'] = (object) $input_schema['properties'];
+		$input_schema['required']   = (object) $input_schema['required'];
+
 		// Apply modifications if provided in rest_alias['modifications'] .
 		if ( isset( $this->args['rest_alias']['inputSchemaReplacements'] ) ) {
 			$modifications = $this->args['rest_alias']['inputSchemaReplacements'];

includes/Core/WpMcp.php

@@ -3,12 +3,16 @@
 
 namespace Automattic\WordpressMcp\Core;
 
+use Automattic\WordpressMcp\Tools\McpCustomPostTypesTools;
 use Automattic\WordpressMcp\Tools\McpPostsTools;
 use Automattic\WordpressMcp\Resources\McpGeneralSiteInfo;
 use Automattic\WordpressMcp\Tools\McpSiteInfo;
 use Automattic\WordpressMcp\Tools\McpUsersTools;
 use Automattic\WordpressMcp\Tools\McpWooOrders;
 use Automattic\WordpressMcp\Tools\McpWooProducts;
+use Automattic\WordpressMcp\Tools\McpPagesTools;
+use Automattic\WordpressMcp\Tools\McpSettingsTools;
+use Automattic\WordpressMcp\Tools\McpMediaTools;
 use Automattic\WordpressMcp\Prompts\McpGetSiteInfo as McpGetSiteInfoPrompt;
 use Automattic\WordpressMcp\Prompts\McpAnalyzeSales;
 use Automattic\WordpressMcp\Resources\McpPluginInfoResource;
@@ -136,6 +140,10 @@ private function init_default_tools(): void {
 		new McpUsersTools();
 		new McpWooProducts();
 		new McpWooOrders();
+		new McpPagesTools();
+		new McpSettingsTools();
+		new McpMediaTools();
+		new McpCustomPostTypesTools();
 	}
 
 	/**