@daisyintel/whatsapp-cloud-mcp 0.1.0 → 2.0.0

package/dist/src/tools.js

@@ -1,7 +1,9 @@
+// @ts-nocheck
 import { readFile } from "node:fs/promises";
 import { basename } from "node:path";
 import { z } from "zod";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { WhatsAppGraphClient } from "./graphClient.js";
 function ensureValue(value, envName) {
     if (!value) {
         throw new Error(`${envName} is required for this operation.`);
@@ -69,27 +71,43 @@ function defaultBusinessProfileFields(fields) {
     }
     return "about,address,description,email,profile_picture_url,websites,vertical";
 }
-export function createToolHandlers(client, config, eventStore) {
+function registerAccountScopedTool(server, _accountConfig, name, description, shape, handler) {
+    server.tool(name, description, shape, async (args) => handler(args));
+}
+function toToolResult(result) {
+    return {
+        content: [
+            {
+                type: "text",
+                text: JSON.stringify(result, null, 2)
+            }
+        ],
+        structuredContent: result
+    };
+}
+export function createToolHandlers(accountConfig, eventStore, client = new WhatsAppGraphClient(accountConfig)) {
+    const currentAccount = () => accountConfig;
+    const currentClient = () => client;
     return {
         async getOwnedWabas(args) {
-            return formatToolResult(await client.safeRequest({
-                path: `${resolveBusinessId(config, args.business_id)}/owned_whatsapp_business_accounts`
+            return formatToolResult(await currentClient().safeRequest({
+                path: `${resolveBusinessId(currentAccount(), args.business_id)}/owned_whatsapp_business_accounts`
             }));
         },
         async getWaba(args) {
-            return formatToolResult(await client.safeRequest({
-                path: resolveWabaId(config, args.waba_id)
+            return formatToolResult(await currentClient().safeRequest({
+                path: resolveWabaId(currentAccount(), args.waba_id)
             }));
         },
         async getPhoneNumbers(args) {
-            return formatToolResult(await client.safeRequest({
-                path: `${resolveWabaId(config, args.waba_id)}/phone_numbers`
+            return formatToolResult(await currentClient().safeRequest({
+                path: `${resolveWabaId(currentAccount(), args.waba_id)}/phone_numbers`
             }));
         },
         async registerPhoneNumber(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "POST",
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/register`,
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/register`,
                 body: {
                     messaging_product: "whatsapp",
                     pin: args.pin
@@ -97,9 +115,9 @@ export function createToolHandlers(client, config, eventStore) {
             }));
         },
         async requestVerificationCode(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "POST",
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/request_code`,
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/request_code`,
                 body: {
                     code_method: args.code_method,
                     locale: args.locale
@@ -107,51 +125,51 @@ export function createToolHandlers(client, config, eventStore) {
             }));
         },
         async verifyCode(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "POST",
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/verify_code`,
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/verify_code`,
                 body: {
                     code: args.code
                 }
             }));
         },
         async subscribeApp(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "POST",
-                path: `${resolveWabaId(config, args.waba_id)}/subscribed_apps`
+                path: `${resolveWabaId(currentAccount(), args.waba_id)}/subscribed_apps`
             }));
         },
         async getSubscribedApps(args) {
-            return formatToolResult(await client.safeRequest({
-                path: `${resolveWabaId(config, args.waba_id)}/subscribed_apps`
+            return formatToolResult(await currentClient().safeRequest({
+                path: `${resolveWabaId(currentAccount(), args.waba_id)}/subscribed_apps`
             }));
         },
         async unsubscribeApp(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "DELETE",
-                path: `${resolveWabaId(config, args.waba_id)}/subscribed_apps`
+                path: `${resolveWabaId(currentAccount(), args.waba_id)}/subscribed_apps`
             }));
         },
         async debugAccessToken() {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 path: "debug_token",
                 query: {
-                    input_token: config.accessToken
+                    input_token: currentAccount().accessToken
                 }
             }));
         },
         async getBusinessProfile(args) {
-            return formatToolResult(await client.safeRequest({
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/whatsapp_business_profile`,
+            return formatToolResult(await currentClient().safeRequest({
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/whatsapp_business_profile`,
                 query: {
                     fields: defaultBusinessProfileFields(args.fields)
                 }
             }));
         },
         async updateBusinessProfile(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "POST",
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/whatsapp_business_profile`,
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/whatsapp_business_profile`,
                 body: {
                     messaging_product: "whatsapp",
                     ...(args.address !== undefined ? { address: args.address } : {}),
@@ -165,14 +183,14 @@ export function createToolHandlers(client, config, eventStore) {
             }));
         },
         async getBlockedUsers(args) {
-            return formatToolResult(await client.safeRequest({
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/block_users`
+            return formatToolResult(await currentClient().safeRequest({
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/block_users`
             }));
         },
         async blockUsers(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "POST",
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/block_users`,
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/block_users`,
                 body: {
                     messaging_product: "whatsapp",
                     block_users: buildBlockUsers(args.users)
@@ -180,9 +198,9 @@ export function createToolHandlers(client, config, eventStore) {
             }));
         },
         async unblockUsers(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "DELETE",
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/block_users`,
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/block_users`,
                 body: {
                     messaging_product: "whatsapp",
                     block_users: buildBlockUsers(args.users)
@@ -190,8 +208,8 @@ export function createToolHandlers(client, config, eventStore) {
             }));
         },
         async getTemplates(args) {
-            return formatToolResult(await client.safeRequest({
-                path: `${resolveWabaId(config, args.waba_id)}/message_templates`,
+            return formatToolResult(await currentClient().safeRequest({
+                path: `${resolveWabaId(currentAccount(), args.waba_id)}/message_templates`,
                 query: {
                     ...(args.limit !== undefined ? { limit: args.limit } : {}),
                     ...(args.name ? { name: args.name } : {}),
@@ -200,7 +218,7 @@ export function createToolHandlers(client, config, eventStore) {
             }));
         },
         async getTemplateById(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 path: args.template_id,
                 query: {
                     ...(args.fields && args.fields.length > 0 ? { fields: args.fields.join(",") } : {})
@@ -208,9 +226,9 @@ export function createToolHandlers(client, config, eventStore) {
             }));
         },
         async createTemplate(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "POST",
-                path: `${resolveWabaId(config, args.waba_id)}/message_templates`,
+                path: `${resolveWabaId(currentAccount(), args.waba_id)}/message_templates`,
                 body: {
                     name: args.name,
                     language: args.language,
@@ -221,18 +239,18 @@ export function createToolHandlers(client, config, eventStore) {
             }));
         },
         async deleteTemplateByName(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "DELETE",
-                path: `${resolveWabaId(config, args.waba_id)}/message_templates`,
+                path: `${resolveWabaId(currentAccount(), args.waba_id)}/message_templates`,
                 query: {
                     name: args.name
                 }
             }));
         },
         async sendTextMessage(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "POST",
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/messages`,
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/messages`,
                 body: withContext({
                     messaging_product: "whatsapp",
                     recipient_type: "individual",
@@ -246,9 +264,9 @@ export function createToolHandlers(client, config, eventStore) {
             }));
         },
         async sendTemplateMessage(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "POST",
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/messages`,
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/messages`,
                 body: withContext({
                     messaging_product: "whatsapp",
                     recipient_type: "individual",
@@ -281,9 +299,9 @@ export function createToolHandlers(client, config, eventStore) {
             if (args.filename && args.media_type === "document") {
                 mediaPayload.filename = args.filename;
             }
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "POST",
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/messages`,
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/messages`,
                 body: withContext({
                     messaging_product: "whatsapp",
                     recipient_type: "individual",
@@ -294,16 +312,16 @@ export function createToolHandlers(client, config, eventStore) {
             }));
         },
         async sendRawMessage(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "POST",
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/messages`,
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/messages`,
                 body: args.body
             }));
         },
         async markMessageAsRead(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "POST",
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/messages`,
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/messages`,
                 body: {
                     messaging_product: "whatsapp",
                     status: "read",
@@ -317,19 +335,19 @@ export function createToolHandlers(client, config, eventStore) {
             formData.append("messaging_product", "whatsapp");
             formData.append("type", args.mime_type);
             formData.append("file", new Blob([fileBuffer], { type: args.mime_type }), args.filename ?? basename(args.file_path));
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "POST",
-                path: `${resolvePhoneNumberId(config, args.phone_number_id)}/media`,
+                path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/media`,
                 formData
             }));
         },
         async getMediaUrl(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 path: args.media_id
             }));
         },
         async deleteMedia(args) {
-            return formatToolResult(await client.safeRequest({
+            return formatToolResult(await currentClient().safeRequest({
                 method: "DELETE",
                 path: args.media_id,
                 query: {
@@ -346,56 +364,46 @@ export function createToolHandlers(client, config, eventStore) {
         }
     };
 }
-function toToolResult(result) {
-    return {
-        content: [
-            {
-                type: "text",
-                text: JSON.stringify(result, null, 2)
-            }
-        ],
-        structuredContent: result
-    };
-}
-export function registerWhatsAppTools(server, client, config, eventStore) {
-    const handlers = createToolHandlers(client, config, eventStore);
-    server.tool("whatsapp_get_owned_wabas", "List WhatsApp Business Accounts owned by the configured business.", {
+export function registerWhatsAppTools(server, accountConfig, client, eventStore) {
+    const handlers = createToolHandlers(accountConfig, eventStore, client);
+    const accountRegistry = accountConfig;
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_owned_wabas", "List WhatsApp Business Accounts owned by the configured business.", {
         business_id: z.string().optional()
     }, async (args) => toToolResult(await handlers.getOwnedWabas(args)));
-    server.tool("whatsapp_get_waba", "Fetch metadata for a WhatsApp Business Account.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_waba", "Fetch metadata for a WhatsApp Business Account.", {
         waba_id: z.string().optional()
     }, async (args) => toToolResult(await handlers.getWaba(args)));
-    server.tool("whatsapp_get_phone_numbers", "List phone numbers attached to a WhatsApp Business Account.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_phone_numbers", "List phone numbers attached to a WhatsApp Business Account.", {
         waba_id: z.string().optional()
     }, async (args) => toToolResult(await handlers.getPhoneNumbers(args)));
-    server.tool("whatsapp_register_phone_number", "Register a WhatsApp phone number and set the 6-digit verification PIN.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_register_phone_number", "Register a WhatsApp phone number and set the 6-digit verification PIN.", {
         phone_number_id: z.string().optional(),
         pin: z.string().regex(/^\d{6}$/)
     }, async (args) => toToolResult(await handlers.registerPhoneNumber(args)));
-    server.tool("whatsapp_request_verification_code", "Request an SMS or voice verification code for a phone number.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_request_verification_code", "Request an SMS or voice verification code for a phone number.", {
         phone_number_id: z.string().optional(),
         code_method: z.enum(["SMS", "VOICE"]),
         locale: z.string()
     }, async (args) => toToolResult(await handlers.requestVerificationCode(args)));
-    server.tool("whatsapp_verify_code", "Verify a phone number using a previously requested code.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_verify_code", "Verify a phone number using a previously requested code.", {
         phone_number_id: z.string().optional(),
         code: z.string().min(1)
     }, async (args) => toToolResult(await handlers.verifyCode(args)));
-    server.tool("whatsapp_get_subscribed_apps", "List apps subscribed to the configured WABA webhooks.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_subscribed_apps", "List apps subscribed to the configured WABA webhooks.", {
         waba_id: z.string().optional()
     }, async (args) => toToolResult(await handlers.getSubscribedApps(args)));
-    server.tool("whatsapp_subscribe_app", "Subscribe the current app to receive webhook events for the configured WABA.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_subscribe_app", "Subscribe the current app to receive webhook events for the configured WABA.", {
         waba_id: z.string().optional()
     }, async (args) => toToolResult(await handlers.subscribeApp(args)));
-    server.tool("whatsapp_unsubscribe_app", "Unsubscribe the current app from the configured WABA webhooks.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_unsubscribe_app", "Unsubscribe the current app from the configured WABA webhooks.", {
         waba_id: z.string().optional()
     }, async (args) => toToolResult(await handlers.unsubscribeApp(args)));
-    server.tool("whatsapp_debug_access_token", "Debug the configured access token using Graph API token introspection.", {}, async () => toToolResult(await handlers.debugAccessToken()));
-    server.tool("whatsapp_get_business_profile", "Fetch the WhatsApp business profile for a phone number.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_debug_access_token", "Debug the configured access token using Graph API token introspection.", {}, async () => toToolResult(await handlers.debugAccessToken()));
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_business_profile", "Fetch the WhatsApp business profile for a phone number.", {
         phone_number_id: z.string().optional(),
         fields: z.array(z.string()).optional()
     }, async (args) => toToolResult(await handlers.getBusinessProfile(args)));
-    server.tool("whatsapp_update_business_profile", "Update the WhatsApp business profile for a phone number.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_update_business_profile", "Update the WhatsApp business profile for a phone number.", {
         phone_number_id: z.string().optional(),
         address: z.string().optional(),
         description: z.string().optional(),
@@ -405,28 +413,28 @@ export function registerWhatsAppTools(server, client, config, eventStore) {
         websites: z.array(z.string().url()).max(2).optional(),
         profile_picture_handle: z.string().optional()
     }, async (args) => toToolResult(await handlers.updateBusinessProfile(args)));
-    server.tool("whatsapp_get_blocked_users", "List WhatsApp users blocked by the business phone number.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_blocked_users", "List WhatsApp users blocked by the business phone number.", {
         phone_number_id: z.string().optional()
     }, async (args) => toToolResult(await handlers.getBlockedUsers(args)));
-    server.tool("whatsapp_block_users", "Block one or more WhatsApp users.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_block_users", "Block one or more WhatsApp users.", {
         phone_number_id: z.string().optional(),
         users: z.array(z.string()).min(1)
     }, async (args) => toToolResult(await handlers.blockUsers(args)));
-    server.tool("whatsapp_unblock_users", "Unblock one or more WhatsApp users.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_unblock_users", "Unblock one or more WhatsApp users.", {
         phone_number_id: z.string().optional(),
         users: z.array(z.string()).min(1)
     }, async (args) => toToolResult(await handlers.unblockUsers(args)));
-    server.tool("whatsapp_get_templates", "List message templates for the configured WABA.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_templates", "List message templates for the configured WABA.", {
         waba_id: z.string().optional(),
         limit: z.number().int().positive().optional(),
         name: z.string().optional(),
         fields: z.array(z.string()).optional()
     }, async (args) => toToolResult(await handlers.getTemplates(args)));
-    server.tool("whatsapp_get_template_by_id", "Fetch a message template by template ID.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_template_by_id", "Fetch a message template by template ID.", {
         template_id: z.string(),
         fields: z.array(z.string()).optional()
     }, async (args) => toToolResult(await handlers.getTemplateById(args)));
-    server.tool("whatsapp_create_template", "Create a WhatsApp message template with a generic components payload.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_create_template", "Create a WhatsApp message template with a generic components payload.", {
         waba_id: z.string().optional(),
         name: z.string(),
         language: z.string(),
@@ -434,18 +442,18 @@ export function registerWhatsAppTools(server, client, config, eventStore) {
         components: z.array(z.record(z.string(), z.any())),
         allow_category_change: z.boolean().optional()
     }, async (args) => toToolResult(await handlers.createTemplate(args)));
-    server.tool("whatsapp_delete_template_by_name", "Delete a WhatsApp message template by name.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_delete_template_by_name", "Delete a WhatsApp message template by name.", {
         waba_id: z.string().optional(),
         name: z.string()
     }, async (args) => toToolResult(await handlers.deleteTemplateByName(args)));
-    server.tool("whatsapp_send_text_message", "Send a plain text WhatsApp message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_text_message", "Send a plain text WhatsApp message.", {
         to: z.string(),
         body: z.string().min(1),
         phone_number_id: z.string().optional(),
         preview_url: z.boolean().optional(),
         context_message_id: z.string().optional()
     }, async (args) => toToolResult(await handlers.sendTextMessage(args)));
-    server.tool("whatsapp_send_template_message", "Send a template WhatsApp message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_template_message", "Send a template WhatsApp message.", {
         to: z.string(),
         name: z.string(),
         languageCode: z.string(),
@@ -454,7 +462,7 @@ export function registerWhatsAppTools(server, client, config, eventStore) {
         previewUrl: z.boolean().optional(),
         contextMessageId: z.string().optional()
     }, async (args) => toToolResult(await handlers.sendTemplateMessage(args)));
-    server.tool("whatsapp_send_media_message", "Send an image, document, audio, sticker, or video message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_media_message", "Send an image, document, audio, sticker, or video message.", {
         to: z.string(),
         media_type: z.enum(["audio", "document", "image", "sticker", "video"]),
         media_id: z.string().optional(),
@@ -464,41 +472,44 @@ export function registerWhatsAppTools(server, client, config, eventStore) {
         phone_number_id: z.string().optional(),
         context_message_id: z.string().optional()
     }, async (args) => toToolResult(await handlers.sendMediaMessage(args)));
-    server.tool("whatsapp_send_raw_message", "Send a raw WhatsApp Cloud API message body for unsupported message variants.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_raw_message", "Send a raw WhatsApp Cloud API message body for unsupported message variants.", {
         phone_number_id: z.string().optional(),
         body: z.record(z.string(), z.any())
     }, async (args) => toToolResult(await handlers.sendRawMessage(args)));
-    server.tool("whatsapp_mark_message_as_read", "Mark a WhatsApp message as read.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_mark_message_as_read", "Mark a WhatsApp message as read.", {
         message_id: z.string(),
         phone_number_id: z.string().optional()
     }, async (args) => toToolResult(await handlers.markMessageAsRead(args)));
-    server.tool("whatsapp_upload_media", "Upload a local media file to WhatsApp Cloud API for later reuse.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_upload_media", "Upload a local media file to WhatsApp Cloud API for later reuse.", {
         file_path: z.string(),
         mime_type: z.string(),
         phone_number_id: z.string().optional(),
         filename: z.string().optional()
     }, async (args) => toToolResult(await handlers.uploadMedia(args)));
-    server.tool("whatsapp_get_media_url", "Fetch metadata and download URL for an uploaded WhatsApp media asset.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_media_url", "Fetch metadata and download URL for an uploaded WhatsApp media asset.", {
         media_id: z.string()
     }, async (args) => toToolResult(await handlers.getMediaUrl(args)));
-    server.tool("whatsapp_delete_media", "Delete an uploaded WhatsApp media asset.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_delete_media", "Delete an uploaded WhatsApp media asset.", {
         media_id: z.string(),
         phone_number_id: z.string().optional()
     }, async (args) => toToolResult(await handlers.deleteMedia(args)));
-    server.tool("whatsapp_get_recent_webhook_events", "Return recently received inbound messages and delivery status events kept in memory.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_recent_webhook_events", "Return recently received inbound messages and delivery status events kept in memory.", {
         limit: z.number().int().positive().max(100).optional()
     }, async (args) => toToolResult(await handlers.getRecentWebhookEvents(args)));
 }
-function registerAdditionalWhatsAppTools(server, client, config) {
-    const rawRequest = async (request) => toToolResult(formatToolResult(await client.safeRequest(request)));
+function registerAdditionalWhatsAppTools(server, accountConfig, client) {
+    const accountRegistry = accountConfig;
+    const currentAccount = () => accountConfig;
+    const currentClient = () => client;
+    const rawRequest = async (request) => toToolResult(formatToolResult(await currentClient().safeRequest(request)));
     const sendMessage = async (args) => rawRequest({
         method: "POST",
-        path: `${resolvePhoneNumberId(config, args.phone_number_id)}/messages`,
+        path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/messages`,
         body: withContext(args.body, args.context_message_id)
     });
     const createTemplate = async (args) => rawRequest({
         method: "POST",
-        path: `${resolveWabaId(config, args.waba_id)}/message_templates`,
+        path: `${resolveWabaId(currentAccount(), args.waba_id)}/message_templates`,
         body: {
             name: args.name,
             language: args.language,
@@ -507,66 +518,66 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             ...(args.allow_category_change !== undefined ? { allow_category_change: args.allow_category_change } : {})
         }
     });
-    server.tool("whatsapp_get_shared_wabas", "List WhatsApp Business Accounts shared with the configured business.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_shared_wabas", "List WhatsApp Business Accounts shared with the configured business.", {
         business_id: z.string().optional()
     }, async (args) => rawRequest({
-        path: `${resolveBusinessId(config, args.business_id)}/client_whatsapp_business_accounts`
+        path: `${resolveBusinessId(currentAccount(), args.business_id)}/client_whatsapp_business_accounts`
     }));
-    server.tool("whatsapp_deregister_phone", "Deregister a previously registered phone number.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_deregister_phone", "Deregister a previously registered phone number.", {
         phone_number_id: z.string().optional()
     }, async (args) => rawRequest({
         method: "POST",
-        path: `${resolvePhoneNumberId(config, args.phone_number_id)}/deregister`
+        path: `${resolvePhoneNumberId(currentAccount(), args.phone_number_id)}/deregister`
     }));
-    server.tool("whatsapp_get_phone_number_by_id", "Fetch a single business phone number by phone number ID.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_phone_number_by_id", "Fetch a single business phone number by phone number ID.", {
         phone_number_id: z.string().optional(),
         fields: z.array(z.string()).optional()
     }, async (args) => rawRequest({
-        path: resolvePhoneNumberId(config, args.phone_number_id),
+        path: resolvePhoneNumberId(currentAccount(), args.phone_number_id),
         query: args.fields && args.fields.length > 0 ? { fields: args.fields.join(",") } : undefined
     }));
-    server.tool("whatsapp_get_display_name_status", "Fetch the beta display-name approval status for a phone number.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_display_name_status", "Fetch the beta display-name approval status for a phone number.", {
         phone_number_id: z.string().optional()
     }, async (args) => rawRequest({
-        path: resolvePhoneNumberId(config, args.phone_number_id),
+        path: resolvePhoneNumberId(currentAccount(), args.phone_number_id),
         query: {
             fields: "name_status"
         }
     }));
-    server.tool("whatsapp_get_phone_numbers_with_filtering", "List WABA phone numbers using the filtering beta query parameters.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_phone_numbers_with_filtering", "List WABA phone numbers using the filtering beta query parameters.", {
         waba_id: z.string().optional(),
         fields: z.string().optional(),
         filtering: z.string().optional()
     }, async (args) => rawRequest({
-        path: `${resolveWabaId(config, args.waba_id)}/phone_numbers`,
+        path: `${resolveWabaId(currentAccount(), args.waba_id)}/phone_numbers`,
         query: {
             ...(args.fields ? { fields: args.fields } : {}),
             ...(args.filtering ? { filtering: args.filtering } : {})
         }
     }));
-    server.tool("whatsapp_set_two_step_verification_code", "Change the two-step verification PIN for a phone number.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_set_two_step_verification_code", "Change the two-step verification PIN for a phone number.", {
         phone_number_id: z.string().optional(),
         pin: z.string().regex(/^\d{6}$/)
     }, async (args) => rawRequest({
         method: "POST",
-        path: resolvePhoneNumberId(config, args.phone_number_id),
+        path: resolvePhoneNumberId(currentAccount(), args.phone_number_id),
         body: {
             pin: args.pin
         }
     }));
-    server.tool("whatsapp_override_callback_url", "Subscribe a WABA with an override callback URL and verify token.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_override_callback_url", "Subscribe a WABA with an override callback URL and verify token.", {
         waba_id: z.string().optional(),
         override_callback_uri: z.string().url(),
         verify_token: z.string().min(1)
     }, async (args) => rawRequest({
         method: "POST",
-        path: `${resolveWabaId(config, args.waba_id)}/subscribed_apps`,
+        path: `${resolveWabaId(currentAccount(), args.waba_id)}/subscribed_apps`,
         body: {
             override_callback_uri: args.override_callback_uri,
             verify_token: args.verify_token
         }
     }));
-    server.tool("whatsapp_send_reply_to_text_message", "Send a text reply to a previously received WhatsApp message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_reply_to_text_message", "Send a text reply to a previously received WhatsApp message.", {
         to: z.string(),
         body: z.string().min(1),
         context_message_id: z.string(),
@@ -582,7 +593,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             text: { body: args.body }
         }
     }));
