diff --git a/composer.json b/composer.json
index 8ac16ea37..760442655 100644
--- a/composer.json
+++ b/composer.json
@@ -9,12 +9,19 @@
   ],
   "type": "wordpress-plugin",
   "license": "GPLv2",
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/WordPress/mcp-adapter"
+    }
+  ],
   "require": {
     "php": ">=7.4",
     "yahnis-elsts/plugin-update-checker": "5.1",
     "aws/aws-sdk-php": "^3.300",
     "woocommerce/action-scheduler": "3.8.1",
-    "wordpress/abilities-api": "^0.1"
+    "wordpress/abilities-api": "^0.1",
+    "wordpress/mcp-adapter": "dev-trunk"
   },
   "autoload": {
     "psr-4": {
diff --git a/composer.lock b/composer.lock
index 0b7073281..b5c4bb2f8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6dc808963eeb7d944100df18d3fb0dee",
+    "content-hash": "cc702ece2eaff55dc454cacb97aaa990",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -1024,6 +1024,100 @@
             },
             "time": "2025-09-05T07:28:21+00:00"
         },
+        {
+            "name": "wordpress/mcp-adapter",
+            "version": "dev-trunk",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/WordPress/mcp-adapter.git",
+                "reference": "7a2d22cff92328bc94f5b1648a66ae4273e949c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/WordPress/mcp-adapter/zipball/7a2d22cff92328bc94f5b1648a66ae4273e949c5",
+                "reference": "7a2d22cff92328bc94f5b1648a66ae4273e949c5",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "automattic/vipwpcs": "^3.0",
+                "phpcompatibility/php-compatibility": "10.x-dev as 9.99.99",
+                "phpcompatibility/phpcompatibility-wp": "^2.1",
+                "phpstan/extension-installer": "^1.3",
+                "phpstan/php-8-stubs": "^0.4.24",
+                "phpstan/phpstan": "^2.1.22",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^9.6",
+                "slevomat/coding-standard": "^8.0",
+                "szepeviktor/phpstan-wordpress": "^2.0",
+                "wp-phpunit/wp-phpunit": "^6.5",
+                "wpackagist-plugin/plugin-check": "^1.6",
+                "yoast/phpunit-polyfills": "^4.0"
+            },
+            "default-branch": true,
+            "type": "library",
+            "extra": {
+                "installer-paths": {
+                    "vendor/{$vendor}/{$name}/": [
+                        "wpackagist-plugin/plugin-check"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "WP\\MCP\\": "includes/"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "WP\\MCP\\Tests\\": [
+                        "tests/"
+                    ]
+                }
+            },
+            "scripts": {
+                "lint:php": [
+                    "phpcs"
+                ],
+                "lint:php:fix": [
+                    "phpcbf"
+                ],
+                "lint:php:stan": [
+                    "vendor/bin/phpstan analyse --memory-limit=1G"
+                ],
+                "test": [
+                    "phpunit --strict-coverage"
+                ]
+            },
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "WordPress AI Team",
+                    "homepage": "https://make.wordpress.org/ai/"
+                }
+            ],
+            "description": "Adapter for Abilities API, letting WordPress abilities to be used as MCP tools, resources or prompts",
+            "homepage": "https://github.com/wordpress/mcp-adapter",
+            "keywords": [
+                "abilities-api",
+                "adapter",
+                "ai",
+                "api",
+                "integration",
+                "mcp",
+                "model-context-protocol",
+                "wordpress"
+            ],
+            "support": {
+                "issues": "https://github.com/wordpress/mcp-adapter/issues",
+                "source": "https://github.com/wordpress/mcp-adapter"
+            },
+            "time": "2025-09-12T10:52:00+00:00"
+        },
         {
             "name": "yahnis-elsts/plugin-update-checker",
             "version": "v5.1",
@@ -4117,7 +4211,8 @@
     "stability-flags": {
         "php-stubs/wp-cli-stubs": 20,
         "phpcompatibility/php-compatibility": 20,
-        "phpstan/extension-installer": 20
+        "phpstan/extension-installer": 20,
+        "wordpress/mcp-adapter": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/includes/Classifai/Plugin.php b/includes/Classifai/Plugin.php
index 593f64aa4..8e7ec4572 100644
--- a/includes/Classifai/Plugin.php
+++ b/includes/Classifai/Plugin.php
@@ -1,6 +1,11 @@
 <?php
 namespace Classifai;
 
+use WP\MCP\Core\McpAdapter;
+use WP\MCP\Transport\Http\RestTransport;
+use WP\MCP\Infrastructure\ErrorHandling\ErrorLogMcpErrorHandler;
+use WP\MCP\Infrastructure\Observability\NullMcpObservabilityHandler;
+
 class Plugin {
 
 	/**
@@ -42,6 +47,10 @@ public function enable() {
 		add_filter( 'plugin_action_links_' . CLASSIFAI_PLUGIN_BASENAME, [ $this, 'filter_plugin_action_links' ] );
 		add_filter( 'robots_txt', [ $this, 'maybe_block_ai_crawlers' ] );
 		add_action( 'after_classifai_init', [ $this, 'load_action_scheduler' ] );
+
+		// Initialize the MCP adapter so the hooks are loaded.
+		McpAdapter::instance();
+		add_action( 'mcp_adapter_init', [ $this, 'mcp_adapter_init' ] );
 	}
 
 	/**
@@ -341,6 +350,30 @@ public function load_action_scheduler() {
 		}
 	}
 
+	/**
+	 * Initialize the MCP adapter.
+	 *
+	 * @param McpAdapter $adapter The MCP adapter.
+	 */
+	public function mcp_adapter_init( McpAdapter $adapter ) {
+		$adapter->create_server(
+			'classifai',
+			'classifai',
+			'mcp',
+			'ClassifAI MCP Server',
+			'Custom MCP Server for ClassifAI Features',
+			'v1.0.0',
+			[
+				RestTransport::class,
+			],
+			ErrorLogMcpErrorHandler::class,
+			NullMcpObservabilityHandler::class,
+			[
+				'classifai/generate-title',
+			],
+		);
+	}
+
 	/**
 	 * Migrate the existing settings to v3 if necessary.
 	 *