Address code review feedback

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

Author: Copilot

ai-command.php

@@ -12,8 +12,8 @@
 		require_once __DIR__ . '/vendor/autoload.php';
 }
 
-WP_CLI::add_command( 'ai', AiCommand::class );
-WP_CLI::add_command( 'ai credentials', CredentialsCommand::class );
-WP_CLI::add_command( 'mcp prompt', AiCommand::class );
-WP_CLI::add_command( 'mcp', McpCommand::class );
-WP_CLI::add_command( 'mcp server', McpServerCommand::class );
+WP_CLI::add_command( 'ai', \McpWp\AiCommand\AiCommand::class );
+WP_CLI::add_command( 'ai credentials', \McpWp\AiCommand\CredentialsCommand::class );
+WP_CLI::add_command( 'mcp prompt', \McpWp\AiCommand\AiCommand::class );
+WP_CLI::add_command( 'mcp', \McpWp\AiCommand\McpCommand::class );
+WP_CLI::add_command( 'mcp server', \McpWp\AiCommand\McpServerCommand::class );

src/AI/WpAiClient.php

@@ -87,8 +87,15 @@ public function call_ai_service_with_prompt( string $prompt ): void {
 			if ( $this->service && $this->model ) {
 				$prompt_builder = $prompt_builder->using_model_preference( [ $this->service, $this->model ] );
 			} elseif ( $this->model ) {
-				// If only model is specified, try to use it as a preference.
-				$prompt_builder = $prompt_builder->using_model_preference( [ 'anthropic', $this->model ], [ 'openai', $this->model ], [ 'google', $this->model ] );
+				// If only model is specified without a service, try common providers.
+				// This provides a reasonable fallback that works with most configurations.
+				// The WP AI Client will automatically use the first available provider
+				// that has the specified model and is properly configured.
+				$prompt_builder = $prompt_builder->using_model_preference(
+					[ 'anthropic', $this->model ],
+					[ 'openai', $this->model ],
+					[ 'google', $this->model ]
+				);
 			}
 
 			// Generate text response.

src/AiCommand.php

@@ -4,6 +4,7 @@
 
 use Mcp\Client\ClientSession;
 use McpWp\AiCommand\AI\AiClient;
+use McpWp\AiCommand\AI\WpAiClient;
 use McpWp\AiCommand\MCP\Client;
 use McpWp\AiCommand\Utils\CliLogger;
 use McpWp\AiCommand\Utils\McpConfig;
@@ -87,7 +88,7 @@ public function __invoke( array $args, array $assoc_args ): void {
 			$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 = new WpAiClient( [], $approval_mode, $service, $model );
 				$ai_client->call_ai_service_with_prompt( $args[0] );
 				return;
 			}

src/CredentialsCommand.php

@@ -20,12 +20,12 @@ class CredentialsCommand extends WP_CLI_Command {
 	 *
 	 *     # List all credentials
 	 *     $ wp ai credentials list
-	 *     +----------+------------+
-	 *     | Provider | Status     |
-	 *     +----------+------------+
-	 *     | openai   | configured |
-	 *     | anthropic| configured |
-	 *     +----------+------------+
+	 *     +-----------+------------+
+	 *     | Provider  | Status     |
+	 *     +-----------+------------+
+	 *     | openai    | configured |
+	 *     | anthropic | configured |
+	 *     +-----------+------------+
 	 *
 	 * @when before_wp_load
 	 *