-    server.tool("whatsapp_send_text_message_with_preview_url", "Send a text message with URL previews enabled.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_text_message_with_preview_url", "Send a text message with URL previews enabled.", {
         to: z.string(),
         body: z.string().min(1),
         phone_number_id: z.string().optional(),
@@ -598,7 +609,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             text: { body: args.body, preview_url: true }
         }
     }));
-    server.tool("whatsapp_send_reply_with_reaction_message", "Send a reaction reply to an existing WhatsApp message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_reply_with_reaction_message", "Send a reaction reply to an existing WhatsApp message.", {
         to: z.string(),
         reaction_message_id: z.string(),
         emoji: z.string().min(1),
@@ -616,7 +627,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             }
         }
     }));
-    server.tool("whatsapp_send_image_message_by_id", "Send an image message using an uploaded media ID.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_image_message_by_id", "Send an image message using an uploaded media ID.", {
         to: z.string(),
         media_id: z.string(),
         caption: z.string().optional(),
@@ -636,7 +647,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             }
         }
     }));
-    server.tool("whatsapp_send_reply_to_image_message_by_id", "Reply to a message with an uploaded image media ID.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_reply_to_image_message_by_id", "Reply to a message with an uploaded image media ID.", {
         to: z.string(),
         media_id: z.string(),
         context_message_id: z.string(),
@@ -656,7 +667,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             }
         }
     }));
