Apply feedback and pass a correct is_active hook for the ai connectors

Author: jorgefilipecosta

src/wp-includes/class-wp-connector-registry.php

@@ -110,8 +110,9 @@ final class WP_Connector_Registry {
 	 *     @type array  $plugin         {
 	 *         Optional. Plugin data for install/activate UI.
 	 *
-	 *         @type string   $file      The plugin's main file path relative to the plugins
-	 *                                   directory (e.g. 'my-plugin/my-plugin.php' or 'hello.php').
+	 *         @type string   $file      Optional. The plugin's main file path relative to the
+	 *                                   plugins directory (e.g. 'my-plugin/my-plugin.php' or
+	 *                                   'hello.php').
 	 *         @type callable $is_active Optional callback to determine whether the plugin
 	 *                                   is active. Receives no arguments and must return bool.
 	 *                                   Defaults to `__return_true`.
@@ -247,8 +248,12 @@ public function register( string $id, array $args ): ?array {
 			}
 		}
 
-		if ( ! empty( $args['plugin'] ) && is_array( $args['plugin'] ) && ! empty( $args['plugin']['file'] ) ) {
-			$connector['plugin'] = array( 'file' => $args['plugin']['file'] );
+		$connector['plugin'] = array();
+
+		if ( ! empty( $args['plugin'] ) && is_array( $args['plugin'] ) ) {
+			if ( ! empty( $args['plugin']['file'] ) ) {
+				$connector['plugin']['file'] = $args['plugin']['file'];
+			}
 
 			if ( isset( $args['plugin']['is_active'] ) ) {
 				if ( ! is_callable( $args['plugin']['is_active'] ) ) {
@@ -262,11 +267,13 @@ public function register( string $id, array $args ): ?array {
 				}
 
 				$connector['plugin']['is_active'] = $args['plugin']['is_active'];
-			} else {
-				$connector['plugin']['is_active'] = '__return_true';
 			}
 		}
 
+		if ( ! isset( $connector['plugin']['is_active'] ) ) {
+			$connector['plugin']['is_active'] = '__return_true';
+		}
+
 		$this->registered_connectors[ $id ] = $connector;
 		return $connector;
 	}

src/wp-includes/connectors.php

@@ -367,6 +367,17 @@ function _wp_connectors_register_default_ai_providers( WP_Connector_Registry $re
 				}
 			}
 		}
+
+		if ( ! isset( $args['plugin']['is_active'] ) ) {
+			$args['plugin']['is_active'] = static function () use ( $ai_registry, $id ): bool {
+				try {
+					return $ai_registry->hasProvider( $id );
+				} catch ( Exception $e ) {
+					return false;
+				}
+			};
+		}
+
 		$registry->register( $id, $args );
 	}
 }
@@ -671,7 +682,7 @@ function _wp_connectors_get_connector_script_module_data( array $data ): array {
 		if ( ! empty( $connector_data['plugin']['file'] ) ) {
 			$file         = $connector_data['plugin']['file'];
 			$is_activated = (bool) call_user_func( $connector_data['plugin']['is_active'] );
-			$is_installed = $is_activated || file_exists( WP_PLUGIN_DIR . '/' . $file );
+			$is_installed = $is_activated || file_exists( wp_normalize_path( WP_PLUGIN_DIR . '/' . $file ) );
 
 			$connector_out['plugin'] = array(
 				'file'        => $file,

tests/phpunit/tests/connectors/wpConnectorRegistry.php

@@ -353,10 +353,12 @@ public function test_register_defaults_plugin_is_active_to_return_true() {
 	/**
 	 * @ticket 64791
 	 */
-	public function test_register_omits_plugin_when_not_provided() {
+	public function test_register_defaults_plugin_when_not_provided() {
 		$result = $this->registry->register( 'no-plugin', self::$default_args );
 
-		$this->assertArrayNotHasKey( 'plugin', $result );
+		$this->assertArrayHasKey( 'plugin', $result );
+		$this->assertArrayNotHasKey( 'file', $result['plugin'] );
+		$this->assertSame( '__return_true', $result['plugin']['is_active'] );
 	}
 
 	/**