i guess it needs to be hard-set version

Author: frankmeszaros

apps/cloudflare-one-casb/package.json

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

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

@@ -14,7 +14,7 @@ export const withAccountCheck = <T extends Record<string, any>>(
 	handler: ToolHandler<T>
 ) => {
 	return async (params: T) => {
-		const accountId = agent.getActiveAccountId()
+		const accountId = await agent.getActiveAccountId()
 		if (!accountId) {
 			return {
 				content: [
@@ -30,7 +30,7 @@ export const withAccountCheck = <T extends Record<string, any>>(
 			const result = await handler({
 				...params,
 				accountId,
-				apiToken: agent.props.accessToken as string,
+				apiToken: agent.props.accessToken || '',
 			})
 			return {
 				content: [{ type: 'text' as const, text: JSON.stringify(result) }],

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

@@ -1,7 +1,7 @@
 import type { z } from 'zod'
 
 export type ToolHandler<T extends Record<string, any>> = (
-	params: T & { accountId: string; apiToken: string }
+	params: T & { accountId: string | null; apiToken: string }
 ) => Promise<any>
 
 export interface ToolDefinition<T extends Record<string, any>> {