-    server.tool("whatsapp_send_image_message_by_url", "Send an image message using a public URL.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_image_message_by_url", "Send an image message using a public URL.", {
         to: z.string(),
         link: z.string().url(),
         caption: z.string().optional(),
@@ -676,7 +687,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             }
         }
     }));
-    server.tool("whatsapp_send_reply_to_image_message_by_url", "Reply with an image using a public URL.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_reply_to_image_message_by_url", "Reply with an image using a public URL.", {
         to: z.string(),
         link: z.string().url(),
         context_message_id: z.string(),
@@ -696,7 +707,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             }
         }
     }));
-    server.tool("whatsapp_send_audio_message_by_id", "Send an audio message using an uploaded media ID.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_audio_message_by_id", "Send an audio message using an uploaded media ID.", {
         to: z.string(),
         media_id: z.string(),
         phone_number_id: z.string().optional(),
@@ -712,7 +723,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             audio: { id: args.media_id }
         }
     }));
-    server.tool("whatsapp_send_audio_message_by_url", "Send an audio message using a public URL.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_audio_message_by_url", "Send an audio message using a public URL.", {
         to: z.string(),
         link: z.string().url(),
         phone_number_id: z.string().optional(),
@@ -728,7 +739,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             audio: { link: args.link }
         }
     }));
