@neverinfamous/mysql-mcp 2.3.0 → 3.0.0

package/src/adapters/mysql/tools/sysschema/__tests__/performance.test.ts

@@ -67,6 +67,21 @@ describe("Sys Schema Performance Tools", () => {
       const call = mockAdapter.executeQuery.mock.calls[0][0] as string;
       expect(call).toContain("ORDER BY exec_count DESC");
     });
+
+    it("should return structured error for invalid orderBy", async () => {
+      const tool = createSysStatementSummaryTool(
+        mockAdapter as unknown as MySQLAdapter,
+      );
+      const result = (await tool.handler(
+        { orderBy: "invalid_order" },
+        mockContext,
+      )) as { success: boolean; error: string };
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain("Invalid orderBy");
+      expect(result.error).toContain("invalid_order");
+      expect(mockAdapter.executeQuery).not.toHaveBeenCalled();
+    });
   });
 
   describe("createSysWaitSummaryTool", () => {
@@ -130,6 +145,21 @@ describe("Sys Schema Performance Tools", () => {
       expect(call).toContain("AS avg_latency");
       expect(call).toContain("AS total");
     });
+
+    it("should return structured error for invalid type", async () => {
+      const tool = createSysWaitSummaryTool(
+        mockAdapter as unknown as MySQLAdapter,
+      );
+      const result = (await tool.handler(
+        { type: "invalid_type" },
+        mockContext,
+      )) as { success: boolean; error: string };
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain("Invalid type");
+      expect(result.error).toContain("invalid_type");
+      expect(mockAdapter.executeQuery).not.toHaveBeenCalled();
+    });
   });
 
   describe("createSysIOSummaryTool", () => {
@@ -179,5 +209,20 @@ describe("Sys Schema Performance Tools", () => {
       expect(call).toContain("sys.io_global_by_wait_by_latency");
       expect(call).toContain("event_name");
     });
+
+    it("should return structured error for invalid type", async () => {
+      const tool = createSysIOSummaryTool(
+        mockAdapter as unknown as MySQLAdapter,
+      );
+      const result = (await tool.handler(
+        { type: "invalid_type" },
+        mockContext,
+      )) as { success: boolean; error: string };
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain("Invalid type");
+      expect(result.error).toContain("invalid_type");
+      expect(mockAdapter.executeQuery).not.toHaveBeenCalled();
+    });
   });
 });

package/src/adapters/mysql/tools/sysschema/__tests__/resources.test.ts

@@ -124,7 +124,7 @@ describe("Sys Schema Resource Tools", () => {
       expect(result.autoIncrementStatusCount).toBe(0);
     });
 
