elicitation support ot create_branch

Author: Rodriguespn

packages/mcp-server-supabase/src/tools/branching-tools.ts

@@ -37,25 +37,73 @@ export function getBranchingTools({
           .string()
           .default('develop')
           .describe('Name of the branch to create'),
+        // When the client supports elicitation, we will ask the user to confirm the
+        // branch cost interactively and this parameter is not required. For clients
+        // without elicitation support, this confirmation ID is required.
         confirm_cost_id: z
-          .string({
-            required_error:
-              'User must confirm understanding of costs before creating a branch.',
-          })
-          .describe('The cost confirmation ID. Call `confirm_cost` first.'),
+          .string()
+          .optional()
+          .describe(
+            'The cost confirmation ID. Call `confirm_cost` first if elicitation is not supported.'
+          ),
       }),
       inject: { project_id },
-      execute: async ({ project_id, name, confirm_cost_id }) => {
+      execute: async ({ project_id, name, confirm_cost_id }, context) => {
         if (readOnly) {
           throw new Error('Cannot create a branch in read-only mode.');
         }
 
         const cost = getBranchCost();
-        const costHash = await hashObject(cost);
-        if (costHash !== confirm_cost_id) {
-          throw new Error(
-            'Cost confirmation ID does not match the expected cost of creating a branch.'
-          );
+
+        // If the server and client support elicitation, request explicit confirmation
+        const caps = context?.server?.getClientCapabilities?.();
+        const supportsElicitation = Boolean(caps && (caps as any).elicitation);
+
+        if (
+          cost.amount > 0 &&
+          supportsElicitation &&
+          context?.server?.elicitInput
+        ) {
+          const costMessage = `$${cost.amount} per ${cost.recurrence}`;
+
+          const result = await context.server.elicitInput({
+            message: `You are about to create branch "${name}" on project ${project_id}.\n\n💰 Cost: ${costMessage}\n\nDo you want to proceed with this billable branch?`,
+            requestedSchema: {
+              type: 'object',
+              properties: {
+                confirm: {
+                  type: 'boolean',
+                  title: 'Confirm billable branch creation',
+                  description: `I understand this will cost ${costMessage} and want to proceed`,
+                },
+              },
+              required: ['confirm'],
+            },
+          });
+
+          if (result.action === 'decline' || result.action === 'cancel') {
+            throw new Error('Branch creation cancelled by user.');
+          }
+
+          if (result.action === 'accept' && !result.content?.confirm) {
+            throw new Error(
+              'You must confirm understanding of the cost to create a billable branch.'
+            );
+          }
+        } else {
+          // Fallback path (no elicitation support): require confirm_cost_id
+          if (!confirm_cost_id) {
+            throw new Error(
+              'User must confirm understanding of costs before creating a branch.'
+            );
+          }
+
+          const costHash = await hashObject(cost);
+          if (costHash !== confirm_cost_id) {
+            throw new Error(
+              'Cost confirmation ID does not match the expected cost of creating a branch.'
+            );
+          }
         }
         return await branching.createBranch(project_id, { name });
       },

packages/mcp-server-supabase/src/tools/database-operation-tools.ts

@@ -232,7 +232,8 @@ export function getDatabaseTools({
                       confirm: {
                         type: 'boolean',
                         title: 'Confirm Migration',
-                        description: 'I have reviewed the SQL and approve this migration',
+                        description:
+                          'I have reviewed the SQL and approve this migration',
                       },
                     },
                     required: ['confirm'],

packages/mcp-server-supabase/src/tools/util.ts

@@ -64,6 +64,6 @@ export function injectableTool<
     description,
     annotations,
     parameters: parameters.omit(mask),
-    execute: (args) => execute({ ...args, ...inject }),
+    execute: (args, context) => execute({ ...args, ...inject }, context),
   }) as Tool<z.ZodObject<any, any, any, CleanParams>, Result>;
 }