-    server.tool("whatsapp_send_video_message_by_id", "Send a video message using an uploaded media ID.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_video_message_by_id", "Send a video message using an uploaded media ID.", {
         to: z.string(),
         media_id: z.string(),
         caption: z.string().optional(),
@@ -748,7 +759,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             }
         }
     }));
-    server.tool("whatsapp_send_video_message_by_url", "Send a video message using a public URL.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_video_message_by_url", "Send a video message using a public URL.", {
         to: z.string(),
         link: z.string().url(),
         caption: z.string().optional(),
@@ -768,7 +779,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             }
         }
     }));
-    server.tool("whatsapp_send_document_message_by_id", "Send a document message using an uploaded media ID.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_document_message_by_id", "Send a document message using an uploaded media ID.", {
         to: z.string(),
         media_id: z.string(),
         caption: z.string().optional(),
@@ -790,7 +801,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             }
         }
     }));
-    server.tool("whatsapp_send_document_message_by_url", "Send a document message using a public URL.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_document_message_by_url", "Send a document message using a public URL.", {
         to: z.string(),
         link: z.string().url(),
         caption: z.string().optional(),
@@ -812,7 +823,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             }
         }
     }));
-    server.tool("whatsapp_send_sticker_message_by_id", "Send a sticker message using an uploaded media ID.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_sticker_message_by_id", "Send a sticker message using an uploaded media ID.", {
         to: z.string(),
         media_id: z.string(),
         phone_number_id: z.string().optional(),
@@ -828,7 +839,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             sticker: { id: args.media_id }
         }
     }));
