Add Sentry client to CloudflareMCPServer (#74)

* Add sentry client to CloudflareMCPServer

* Dont use empty object in tool calls & update agents deps (cloudflare#80)

* Add syncpack lint job

* Dont use empty object in tool calls

* Allow sentry to only record the scope search param

Author: Maximo-Guk

.github/workflows/test-and-check.yml

@@ -21,6 +21,8 @@ jobs:
           cache: 'pnpm'
       - name: Install dependencies
         run: pnpm install
+      - name: Syncpack lint
+        run: pnpm syncpack lint
       - name: Run linter
         run: pnpm check:turbo
       - name: Run linter (formatting)

.syncpackrc.cjs

@@ -14,12 +14,12 @@ const config = {
 		{
 			label: 'Sentry types that are compatible with toucan-js',
 			dependencies: ['@sentry/types', '@sentry/tracing'],
-			pinVersion: '7.76.0',
+			pinVersion: '8.9.2',
 		},
 		{
 			label: 'toucan-js that is compatible with pinned sentry types',
 			dependencies: ['toucan-js'],
-			pinVersion: '3.3.1',
+			pinVersion: '4.1.1',
 		},
 		{
 			label: 'pin vitest compatible with @cloudflare/vitest-pool-workers',

apps/docs-autorag/package.json

@@ -12,12 +12,12 @@
 		"test": "vitest run"
 	},
 	"dependencies": {
-		"@cloudflare/workers-oauth-provider": "0.0.2",
+		"@cloudflare/workers-oauth-provider": "0.0.3",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.9.0",
+		"@modelcontextprotocol/sdk": "1.10.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.0.62",
+		"agents": "0.0.67",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"mime": "4.0.6",

apps/docs-autorag/src/index.ts

@@ -15,9 +15,12 @@ export type Props = never
 export type State = never
 
 export class CloudflareDocumentationMCP extends McpAgent<Env, State, Props> {
-	server = new CloudflareMCPServer(undefined, env.MCP_METRICS, {
-		name: env.MCP_SERVER_NAME,
-		version: env.MCP_SERVER_VERSION,
+	server = new CloudflareMCPServer({
+		wae: env.MCP_METRICS,
+		serverInfo: {
+			name: env.MCP_SERVER_NAME,
+			version: env.MCP_SERVER_VERSION,
+		},
 	})
 
 	constructor(

apps/sandbox-container/package.json

@@ -18,26 +18,23 @@
 		"eval:ci": "start-server-and-test --expect 404 eval:server http://localhost:8976 'vitest run --testTimeout=60000 --config vitest.config.evals.ts'"
 	},
 	"dependencies": {
-		"@cloudflare/workers-oauth-provider": "0.0.2",
+		"@cloudflare/workers-oauth-provider": "0.0.3",
 		"@hono/node-server": "1.13.8",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.9.0",
+		"@modelcontextprotocol/sdk": "1.10.2",
 		"@n8n/json-schema-to-zod": "1.1.0",
 		"@repo/eval-tools": "workspace:*",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
 		"@types/node": "22.14.1",
-		"agents": "0.0.62",
+		"agents": "0.0.67",
 		"cron-schedule": "5.0.4",
 		"esbuild": "0.25.1",
 		"hono": "4.7.6",
 		"mime": "4.0.6",
-		"octokit": "4.1.2",
-		"partyserver": "0.0.65",
 		"simple-git-hooks": "2.12.1",
 		"tsx": "4.19.3",
 		"vitest-evals": "0.1.4",
-		"workers-mcp": "0.1.0-3",
 		"zod": "3.24.2"
 	},
 	"devDependencies": {

apps/sandbox-container/server/containerMcp.ts

@@ -52,15 +52,15 @@ export class ContainerMcpAgent extends McpAgent<Env, {}, Props> {
 
 	async init() {
 		this.props.user.id
-		this.server = new CloudflareMCPServer(
-			this.props.user.id,
-			this.env.MCP_METRICS,
-			{
+		this.server = new CloudflareMCPServer({
+			userId: this.props.user.id,
+			wae: this.env.MCP_METRICS,
+			serverInfo: {
 				name: this.env.MCP_SERVER_NAME,
 				version: this.env.MCP_SERVER_VERSION,
 			},
-			{ instructions: BASE_INSTRUCTIONS }
-		)
+			options: { instructions: BASE_INSTRUCTIONS },
+		})
 
 		this.server.tool(
 			'container_initialize',

apps/workers-bindings/package.json

@@ -22,12 +22,12 @@
 		"wrangler": "4.10.0"
 	},
 	"dependencies": {
-		"@cloudflare/workers-oauth-provider": "0.0.2",
-		"@modelcontextprotocol/sdk": "1.9.0",
+		"@cloudflare/workers-oauth-provider": "0.0.3",
+		"@modelcontextprotocol/sdk": "1.10.2",
 		"@n8n/json-schema-to-zod": "1.1.0",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.0.62",
+		"agents": "0.0.67",
 		"hono": "4.7.6",
 		"zod": "3.24.2"
 	}

apps/workers-bindings/src/index.ts

@@ -57,9 +57,13 @@ export class WorkersBindingsMCP extends McpAgent<Env, WorkersBindingsMCPState, P
 	}
 
 	async init() {
-		this.server = new CloudflareMCPServer(this.props.user.id, this.env.MCP_METRICS, {
-			name: this.env.MCP_SERVER_NAME,
-			version: this.env.MCP_SERVER_VERSION,
+		this.server = new CloudflareMCPServer({
+			userId: this.props.user.id,
+			wae: this.env.MCP_METRICS,
+			serverInfo: {
+				name: this.env.MCP_SERVER_NAME,
+				version: this.env.MCP_SERVER_VERSION,
+			},
 		})
 
 		registerAccountTools(this)

apps/workers-observability/package.json

@@ -12,12 +12,12 @@
 		"test": "vitest run"
 	},
 	"dependencies": {
-		"@cloudflare/workers-oauth-provider": "0.0.2",
+		"@cloudflare/workers-oauth-provider": "0.0.3",
 		"@hono/zod-validator": "0.4.3",
-		"@modelcontextprotocol/sdk": "1.9.0",
+		"@modelcontextprotocol/sdk": "1.10.2",
 		"@repo/mcp-common": "workspace:*",
 		"@repo/mcp-observability": "workspace:*",
-		"agents": "0.0.62",
+		"agents": "0.0.67",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
 		"zod": "3.24.2"

apps/workers-observability/src/context.ts

@@ -9,4 +9,8 @@ export interface Env {
 	CLOUDFLARE_CLIENT_SECRET: 'PLACEHOLDER'
 	MCP_OBJECT: DurableObjectNamespace<ObservabilityMCP>
 	MCP_METRICS: AnalyticsEngineDataset
+	SENTRY_ACCESS_CLIENT_ID: 'PLACEHOLDER'
+	SENTRY_ACCESS_CLIENT_SECRET: 'PLACEHOLDER'
+	GIT_HASH: 'OVERRIDEN_DURING_DEPLOYMENT'
+	SENTRY_DSN: 'PLACEHOLDER'
 }