Use MCP common zones_list tool

Author: Maximo-Guk

apps/dns-analytics/README.md

@@ -11,10 +11,10 @@ Currently available tools:
 
 | **Category**            | **Tool**                    | **Description**                                                |
 | ----------------------- | --------------------------- | -------------------------------------------------------------- |
-| **DNS Analytics**       | `dns-report`                | Fetch the DNS Report for a given zone over a given time frame. |
-| **Account DNS Setting** | `show-account-dns-settings` | Fetch the DNS setting for the current active account.          |
-| **Zone DNS Setting**    | `show-zone-dns-settings`    | Fetch the DNS setting for a given zone.                        |
-| **Zone Information**    | `list-zones-under-account`  | List zones under the current active account.                   |
+| **Zone Information**    | `zones_list`                | List zones under the current active account.                   |
+| **DNS Analytics**       | `dns_report`                | Fetch the DNS Report for a given zone over a given time frame. |
+| **Account DNS Setting** | `show_account_dns_settings` | Fetch the DNS setting for the current active account.          |
+| **Zone DNS Setting**    | `show_zone_dns_settings`    | Fetch the DNS setting for a given zone.                        |
 
 This MCP server is still a work in progress, and we plan to add more tools in the future.
 

apps/dns-analytics/src/index.ts

@@ -11,6 +11,7 @@ import { getEnv } from '@repo/mcp-common/src/env'
 import { RequiredScopes } from '@repo/mcp-common/src/scopes'
 import { CloudflareMCPServer } from '@repo/mcp-common/src/server'
 import { registerAccountTools } from '@repo/mcp-common/src/tools/account'
+import { registerZoneTools } from '@repo/mcp-common/src/tools/zone'
 
 import { MetricsTracker } from '../../../packages/mcp-observability/src'
 import { registerAnalyticTools } from './tools/analytics'
@@ -63,8 +64,10 @@ export class DNSAnalyticsMCP extends McpAgent<Env, State, Props> {
 
 		registerAccountTools(this)
 
-		// Register Cloudflare DNS Analytic tools
+		// Register Cloudflare DNS Analytics tools
 		registerAnalyticTools(this)
+
+		registerZoneTools(this)
 	}
 
 	async getActiveAccountId() {
@@ -89,11 +92,10 @@ export class DNSAnalyticsMCP extends McpAgent<Env, State, Props> {
 	}
 }
 
-// TODO: Add scopes for `dns_settings:read` and `dns_analytics:read` when they are ready.
-// Also remove `DEV_CLOUDFLARE_API_TOKEN` env var.
 const AnalyticsScopes = {
 	...RequiredScopes,
 	'account:read': 'See your account info such as account details, analytics, and memberships.',
+	'zone:read': "See your zones",
 	'dns_settings:read': 'See your DNS settings',
 	'dns_analytics:read': 'See your DNS analytics',
 } as const

apps/dns-analytics/src/tools/analytics.ts

@@ -6,7 +6,6 @@ import { getEnv } from '@repo/mcp-common/src/env'
 import type { AccountGetParams } from 'cloudflare/resources/accounts/accounts.mjs'
 import type { ReportGetParams } from 'cloudflare/resources/dns/analytics.mjs'
 import type { ZoneGetParams } from 'cloudflare/resources/dns/settings.mjs'
-import type { ZoneListParams } from 'cloudflare/resources/zones/zones.mjs'
 import type { Env } from '../context'
 import type { DNSAnalyticsMCP } from '../index'
 
@@ -21,7 +20,7 @@ function getStartDate(days: number) {
 export function registerAnalyticTools(agent: DNSAnalyticsMCP) {
 	// Register DNS Report tool
 	agent.server.tool(
-		'dns-report',
+		'dns_report',
 		'Fetch the DNS Report for a given zone since a date',
 		{
 			zone: z.string(),
@@ -62,7 +61,7 @@ export function registerAnalyticTools(agent: DNSAnalyticsMCP) {
 	)
 	// Register Account DNS Settings display tool
 	agent.server.tool(
-		'show-account-dns-settings',
+		'show_account_dns_settings',
 		'Show DNS settings for current account',
 		async () => {
 			try {
@@ -106,7 +105,7 @@ export function registerAnalyticTools(agent: DNSAnalyticsMCP) {
 	)
 	// Register Zone DNS Settings display tool
 	agent.server.tool(
-		'show-zone-dns-settings',
+		'show_zone_dns_settings',
 		'Show DNS settings for a zone',
 		{
 			zone: z.string(),
@@ -140,52 +139,4 @@ export function registerAnalyticTools(agent: DNSAnalyticsMCP) {
 			}
 		}
 	)
-
-	// Register Zone DNS Settings display tool
-	agent.server.tool(
-		'list-zones-under-account',
-		'List zones under the current active account',
-		async () => {
-			try {
-				const client = getCloudflareClient(agent.props.accessToken)
-				const accountId = await agent.getActiveAccountId()
-				if (!accountId) {
-					return {
-						content: [
-							{
-								type: 'text',
-								text: 'No currently active accountId. Try listing your accounts (accounts_list) and then setting an active account (set_active_account)',
-							},
-						],
-					}
-				}
-				const zone_list_account: ZoneListParams.Account = {
-					id: accountId,
-				}
-				const zone_list_params: ZoneListParams = {
-					account: zone_list_account,
-				}
-				const result = await client.zones.list(zone_list_params)
-				return {
-					content: [
-						{
-							type: 'text',
-							text: JSON.stringify({
-								result,
-							}),
-						},
-					],
-				}
-			} catch (error) {
-				return {
-					content: [
-						{
-							type: 'text',
-							text: `Error fetching DNS report: ${error instanceof Error && error.message}`,
-						},
-					],
-				}
-			}
-		}
-	)
 }