-    server.tool("whatsapp_send_sticker_message_by_url", "Send a sticker message using a public URL.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_sticker_message_by_url", "Send a sticker message using a public URL.", {
         to: z.string(),
         link: z.string().url(),
         phone_number_id: z.string().optional(),
@@ -844,7 +855,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             sticker: { link: args.link }
         }
     }));
-    server.tool("whatsapp_send_contact_message", "Send a contact card message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_contact_message", "Send a contact card message.", {
         to: z.string(),
         contacts: z.array(z.record(z.string(), z.any())).min(1),
         phone_number_id: z.string().optional(),
@@ -860,7 +871,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             contacts: args.contacts
         }
     }));
-    server.tool("whatsapp_send_reply_to_contact_message", "Reply with a contact card message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_reply_to_contact_message", "Reply with a contact card message.", {
         to: z.string(),
         contacts: z.array(z.record(z.string(), z.any())).min(1),
         context_message_id: z.string(),
@@ -876,7 +887,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             contacts: args.contacts
         }
     }));
-    server.tool("whatsapp_send_location_message", "Send a location message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_location_message", "Send a location message.", {
         to: z.string(),
         location: z.record(z.string(), z.any()),
         phone_number_id: z.string().optional(),
@@ -892,7 +903,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             location: args.location
         }
     }));
