WIP more scaffolding

Author: jahands

apps/workers-builds/src/index.ts

@@ -15,7 +15,7 @@ import { registerAccountTools } from '@repo/mcp-common/src/tools/account'
 import { registerWorkersTools } from '@repo/mcp-common/src/tools/worker'
 
 import { MetricsTracker } from '../../../packages/mcp-observability/src'
-import { registerBuildsTools } from './tools/observability'
+import { registerBuildsTools } from './tools/builds'
 
 import type { AuthProps } from '@repo/mcp-common/src/cloudflare-oauth-handler'
 import type { Env } from './context'
@@ -99,12 +99,12 @@ export class BuildsMCP extends McpAgent<Env, State, Props> {
 	}
 }
 
-const ObservabilityScopes = {
+const BuildsScopes = {
 	...RequiredScopes,
 	'account:read': 'See your account info such as account details, analytics, and memberships.',
 	'workers:write':
 		'See and change Cloudflare Workers data such as zones, KV storage, namespaces, scripts, and routes.',
-	'workers_observability:read': 'See observability logs for your account',
+	// TODO: add builds
 } as const
 
 export default {
@@ -119,7 +119,7 @@ export default {
 				'/sse': BuildsMCP.serveSSE('/sse'),
 			},
 			// @ts-ignore
-			defaultHandler: createAuthHandlers({ scopes: ObservabilityScopes, metrics }),
+			defaultHandler: createAuthHandlers({ scopes: BuildsScopes, metrics }),
 			authorizeEndpoint: '/oauth/authorize',
 			tokenEndpoint: '/token',
 			tokenExchangeCallback: (options) =>

apps/workers-builds/src/tools/builds.ts

@@ -0,0 +1,67 @@
+import {
+	handleWorkerLogsKeys,
+	handleWorkerLogsValues,
+	queryWorkersObservability,
+} from '@repo/mcp-common/src/api/workers-observability'
+import {
+	zKeysRequest,
+	zQueryRunRequest,
+	zValuesRequest,
+} from '@repo/mcp-common/src/types/workers-logs-schemas'
+
+import type { BuildsMCP } from '../index'
+
+/**
+ * Registers the logs analysis tool with the MCP server
+ * @param server The MCP server instance
+ * @param accountId Cloudflare account ID
+ * @param apiToken Cloudflare API token
+ */
+export function registerBuildsTools(agent: BuildsMCP) {
+	// Register the worker logs analysis tool by worker name
+	agent.server.tool(
+		'list_workers_builds',
+		`
+Query the Workers Builds API to view builds from your Cloudflare Workers.
+`.trim(),
+
+		{
+			query: zQueryRunRequest,
+		},
+		async ({ query }) => {
+			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)',
+						},
+					],
+				}
+			}
+			try {
+				const res = await queryWorkersObservability(agent.props.accessToken, accountId, query)
+				return {
+					content: [
+						{
+							type: 'text',
+							text: JSON.stringify(res),
+						},
+					],
+				}
+			} catch (error) {
+				return {
+					content: [
+						{
+							type: 'text',
+							text: JSON.stringify({
+								error: `Error analyzing worker logs: ${error instanceof Error && error.message}`,
+							}),
+						},
+					],
+				}
+			}
+		}
+	)
+}

apps/workers-builds/src/tools/observability.ts

@@ -0,0 +1,30 @@
+import { fetchCloudflareApi } from '../cloudflare-api'
+import {
+	zKeysResponse,
+	zReturnedQueryRunResult,
+	zValuesResponse,
+} from '../types/workers-logs-schemas'
+import { V4Schema } from '../v4-api'
+
+import type { z } from 'zod'
+import type { zKeysRequest, zQueryRunRequest, zValuesRequest } from '../types/workers-logs-schemas'
+
+export async function listWorkersBuilds(
+	apiToken: string,
+	accountId: string
+): Promise<z.infer<typeof zReturnedQueryRunResult> | null> {
+	const data = await fetchCloudflareApi({
+		endpoint: '/workers/observability/telemetry/query',
+		accountId,
+		apiToken,
+		responseSchema: V4Schema(zReturnedQueryRunResult),
+		options: {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		},
+	})
+
+	return data.result
+}