Removing non-standard enumNames for standard oneOf

Author: jake-danton

README.md

@@ -1040,8 +1040,11 @@ server.tool(
               type: "string",
               title: "Date flexibility",
               description: "How flexible are your dates?",
-              enum: ["next_day", "same_week", "next_week"],
-              enumNames: ["Next day", "Same week", "Next week"]
+              oneOf: [
+                { const: "next_day", title: "Next day" },
+                { const: "same_week", title: "Same week" },
+                { const: "next_week", title: "Next week" }
+              ],
             }
           },
           required: ["checkAlternatives"]

package-lock.json

@@ -50,7 +50,7 @@
     "client": "tsx src/cli.ts client"
   },
   "dependencies": {
-    "ajv": "^6.12.6",
+    "ajv": "^8.17.1",
     "content-type": "^1.0.5",
     "cors": "^2.8.5",
     "cross-spawn": "^7.0.5",

package.json

@@ -141,8 +141,11 @@ const getServer = () => {
                 type: 'string',
                 title: 'Theme',
                 description: 'Choose your preferred theme',
-                enum: ['light', 'dark', 'auto'],
-                enumNames: ['Light', 'Dark', 'Auto'],
+                oneOf: [
+                  { const: 'light', title: 'Light' },
+                  { const: 'dark', title: 'Dark' },
+                  { const: 'auto', title: 'Auto' }
+                ],
               },
               notifications: {
                 type: 'boolean',
@@ -154,8 +157,11 @@ const getServer = () => {
                 type: 'string',
                 title: 'Notification Frequency',
                 description: 'How often would you like notifications?',
-                enum: ['daily', 'weekly', 'monthly'],
-                enumNames: ['Daily', 'Weekly', 'Monthly'],
+                oneOf: [
+                  { const: 'daily', title: 'Daily' },
+                  { const: 'weekly', title: 'Weekly' },
+                  { const: 'monthly', title: 'Monthly' }
+                ],
               },
             },
             required: ['theme'],

src/examples/server/simpleStreamableHttp.ts

@@ -4119,8 +4119,11 @@ describe("elicitInput()", () => {
                   type: "string",
                   title: "Date flexibility",
                   description: "How flexible are your dates?",
-                  enum: ["next_day", "same_week", "next_week"],
-                  enumNames: ["Next day", "Same week", "Next week"]
+                  oneOf: [
+                    { const: "next_day", title: "Next day" },
+                    { const: "same_week", title: "Same week" },
+                    { const: "next_week", title: "Next week" }
+                  ],
                 }
               },
               required: ["checkAlternatives"]

src/server/mcp.test.ts

@@ -1212,8 +1212,10 @@ export const EnumSchemaSchema = z
     type: z.literal("string"),
     title: z.optional(z.string()),
     description: z.optional(z.string()),
-    enum: z.array(z.string()),
-    enumNames: z.optional(z.array(z.string())),
+    oneOf: z.array(z.object({
+      const: z.string(),
+      title: z.string()
+    })),
   })
   .passthrough();