-    server.tool("whatsapp_send_reply_to_location_message", "Reply with a location message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_reply_to_location_message", "Reply with a location message.", {
         to: z.string(),
         location: z.record(z.string(), z.any()),
         context_message_id: z.string(),
@@ -908,7 +919,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             location: args.location
         }
     }));
-    server.tool("whatsapp_send_message_template_text", "Send a template message using a text-oriented template payload.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_message_template_text", "Send a template message using a text-oriented template payload.", {
         to: z.string(),
         template: z.record(z.string(), z.any()),
         phone_number_id: z.string().optional(),
@@ -924,7 +935,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             template: args.template
         }
     }));
-    server.tool("whatsapp_send_message_template_media", "Send a template message using a media-oriented template payload.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_message_template_media", "Send a template message using a media-oriented template payload.", {
         to: z.string(),
         template: z.record(z.string(), z.any()),
         phone_number_id: z.string().optional(),
@@ -940,7 +951,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             template: args.template
         }
     }));
-    server.tool("whatsapp_send_message_template_interactive", "Send a template message using an interactive template payload.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_message_template_interactive", "Send a template message using an interactive template payload.", {
         to: z.string(),
         template: z.record(z.string(), z.any()),
         phone_number_id: z.string().optional(),
@@ -956,7 +967,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             template: args.template
         }
     }));
