Dont use empty object in tool calls

Author: Maximo-Guk

apps/sandbox-container/server/containerMcp.ts

@@ -65,7 +65,6 @@ export class ContainerMcpAgent extends McpAgent<Env, {}, Props> {
 		this.server.tool(
 			'container_initialize',
 			'Start or reset the container',
-			{},
 			// @ts-ignore
 			async ({}) => {
 				return {
@@ -74,7 +73,7 @@ export class ContainerMcpAgent extends McpAgent<Env, {}, Props> {
 			}
 		)
 
-		this.server.tool('container_ping', 'Ping the container for liveliness', {}, async ({}) => {
+		this.server.tool('container_ping', 'Ping the container for liveliness', async ({}) => {
 			return {
 				content: [{ type: 'text', text: await this.container_ping() }],
 			}
@@ -112,7 +111,7 @@ export class ContainerMcpAgent extends McpAgent<Env, {}, Props> {
 				}
 			}
 		)
-		this.server.tool('container_files_list', 'List working directory file tree', {}, async ({}) => {
+		this.server.tool('container_files_list', 'List working directory file tree', async ({}) => {
 			// This approach relies on resources, which aren't handled well by Claude right now. Until that's sorted, we can just use file read, since it lists all files in a directory if a directory is passed to it.
 			//const files = await this.container_ls()
 

packages/mcp-common/src/tools/account.ts

@@ -6,48 +6,43 @@ import { type CloudflareMcpAgent } from '../types/cloudflare-mcp-agent'
 
 export function registerAccountTools(agent: CloudflareMcpAgent) {
 	// Tool to list all accounts
-	agent.server.tool(
-		'accounts_list',
-		'List all accounts in your Cloudflare account',
-		{},
-		async () => {
-			try {
-				const results = await handleAccountsList({
-					client: getCloudflareClient(agent.props.accessToken),
+	agent.server.tool('accounts_list', 'List all accounts in your Cloudflare account', async () => {
+		try {
+			const results = await handleAccountsList({
+				client: getCloudflareClient(agent.props.accessToken),
+			})
+			// Sort accounts by created_on date (newest first)
+			const accounts = results
+				// order by created_on desc ( newest first )
+				.sort((a, b) => {
+					if (!a.created_on) return 1
+					if (!b.created_on) return -1
+					return new Date(b.created_on).getTime() - new Date(a.created_on).getTime()
 				})
-				// Sort accounts by created_on date (newest first)
-				const accounts = results
-					// order by created_on desc ( newest first )
-					.sort((a, b) => {
-						if (!a.created_on) return 1
-						if (!b.created_on) return -1
-						return new Date(b.created_on).getTime() - new Date(a.created_on).getTime()
-					})
 
-				return {
-					content: [
-						{
-							type: 'text',
-							text: JSON.stringify({
-								accounts,
-								count: accounts.length,
-							}),
-						},
-					],
-				}
-			} catch (e) {
-				agent.server.recordError(e)
-				return {
-					content: [
-						{
-							type: 'text',
-							text: `Error listing accounts: ${e instanceof Error && e.message}`,
-						},
-					],
-				}
+			return {
+				content: [
+					{
+						type: 'text',
+						text: JSON.stringify({
+							accounts,
+							count: accounts.length,
+						}),
+					},
+				],
+			}
+		} catch (e) {
+			agent.server.recordError(e)
+			return {
+				content: [
+					{
+						type: 'text',
+						text: `Error listing accounts: ${e instanceof Error && e.message}`,
+					},
+				],
 			}
 		}
-	)
+	})
 
 	const activeAccountIdParam = z
 		.string()

packages/mcp-common/src/tools/r2_bucket.ts

@@ -688,7 +688,7 @@ export function registerR2BucketTools(agent: CloudflareMcpAgent) {
 	// 	}
 	// )
 
-	// agent.server.tool('r2_metrics_list', 'List metrics for an R2 bucket', {}, async () => {
+	// agent.server.tool('r2_metrics_list', 'List metrics for an R2 bucket', async () => {
 	// 	const account_id = agent.getActiveAccountId()
 	// 	if (!account_id) {
 	// 		return MISSING_ACCOUNT_ID_RESPONSE

packages/mcp-common/src/tools/worker.ts

@@ -15,7 +15,7 @@ const workerNameParam = z.string().describe('The name of the worker script to re
 
 export function registerWorkersTools(agent: CloudflareMcpAgent) {
 	// Tool to list all workers
-	agent.server.tool('workers_list', 'List all Workers in your Cloudflare account', {}, async () => {
+	agent.server.tool('workers_list', 'List all Workers in your Cloudflare account', async () => {
 		const accountId = agent.getActiveAccountId()
 		if (!accountId) {
 			return {