-    it("should return exists: false for nonexistent schema (P154)", async () => {
+    it("should return structured error for nonexistent schema (P154)", async () => {
       // Mock schema existence check returning empty
       mockAdapter.executeQuery.mockResolvedValueOnce(createMockQueryResult([]));
 
@@ -134,9 +134,12 @@ describe("Sys Schema Resource Tools", () => {
       const result = (await tool.handler(
         { schema: "nonexistent_db" },
         mockContext,
-      )) as { exists: boolean; schema: string };
+      )) as { success: boolean; error: string };
 
-      expect(result).toEqual({ exists: false, schema: "nonexistent_db" });
+      expect(result).toEqual({
+        success: false,
+        error: "Schema 'nonexistent_db' does not exist",
+      });
       // Should only call the schema check, not the 3 stats queries
       expect(mockAdapter.executeQuery).toHaveBeenCalledTimes(1);
     });

package/src/adapters/mysql/tools/sysschema/activity.ts

@@ -5,13 +5,22 @@
  * 2 tools: user_summary, host_summary.
  */
 
-import { z } from "zod";
+import { z, ZodError } from "zod";
 import type { MySQLAdapter } from "../../MySQLAdapter.js";
 import type {
   ToolDefinition,
   RequestContext,
 } from "../../../../types/index.js";
 
+// =============================================================================
+// Helpers
+// =============================================================================
+
+/** 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("; ");
+}
+
 // =============================================================================
 // Zod Schemas
 // =============================================================================
@@ -45,9 +54,10 @@ export function createSysUserSummaryTool(
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { user, limit } = UserSummarySchema.parse(params);
+      try {
+        const { user, limit } = UserSummarySchema.parse(params);
 
-      let query = `
+        let query = `
                 SELECT 
                     user,
                     statements,
@@ -61,19 +71,26 @@ export function createSysUserSummaryTool(
                 FROM sys.user_summary
             `;
 
-      const queryParams: unknown[] = [];
-      if (user) {
-        query += " WHERE user = ?";
-        queryParams.push(user);
-      }
+        const queryParams: unknown[] = [];
+        if (user) {
+          query += " WHERE user = ?";
+          queryParams.push(user);
+        }
 
-      query += ` ORDER BY statement_latency DESC LIMIT ${String(limit)}`;
+        query += ` ORDER BY statement_latency DESC LIMIT ${String(limit)}`;
 
-      const result = await adapter.executeQuery(query, queryParams);
-      return {
-        users: result.rows,
-        count: result.rows?.length ?? 0,
-      };
+        const result = await adapter.executeQuery(query, queryParams);
+        return {
+          users: result.rows,
+          count: 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 };
+      }
     },
   };
 }
@@ -96,9 +113,10 @@ export function createSysHostSummaryTool(
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { host, limit } = HostSummarySchema.parse(params);
+      try {
+        const { host, limit } = HostSummarySchema.parse(params);
 
-      let query = `
+        let query = `
                 SELECT 
                     host,
                     statements,
@@ -112,19 +130,26 @@ export function createSysHostSummaryTool(
                 FROM sys.host_summary
             `;
 
-      const queryParams: unknown[] = [];
-      if (host) {
-        query += " WHERE host = ?";
-        queryParams.push(host);
-      }
+        const queryParams: unknown[] = [];
+        if (host) {
+          query += " WHERE host = ?";
+          queryParams.push(host);
+        }
 
-      query += ` ORDER BY statement_latency DESC LIMIT ${String(limit)}`;
+        query += ` ORDER BY statement_latency DESC LIMIT ${String(limit)}`;
 
-      const result = await adapter.executeQuery(query, queryParams);
-      return {
-        hosts: result.rows,
-        count: result.rows?.length ?? 0,
-      };
+        const result = await adapter.executeQuery(query, queryParams);
+        return {
+          hosts: result.rows,
+          count: 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 };
+      }
     },
   };
 }

package/src/adapters/mysql/tools/sysschema/performance.ts

@@ -5,44 +5,55 @@
  * 3 tools: statement_summary, wait_summary, io_summary.
  */
 
-import { z } from "zod";
+import { z, ZodError } from "zod";
 import type { MySQLAdapter } from "../../MySQLAdapter.js";
 import type {
   ToolDefinition,
   RequestContext,
 } from "../../../../types/index.js";
 
+// =============================================================================
+// Helpers
+// =============================================================================
+
+/** 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("; ");
+}
+
 // =============================================================================
 // Zod Schemas
 // =============================================================================
 
+const VALID_ORDER_BY = [
+  "total_latency",
+  "exec_count",
+  "avg_latency",
+  "rows_sent",
+  "rows_examined",
+] as const;
+
 const StatementSummarySchema = z.object({
-  orderBy: z
-    .enum([
-      "total_latency",
-      "exec_count",
-      "avg_latency",
-      "rows_sent",
-      "rows_examined",
-    ])
-    .default("total_latency")
-    .describe("Order results by"),
+  orderBy: z.string().default("total_latency").describe("Order results by"),
   limit: z.number().default(20).describe("Maximum number of results"),
 });
 
+const VALID_WAIT_TYPES = [
+  "global",
+  "by_host",
+  "by_user",
+  "by_instance",
+] as const;
+
 const WaitSummarySchema = z.object({
-  type: z
-    .enum(["global", "by_host", "by_user", "by_instance"])
-    .default("global")
-    .describe("Type of wait summary"),
+  type: z.string().default("global").describe("Type of wait summary"),
   limit: z.number().default(20).describe("Maximum number of results"),
 });
 
+const VALID_IO_TYPES = ["file", "table", "global"] as const;
+
 const IOSummarySchema = z.object({
-  type: z
-    .enum(["file", "table", "global"])
-    .default("table")
-    .describe("Type of I/O summary"),
+  type: z.string().default("table").describe("Type of I/O summary"),
   limit: z.number().default(20).describe("Maximum number of results"),
 });
 
@@ -65,9 +76,19 @@ export function createSysStatementSummaryTool(
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { orderBy, limit } = StatementSummarySchema.parse(params);
+      try {
+        const { orderBy, limit } = StatementSummarySchema.parse(params);
 
-      const query = `
+        if (
+          !VALID_ORDER_BY.includes(orderBy as (typeof VALID_ORDER_BY)[number])
+        ) {
+          return {
+            success: false,
+            error: `Invalid orderBy: '${orderBy}' — expected one of: ${VALID_ORDER_BY.join(", ")}`,
+          };
+        }
+
+        const query = `
                 SELECT 
                     query,
                     db,
@@ -84,12 +105,19 @@ export function createSysStatementSummaryTool(
                 LIMIT ${String(limit)}
             `;
 
-      const result = await adapter.executeQuery(query);
-      return {
-        statements: result.rows,
-        orderedBy: orderBy,
-        count: result.rows?.length ?? 0,
-      };
+        const result = await adapter.executeQuery(query);
+        return {
+          statements: result.rows,
+          orderedBy: orderBy,
+          count: 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 };
+      }
     },
   };
 }
@@ -113,13 +141,23 @@ export function createSysWaitSummaryTool(
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { type, limit } = WaitSummarySchema.parse(params);
+      try {
+        const { type, limit } = WaitSummarySchema.parse(params);
 
-      let query: string;
+        if (
+          !VALID_WAIT_TYPES.includes(type as (typeof VALID_WAIT_TYPES)[number])
+        ) {
+          return {
+            success: false,
+            error: `Invalid type: '${type}' — expected one of: ${VALID_WAIT_TYPES.join(", ")}`,
+          };
+        }
 
-      switch (type) {
-        case "global":
-          query = `
+        let query: string;
+
+        switch (type) {
+          case "global":
+            query = `
                         SELECT 
                             events,
                             total,
@@ -129,9 +167,9 @@ export function createSysWaitSummaryTool(
                         ORDER BY total_latency DESC
                         LIMIT ${String(limit)}
                     `;
-          break;
-        case "by_host":
-          query = `
+            break;
+          case "by_host":
+            query = `
                         SELECT 
                             host,
                             event,
@@ -142,9 +180,9 @@ export function createSysWaitSummaryTool(
                         ORDER BY total_latency DESC
                         LIMIT ${String(limit)}
                     `;
-          break;
-        case "by_user":
-          query = `
+            break;
+          case "by_user":
+            query = `
                         SELECT 
                             user,
                             event,
@@ -155,9 +193,9 @@ export function createSysWaitSummaryTool(
                         ORDER BY total_latency DESC
                         LIMIT ${String(limit)}
                     `;
-          break;
-        case "by_instance":
-          query = `
+            break;
+          case "by_instance":
+            query = `
                         SELECT 
                             event_name AS event,
                             count_star AS total,
@@ -167,15 +205,24 @@ export function createSysWaitSummaryTool(
                         ORDER BY sum_timer_wait DESC
                         LIMIT ${String(limit)}
                     `;
-          break;
-      }
+            break;
+          default:
+            throw new Error(`Unexpected type: ${type}`);
+        }
 
-      const result = await adapter.executeQuery(query);
-      return {
-        waits: result.rows,
-        type,
-        count: result.rows?.length ?? 0,
-      };
+        const result = await adapter.executeQuery(query);
+        return {
+          waits: result.rows,
+          type,
+          count: 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 };
+      }
     },
   };
 }
@@ -197,13 +244,21 @@ export function createSysIOSummaryTool(adapter: MySQLAdapter): ToolDefinition {
       idempotentHint: true,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { type, limit } = IOSummarySchema.parse(params);
+      try {
+        const { type, limit } = IOSummarySchema.parse(params);
+
+        if (!VALID_IO_TYPES.includes(type as (typeof VALID_IO_TYPES)[number])) {
+          return {
+            success: false,
+            error: `Invalid type: '${type}' — expected one of: ${VALID_IO_TYPES.join(", ")}`,
+          };
+        }
 
-      let query: string;
+        let query: string;
 
-      switch (type) {
-        case "file":
-          query = `
+        switch (type) {
+          case "file":
+            query = `
                         SELECT 
                             file,
                             count_read,
@@ -218,9 +273,9 @@ export function createSysIOSummaryTool(adapter: MySQLAdapter): ToolDefinition {
                         ORDER BY total DESC
                         LIMIT ${String(limit)}
                     `;
-          break;
-        case "table":
-          query = `
+            break;
+          case "table":
+            query = `
                         SELECT 
                             table_schema,
                             table_name,
@@ -236,9 +291,9 @@ export function createSysIOSummaryTool(adapter: MySQLAdapter): ToolDefinition {
                         ORDER BY (fetch_latency + insert_latency + update_latency + delete_latency) DESC
                         LIMIT ${String(limit)}
                     `;
-          break;
-        case "global":
-          query = `
+            break;
+          case "global":
+            query = `
                         SELECT 
                             event_name,
                             total,
@@ -248,15 +303,24 @@ export function createSysIOSummaryTool(adapter: MySQLAdapter): ToolDefinition {
                         ORDER BY total_latency DESC
                         LIMIT ${String(limit)}
                     `;
-          break;
-      }
+            break;
+          default:
+            throw new Error(`Unexpected type: ${type}`);
+        }
 
-      const result = await adapter.executeQuery(query);
-      return {
-        ioStats: result.rows,
-        type,
-        count: result.rows?.length ?? 0,
-      };
+        const result = await adapter.executeQuery(query);
+        return {
+          ioStats: result.rows,
+          type,
+          count: 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 };
+      }
     },
   };
 }