mcp-wordpress 1.5.2 → 2.0.0

package/src/server/ToolRegistry.ts

@@ -1,6 +1,7 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { WordPressClient } from "../client/api.js";
 import { getErrorMessage } from "../utils/error.js";
+import { EnhancedError, ErrorHandlers } from "../utils/enhancedError.js";
 import * as Tools from "../tools/index.js";
 import { z } from "zod";
 
@@ -27,10 +28,7 @@ export class ToolRegistry {
   private server: McpServer;
   private wordpressClients: Map<string, WordPressClient>;
 
-  constructor(
-    server: McpServer,
-    wordpressClients: Map<string, WordPressClient>,
-  ) {
+  constructor(server: McpServer, wordpressClients: Map<string, WordPressClient>) {
     this.server = server;
     this.wordpressClients = wordpressClients;
   }
@@ -44,10 +42,7 @@ export class ToolRegistry {
       let toolInstance: any;
 
       // Cache and Performance tools need the clients map
-      if (
-        ToolClass.name === "CacheTools" ||
-        ToolClass.name === "PerformanceTools"
-      ) {
+      if (ToolClass.name === "CacheTools" || ToolClass.name === "PerformanceTools") {
         toolInstance = new ToolClass(this.wordpressClients);
       } else {
         toolInstance = new (ToolClass as new () => any)();
@@ -91,18 +86,38 @@ export class ToolRegistry {
       parameterSchema,
       async (args: any) => {
         try {
-          const siteId = args.site || "default";
+          let siteId = args.site;
+
+          // If no site specified and multiple sites configured, require site parameter
+          if (!siteId && this.wordpressClients.size > 1) {
+            const availableSites = Array.from(this.wordpressClients.keys());
+            const error = ErrorHandlers.siteParameterMissing(availableSites);
+            return {
+              content: [
+                {
+                  type: "text" as const,
+                  text: error.toString(),
+                },
+              ],
+              isError: true,
+            };
+          }
+
+          // Intelligent site selection for single-site configurations
+          if (!siteId) {
+            siteId = this.selectBestSite(tool.name, args);
+          }
+
           const client = this.wordpressClients.get(siteId);
 
           if (!client) {
-            const availableSites = Array.from(
-              this.wordpressClients.keys(),
-            ).join(", ");
+            const availableSites = Array.from(this.wordpressClients.keys());
+            const error = ErrorHandlers.siteNotFound(siteId, availableSites);
             return {
               content: [
                 {
                   type: "text" as const,
-                  text: `Error: Site with ID '${siteId}' not found. Available sites: ${availableSites}`,
+                  text: error.toString(),
                 },
               ],
               isError: true,
@@ -116,10 +131,7 @@ export class ToolRegistry {
             content: [
               {
                 type: "text" as const,
-                text:
-                  typeof result === "string"
-                    ? result
-                    : JSON.stringify(result, null, 2),
+                text: typeof result === "string" ? result : JSON.stringify(result, null, 2),
               },
             ],
           };
@@ -136,6 +148,19 @@ export class ToolRegistry {
             };
           }
 
+          // Handle enhanced errors with suggestions
+          if (error instanceof EnhancedError) {
+            return {
+              content: [
+                {
+                  type: "text" as const,
+                  text: error.toString(),
+                },
+              ],
+              isError: true,
+            };
+          }
+
           return {
             content: [
               {
@@ -195,6 +220,52 @@ export class ToolRegistry {
     }
   }
 
+  /**
+   * Intelligent site selection based on context
+   */
+  private selectBestSite(toolName: string, args: any): string {
+    const availableSites = Array.from(this.wordpressClients.keys());
+
+    // Single site scenario - use it directly
+    if (availableSites.length === 1) {
+      return availableSites[0];
+    }
+
+    // Multiple sites scenario - intelligent selection
+    if (availableSites.length > 1) {
+      // Try to find a site based on context clues
+
+      // 1. Check if there's a 'default' site
+      if (availableSites.includes("default")) {
+        return "default";
+      }
+
+      // 2. Check if there's a 'main' or 'primary' site
+      const primarySites = availableSites.filter((site) =>
+        ["main", "primary", "prod", "production"].includes(site.toLowerCase()),
+      );
+      if (primarySites.length > 0) {
+        return primarySites[0];
+      }
+
+      // 3. For development/test operations, prefer dev sites
+      if (toolName.includes("test") || process.env.NODE_ENV === "development") {
+        const devSites = availableSites.filter((site) =>
+          ["dev", "test", "staging", "local"].includes(site.toLowerCase()),
+        );
+        if (devSites.length > 0) {
+          return devSites[0];
+        }
+      }
+
+      // 4. Default to first available site
+      return availableSites[0];
+    }
+
+    // Fallback to 'default' if no sites available
+    return "default";
+  }
+
   /**
    * Check if error is authentication-related
    */

package/src/tools/auth.ts

@@ -16,21 +16,25 @@ export class AuthTools {
       {
         name: "wp_test_auth",
         description:
-          "Tests the authentication and connectivity for a configured WordPress site.",
+          "Tests the authentication and connectivity for a configured WordPress site with detailed connection diagnostics.\n\n" +
+          "**Usage Examples:**\n" +
+          "• Test connection: `wp_test_auth`\n" +
+          '• Multi-site test: `wp_test_auth --site="my-site"`\n' +
+          "• Verify setup: Use this after configuring new credentials\n" +
+          "• Troubleshoot: Run when experiencing connection issues\n" +
+          "• Health check: Regular verification of WordPress connectivity",
         parameters: [], // The 'site' parameter is added dynamically by the server
         handler: this.handleTestAuth.bind(this),
       },
       {
         name: "wp_get_auth_status",
-        description:
-          "Gets the current authentication status for a configured WordPress site.",
+        description: "Gets the current authentication status for a configured WordPress site.",
         parameters: [],
         handler: this.handleGetAuthStatus.bind(this),
       },
       {
         name: "wp_switch_auth_method",
-        description:
-          "Switches the authentication method for a site for the current session.",
+        description: "Switches the authentication method for a site for the current session.",
         parameters: [
           {
             name: "method",
@@ -42,14 +46,12 @@ export class AuthTools {
           {
             name: "username",
             type: "string",
-            description:
-              "The username for 'app-password' or 'basic' authentication.",
+            description: "The username for 'app-password' or 'basic' authentication.",
           },
           {
             name: "password",
             type: "string",
-            description:
-              "The Application Password for 'app-password' or password for 'basic' auth.",
+            description: "The Application Password for 'app-password' or password for 'basic' auth.",
           },
           {
             name: "jwt_token",
@@ -69,10 +71,7 @@ export class AuthTools {
    * @param params - The parameters for the tool request.
    * @returns A promise that resolves to an MCPToolResponse.
    */
-  public async handleTestAuth(
-    client: WordPressClient,
-    params: any,
-  ): Promise<any> {
+  public async handleTestAuth(client: WordPressClient, params: any): Promise<any> {
     try {
       await client.ping();
       const user = await client.getCurrentUser();
@@ -99,10 +98,7 @@ export class AuthTools {
    * @param params - The parameters for the tool request.
    * @returns A promise that resolves to an MCPToolResponse.
    */
-  public async handleGetAuthStatus(
-    client: WordPressClient,
-    params: any,
-  ): Promise<any> {
+  public async handleGetAuthStatus(client: WordPressClient, params: any): Promise<any> {
     try {
       const isAuthenticated = client.isAuthenticated;
       const config = client.config;
@@ -115,8 +111,7 @@ export class AuthTools {
         const user = await client.getCurrentUser();
         content += `**User:** ${user.name} (@${user.slug})\n`;
       } else {
-        content +=
-          "**Status:** Not connected. Use 'wp_test_auth' to connect and verify credentials.";
+        content += "**Status:** Not connected. Use 'wp_test_auth' to connect and verify credentials.";
       }
 
       return content;
@@ -148,9 +143,7 @@ export class AuthTools {
         "Dynamic authentication method switching is not currently supported. Please update your configuration file and restart the server.",
       );
     } catch (error) {
-      throw new Error(
-        `Failed to switch auth method: ${getErrorMessage(error)}`,
-      );
+      throw new Error(`Failed to switch auth method: ${getErrorMessage(error)}`);
     }
   }
 }