-    server.tool("whatsapp_send_list_message", "Send an interactive list message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_list_message", "Send an interactive list message.", {
         to: z.string(),
         interactive: z.record(z.string(), z.any()),
         phone_number_id: z.string().optional(),
@@ -972,7 +983,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             interactive: args.interactive
         }
     }));
-    server.tool("whatsapp_send_reply_to_list_message", "Reply with an interactive list message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_reply_to_list_message", "Reply with an interactive list message.", {
         to: z.string(),
         interactive: z.record(z.string(), z.any()),
         context_message_id: z.string(),
@@ -988,7 +999,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             interactive: args.interactive
         }
     }));
-    server.tool("whatsapp_send_reply_button", "Send an interactive reply-button message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_reply_button", "Send an interactive reply-button message.", {
         to: z.string(),
         interactive: z.record(z.string(), z.any()),
         phone_number_id: z.string().optional(),
@@ -1004,7 +1015,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             interactive: args.interactive
         }
     }));
-    server.tool("whatsapp_send_single_product_message", "Send an interactive single-product message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_single_product_message", "Send an interactive single-product message.", {
         to: z.string(),
         interactive: z.record(z.string(), z.any()),
         phone_number_id: z.string().optional(),
@@ -1020,7 +1031,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             interactive: args.interactive
         }
     }));
-    server.tool("whatsapp_send_multi_product_message", "Send an interactive multi-product message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_multi_product_message", "Send an interactive multi-product message.", {
         to: z.string(),
         interactive: z.record(z.string(), z.any()),
         phone_number_id: z.string().optional(),
@@ -1036,7 +1047,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             interactive: args.interactive
         }
     }));
-    server.tool("whatsapp_send_catalog_message", "Send an interactive catalog message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_catalog_message", "Send an interactive catalog message.", {
         to: z.string(),
         interactive: z.record(z.string(), z.any()),
         phone_number_id: z.string().optional(),
@@ -1052,7 +1063,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             interactive: args.interactive
         }
     }));
-    server.tool("whatsapp_send_catalog_template_message", "Send a template payload for a catalog-oriented template message.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_send_catalog_template_message", "Send a template payload for a catalog-oriented template message.", {
         to: z.string(),
         template: z.record(z.string(), z.any()),
         phone_number_id: z.string().optional(),
@@ -1068,25 +1079,25 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             template: args.template
         }
     }));
-    server.tool("whatsapp_get_template_by_name_default_fields", "Fetch a template by name using the collection's default fields.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_template_by_name_default_fields", "Fetch a template by name using the collection's default fields.", {
         waba_id: z.string().optional(),
         name: z.string()
     }, async (args) => rawRequest({
-        path: `${resolveWabaId(config, args.waba_id)}/message_templates`,
+        path: `${resolveWabaId(currentAccount(), args.waba_id)}/message_templates`,
         query: { name: args.name }
     }));
-    server.tool("whatsapp_get_all_templates_default_fields", "Fetch all templates using the collection's default fields.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_all_templates_default_fields", "Fetch all templates using the collection's default fields.", {
         waba_id: z.string().optional()
     }, async (args) => rawRequest({
-        path: `${resolveWabaId(config, args.waba_id)}/message_templates`
+        path: `${resolveWabaId(currentAccount(), args.waba_id)}/message_templates`
     }));
-    server.tool("whatsapp_get_namespace", "Fetch the message template namespace for a WABA.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_get_namespace", "Fetch the message template namespace for a WABA.", {
         waba_id: z.string().optional()
     }, async (args) => rawRequest({
-        path: resolveWabaId(config, args.waba_id),
+        path: resolveWabaId(currentAccount(), args.waba_id),
         query: { fields: "message_template_namespace" }
     }));
-    server.tool("whatsapp_create_auth_template_copy_code", "Create an authentication template with an OTP copy-code button payload.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_create_auth_template_copy_code", "Create an authentication template with an OTP copy-code button payload.", {
         waba_id: z.string().optional(),
         name: z.string(),
         language: z.string(),
@@ -1094,7 +1105,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
         components: z.array(z.record(z.string(), z.any())),
         allow_category_change: z.boolean().optional()
     }, async (args) => createTemplate(args));
