@neverinfamous/mysql-mcp 2.3.0 → 3.0.0

package/src/adapters/mysql/tools/admin/maintenance.ts

@@ -5,6 +5,7 @@
  * 6 tools: optimize, analyze, check, repair, flush, kill.
  */
 
+import { ZodError } from "zod";
 import type { MySQLAdapter } from "../../MySQLAdapter.js";
 import type {
   ToolDefinition,
@@ -17,11 +18,18 @@ import {
   AnalyzeTableSchemaBase,
   CheckTableSchema,
   CheckTableSchemaBase,
+  RepairTableSchema,
+  RepairTableSchemaBase,
   FlushTablesSchema,
   FlushTablesSchemaBase,
   KillQuerySchema,
+  KillQuerySchemaBase,
 } from "../../types.js";
-import { z } from "zod";
+
+/** Extract human-readable messages from a ZodError instead of raw JSON array */
+function formatZodError(error: ZodError): string {
+  return error.issues.map((i) => i.message).join("; ");
+}
 
 export function createOptimizeTableTool(adapter: MySQLAdapter): ToolDefinition {
   return {
@@ -36,10 +44,20 @@ export function createOptimizeTableTool(adapter: MySQLAdapter): ToolDefinition {
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { tables } = OptimizeTableSchema.parse(params);
-      const tableList = tables.map((t) => `\`${t}\``).join(", ");
-      const result = await adapter.executeQuery(`OPTIMIZE TABLE ${tableList}`);
-      return { results: result.rows, rowCount: result.rows?.length ?? 0 };
+      try {
+        const { tables } = OptimizeTableSchema.parse(params);
+        const tableList = tables.map((t) => `\`${t}\``).join(", ");
+        const result = await adapter.executeQuery(
+          `OPTIMIZE TABLE ${tableList}`,
+        );
+        return { results: result.rows, rowCount: result.rows?.length ?? 0 };
+      } catch (error) {
+        if (error instanceof ZodError) {
+          return { success: false, error: formatZodError(error) };
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        return { success: false, error: message };
+      }
     },
   };
 }
@@ -58,10 +76,18 @@ export function createAnalyzeTableTool(adapter: MySQLAdapter): ToolDefinition {
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { tables } = AnalyzeTableSchema.parse(params);
-      const tableList = tables.map((t) => `\`${t}\``).join(", ");
-      const result = await adapter.executeQuery(`ANALYZE TABLE ${tableList}`);
-      return { results: result.rows, rowCount: result.rows?.length ?? 0 };
+      try {
+        const { tables } = AnalyzeTableSchema.parse(params);
+        const tableList = tables.map((t) => `\`${t}\``).join(", ");
+        const result = await adapter.executeQuery(`ANALYZE TABLE ${tableList}`);
+        return { results: result.rows, rowCount: result.rows?.length ?? 0 };
+      } catch (error) {
+        if (error instanceof ZodError) {
+          return { success: false, error: formatZodError(error) };
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        return { success: false, error: message };
+      }
     },
   };
 }
@@ -79,46 +105,57 @@ export function createCheckTableTool(adapter: MySQLAdapter): ToolDefinition {
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { tables, option } = CheckTableSchema.parse(params);
-      const tableList = tables.map((t) => `\`${t}\``).join(", ");
-      const optionClause = option ? ` ${option}` : "";
-      // Use rawQuery - CHECK TABLE not supported in prepared statement protocol
-      const result = await adapter.rawQuery(
-        `CHECK TABLE ${tableList}${optionClause}`,
-      );
-      return {
-        results: result.rows ?? [],
-        rowCount: result.rows?.length ?? 0,
-      };
+      try {
+        const { tables, option } = CheckTableSchema.parse(params);
+        const tableList = tables.map((t) => `\`${t}\``).join(", ");
+        const optionClause = option ? ` ${option}` : "";
+        // Use rawQuery - CHECK TABLE not supported in prepared statement protocol
+        const result = await adapter.rawQuery(
+          `CHECK TABLE ${tableList}${optionClause}`,
+        );
+        return {
+          results: result.rows ?? [],
+          rowCount: result.rows?.length ?? 0,
+        };
+      } catch (error) {
+        if (error instanceof ZodError) {
+          return { success: false, error: formatZodError(error) };
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        return { success: false, error: message };
+      }
     },
   };
 }
 
 export function createRepairTableTool(adapter: MySQLAdapter): ToolDefinition {
-  const schema = z.object({
-    tables: z.array(z.string()),
-    quick: z.boolean().optional().default(false),
-  });
-
   return {
     name: "mysql_repair_table",
     title: "MySQL Repair Table",
     description: "Repair corrupted tables (MyISAM only).",
     group: "admin",
-    inputSchema: schema,
+    inputSchema: RepairTableSchemaBase,
     requiredScopes: ["admin"],
     annotations: {
       readOnlyHint: false,
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { tables, quick } = schema.parse(params);
-      const tableList = tables.map((t) => `\`${t}\``).join(", ");
-      const quickClause = quick ? " QUICK" : "";
-      const result = await adapter.executeQuery(
-        `REPAIR TABLE ${tableList}${quickClause}`,
-      );
-      return { results: result.rows, rowCount: result.rows?.length ?? 0 };
+      try {
+        const { tables, quick } = RepairTableSchema.parse(params);
+        const tableList = tables.map((t) => `\`${t}\``).join(", ");
+        const quickClause = quick ? " QUICK" : "";
+        const result = await adapter.executeQuery(
+          `REPAIR TABLE ${tableList}${quickClause}`,
+        );
+        return { results: result.rows, rowCount: result.rows?.length ?? 0 };
+      } catch (error) {
+        if (error instanceof ZodError) {
+          return { success: false, error: formatZodError(error) };
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        return { success: false, error: message };
+      }
     },
   };
 }
@@ -136,43 +173,52 @@ export function createFlushTablesTool(adapter: MySQLAdapter): ToolDefinition {
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { tables } = FlushTablesSchema.parse(params);
+      try {
+        const { tables } = FlushTablesSchema.parse(params);
 
-      if (tables && tables.length > 0) {
-        // Pre-check table existence since FLUSH TABLES silently succeeds for nonexistent tables
-        const placeholders = tables.map(() => "?").join(", ");
-        const checkResult = await adapter.executeReadQuery(
-          `SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME IN (${placeholders})`,
-          tables,
-        );
-        const foundTables = new Set(
-          (checkResult.rows ?? []).map(
-            (r: Record<string, unknown>) => r["TABLE_NAME"] as string,
-          ),
-        );
-        const notFound = tables.filter((t) => !foundTables.has(t));
+        if (tables && tables.length > 0) {
+          // Pre-check table existence since FLUSH TABLES silently succeeds for nonexistent tables
+          const placeholders = tables.map(() => "?").join(", ");
+          const checkResult = await adapter.executeReadQuery(
+            `SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME IN (${placeholders})`,
+            tables,
+          );
+          const foundTables = new Set(
+            (checkResult.rows ?? []).map(
+              (r: Record<string, unknown>) => r["TABLE_NAME"] as string,
+            ),
+          );
+          const notFound = tables.filter((t) => !foundTables.has(t));
 
-        if (notFound.length > 0) {
-          // Flush valid tables before reporting missing ones
-          const validTables = tables.filter((t) => foundTables.has(t));
-          if (validTables.length > 0) {
-            const validList = validTables.map((t) => `\`${t}\``).join(", ");
-            await adapter.executeQuery(`FLUSH TABLES ${validList}`);
+          if (notFound.length > 0) {
+            // Flush valid tables before reporting missing ones
+            const validTables = tables.filter((t) => foundTables.has(t));
+            if (validTables.length > 0) {
+              const validList = validTables.map((t) => `\`${t}\``).join(", ");
+              await adapter.executeQuery(`FLUSH TABLES ${validList}`);
+            }
+            return {
+              success: false,
+              error: `Tables not found: ${notFound.join(", ")}`,
+              notFound,
+              flushed: validTables,
+            };
           }
-          return {
-            success: false,
-            notFound,
-            flushed: validTables,
-          };
+
+          const tableList = tables.map((t) => `\`${t}\``).join(", ");
+          await adapter.executeQuery(`FLUSH TABLES ${tableList}`);
+        } else {
+          await adapter.executeQuery("FLUSH TABLES");
         }
 
-        const tableList = tables.map((t) => `\`${t}\``).join(", ");
-        await adapter.executeQuery(`FLUSH TABLES ${tableList}`);
-      } else {
-        await adapter.executeQuery("FLUSH TABLES");
+        return { success: true };
+      } catch (error) {
+        if (error instanceof ZodError) {
+          return { success: false, error: formatZodError(error) };
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        return { success: false, error: message };
       }
-
-      return { success: true };
     },
   };
 }
@@ -183,27 +229,30 @@ export function createKillQueryTool(adapter: MySQLAdapter): ToolDefinition {
     title: "MySQL Kill Query",
     description: "Kill a running query or connection.",
     group: "admin",
-    inputSchema: KillQuerySchema,
+    inputSchema: KillQuerySchemaBase,
     requiredScopes: ["admin"],
     annotations: {
       readOnlyHint: false,
       destructiveHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { processId, connection } = KillQuerySchema.parse(params);
-      const killType = connection ? "CONNECTION" : "QUERY";
       try {
+        const { processId, connection } = KillQuerySchema.parse(params);
+        const killType = connection ? "CONNECTION" : "QUERY";
         await adapter.executeQuery(`KILL ${killType} ${processId}`);
         return { success: true, killed: processId, type: killType };
       } catch (error) {
+        if (error instanceof ZodError) {
+          return { success: false, error: formatZodError(error) };
+        }
         const message = error instanceof Error ? error.message : String(error);
         if (message.includes("Unknown thread id")) {
           return {
             success: false,
-            error: `Process ID ${processId} not found`,
+            error: `Process ID ${/\d+/.exec(message)?.[0] ?? "unknown"} not found`,
           };
         }
-        throw error;
+        return { success: false, error: message };
       }
     },
   };

package/src/adapters/mysql/tools/admin/monitoring.ts

@@ -15,7 +15,7 @@ import {
   ShowStatusSchema,
   ShowVariablesSchema,
 } from "../../types.js";
-import { z } from "zod";
+import { z, ZodError } from "zod";
 
 export function createShowProcesslistTool(
   adapter: MySQLAdapter,
@@ -32,10 +32,21 @@ export function createShowProcesslistTool(
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { full } = ShowProcesslistSchema.parse(params);
-      const sql = full ? "SHOW FULL PROCESSLIST" : "SHOW PROCESSLIST";
-      const result = await adapter.executeQuery(sql);
-      return { processes: result.rows };
+      try {
+        const { full } = ShowProcesslistSchema.parse(params);
+        const sql = full ? "SHOW FULL PROCESSLIST" : "SHOW PROCESSLIST";
+        const result = await adapter.executeQuery(sql);
+        return { processes: result.rows };
+      } catch (err) {
+        if (err instanceof ZodError) {
+          const messages = err.issues.map((i) => i.message).join("; ");
+          return { success: false as const, error: messages };
+        }
+        return {
+          success: false as const,
+          error: err instanceof Error ? err.message : String(err),
+        };
+      }
     },
   };
 }
@@ -53,49 +64,68 @@ export function createShowStatusTool(adapter: MySQLAdapter): ToolDefinition {
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { like, global, limit } = ShowStatusSchema.parse(params);
-      const effectiveLimit = limit ?? 100;
+      try {
+        const { like, global, limit } = ShowStatusSchema.parse(params);
+        if (limit !== undefined && limit < 1) {
+          return {
+            success: false as const,
+            error: "limit must be a positive integer",
+          };
+        }
+        const effectiveLimit = limit ?? 100;
 
-      let sql = global ? "SHOW GLOBAL STATUS" : "SHOW STATUS";
+        let sql = global ? "SHOW GLOBAL STATUS" : "SHOW STATUS";
 
-      // SHOW commands don't support parameter binding - build SQL directly
-      if (like) {
-        // Escape the like pattern for safety
-        const escapedLike = like.replace(/'/g, "''");
-        sql += ` LIKE '${escapedLike}'`;
-      }
+        // SHOW commands don't support parameter binding - build SQL directly
+        if (like) {
+          // Escape the like pattern for safety
+          const escapedLike = like.replace(/'/g, "''");
+          sql += ` LIKE '${escapedLike}'`;
+        }
 
-      const result = await adapter.rawQuery(sql);
-
-      // Convert to object for easier use
-      // Handle both uppercase and Pascal case column names
-      const status: Record<string, string> = {};
-      for (const row of result.rows ?? []) {
-        const name = (row["Variable_name"] ??
-          row["VARIABLE_NAME"] ??
-          row["variable_name"]) as string;
-        const value = (row["Value"] ?? row["VALUE"] ?? row["value"]) as string;
-        if (name) {
-          // Redact RSA public key blobs (multi-line PEM certificates)
-          status[name] = value?.includes("-----BEGIN PUBLIC KEY-----")
-            ? "[REDACTED]"
-            : value;
+        const result = await adapter.rawQuery(sql);
+
+        // Convert to object for easier use
+        // Handle both uppercase and Pascal case column names
+        const status: Record<string, string> = {};
+        for (const row of result.rows ?? []) {
+          const name = (row["Variable_name"] ??
+            row["VARIABLE_NAME"] ??
+            row["variable_name"]) as string;
+          const value = (row["Value"] ??
+            row["VALUE"] ??
+            row["value"]) as string;
+          if (name) {
+            // Redact RSA public key blobs (multi-line PEM certificates)
+            status[name] = value?.includes("-----BEGIN PUBLIC KEY-----")
+              ? "[REDACTED]"
+              : value;
+          }
         }
-      }
 
-      const totalAvailable = Object.keys(status).length;
-      const entries = Object.entries(status);
-      const limited = entries.length > effectiveLimit;
-      const truncated = limited
-        ? Object.fromEntries(entries.slice(0, effectiveLimit))
-        : status;
-
-      return {
-        status: truncated,
-        rowCount: Object.keys(truncated).length,
-        totalAvailable,
-        ...(limited && { limited: true }),
-      };
+        const totalAvailable = Object.keys(status).length;
+        const entries = Object.entries(status);
+        const limited = entries.length > effectiveLimit;
+        const truncated = limited
+          ? Object.fromEntries(entries.slice(0, effectiveLimit))
+          : status;
+
+        return {
+          status: truncated,
+          rowCount: Object.keys(truncated).length,
+          totalAvailable,
+          ...(limited && { limited: true }),
+        };
+      } catch (err) {
+        if (err instanceof ZodError) {
+          const messages = err.issues.map((i) => i.message).join("; ");
+          return { success: false as const, error: messages };
+        }
+        return {
+          success: false as const,
+          error: err instanceof Error ? err.message : String(err),
+        };
+      }
     },
   };
 }
@@ -113,46 +143,65 @@ export function createShowVariablesTool(adapter: MySQLAdapter): ToolDefinition {
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { like, global, limit } = ShowVariablesSchema.parse(params);
-      const effectiveLimit = limit ?? 100;
+      try {
+        const { like, global, limit } = ShowVariablesSchema.parse(params);
+        if (limit !== undefined && limit < 1) {
+          return {
+            success: false as const,
+            error: "limit must be a positive integer",
+          };
+        }
+        const effectiveLimit = limit ?? 100;
 
-      let sql = global ? "SHOW GLOBAL VARIABLES" : "SHOW VARIABLES";
+        let sql = global ? "SHOW GLOBAL VARIABLES" : "SHOW VARIABLES";
 
-      // SHOW commands don't support parameter binding - build SQL directly
-      if (like) {
-        // Escape the like pattern for safety
-        const escapedLike = like.replace(/'/g, "''");
-        sql += ` LIKE '${escapedLike}'`;
-      }
+        // SHOW commands don't support parameter binding - build SQL directly
+        if (like) {
+          // Escape the like pattern for safety
+          const escapedLike = like.replace(/'/g, "''");
+          sql += ` LIKE '${escapedLike}'`;
+        }
+
+        const result = await adapter.rawQuery(sql);
+
+        // Convert to object
+        // Handle both uppercase and Pascal case column names
+        const variables: Record<string, string> = {};
+        for (const row of result.rows ?? []) {
+          const name = (row["Variable_name"] ??
+            row["VARIABLE_NAME"] ??
+            row["variable_name"]) as string;
+          const value = (row["Value"] ??
+            row["VALUE"] ??
+            row["value"]) as string;
+          if (name) {
+            variables[name] = value;
+          }
+        }
 
-      const result = await adapter.rawQuery(sql);
-
-      // Convert to object
-      // Handle both uppercase and Pascal case column names
-      const variables: Record<string, string> = {};
-      for (const row of result.rows ?? []) {
-        const name = (row["Variable_name"] ??
-          row["VARIABLE_NAME"] ??
-          row["variable_name"]) as string;
-        const value = (row["Value"] ?? row["VALUE"] ?? row["value"]) as string;
-        if (name) {
-          variables[name] = value;
+        const totalAvailable = Object.keys(variables).length;
+        const entries = Object.entries(variables);
+        const limited = entries.length > effectiveLimit;
+        const truncated = limited
+          ? Object.fromEntries(entries.slice(0, effectiveLimit))
+          : variables;
+
+        return {
+          variables: truncated,
+          rowCount: Object.keys(truncated).length,
+          totalAvailable,
+          ...(limited && { limited: true }),
+        };
+      } catch (err) {
+        if (err instanceof ZodError) {
+          const messages = err.issues.map((i) => i.message).join("; ");
+          return { success: false as const, error: messages };
         }
+        return {
+          success: false as const,
+          error: err instanceof Error ? err.message : String(err),
+        };
       }
-
-      const totalAvailable = Object.keys(variables).length;
-      const entries = Object.entries(variables);
-      const limited = entries.length > effectiveLimit;
-      const truncated = limited
-        ? Object.fromEntries(entries.slice(0, effectiveLimit))
-        : variables;
-
-      return {
-        variables: truncated,
-        rowCount: Object.keys(truncated).length,
-        totalAvailable,
-        ...(limited && { limited: true }),
-      };
     },
   };
 }
@@ -263,17 +312,30 @@ export function createInnodbStatusTool(adapter: MySQLAdapter): ToolDefinition {
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { summary } = InnodbStatusSchema.parse(params);
-      const result = await adapter.executeQuery("SHOW ENGINE INNODB STATUS");
-      const rawRow = result.rows?.[0];
-      const rawStatus =
-        (rawRow?.["Status"] as string) ?? (rawRow?.["STATUS"] as string) ?? "";
-
-      if (summary) {
-        return { summary: parseInnodbStatusSummary(rawStatus) };
-      }
+      try {
+        const { summary } = InnodbStatusSchema.parse(params);
+        const result = await adapter.executeQuery("SHOW ENGINE INNODB STATUS");
+        const rawRow = result.rows?.[0];
+        const rawStatus =
+          (rawRow?.["Status"] as string) ??
+          (rawRow?.["STATUS"] as string) ??
+          "";
+
+        if (summary) {
+          return { summary: parseInnodbStatusSummary(rawStatus) };
+        }
 
-      return { status: rawRow };
+        return { status: rawRow };
+      } catch (err) {
+        if (err instanceof ZodError) {
+          const messages = err.issues.map((i) => i.message).join("; ");
+          return { success: false as const, error: messages };
+        }
+        return {
+          success: false as const,
+          error: err instanceof Error ? err.message : String(err),
+        };
+      }
     },
   };
 }
@@ -341,11 +403,18 @@ export function createPoolStatsTool(adapter: MySQLAdapter): ToolDefinition {
       idempotentHint: true,
     },
     handler: async (_params: unknown, _context: RequestContext) => {
-      const pool = await Promise.resolve(adapter.getPool());
-      if (!pool) {
-        return { error: "Pool not available" };
+      try {
+        const pool = await Promise.resolve(adapter.getPool());
+        if (!pool) {
+          return { success: false as const, error: "Pool not available" };
+        }
+        return { poolStats: pool.getStats() };
+      } catch (err) {
+        return {
+          success: false as const,
+          error: err instanceof Error ? err.message : String(err),
+        };
       }
-      return { poolStats: pool.getStats() };
     },
   };
 }
@@ -365,39 +434,46 @@ export function createServerHealthTool(adapter: MySQLAdapter): ToolDefinition {
       idempotentHint: true,
     },
     handler: async (_params: unknown, _context: RequestContext) => {
-      const health = await adapter.getHealth();
-
-      // Get additional metrics
-      const uptimeResult = await adapter.executeQuery(
-        "SHOW GLOBAL STATUS LIKE 'Uptime'",
-      );
-      const uptime = uptimeResult.rows?.[0]?.["Value"];
-
-      const connectionsResult = await adapter.executeQuery(
-        "SHOW GLOBAL STATUS LIKE 'Threads_connected'",
-      );
-      const connections = connectionsResult.rows?.[0]?.["Value"];
-
-      const queriesResult = await adapter.executeQuery(
-        "SHOW GLOBAL STATUS LIKE 'Questions'",
-      );
-      const queries = queriesResult.rows?.[0]?.["Value"];
-
-      return {
-        ...health,
-        uptime:
-          uptime != null && typeof uptime === "string"
-            ? parseInt(uptime, 10)
-            : undefined,
-        activeConnections:
-          connections != null && typeof connections === "string"
-            ? parseInt(connections, 10)
-            : undefined,
-        totalQueries:
-          queries != null && typeof queries === "string"
-            ? parseInt(queries, 10)
-            : undefined,
-      };
+      try {
+        const health = await adapter.getHealth();
+
+        // Get additional metrics
+        const uptimeResult = await adapter.executeQuery(
+          "SHOW GLOBAL STATUS LIKE 'Uptime'",
+        );
+        const uptime = uptimeResult.rows?.[0]?.["Value"];
+
+        const connectionsResult = await adapter.executeQuery(
+          "SHOW GLOBAL STATUS LIKE 'Threads_connected'",
+        );
+        const connections = connectionsResult.rows?.[0]?.["Value"];
+
+        const queriesResult = await adapter.executeQuery(
+          "SHOW GLOBAL STATUS LIKE 'Questions'",
+        );
+        const queries = queriesResult.rows?.[0]?.["Value"];
+
+        return {
+          ...health,
+          uptime:
+            uptime != null && typeof uptime === "string"
+              ? parseInt(uptime, 10)
+              : undefined,
+          activeConnections:
+            connections != null && typeof connections === "string"
+              ? parseInt(connections, 10)
+              : undefined,
+          totalQueries:
+            queries != null && typeof queries === "string"
+              ? parseInt(queries, 10)
+              : undefined,
+        };
+      } catch (err) {
+        return {
+          success: false as const,
+          error: err instanceof Error ? err.message : String(err),
+        };
+      }
     },
   };
 }