Linting fixes + add scopes

Author: Maximo-Guk

apps/dns-analytics/src/index.ts

@@ -94,6 +94,8 @@ export class DNSAnalyticsMCP extends McpAgent<Env, State, Props> {
 const AnalyticsScopes = {
 	...RequiredScopes,
 	'account:read': 'See your account info such as account details, analytics, and memberships.',
+	'dns_settings:read': 'See your DNS settings',
+	'dns_analytics:read': 'See your DNS analytics',
 } as const
 
 export default {

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

@@ -1,12 +1,12 @@
-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 { z } from 'zod'
 
 import { getCloudflareClient } from '@repo/mcp-common/src/cloudflare-api'
 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'
 
@@ -29,7 +29,7 @@ export function registerAnalyticTools(agent: DNSAnalyticsMCP) {
 		},
 		async ({ zone, days }) => {
 			try {
-				const client = getCloudflareClient(env.DEV_CLOUDFLARE_API_TOKEN)
+				const client = getCloudflareClient(agent.props.accessToken)
 				const start_date = getStartDate(days)
 				const params: ReportGetParams = {
 					zone_id: zone,
@@ -77,7 +77,7 @@ export function registerAnalyticTools(agent: DNSAnalyticsMCP) {
 						],
 					}
 				}
-				const client = getCloudflareClient(env.DEV_CLOUDFLARE_API_TOKEN)
+				const client = getCloudflareClient(agent.props.accessToken)
 				const params: AccountGetParams = {
 					account_id: accountId,
 				}
@@ -113,7 +113,7 @@ export function registerAnalyticTools(agent: DNSAnalyticsMCP) {
 		},
 		async ({ zone }) => {
 			try {
-				const client = getCloudflareClient(env.DEV_CLOUDFLARE_API_TOKEN)
+				const client = getCloudflareClient(agent.props.accessToken)
 				const params: ZoneGetParams = {
 					zone_id: zone,
 				}
@@ -147,7 +147,7 @@ export function registerAnalyticTools(agent: DNSAnalyticsMCP) {
 		'List zones under the current active account',
 		async () => {
 			try {
-				const client = getCloudflareClient(env.DEV_CLOUDFLARE_API_TOKEN)
+				const client = getCloudflareClient(agent.props.accessToken)
 				const accountId = await agent.getActiveAccountId()
 				if (!accountId) {
 					return {

apps/workers-bindings/evals/kv_namespaces.eval.ts

@@ -37,7 +37,7 @@ eachModel('$modelName', ({ model }) => {
 		],
 		task: async (input: string) => {
 			const client = await initializeClient(/* Pass necessary mocks/config */)
-			const { promptOutput, toolCalls, fullResult } = await runTask(client, model, input)
+			const { promptOutput, toolCalls } = await runTask(client, model, input)
 
 			const toolCall = toolCalls.find((call) => call.toolName === 'kv_namespaces_list')
 			expect(toolCall, 'Tool kv_namespaces_list was not called').toBeDefined()
@@ -58,7 +58,7 @@ eachModel('$modelName', ({ model }) => {
 		],
 		task: async (input: string) => {
 			const client = await initializeClient(/* Pass necessary mocks/config */)
-			const { promptOutput, toolCalls, fullResult } = await runTask(client, model, input)
+			const { promptOutput, toolCalls } = await runTask(client, model, input)
 
 			const toolCall = toolCalls.find((call) => call.toolName === 'kv_namespace_update')
 			expect(toolCall, 'Tool kv_namespace_update was not called').toBeDefined()
@@ -100,7 +100,7 @@ eachModel('$modelName', ({ model }) => {
 		],
 		task: async (input: string) => {
 			const client = await initializeClient(/* Pass necessary mocks/config */)
-			const { promptOutput, toolCalls, fullResult } = await runTask(client, model, input)
+			const { promptOutput, toolCalls } = await runTask(client, model, input)
 
 			const toolCall = toolCalls.find((call) => call.toolName === 'kv_namespace_delete')
 			expect(toolCall, 'Tool kv_namespace_delete was not called').toBeDefined()

apps/workers-bindings/evals/utils.ts

@@ -59,8 +59,8 @@ export async function runTask(
 		maxSteps: 10,
 	})
 
-	for await (const part of res.fullStream) {
-	}
+	// for await (const part of res.fullStream) {
+	// }
 
 	// convert into an LLM readable result so our factuality checker can validate tool calls
 	let messagesWithTools = ''

apps/workers-bindings/src/index.ts

@@ -1,7 +1,6 @@
 import OAuthProvider from '@cloudflare/workers-oauth-provider'
 import { McpAgent } from 'agents/mcp'
 
-import { createApiHandler } from '@repo/mcp-common/src/api-handler'
 import {
 	createAuthHandlers,
 	handleTokenExchangeCallback,