Merge pull request #6 from frankmeszaros/fm/cf1-ces-mcp

add more full-fledged param set

Author: frankmeszaros

apps/cloudflare-one-email-security/src/tools/email-security.tools.ts

@@ -25,32 +25,144 @@ const endParam = z
 	.optional()
 	.describe('ISO 8601 datetime string marking end of search range. Defaults to now if omitted.')
 
+// Boolean flags
+const actionLogParam = z
+	.boolean()
+	.optional()
+	.describe('Include the message action log in response when true.')
+
+const detectionsOnlyParam = z
+	.boolean()
+	.optional()
+	.describe('When true, results include only detection information.')
+
+// Simple string params
+const alertIdParam = z.string().optional().describe('Filter by alert_id')
+const domainParam = z.string().optional().describe('Filter by sender domain')
+const messageIdParam = z.string().optional().describe('Filter by message_id')
+const metricParam = z.string().optional().describe('Metric filter (reserved)')
+const recipientParam = z.string().optional().describe('Filter by recipient email')
+const senderParam = z.string().optional().describe('Filter by sender email')
+
+// Enumerations
+const finalDispositionParam = z
+	.enum([
+		'MALICIOUS',
+		'MALICIOUS-BEC',
+		'SUSPICIOUS',
+		'SPOOF',
+		'BENIGN',
+		'UNKNOWN',
+	])
+	.optional()
+	.describe('Filter by final disposition')
+
+const messageActionParam = z
+	.enum(['PREVIEW', 'QUARANTINE_RELEASED', 'MOVED'])
+	.optional()
+	.describe('Filter by message action')
+
+// Pagination
+const pageParam = z.number().int().positive().optional().describe('Result page number')
+const perPageParam = z
+	.number()
+	.int()
+	.positive()
+	.max(100)
+	.optional()
+	.describe('Results per page (max 100)')
+
 export function registerEmailSecurityTools(agent: EmailSecurityMCP) {
 	agent.server.tool(
 		'email_security_search_messages',
 		'Search Cloudflare Email Security messages via Investigate list endpoint',
-		{ query: searchQueryParam, start: startParam, end: endParam },
+		{
+			query: searchQueryParam,
+			start: startParam,
+			end: endParam,
+			actionLog: actionLogParam,
+			alertId: alertIdParam,
+			detectionsOnly: detectionsOnlyParam,
+			domain: domainParam,
+			finalDisposition: finalDispositionParam,
+			messageAction: messageActionParam,
+			messageId: messageIdParam,
+			metric: metricParam,
+			page: pageParam,
+			perPage: perPageParam,
+			recipient: recipientParam,
+			sender: senderParam,
+		},
 		withAccountCheck<{
 			query?: string
 			start?: string
 			end?: string
+			actionLog?: boolean
+			alertId?: string
+			detectionsOnly?: boolean
+			domain?: string
+			finalDisposition?: string
+			messageAction?: string
+			messageId?: string
+			metric?: string
+			page?: number
+			perPage?: number
+			recipient?: string
+			sender?: string
 		}>(
 			agent,
-			async ({ query, start, end, accountId, apiToken }: {
+			async ({
+				query,
+				start,
+				end,
+				actionLog,
+				alertId,
+				detectionsOnly,
+				domain,
+				finalDisposition,
+				messageAction,
+				messageId,
+				metric,
+				page,
+				perPage,
+				recipient,
+				sender,
+			}: {
 				query?: string
 				start?: string
 				end?: string
-				accountId: string | null
-				apiToken: string
+				actionLog?: boolean
+				alertId?: string
+				detectionsOnly?: boolean
+				domain?: string
+				finalDisposition?: string
+				messageAction?: string
+				messageId?: string
+				metric?: string
+				page?: number
+				perPage?: number
+				recipient?: string
+				sender?: string
 			}) => {
-				const client = getCloudflareClient(apiToken)
+				const accountId = await agent.getActiveAccountId()
+				const client = getCloudflareClient(agent.props.accessToken)
 
 				const params: any = { account_id: accountId }
 				if (query) params.query = query
 				if (start) params.start = start
 				if (end) params.end = end
-				// Limit page result count per_page to PAGE_SIZE
-				params.per_page = PAGE_SIZE
+				if (actionLog !== undefined) params.action_log = actionLog
+				if (alertId) params.alert_id = alertId
+				if (detectionsOnly !== undefined) params.detections_only = detectionsOnly
+				if (domain) params.domain = domain
+				if (finalDisposition) params.final_disposition = finalDisposition
+				if (messageAction) params.message_action = messageAction
+				if (messageId) params.message_id = messageId
+				if (metric) params.metric = metric
+				if (page) params.page = page
+				params.per_page = perPage ?? PAGE_SIZE
+				if (recipient) params.recipient = recipient
+				if (sender) params.sender = sender
 
 				const messages: any[] = []
 				try {