-    server.tool("whatsapp_create_auth_template_one_tap_autofill", "Create an authentication template with an OTP one-tap autofill payload.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_create_auth_template_one_tap_autofill", "Create an authentication template with an OTP one-tap autofill payload.", {
         waba_id: z.string().optional(),
         name: z.string(),
         language: z.string(),
@@ -1102,7 +1113,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
         components: z.array(z.record(z.string(), z.any())),
         allow_category_change: z.boolean().optional()
     }, async (args) => createTemplate(args));
-    server.tool("whatsapp_create_catalog_template", "Create a catalog template payload.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_create_catalog_template", "Create a catalog template payload.", {
         waba_id: z.string().optional(),
         name: z.string(),
         language: z.string(),
@@ -1110,7 +1121,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
         components: z.array(z.record(z.string(), z.any())),
         allow_category_change: z.boolean().optional()
     }, async (args) => createTemplate(args));
-    server.tool("whatsapp_create_multi_product_template", "Create a multi-product template payload.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_create_multi_product_template", "Create a multi-product template payload.", {
         waba_id: z.string().optional(),
         name: z.string(),
         language: z.string(),
@@ -1118,7 +1129,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
         components: z.array(z.record(z.string(), z.any())),
         allow_category_change: z.boolean().optional()
     }, async (args) => createTemplate(args));
-    server.tool("whatsapp_create_template_text_header_quick_replies", "Create a template with text header, footer, and quick replies.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_create_template_text_header_quick_replies", "Create a template with text header, footer, and quick replies.", {
         waba_id: z.string().optional(),
         name: z.string(),
         language: z.string(),
@@ -1126,7 +1137,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
         components: z.array(z.record(z.string(), z.any())),
         allow_category_change: z.boolean().optional()
     }, async (args) => createTemplate(args));
-    server.tool("whatsapp_create_template_image_header_cta", "Create a template with an image header and call-to-action buttons.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_create_template_image_header_cta", "Create a template with an image header and call-to-action buttons.", {
         waba_id: z.string().optional(),
         name: z.string(),
         language: z.string(),
@@ -1134,7 +1145,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
         components: z.array(z.record(z.string(), z.any())),
         allow_category_change: z.boolean().optional()
     }, async (args) => createTemplate(args));
-    server.tool("whatsapp_create_template_location_header_website", "Create a template with a location header and website button.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_create_template_location_header_website", "Create a template with a location header and website button.", {
         waba_id: z.string().optional(),
         name: z.string(),
         language: z.string(),
@@ -1142,7 +1153,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
         components: z.array(z.record(z.string(), z.any())),
         allow_category_change: z.boolean().optional()
     }, async (args) => createTemplate(args));
-    server.tool("whatsapp_create_template_document_header_phone_url", "Create a template with a document header plus phone and URL buttons.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_create_template_document_header_phone_url", "Create a template with a document header plus phone and URL buttons.", {
         waba_id: z.string().optional(),
         name: z.string(),
         language: z.string(),
@@ -1150,7 +1161,7 @@ function registerAdditionalWhatsAppTools(server, client, config) {
         components: z.array(z.record(z.string(), z.any())),
         allow_category_change: z.boolean().optional()
     }, async (args) => createTemplate(args));
-    server.tool("whatsapp_edit_template", "Edit a template directly by template ID.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_edit_template", "Edit a template directly by template ID.", {
         template_id: z.string(),
         name: z.string().optional(),
         components: z.array(z.record(z.string(), z.any())).optional()
@@ -1162,26 +1173,27 @@ function registerAdditionalWhatsAppTools(server, client, config) {
             ...(args.components ? { components: args.components } : {})
         }
     }));
-    server.tool("whatsapp_delete_template_by_id", "Delete a template by template ID and name.", {
+    registerAccountScopedTool(server, accountRegistry, "whatsapp_delete_template_by_id", "Delete a template by template ID and name.", {
         waba_id: z.string().optional(),
         hsm_id: z.string(),
         name: z.string()
     }, async (args) => rawRequest({
         method: "DELETE",
-        path: `${resolveWabaId(config, args.waba_id)}/message_templates`,
+        path: `${resolveWabaId(currentAccount(), args.waba_id)}/message_templates`,
         query: {
             hsm_id: args.hsm_id,
             name: args.name
         }
     }));
 }
-export function createWhatsAppMcpServer(client, config, eventStore) {
+export function createWhatsAppMcpServer(accountConfig, eventStore) {
     const server = new McpServer({
         name: "whatsapp-cloud-api",
-        version: "0.1.0"
+        version: "2.0.0"
     });
-    registerWhatsAppTools(server, client, config, eventStore);
-    registerAdditionalWhatsAppTools(server, client, config);
+    const client = new WhatsAppGraphClient(accountConfig);
+    registerWhatsAppTools(server, accountConfig, client, eventStore);
+    registerAdditionalWhatsAppTools(server, accountConfig, client);
     return server;
 }
 //# sourceMappingURL=tools.js.map