chore: check for default message, use MCP schema type, tweak formatting of delete docs

Author: gagik

src/elicitation.ts

@@ -1,4 +1,4 @@
-import type { PrimitiveSchemaDefinition } from "@modelcontextprotocol/sdk/types.js";
+import type { ElicitRequest } from "@modelcontextprotocol/sdk/types.js";
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 
 export class Elicitation {
@@ -37,7 +37,7 @@ export class Elicitation {
      * The schema for the confirmation question.
      * TODO: In the future would be good to use Zod 4's toJSONSchema() to generate the schema.
      */
-    public static CONFIRMATION_SCHEMA: MCPElicitationSchema = {
+    public static CONFIRMATION_SCHEMA: ElicitRequest["params"]["requestedSchema"] = {
         type: "object",
         properties: {
             confirmation: {
@@ -51,9 +51,3 @@ export class Elicitation {
         required: ["confirmation"],
     };
 }
-
-export type MCPElicitationSchema = {
-    type: "object";
-    properties: Record<string, PrimitiveSchemaDefinition>;
-    required?: string[];
-};

src/tools/mongodb/delete/deleteMany.ts

@@ -59,12 +59,12 @@ export class DeleteManyTool extends MongoDBToolBase {
 
     protected getConfirmationMessage({ database, collection, filter }: ToolArgs<typeof this.argsShape>): string {
         const filterDescription =
-            filter && Object.keys(filter).length > 0 ? EJSON.stringify(filter) : "All documents (No filter)";
+            filter && Object.keys(filter).length > 0
+                ? "```json\n" + `{ "filter": ${EJSON.stringify(filter)} }\n` + "```\n\n"
+                : "- **All documents** (No filter)\n\n";
         return (
             `You are about to delete documents from the \`${collection}\` collection in the \`${database}\` database:\n\n` +
-            "```json\n" +
-            `{ "filter": ${filterDescription} }\n` +
-            "```\n\n" +
+            filterDescription +
             "This operation will permanently remove all documents matching the filter.\n\n" +
             "**Do you confirm the execution of the action?**"
         );

tests/integration/elicitation.test.ts

@@ -25,7 +25,7 @@ describe("Elicitation Integration Tests", () => {
             { elicitInput: mockElicitInput }
         );
 
-        describe("tools requiring confirmation", () => {
+        describe("tools requiring confirmation by default", () => {
             it("should request confirmation for drop-database tool and proceed when confirmed", async () => {
                 mockElicitInput.confirmYes();
 
@@ -37,19 +37,7 @@ describe("Elicitation Integration Tests", () => {
                 expect(mockElicitInput.mock).toHaveBeenCalledTimes(1);
                 expect(mockElicitInput.mock).toHaveBeenCalledWith({
                     message: expect.stringContaining("You are about to drop the `test-db` database"),
-                    requestedSchema: {
-                        type: "object",
-                        properties: {
-                            confirmation: {
-                                type: "string",
-                                title: "Would you like to confirm?",
-                                description: "Would you like to confirm?",
-                                enum: ["Yes", "No"],
-                                enumNames: ["Yes, I confirm", "No, I do not confirm"],
-                            },
-                        },
-                        required: ["confirmation"],
-                    },
+                    requestedSchema: Elicitation.CONFIRMATION_SCHEMA,
                 });
 
                 // Should attempt to execute (will fail due to no connection, but confirms flow worked)
@@ -154,7 +142,7 @@ describe("Elicitation Integration Tests", () => {
             });
         });
 
-        describe("tools not requiring confirmation", () => {
+        describe("tools not requiring confirmation by default", () => {
             it("should not request confirmation for read operations", async () => {
                 const result = await integration.mcpClient().callTool({
                     name: "list-databases",
@@ -189,7 +177,7 @@ describe("Elicitation Integration Tests", () => {
             { getClientCapabilities: () => ({}) }
         );
 
-        it("should proceed without confirmation for destructive tools when client lacks elicitation support", async () => {
+        it("should proceed without confirmation for default confirmation-required tools when client lacks elicitation support", async () => {
             const result = await integration.mcpClient().callTool({
                 name: "drop-database",
                 arguments: { database: "test-db" },
@@ -217,7 +205,7 @@ describe("Elicitation Integration Tests", () => {
             { elicitInput: mockElicitInput }
         );
 
-        it("should respect custom confirmationRequiredTools configuration", async () => {
+        it("should confirm with a generic message with custom configurations for other tools", async () => {
             mockElicitInput.confirmYes();
 
             await integration.mcpClient().callTool({
@@ -226,6 +214,12 @@ describe("Elicitation Integration Tests", () => {
             });
 
             expect(mockElicitInput.mock).toHaveBeenCalledTimes(1);
+            expect(mockElicitInput.mock).toHaveBeenCalledWith({
+                message: expect.stringMatching(
+                    /You are about to execute the `list-databases` tool which requires additional confirmation. Would you like to proceed\?/
+                ),
+                requestedSchema: expect.objectContaining(Elicitation.CONFIRMATION_SCHEMA),
+            });
         });
 
         it("should not request confirmation when tool is removed from default confirmationRequiredTools", async () => {