Improve backward compatibility and add tests

Co-authored-by: swissspidy <841956+swissspidy@users.noreply.github.com>

Author: Copilot

composer.json

@@ -50,6 +50,9 @@
         "bundled": false,
         "commands": [
             "ai",
+            "ai credentials list",
+            "ai credentials set",
+            "ai credentials delete",
             "mcp prompt",
             "mcp server add",
             "mcp server list",

features/ai-credentials.feature

@@ -0,0 +1,12 @@
+Feature: AI Credentials command
+  Scenario: Credentials management with WP AI Client
+    Given a WP installation
+
+    When I try `wp ai credentials list`
+    Then STDERR should contain:
+      """
+      The WP AI Client is not available.
+      """
+
+    # TODO: Add tests for when WP AI Client is available
+    # This would require installing the AI plugin or WordPress 7.0+

features/ai.feature

@@ -16,7 +16,7 @@ Feature: AI command
     When I try `wp ai "Hello World"`
     Then STDERR should contain:
       """
-      This command currently requires the AI Services plugin.
+      This command requires the AI Services plugin for MCP tool integration.
       """
 
     When I run `wp plugin install ai-services --activate`

src/AiCommand.php

@@ -75,26 +75,29 @@ public function __invoke( array $args, array $assoc_args ): void {
 			WP_CLI::error( 'Not implemented yet.' );
 		}
 
-		// Check if WP AI Client is available (preferred).
-		$use_wp_ai_client = class_exists( '\WordPress\AI_Client\AI_Client' );
-
-		// Fallback to AI Services if WP AI Client is not available.
-		if ( ! $use_wp_ai_client && ! function_exists( '\ai_services' ) ) {
-			WP_CLI::error( 'This command requires either the WP AI Client (WordPress 7.0+) or the AI Services plugin. You can install the AI Services plugin with `wp plugin install ai-services --activate`.' );
-		}
-
 		$approval_mode = (bool) Utils\get_flag_value( $assoc_args, 'approval-mode', false );
 		$service       = Utils\get_flag_value( $assoc_args, 'service' );
 		$model         = Utils\get_flag_value( $assoc_args, 'model' );
 
-		// If using WP AI Client and no MCP tools are needed, use simplified path.
+		// Check if WP AI Client is available (preferred for simple prompts).
+		$use_wp_ai_client = class_exists( '\WordPress\AI_Client\AI_Client' );
+
+		// If using WP AI Client and no MCP tools/approval is needed, use simplified path.
 		if ( $use_wp_ai_client && ! $approval_mode ) {
-			$ai_client = new AI\WpAiClient( [], $approval_mode, $service, $model );
-			$ai_client->call_ai_service_with_prompt( $args[0] );
-			return;
+			$skip_builtin_servers = Utils\get_flag_value( $assoc_args, 'skip-builtin-servers' );
+			// Only use WP AI Client if MCP servers are skipped.
+			if ( $skip_builtin_servers ) {
+				$ai_client = new AI\WpAiClient( [], $approval_mode, $service, $model );
+				$ai_client->call_ai_service_with_prompt( $args[0] );
+				return;
+			}
+		}
+
+		// Otherwise, use the full MCP integration with AI Services (required for tools).
+		if ( ! function_exists( '\ai_services' ) ) {
+			WP_CLI::error( 'This command requires the AI Services plugin for MCP tool integration. You can install it with `wp plugin install ai-services --activate`. Alternatively, use `--skip-builtin-servers=all` to use WP AI Client without MCP tools.' );
 		}
 
-		// Otherwise, use the full MCP integration with AI Services.
 		$skip_builtin_servers = Utils\get_flag_value( $assoc_args, 'skip-builtin-servers', 'all' );
 
 		$sessions = $this->get_sessions( $with_wordpress && 'cli' === $skip_builtin_servers, 'wp' === $skip_builtin_servers );