← All changes | includes/modules/Mcp/McpModule.php +841 -42 1.1.0 → 1.3.4 View file →

		@@ -36,9 +36,11 @@
36	36	declare(strict_types=1);
37	37
38	38	namespace XSpeed\Modules\Mcp;
39	39
	40	+use XSpeed\Activity_Log;
40	41	use XSpeed\Module;
	42	+use XSpeed\Onboarding;
41	43
42	44	defined( 'ABSPATH' ) || exit;
43	45
44	46	final class McpModule extends Module {
		@@ -46,11 +48,77 @@
46	48	public const SLUG = 'mcp';
47	49	public const TIER = self::TIER_FREE;
48	50	public const VERSION = '1.0.0';
49	51
50		- /** REST namespace shared with Free. */
51		- private const NS = 'xspeed/v1';
	52	+ /**
	53	+ * Every rewrite rule this module registers, in registration order.
	54	+ *
	55	+ * Single source of truth: add_rewrite() registers these, and the self-heal
	56	+ * guard re-flushes when any is missing from the stored table. They were two
	57	+ * hand-maintained lists before, which is a silent drift risk — a rule
	58	+ * dropped from one and not the other leaves the guard restoring a rule
	59	+ * nothing registers, or never firing for one that is registered.
	60	+ *
	61	+ * @var string[] Rewrite regexes. The query each maps to is built in
	62	+ * add_rewrite(), which also fixes their order.
	63	+ */
	64	+ public const REWRITE_RULES = array(
	65	+ '^xspeed/mcp/([a-f0-9]{64})/?$',
	66	+ '^xspeed/mcp/?$',
	67	+ '^xspeed/mcp/attach/?$',
	68	+ // OAuth discovery. RFC 9728 §3.1 / RFC 8414 §3.1 put the
	69	+ // `.well-known` segment BEFORE the resource/issuer path, and both of
	70	+ // our identifiers are /xspeed/mcp — so this pair of URLs, and only
	71	+ // this pair, is ours. It names our own path explicitly: a catch-all
	72	+ // tail here also matched other MCP plugins' discovery URLs on the
	73	+ // same site and answered them with our metadata, which broke their
	74	+ // connectors. The bare root form is registered conditionally and so
	75	+ // lives apart, in ROOT_DISCOVERY_RULE.
	76	+ '^\.well-known/oauth-(protected-resource|authorization-server)/xspeed/mcp/?$',
	77	+ '^xspeed/authorize/?$',
	78	+ );
52	79
	80	+ /**
	81	+ * The root-form discovery rule — registered CONDITIONALLY, which is why
	82	+ * it is not in REWRITE_RULES.
	83	+ *
	84	+ * It is the address a client built to the 2025-03-26 MCP spec looks at,
	85	+ * and the only address it looks at; current clients read the
	86	+ * protected-resource document first and follow it to the path form. So
	87	+ * dropping it outright would cut off older clients on every site,
	88	+ * including the single-plugin sites where the collision #266 exists to
	89	+ * fix never happened. We answer it while it is uncontested and stand
	90	+ * down the moment another plugin's rule claims it —
	91	+ * root_discovery_contested().
	92	+ */
	93	+ public const ROOT_DISCOVERY_RULE = '^\.well-known/oauth-(protected-resource|authorization-server)/?$';
	94	+
	95	+ /**
	96	+ * Rules earlier builds registered that we never register again under any
	97	+ * condition. The self-heal guard flushes once when it finds OUR copy of
	98	+ * one still in the stored table.
	99	+ *
	100	+ * The catch-all below shipped in an intermediate build and matched every
	101	+ * path-suffixed discovery URL on the site, including other MCP plugins'
	102	+ * (#264). Nothing brings it back, so its removal is unconditional —
	103	+ * unlike ROOT_DISCOVERY_RULE, which is a rule we still register when the
	104	+ * root URL is uncontested and therefore cannot live in this list.
	105	+ *
	106	+ * Ownership is read from the rule's TARGET, never from the regex alone:
	107	+ * a sibling may register the same regex for its own document, its rule
	108	+ * comes back from every flush, and a guard that treated that as stale
	109	+ * would flush on every request forever.
	110	+ *
	111	+ * @var string[]
	112	+ */
	113	+ public const RETIRED_REWRITE_RULES = array(
	114	+ '^\.well-known/oauth-(protected-resource|authorization-server)(?:/.*)?/?$',
	115	+ );
	116	+
	117	+ /** REST namespace shared with Free. Public: Mcp_Server builds the
	118	+ * discovery fallback URL from it. */
	119	+ public const NS = 'xspeed/v1';
	120	+
53	121	/** Query var flagging a pretty /xspeed/mcp request. */
54	122	private const QUERY_VAR = 'xspeed_mcp';
55	123
56	124	/** Query var carrying the token when embedded in the URL path. */
		@@ -77,11 +145,11 @@
77	145	private const ATTACH_QUERY_VAR = 'xspeed_mcp_attach';
78	146
79	147	public function ui_metadata(): array {
80	148	return array(
81		- 'label' => 'MCP Server',
	149	+ 'label' => __( 'MCP Server', 'xspeed' ),
82	150	'icon' => 'Sparkles',
83		- 'description' => 'Control this site\'s cache from Claude and other AI agents.',
	151	+ 'description' => __( 'Let Claude or another AI agent run this site — purge, check stats, change settings. This is the only thing you connect an AI to, and it is free with no API key.', 'xspeed' ),
84	152	'custom_panel' => 'McpPanel',
85	153	);
86	154	}
87	155
		@@ -105,14 +173,117 @@
105	173	public function boot(): void {
106	174	add_action( 'rest_api_init', array( $this, 'register_rest' ) );
107	175
108	176	// Pretty per-site endpoint: /xspeed/mcp → MCP JSON-RPC handler.
109		- add_action( 'init', array( $this, 'add_rewrite' ) );
	177	+ // `wp_loaded`, not `init`: add_rewrite() decides whether to claim the
	178	+ // root discovery URL by looking at the rewrite table, and on `init` that
	179	+ // view is incomplete -- a sibling MCP plugin hooked at the same priority
	180	+ // but loaded after us has not registered yet. Root then looks
	181	+ // uncontested, we register our rule, and the self-heal guard concludes
	182	+ // nothing is stale, so it never flushes. That is a fixed point: the
	183	+ // table never converges, and because our rule is the one WordPress
	184	+ // matches, the sibling never sees the request either.
	185	+ //
	186	+ // By `wp_loaded` every init callback on every request type has run, so
	187	+ // the contested check sees the sibling and the guard flushes once.
	188	+ // WP_Rewrite::flush_rules() already defers itself to `wp_loaded`, so
	189	+ // nothing is lost by deciding here, and did_action('wp_loaded') is
	190	+ // truthy inside this callback, so the flush lands in time for
	191	+ // parse_request in the same request. (#266 QA)
	192	+ // Priority 0: still after every `init` callback, but ahead of the
	193	+ // widely copied `add_action( 'wp_loaded', 'flush_rewrite_rules' )`
	194	+ // snippet. If such a plugin flushed first it would write a table
	195	+ // without our rules, our guard would find them missing and flush
	196	+ // again -- two flushes and two option writes on every request.
	197	+ add_action( 'wp_loaded', array( $this, 'add_rewrite' ), 0 );
110	198	add_filter( 'query_vars', array( $this, 'register_query_var' ) );
111		- add_action( 'parse_request', array( $this, 'maybe_handle_pretty_endpoint' ) );
	199	+ // Priority 1: a sibling MCP plugin that also claims /.well-known/ gets
	200	+ // to answer first at the default priority 10, and whoever answers
	201	+ // first calls exit(). Running early means the URL is decided by WHOSE
	202	+ // path it is, not by which plugin happened to load last.
	203	+ add_action( 'parse_request', array( $this, 'maybe_handle_pretty_endpoint' ), 1 );
	204	+
	205	+ // Hub redirect-return: after the user approves on the Hub, it sends the
	206	+ // browser back to a plugin admin URL carrying ?xspeed_connected=1 plus
	207	+ // the account email + the SAME signed nonce we minted. We verify our own
	208	+ // nonce and mark this admin attached — no server-to-server callback
	209	+ // needed, so it works for local/firewalled sites too.
	210	+ add_action( 'admin_init', array( $this, 'maybe_handle_hub_return' ) );
	211	+
	212	+ // An attached admin who is DELETED (or removed from the blog) never
	213	+ // runs disconnect(), so the site-level attached mirror would report
	214	+ // hub:true forever. deleted_user fires after both wp_delete_user()
	215	+ // and wpmu_delete_user() drop the user, so a plain recompute is
	216	+ // honest there. remove_user_from_blog is core's only removal action
	217	+ // and fires BEFORE removal, so its handler clears the departing
	218	+ // user's record before recomputing (see Mcp_Hub::handle_user_removed).
	219	+ add_action( 'deleted_user', array( Mcp_Hub::class, 'refresh_site_attached' ) );
	220	+ add_action( 'remove_user_from_blog', array( Mcp_Hub::class, 'handle_user_removed' ) );
112	221	}
113	222
114	223	/**
	224	+ * Handle the browser landing back from the Hub after a connect. Idempotent
	225	+ * and safe to run on every admin page load: it only acts when the return
	226	+ * markers are present and the nonce verifies.
	227	+ */
	228	+ public function maybe_handle_hub_return(): void {
	229	+ // phpcs:disable WordPress.Security.NonceVerification.Recommended -- auth is the signed HMAC nonce below, not a WP nonce; this is a read-only routing check.
	230	+ $nonce = isset( $_GET['xspeed_hub_nonce'] ) ? sanitize_text_field( wp_unslash( $_GET['xspeed_hub_nonce'] ) ) : '';
	231	+ $email = isset( $_GET['xspeed_hub_email'] ) ? sanitize_email( wp_unslash( $_GET['xspeed_hub_email'] ) ) : '';
	232	+
	233	+ /*
	234	+ * Trigger on the signed nonce, not on `xspeed_connected`.
	235	+ *
	236	+ * The Hub bounces the browser back with xspeed_hub_nonce +
	237	+ * xspeed_hub_email, but it does NOT always append xspeed_connected —
	238	+ * that marker only survives when the return_url we handed it carried
	239	+ * one. Gating on it meant a real, correctly-signed return was ignored:
	240	+ * the attach was never recorded, the params were never stripped, and
	241	+ * the card kept showing "Not connected" while the nonce sat in the
	242	+ * address bar. The nonce is the actual proof of a genuine round trip,
	243	+ * so it is what this handler keys on. (FBS-84086)
	244	+ */
	245	+ if ( '' === $nonce && empty( $_GET['xspeed_connected'] ) ) {
	246	+ return;
	247	+ }
	248	+ // phpcs:enable WordPress.Security.NonceVerification.Recommended
	249	+
	250	+ if ( ! current_user_can( 'manage_options' ) ) {
	251	+ return;
	252	+ }
	253	+
	254	+ // Verify OUR own signed nonce (proves the round-trip went through the
	255	+ // Hub with a token we minted), then record the connection.
	256	+ if ( '' !== $nonce ) {
	257	+ $verified = Mcp_Hub::verify_attach_nonce( $nonce );
	258	+ if ( null !== $verified ) {
	259	+ $uid = isset( $verified['user_id'] ) ? (int) $verified['user_id'] : get_current_user_id();
	260	+ Mcp_Hub::mark_attached( $email, $uid ?: null );
	261	+ }
	262	+ }
	263	+
	264	+ // ALWAYS strip the one-time return markers from the URL and redirect to
	265	+ // the clean address. These params are single-use; if they persist in the
	266	+ // browser URL, a later reload re-triggers the "just connected" path and
	267	+ // flashes a stale connected state even after the user has disconnected.
	268	+ $clean = remove_query_arg( array( 'xspeed_connected', 'xspeed_hub_nonce', 'xspeed_hub_email' ) );
	269	+
	270	+ // The setup wizard keeps its current step in component state, so a
	271	+ // redirect remounts it at step 1 — dumping the user back at the START of
	272	+ // onboarding immediately after they finished its LAST step. Carry a
	273	+ // durable hint so the wizard resumes on Connect instead. It's a plain
	274	+ // step marker, not an auth signal (the nonce above did that job), and
	275	+ // it's safe to leave in the URL: re-loading it just re-opens the same
	276	+ // step rather than re-running the connect path. (PM feedback)
	277	+ if ( false !== strpos( (string) $clean, 'page=' . Onboarding::PAGE_SLUG ) ) {
	278	+ $clean = add_query_arg( 'xspeed_step', 'connect', $clean );
	279	+ }
	280	+
	281	+ wp_safe_redirect( $clean );
	282	+ exit;
	283	+ }
	284	+
	285	+ /**
115	286	* Flush rewrites once when the module first boots so /xspeed/mcp works
116	287	* without a manual permalink re-save. Cheap: gated on a one-shot flag.
117	288	*/
118	289	public function activate(): void {
		@@ -126,8 +297,15 @@
126	297
127	298	// -- Pretty endpoint: /xspeed/mcp --
128	299
129	300	public function add_rewrite(): void {
	301	+ // The stored table is WordPress's routing table AND the only durable
	302	+ // record of which plugin owns which discovery URL, so both the
	303	+ // conditional registration below and the self-heal guard at the
	304	+ // bottom read the SAME snapshot of it. Deciding twice from two reads
	305	+ // is how a guard ends up flushing away a rule it just registered.
	306	+ $stored_rules = get_option( 'rewrite_rules' );
	307	+
130	308	// Token-in-URL form: /xspeed/mcp/<token> — a single string the user
131	309	// pastes into their AI client (no separate token field). The bare
132	310	// /xspeed/mcp still works with a Bearer/header token.
133	311	add_rewrite_rule(
		@@ -144,48 +322,275 @@
144	322	// (that rule requires 64 hex chars), so ordering is safe.
145	323	add_rewrite_rule( '^xspeed/mcp/attach/?$', 'index.php?' . self::ATTACH_QUERY_VAR . '=1', 'top' );
146	324
147	325	// OAuth discovery documents. RFC 9728 §3.1 / RFC 8414 §3.1 place the
148		- // `.well-known` segment BEFORE the resource path, so a resource at
149		- // /xspeed/mcp is discovered at BOTH:
150		- // /.well-known/oauth-protected-resource (root form)
151		- // /.well-known/oauth-protected-resource/xspeed/mcp (path-suffixed)
152		- // Real clients (e.g. Claude Desktop) request the path-suffixed form;
153		- // serving only the root form 404s them and the connection aborts. The
154		- // optional `(?:/.*)?` tail matches both without caring about the exact
155		- // resource path (we only serve one resource).
	326	+ // `.well-known` segment BEFORE the resource/issuer path, and both of
	327	+ // our canonical identifiers are the MCP endpoint URL, so our
	328	+ // documents live at:
	329	+ // /.well-known/oauth-protected-resource/xspeed/mcp
	330	+ // /.well-known/oauth-authorization-server/xspeed/mcp
	331	+ //
	332	+ // Matched EXACTLY. A `(?:/.*)?` tail covers our URLs in one rule, but
	333	+ // also matches every OTHER plugin's discovery URL on the same site —
	334	+ // and WordPress matches rewrite rules in table order rather than by
	335	+ // specificity, so a sibling's own exact rule never gets reached. Its
	336	+ // clients then receive OUR metadata, find a resource and issuer that
	337	+ // do not match what they are connecting to, and abort before the
	338	+ // login screen.
156	339	add_rewrite_rule(
157		- '^\.well-known/oauth-(protected-resource|authorization-server)(?:/.*)?/?$',
	340	+ '^\\.well-known/oauth-(protected-resource|authorization-server)/xspeed/mcp/?$',
158	341	'index.php?' . self::WELLKNOWN_QUERY_VAR . '=$matches[1]',
159	342	'top'
160	343	);
161	344
	345	+ // The bare root form, ONLY while no other plugin claims it. A client
	346	+ // written to the 2025-03-26 MCP spec looks there and nowhere else, so
	347	+ // giving it up unconditionally would break those clients on every
	348	+ // site — including the single-plugin sites where the collision never
	349	+ // happened. When a sibling's rule is present the URL is theirs and we
	350	+ // register nothing, which is the case #266 is about. Current clients
	351	+ // read the protected-resource document first and follow it wherever
	352	+ // it points, so they are unaffected either way. The document served
	353	+ // at root carries the LEGACY
	354	+ // host-only issuer, because that is the identifier a client used to
	355	+ // derive that URL (RFC 8414 §3.3).
	356	+ $root_contested = self::root_discovery_contested( $stored_rules );
	357	+ if ( ! $root_contested ) {
	358	+ add_rewrite_rule(
	359	+ self::ROOT_DISCOVERY_RULE,
	360	+ 'index.php?' . self::WELLKNOWN_QUERY_VAR . '=$matches[1]',
	361	+ 'top'
	362	+ );
	363	+ }
	364	+
162	365	// Browser-facing OAuth consent page — served OUTSIDE REST so cookie
163	366	// auth (is_user_logged_in) works after the wp-login round-trip.
164	367	add_rewrite_rule( '^xspeed/authorize/?$', 'index.php?' . self::AUTHORIZE_QUERY_VAR . '=1', 'top' );
165	368
166		- // Self-heal: flush once if ANY of our rules is missing from the stored
167		- // rewrite table. Checking only the first rule is not enough — a site
168		- // flushed under an older build (which had /xspeed/mcp but not the
169		- // later /xspeed/authorize + /.well-known rules) keeps that first rule,
170		- // so the guard never fires and OAuth discovery 404s forever. Guard on
171		- // the full set so any newly-added rule triggers a re-flush.
172		- $expected = array(
173		- '^xspeed/mcp/([a-f0-9]{64})/?$',
174		- '^xspeed/mcp/?$',
175		- '^xspeed/mcp/attach/?$',
176		- '^\.well-known/oauth-(protected-resource|authorization-server)(?:/.*)?/?$',
177		- '^xspeed/authorize/?$',
178		- );
	369	+ // Self-heal: flush once if the stored rewrite table disagrees with the
	370	+ // rules we just registered. Checking only the first rule is not
	371	+ // enough — a site flushed under an older build (which had /xspeed/mcp
	372	+ // but not the later /xspeed/authorize + /.well-known rules) keeps that
	373	+ // first rule, so the guard never fires and OAuth discovery 404s
	374	+ // forever. Guard on the full set so any newly-added rule triggers a
	375	+ // re-flush.
	376	+ //
	377	+ // The guard must mirror the registration decisions EXACTLY, or it
	378	+ // never reaches a fixed point:
	379	+ //
	380	+ // - Uncontested root: we register it, so the table must hold it
	381	+ // with OUR target. A flush produces exactly that, and the next
	382	+ // request reads the same table and stays uncontested — our own
	383	+ // target never counts as a sibling's.
	384	+ // - Contested root: we register nothing, so OUR copy must be gone.
	385	+ // A flush regenerates the sibling's rule (they register it every
	386	+ // request) but not ours, so the next request is quiet.
	387	+ //
	388	+ // Ownership is read from the TARGET in both directions. Keying on the
	389	+ // regex alone is what produced a flush on every request forever when
	390	+ // a sibling held that regex: their rule comes back from every flush.
	391	+ //
	392	+ // This runs on `wp_loaded` for every request, so the first request after an
	393	+ // upgrade flushes once and the guard is quiet from then on. It cannot
	394	+ // move to Plugin::maybe_upgrade() — that is admin-only and runs at
	395	+ // plugins_loaded 21, i.e. BEFORE init, so a flush there would write a
	396	+ // table without our rules and this guard would flush a second time.
	397	+ if ( ! is_array( $stored_rules ) ) {
	398	+ return;
	399	+ }
	400	+
	401	+ $stale = false;
	402	+ $retiring = false;
	403	+ foreach ( self::REWRITE_RULES as $rule ) {
	404	+ if ( ! isset( $stored_rules[ $rule ] ) ) {
	405	+ $stale = true;
	406	+ break;
	407	+ }
	408	+ }
	409	+
	410	+ // Our copy of the root rule must be present exactly when we register
	411	+ // it. Present-and-unwanted is the #266 upgrade; absent-and-wanted is
	412	+ // an older table, or a sibling that has since gone away.
	413	+ $root_is_ours = isset( $stored_rules[ self::ROOT_DISCOVERY_RULE ] )
	414	+ && self::is_our_rule_target( $stored_rules[ self::ROOT_DISCOVERY_RULE ] );
	415	+ if ( $root_is_ours === $root_contested ) {
	416	+ $stale = true;
	417	+ $retiring = $root_contested;
	418	+ }
	419	+
	420	+ // Not an identity move — nothing a site owner can act on — so this
	421	+ // one flushes quietly.
	422	+ foreach ( self::RETIRED_REWRITE_RULES as $rule ) {
	423	+ if ( isset( $stored_rules[ $rule ] ) && self::is_our_rule_target( $stored_rules[ $rule ] ) ) {
	424	+ $stale = true;
	425	+ break;
	426	+ }
	427	+ }
	428	+
	429	+ if ( ! $stale ) {
	430	+ return;
	431	+ }
	432	+
	433	+ if ( $retiring ) {
	434	+ // The one moment the identity move is observable to a site owner,
	435	+ // and it happens on a front-end request with no UI attached. Fires
	436	+ // once: after the flush our rule is gone, so the next request
	437	+ // finds nothing to hand over.
	438	+ Activity_Log::record(
	439	+ 'mcp_discovery_moved',
	440	+ __( 'Another plugin now claims the site-wide OAuth discovery address, so xSpeed handed it over. Its own is /.well-known/oauth-protected-resource/xspeed/mcp — AI assistants already connected may ask for approval once more.', 'xspeed' ),
	441	+ Activity_Log::INFO
	442	+ );
	443	+ }
	444	+
	445	+ flush_rewrite_rules( false );
	446	+ }
	447	+
	448	+ /**
	449	+ * Whether another plugin's rewrite rule already routes the ROOT discovery
	450	+ * URLs, making them theirs rather than ours.
	451	+ *
	452	+ * Read from two views of the rewrite table, because neither alone is
	453	+ * complete at `init`:
	454	+ *
	455	+ * - the STORED table, which is what WordPress actually routes with and
	456	+ * the only view that survives the request. If a sibling registered
	457	+ * the same regex after us at the last flush, its target is what is
	458	+ * stored, and that is precisely "the sibling owns this URL now".
	459	+ * - the IN-MEMORY rules registered so far this request, which catches a
	460	+ * sibling that hooks `init` earlier than we do and has therefore not
	461	+ * reached the stored table yet.
	462	+ *
	463	+ * A sibling that registers LATER than us used to be the one case neither
	464	+ * view saw, and it did NOT resolve itself: the guard is what triggers a
	465	+ * flush, so a guard reading an incomplete view simply never fires. That
	466	+ * is why add_rewrite() now runs on `wp_loaded` rather than `init` — by
	467	+ * then every plugin has registered, whatever its load order.
	468	+ *
	469	+ * @param mixed $stored The stored rewrite table, if already read.
	470	+ */
	471	+ public static function root_discovery_contested( $stored = null ): bool {
	472	+ $tables = array();
	473	+ if ( is_array( $stored ) ) {
	474	+ $tables[] = $stored;
	475	+ } elseif ( null === $stored ) {
	476	+ $option = get_option( 'rewrite_rules' );
	477	+ if ( is_array( $option ) ) {
	478	+ $tables[] = $option;
	479	+ }
	480	+ }
	481	+
	482	+ if ( isset( $GLOBALS['wp_rewrite'] ) && is_object( $GLOBALS['wp_rewrite'] ) ) {
	483	+ foreach ( array( 'extra_rules_top', 'extra_rules' ) as $prop ) {
	484	+ if ( isset( $GLOBALS['wp_rewrite']->$prop ) && is_array( $GLOBALS['wp_rewrite']->$prop ) ) {
	485	+ $tables[] = $GLOBALS['wp_rewrite']->$prop;
	486	+ }
	487	+ }
	488	+ }
	489	+
	490	+ foreach ( $tables as $rules ) {
	491	+ foreach ( $rules as $pattern => $target ) {
	492	+ if ( ! self::is_a_wellknown_rule( (string) $pattern ) || self::is_our_rule_target( $target ) ) {
	493	+ continue;
	494	+ }
	495	+ foreach ( array( 'protected-resource', 'authorization-server' ) as $doc ) {
	496	+ $probe = '.well-known/oauth-' . $doc;
	497	+ if ( preg_match( '#' . str_replace( '#', '\\#', (string) $pattern ) . '#', $probe ) ) {
	498	+ return true;
	499	+ }
	500	+ }
	501	+ }
	502	+ }
	503	+
	504	+ return false;
	505	+ }
	506	+
	507	+ /**
	508	+ * Whether a rewrite regex was written FOR a .well-known discovery URL,
	509	+ * as opposed to merely matching one.
	510	+ *
	511	+ * WordPress's own page rule -- `(.?.+?)/?$` => `index.php?pagename=...`
	512	+ * -- is in the stored table of every site using pretty permalinks, and
	513	+ * it matches `.well-known/oauth-protected-resource` exactly as it
	514	+ * matches every other path on the site. Reading that as a sibling's
	515	+ * claim would report root as contested EVERYWHERE: the root document
	516	+ * would be retired on every install, including the single-plugin sites
	517	+ * this change exists to leave alone, and each of them would log a
	518	+ * hand-over that never happened.
	519	+ *
	520	+ * A rule that routes these URLs on purpose spells the segment out, so
	521	+ * that is the signal. Backslashes are stripped first because the regex
	522	+ * carries them as escapes (`^\\.well-known/...`) and a rule is free to
	523	+ * escape the hyphen too.
	524	+ *
	525	+ * @param string $pattern The stored rewrite regex.
	526	+ */
	527	+ private static function is_a_wellknown_rule( string $pattern ): bool {
	528	+ return false !== stripos( str_replace( '\\', '', $pattern ), 'well-known' );
	529	+ }
	530	+
	531	+ /**
	532	+ * Whether a stored rewrite target was written by this module.
	533	+ *
	534	+ * Every rule we register resolves to `index.php?<one of our query
	535	+ * vars>=…`, and no other plugin sets those. Used to tell OUR leftover
	536	+ * copy of a retired rule from a sibling's rule that happens to share the
	537	+ * regex — only the first is ours to flush away.
	538	+ *
	539	+ * @param mixed $target The stored rewrite target.
	540	+ */
	541	+ private static function is_our_rule_target( $target ): bool {
	542	+ if ( ! is_string( $target ) ) {
	543	+ return false;
	544	+ }
	545	+
	546	+ foreach ( array( self::QUERY_VAR, self::TOKEN_QUERY_VAR, self::WELLKNOWN_QUERY_VAR, self::AUTHORIZE_QUERY_VAR, self::ATTACH_QUERY_VAR ) as $var ) {
	547	+ if ( false !== strpos( $target, $var . '=' ) ) {
	548	+ return true;
	549	+ }
	550	+ }
	551	+
	552	+ return false;
	553	+ }
	554	+
	555	+ /**
	556	+ * True when a request for our discovery URL can reach WordPress at all.
	557	+ *
	558	+ * Since maybe_handle_pretty_endpoint() claims the document by REQUEST
	559	+ * PATH, a sibling plugin winning the rewrite match no longer matters —
	560	+ * we answer either way. What still breaks the pretty URL is there being
	561	+ * no rewrite for it in the first place (plain permalinks), because then
	562	+ * nothing routes the path to index.php and parse_request never runs.
	563	+ *
	564	+ * Blind to upstream interception: a host that owns the /.well-known/
	565	+ * prefix (an nginx ACME block, an edge redirect rule) answers before
	566	+ * WordPress loads, and WP cannot see that. Use the
	567	+ * `xspeed_mcp_resource_metadata_url` filter on such hosts.
	568	+ */
	569	+ public static function wellknown_rewrites_active(): bool {
179	570	$rules = get_option( 'rewrite_rules' );
180		- if ( is_array( $rules ) ) {
181		- foreach ( $expected as $rule ) {
182		- if ( ! isset( $rules[ $rule ] ) ) {
183		- flush_rewrite_rules( false );
184		- break;
185		- }
	571	+ if ( ! is_array( $rules ) || array() === $rules ) {
	572	+ return false;
	573	+ }
	574	+
	575	+ // Any rule that routes our discovery path to index.php will do — ours
	576	+ // or a sibling's — because the path check inside the handler decides
	577	+ // the outcome once the request lands.
	578	+ //
	579	+ // Probe the URL the 401 challenge actually advertises: the
	580	+ // path-suffixed form, which is the canonical identity since #266.
	581	+ // Probing root would answer a different question — whether ANY plugin
	582	+ // routes the contested URL — and on a site where a sibling owns it
	583	+ // that answer says nothing about whether our own document is
	584	+ // reachable.
	585	+ $probe = '.well-known/oauth-protected-resource/' . Mcp_Pairing::SITE_ENDPOINT_PATH;
	586	+ foreach ( $rules as $pattern => $target ) {
	587	+ if ( preg_match( '#' . str_replace( '#', '\\#', $pattern ) . '#', $probe ) ) {
	588	+ return true;
186	589	}
187	590	}
	591	+
	592	+ return false;
188	593	}
189	594
190	595	/**
191	596	* @param string[] $vars Registered query vars.
		@@ -200,8 +605,110 @@
200	605	return $vars;
201	606	}
202	607
203	608	/**
	609	+ * Which discovery document the CURRENT request path asks for, if any.
	610	+ *
	611	+ * Claims only URLs that are unambiguously ours, mirroring the rewrite
	612	+ * rules exactly: the RFC 9728 §3.1 / RFC 8414 §3.1 path-suffixed form
	613	+ * naming our own resource and issuer (`/xspeed/mcp`). A suffix belonging
	614	+ * to a sibling plugin is deliberately NOT claimed — answering
	615	+ * `/.well-known/oauth-protected-resource/betterlinks/mcp` with xSpeed
	616	+ * metadata is the same bug that broke this site, just pointed the other
	617	+ * way.
	618	+ *
	619	+ * The bare root form is claimed only while no other plugin's rewrite rule
	620	+ * claims it. Leaving the suffix optional here took the root document from
	621	+ * a sibling even on a build that had stopped registering its own root
	622	+ * rule, so the path check is exact.
	623	+ *
	624	+ * The TABLE is what hands root over -- add_rewrite() stops registering
	625	+ * the rule and flushes it away. This claim only releases it, and only
	626	+ * while a sibling's rule actually owns the URL: once WordPress has
	627	+ * routed the request to OUR query var, no other plugin's handler can see
	628	+ * it, so releasing it would abandon the request to the front page rather
	629	+ * than pass it on. Note that is about the winning rule's TARGET, not its
	630	+ * regex -- a sibling can hold the same pattern. The document served at root carries the LEGACY host-only
	631	+ * issuer, the identifier a client used to derive that URL. (#266)
	632	+ *
	633	+ * @param string $matched_query The query the matched rule resolved to.
	634	+ * @return array{doc:string,issuer:string} Doc name ('' when not ours)
	635	+ * and the identity to stamp on it.
	636	+ */
	637	+ private function wellknown_claim_from_path( string $matched_query = '' ): array {
	638	+ $none = array(
	639	+ 'doc' => '',
	640	+ 'issuer' => '',
	641	+ );
	642	+
	643	+ $uri = isset( $_SERVER['REQUEST_URI'] )
	644	+ ? sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) )
	645	+ : '';
	646	+ if ( '' === $uri ) {
	647	+ return $none;
	648	+ }
	649	+
	650	+ $path = (string) wp_parse_url( $uri, PHP_URL_PATH );
	651	+
	652	+ // Sites in a subdirectory carry that prefix on every request.
	653	+ $home = (string) wp_parse_url( home_url(), PHP_URL_PATH );
	654	+ if ( '' !== $home && '/' !== $home && 0 === strpos( $path, $home ) ) {
	655	+ $path = substr( $path, strlen( $home ) );
	656	+ }
	657	+
	658	+ $path = trim( $path, '/' );
	659	+
	660	+ // trim() above already dropped a trailing slash, so `/xspeed/mcp/`
	661	+ // still matches — and so does the root form with one.
	662	+ $ours = '#^\.well-known/oauth-(protected-resource|authorization-server)'
	663	+ . '/' . preg_quote( Mcp_Pairing::SITE_ENDPOINT_PATH, '#' ) . '$#';
	664	+ if ( preg_match( $ours, $path, $m ) ) {
	665	+ return array(
	666	+ 'doc' => $m[1],
	667	+ 'issuer' => Mcp_OAuth::issuer(),
	668	+ );
	669	+ }
	670	+
	671	+ // Releasing root is only safe when somebody else can pick it up. If
	672	+ // OUR rule is what WordPress matched, nobody can: the sibling's query
	673	+ // var is unset, so its handler never runs, and the request falls
	674	+ // through to the front page -- a 301 to the homepage where dev
	675	+ // returns JSON. Answering with the legacy document is the pre-#266
	676	+ // behaviour. (#266 QA)
	677	+ //
	678	+ // Keyed on the query the matched rule RESOLVED TO -- not on
	679	+ // $wp->query_vars, and not on which regex matched.
	680	+ //
	681	+ // query_vars is wrong because the var is public and WP::parse_request
	682	+ // lets $_GET override anything a rule set, so `?xspeed_mcp_wellknown=1`
	683	+ // would let anyone force our metadata onto a URL a sibling owns.
	684	+ //
	685	+ // matched_rule is wrong because the rewrite table is keyed BY regex:
	686	+ // a sibling that registered this same pattern replaces our entry and
	687	+ // the key still reads as ours, while the target behind it is theirs.
	688	+ // That is a live case here -- is_our_rule_target() exists for it --
	689	+ // and keying on the rule would answer for the sibling, which is the
	690	+ // bug this whole change is about.
	691	+ //
	692	+ // matched_query is built from the winning rule's TARGET (class-wp.php,
	693	+ // before the parse_request action) and $_GET never touches it. If it
	694	+ // sets our query var, our rule genuinely won. (#266 QA)
	695	+ $routed_to_us = 1 === preg_match(
	696	+ '#(?:^|&)' . preg_quote( self::WELLKNOWN_QUERY_VAR, '#' ) . '=#',
	697	+ $matched_query
	698	+ );
	699	+ $root = '#^\.well-known/oauth-(protected-resource|authorization-server)$#';
	700	+ if ( preg_match( $root, $path, $m ) && ( $routed_to_us || ! self::root_discovery_contested() ) ) {
	701	+ return array(
	702	+ 'doc' => $m[1],
	703	+ 'issuer' => Mcp_OAuth::legacy_issuer(),
	704	+ );
	705	+ }
	706	+
	707	+ return $none;
	708	+ }
	709	+
	710	+ /**
204	711	* Serve the MCP endpoint on the pretty path. Runs on parse_request so
205	712	* it fires before the main query, and short-circuits WP entirely.
206	713	*
207	714	* @param \WP $wp The WP request object.
		@@ -206,18 +713,40 @@
206	713	*
207	714	* @param \WP $wp The WP request object.
208	715	*/
209	716	public function maybe_handle_pretty_endpoint( $wp ): void {
210		- // OAuth discovery documents (served at the site root).
211		- if ( ! empty( $wp->query_vars[ self::WELLKNOWN_QUERY_VAR ] ) ) {
212		- $doc = (string) $wp->query_vars[ self::WELLKNOWN_QUERY_VAR ];
	717	+ // OAuth discovery documents.
	718	+ //
	719	+ // Read the doc name from the REQUEST PATH, and ONLY from the path.
	720	+ // `add_rewrite_rule( …, 'top' )` only means "top at the moment it
	721	+ // runs", so whichever MCP plugin hooks `init` last ends up first in
	722	+ // the table — an order set by plugin load order, which no plugin
	723	+ // controls. A sibling's catch-all
	724	+ // (`…(protected-resource|authorization-server)(?:/.*)?/?$`) then wins
	725	+ // the match and our query var is never set, even though the URL is
	726	+ // unambiguously ours. Observed live with two different plugins on one
	727	+ // site. parse_request runs AFTER matching, so the path is the one
	728	+ // signal no sibling rule can take away from us.
	729	+ //
	730	+ // The query VAR is deliberately never consulted. It is public, so
	731	+ // $_GET can set it on any URL, and answering from it would put our
	732	+ // metadata on somebody else's address — the whole bug. Which rewrite
	733	+ // RULE matched is a different thing: WordPress decides it, the query
	734	+ // string cannot influence it, and it is only read to tell "a sibling
	735	+ // owns this URL" from "we own it and nobody else can answer".
	736	+ $matched_query = is_object( $wp ) && isset( $wp->matched_query ) ? (string) $wp->matched_query : '';
	737	+ $claim = $this->wellknown_claim_from_path( $matched_query );
	738	+ $doc = $claim['doc'];
	739	+ if ( '' !== $doc ) {
213	740	$data = 'authorization-server' === $doc
214		- ? Mcp_OAuth::authorization_server_metadata()
215		- : Mcp_OAuth::protected_resource_metadata();
	741	+ ? Mcp_OAuth::authorization_server_metadata( $claim['issuer'] )
	742	+ : Mcp_OAuth::protected_resource_metadata( $claim['issuer'] );
216	743	status_header( 200 );
217	744	header( 'Content-Type: application/json; charset=utf-8' );
218		- // Discovery metadata is public + cacheable.
219		- header( 'Cache-Control: public, max-age=3600' );
	745	+ // Public and cacheable, but short: this document IS the server's
	746	+ // identity, and a cached copy outliving an issuer change is the
	747	+ // one failure a client cannot recover from on its own. (#266)
	748	+ header( 'Cache-Control: public, max-age=300' );
220	749	echo wp_json_encode( $data );
221	750	exit;
222	751	}
223	752
		@@ -290,8 +819,26 @@
290	819	'permission_callback' => '__return_true',
291	820	)
292	821	);
293	822
	823	+ // --- Public scan signals -----------------------------------------
	824	+ // One tiny unauthenticated JSON body for external audit tools (the
	825	+ // speed scanner on xspeedcache.com): plugin version, whether the MCP
	826	+ // server is connected, and whether the site is attached to xSpeed
	827	+ // Hub. Everything except `hub` is already publicly discoverable —
	828	+ // the cache signature carries the version and /mcp answers 401 when
	829	+ // connected — and `hub` is a bare boolean. No tokens, accounts or
	830	+ // emails leave through this route.
	831	+ register_rest_route(
	832	+ self::NS,
	833	+ '/signals',
	834	+ array(
	835	+ 'methods' => 'GET',
	836	+ 'callback' => array( $this, 'rest_signals' ),
	837	+ 'permission_callback' => '__return_true',
	838	+ )
	839	+ );
	840	+
294	841	// --- Admin-only management routes (dashboard) --------------------
295	842	register_rest_route(
296	843	self::NS,
297	844	'/mcp/connection',
		@@ -302,8 +849,34 @@
302	849	)
303	850	);
304	851	register_rest_route(
305	852	self::NS,
	853	+ '/mcp/activity',
	854	+ array(
	855	+ 'methods' => 'GET',
	856	+ 'callback' => array( $this, 'rest_activity' ),
	857	+ 'permission_callback' => array( $this, 'admin_permission' ),
	858	+ 'args' => array(
	859	+ 'limit' => array(
	860	+ 'type' => 'integer',
	861	+ 'required' => false,
	862	+ 'default' => 50,
	863	+ 'description' => 'Maximum entries to return (newest first).',
	864	+ ),
	865	+ ),
	866	+ )
	867	+ );
	868	+ register_rest_route(
	869	+ self::NS,
	870	+ '/mcp/activity/clear',
	871	+ array(
	872	+ 'methods' => 'POST',
	873	+ 'callback' => array( $this, 'rest_activity_clear' ),
	874	+ 'permission_callback' => array( $this, 'admin_permission' ),
	875	+ )
	876	+ );
	877	+ register_rest_route(
	878	+ self::NS,
306	879	'/mcp/connect',
307	880	array(
308	881	'methods' => 'POST',
309	882	'callback' => array( $this, 'rest_connect' ),
		@@ -450,13 +1023,49 @@
450	1023	'permission_callback' => '__return_true',
451	1024	)
452	1025	);
453	1026
	1027	+ // --- OAuth discovery, REST fallback ------------------------------
	1028	+ // The canonical documents live at /.well-known/… via rewrite rules.
	1029	+ // Many hosts own that prefix for ACME/Let's Encrypt (an nginx
	1030	+ // `location ^~ /.well-known` block, or an edge redirect rule), which
	1031	+ // swallows the request before WordPress ever runs — the pretty URL
	1032	+ // then 404s or redirects to the homepage no matter how the plugin is
	1033	+ // configured, and OAuth discovery dead-ends with no way back.
	1034	+ // Serving the same two documents under /wp-json puts them on a path
	1035	+ // no ACME tooling claims, so discovery still completes there.
	1036	+ register_rest_route(
	1037	+ self::NS,
	1038	+ '/mcp/.well-known/oauth-protected-resource',
	1039	+ array(
	1040	+ 'methods' => 'GET',
	1041	+ 'callback' => array( $this, 'rest_protected_resource_metadata' ),
	1042	+ 'permission_callback' => '__return_true',
	1043	+ )
	1044	+ );
	1045	+ register_rest_route(
	1046	+ self::NS,
	1047	+ '/mcp/.well-known/oauth-authorization-server',
	1048	+ array(
	1049	+ 'methods' => 'GET',
	1050	+ 'callback' => array( $this, 'rest_authorization_server_metadata' ),
	1051	+ 'permission_callback' => '__return_true',
	1052	+ )
	1053	+ );
	1054	+
454	1055	// --- MCP-token-only tool routes (optional hosted-broker path) ----
455	1056	$tool_perm = array( Mcp_Auth::class, 'permission' );
456	1057	register_rest_route(
457	1058	self::NS,
458		- '/mcp/tool/(?P<tool>[a-z_]+)',
	1059	+ // [a-z0-9_-]+ — the HYPHEN is the one that matters, not the digit.
	1060	+ // Generated tool names carry their module slug verbatim, and 33 of
	1061	+ // the 92 in the catalog have a hyphenated slug
	1062	+ // (xspeed_cache-404_status, xspeed_migration-pro_apply,
	1063	+ // xspeed_smart-predict_status …). Every one of those returned
	1064	+ // rest_no_route through the broker path. The earlier widening to
	1065	+ // [a-z0-9_]+ un-blocked nothing: the only digit-bearing name is
	1066	+ // cache-404, whose problem was the hyphen. (QA on #158) */
	1067	+ '/mcp/tool/(?P<tool>[a-z0-9_-]+)',
459	1068	array(
460	1069	array(
461	1070	'methods' => 'GET',
462	1071	'callback' => array( $this, 'rest_tool' ),
		@@ -496,8 +1105,35 @@
496	1105	return $response;
497	1106	}
498	1107
499	1108	/**
	1109	+ * GET /signals — the public scan-signals body. See the route
	1110	+ * registration for what may (and may not) leave through it.
	1111	+ *
	1112	+ * @return \WP_REST_Response
	1113	+ */
	1114	+ public function rest_signals() {
	1115	+ $signals = array(
	1116	+ 'xspeed' => XSPEED_VERSION,
	1117	+ 'mcp' => '' !== Mcp_Pairing::site_token(),
	1118	+ 'hub' => Mcp_Hub::site_attached(),
	1119	+ );
	1120	+
	1121	+ /**
	1122	+ * Filter the public scan signals.
	1123	+ *
	1124	+ * Lets an add-on append its own public facts (e.g. its version
	1125	+ * under `pro`). Values returned here are served UNAUTHENTICATED —
	1126	+ * never add tokens, accounts, emails, or paths.
	1127	+ *
	1128	+ * @param array<string,mixed> $signals The signals body.
	1129	+ */
	1130	+ $signals = (array) apply_filters( 'xspeed_scan_signals', $signals );
	1131	+
	1132	+ return rest_ensure_response( $signals );
	1133	+ }
	1134	+
	1135	+ /**
500	1136	* GET /mcp/connection — pairing status for the dashboard.
501	1137	*
502	1138	* @param \WP_REST_Request $request Unused.
503	1139	* @return \WP_REST_Response
		@@ -507,8 +1143,44 @@
507	1143	return rest_ensure_response( Mcp_Pairing::public_status() );
508	1144	}
509	1145
510	1146	/**
	1147	+ * GET /mcp/activity — the audit trail of AI tool calls.
	1148	+ *
	1149	+ * @param \WP_REST_Request $request Carries the optional limit.
	1150	+ * @return \WP_REST_Response|\WP_Error
	1151	+ */
	1152	+ public function rest_activity( \WP_REST_Request $request ) {
	1153	+ $limit = (int) $request->get_param( 'limit' );
	1154	+
	1155	+ return rest_ensure_response(
	1156	+ array(
	1157	+ 'entries' => Mcp_Activity_Log::entries( $limit > 0 ? $limit : 50 ),
	1158	+ 'summary' => Mcp_Activity_Log::summary(),
	1159	+ )
	1160	+ );
	1161	+ }
	1162	+
	1163	+ /**
	1164	+ * POST /mcp/activity/clear — wipe the audit trail.
	1165	+ *
	1166	+ * @param \WP_REST_Request $request Unused.
	1167	+ * @return \WP_REST_Response|\WP_Error
	1168	+ */
	1169	+ public function rest_activity_clear( \WP_REST_Request $request ) {
	1170	+ unset( $request );
	1171	+ $cleared = Mcp_Activity_Log::clear();
	1172	+
	1173	+ return rest_ensure_response(
	1174	+ array(
	1175	+ 'cleared' => $cleared,
	1176	+ 'entries' => Mcp_Activity_Log::entries(),
	1177	+ 'summary' => Mcp_Activity_Log::summary(),
	1178	+ )
	1179	+ );
	1180	+ }
	1181	+
	1182	+ /**
511	1183	* POST /mcp/connect — mint a connection token.
512	1184	*
513	1185	* @param \WP_REST_Request $request Unused.
514	1186	* @return \WP_REST_Response|\WP_Error
		@@ -652,8 +1324,43 @@
652	1324
653	1325	// -- OAuth 2.1 handlers ------------------------------------------------
654	1326
655	1327	/**
	1328	+ * GET /mcp/.well-known/oauth-protected-resource — RFC 9728 metadata.
	1329	+ *
	1330	+ * Byte-identical to what the /.well-known rewrite serves; both call the
	1331	+ * same builder so the two locations can never drift.
	1332	+ *
	1333	+ * @return \WP_REST_Response
	1334	+ */
	1335	+ public function rest_protected_resource_metadata(): \WP_REST_Response {
	1336	+ return $this->discovery_response( Mcp_OAuth::protected_resource_metadata() );
	1337	+ }
	1338	+
	1339	+ /**
	1340	+ * GET /mcp/.well-known/oauth-authorization-server — RFC 8414 metadata.
	1341	+ *
	1342	+ * @return \WP_REST_Response
	1343	+ */
	1344	+ public function rest_authorization_server_metadata(): \WP_REST_Response {
	1345	+ return $this->discovery_response( Mcp_OAuth::authorization_server_metadata() );
	1346	+ }
	1347	+
	1348	+ /**
	1349	+ * Wrap a discovery document in a public, cacheable REST response.
	1350	+ *
	1351	+ * @param array<string,mixed> $data The metadata document.
	1352	+ * @return \WP_REST_Response
	1353	+ */
	1354	+ private function discovery_response( array $data ): \WP_REST_Response {
	1355	+ $response = new \WP_REST_Response( $data, 200 );
	1356	+ // Same short window as the /.well-known/ emit site, same reason: the
	1357	+ // document carries the server's identity. (#266)
	1358	+ $response->header( 'Cache-Control', 'public, max-age=300' );
	1359	+ return $response;
	1360	+ }
	1361	+
	1362	+ /**
656	1363	* POST /mcp/oauth/register — RFC 7591 dynamic client registration.
657	1364	*
658	1365	* @param \WP_REST_Request $request JSON body with redirect_uris.
659	1366	* @return \WP_REST_Response|\WP_Error
		@@ -786,8 +1493,9 @@
786	1493	$args[ $k ] = $v;
787	1494	}
788	1495	}
789	1496
	1497	+ Mcp_Tools::set_channel( 'broker' );
790	1498	$result = Mcp_Tools::invoke( $tool, $args );
791	1499	if ( is_wp_error( $result ) ) {
792	1500	return $result;
793	1501	}
		@@ -944,8 +1652,27 @@
944	1652	'shortdesc' => 'Show MCP connection status and the paste-in endpoint URL.',
945	1653	'synopsis' => array(),
946	1654	),
947	1655	array(
	1656	+ 'name' => 'xspeed mcp activity',
	1657	+ 'callback' => array( $this, 'cli_activity' ),
	1658	+ 'shortdesc' => 'List recent MCP tool calls (the AI audit trail).',
	1659	+ 'synopsis' => array(
	1660	+ array(
	1661	+ 'name' => 'limit',
	1662	+ 'type' => 'assoc',
	1663	+ 'optional' => true,
	1664	+ 'description' => 'Maximum entries to show (default 20).',
	1665	+ ),
	1666	+ array(
	1667	+ 'name' => 'clear',
	1668	+ 'type' => 'flag',
	1669	+ 'optional' => true,
	1670	+ 'description' => 'Wipe the audit trail instead of listing it.',
	1671	+ ),
	1672	+ ),
	1673	+ ),
	1674	+ array(
948	1675	'name' => 'xspeed mcp connect',
949	1676	'callback' => array( $this, 'cli_connect' ),
950	1677	'shortdesc' => 'Generate a connection token for this site\'s MCP endpoint.',
951	1678	'synopsis' => array(
		@@ -998,8 +1725,59 @@
998	1725	}
999	1726	}
1000	1727
1001	1728	/**
	1729	+ * `wp xspeed mcp activity` — read (or clear) the AI audit trail.
	1730	+ *
	1731	+ * @param array $args Positional args (unused).
	1732	+ * @param array $assoc --limit=<n>, --clear.
	1733	+ */
	1734	+ public function cli_activity( array $args, array $assoc ): void {
	1735	+ unset( $args );
	1736	+
	1737	+ if ( ! empty( $assoc['clear'] ) ) {
	1738	+ if ( ! Mcp_Activity_Log::clear() ) {
	1739	+ // Reached via MCP run_command — the assistant is asking to
	1740	+ // erase the record of its own calls. Mcp_Activity_Log::clear()
	1741	+ // declines and logs the attempt; say so plainly.
	1742	+ \WP_CLI::error( 'The MCP activity log cannot be cleared from an MCP tool call. Clear it from the xSpeed dashboard or from WP-CLI on the server.' );
	1743	+ return;
	1744	+ }
	1745	+ \WP_CLI::success( 'MCP activity log cleared.' );
	1746	+ return;
	1747	+ }
	1748	+
	1749	+ $limit = isset( $assoc['limit'] ) ? (int) $assoc['limit'] : 20;
	1750	+ $summary = Mcp_Activity_Log::summary();
	1751	+ $entries = Mcp_Activity_Log::entries( $limit > 0 ? $limit : 20 );
	1752	+
	1753	+ \WP_CLI::log( sprintf( '%-18s %d', 'total_calls', $summary['total'] ) );
	1754	+ \WP_CLI::log( sprintf( '%-18s %d', 'failed', $summary['failed'] ) );
	1755	+ \WP_CLI::log( sprintf( '%-18s %s', 'top_tool', '' === $summary['top_tool'] ? '-' : $summary['top_tool'] ) );
	1756	+
	1757	+ if ( empty( $entries ) ) {
	1758	+ \WP_CLI::log( '' );
	1759	+ \WP_CLI::log( 'No MCP tool calls recorded yet.' );
	1760	+ return;
	1761	+ }
	1762	+
	1763	+ \WP_CLI::log( '' );
	1764	+ foreach ( $entries as $entry ) {
	1765	+ \WP_CLI::log(
	1766	+ sprintf(
	1767	+ '%s %-22s %-5s %-6s %s%s',
	1768	+ gmdate( 'Y-m-d H:i:s', $entry['ts'] ),
	1769	+ $entry['tool'],
	1770	+ $entry['scope'],
	1771	+ $entry['ok'] ? 'ok' : 'FAIL',
	1772	+ $entry['args'],
	1773	+ '' === $entry['error'] ? '' : ' — ' . $entry['error']
	1774	+ )
	1775	+ );
	1776	+ }
	1777	+ }
	1778	+
	1779	+ /**
1002	1780	* `wp xspeed mcp connect` — mint a token and print the paste-in URL.
1003	1781	*
1004	1782	* @param array $args Positional args (unused).
1005	1783	* @param array $assoc Associative args (unused).
		@@ -1042,6 +1820,27 @@
1042	1820	public function cli_disconnect( array $args, array $assoc ): void {
1043	1821	unset( $args, $assoc );
1044	1822	Mcp_Pairing::disconnect();
1045	1823	\WP_CLI::success( 'Disconnected and revoked the MCP token.' );
	1824	+ }
	1825	+
	1826	+ /**
	1827	+ * MCP is on when a connection token exists -- it has no `enabled`
	1828	+ * setting, so the sidebar counted the AI group as empty on a site with
	1829	+ * a live read-write AI connection. Reads the same
	1830	+ * `Mcp_Pairing::public_status()` the CLI and the panel do, so the count
	1831	+ * cannot disagree with the badge on the panel. (#363)
	1832	+ */
	1833	+ public function is_active(): ?bool {
	1834	+ $status = Mcp_Pairing::public_status();
	1835	+ return ! empty( $status['connected'] );
	1836	+ }
	1837	+
	1838	+ /**
	1839	+ * MCP has no on/off setting -- it is on when a connection exists.
	1840	+ */
	1841	+ public function active_reason(): ?string {
	1842	+ return $this->is_active()
	1843	+ ? __( 'An AI assistant is connected to this site. This module counts as on whenever a connection token exists, rather than having its own on/off setting.', 'xspeed' )
	1844	+ : __( 'No AI assistant is connected. This module counts as on once you connect one.', 'xspeed' );
1046	1845	}
1047	1846	}