Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

refactor(web): give rbac a feature front door (#16728)

Nikita Kabardinccbbc0655673
diff --git a/web/src/ee/features/audit-log-viewer/AuditLogsSettingsPage.tsx b/web/src/ee/features/audit-log-viewer/AuditLogsSettingsPage.tsx
index 8a7d057a65..2380a90bc8 100644
--- a/web/src/ee/features/audit-log-viewer/AuditLogsSettingsPage.tsx
+++ b/web/src/ee/features/audit-log-viewer/AuditLogsSettingsPage.tsx
@@ -2,7 +2,7 @@ import Header from "@/src/components/layouts/header";
import { Alert } from "@/src/components/design-system/Alert/Alert";
import { AuditLogsTable } from "@/src/ee/features/audit-log-viewer/AuditLogsTable";
import { useHasEntitlement } from "@/src/features/entitlements/hooks";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
export function AuditLogsSettingsPage(props: { projectId: string }) {
const hasAccess = useHasProjectAccess({
diff --git a/web/src/ee/features/audit-log-viewer/OrgAuditLogsSettingsPage.tsx b/web/src/ee/features/audit-log-viewer/OrgAuditLogsSettingsPage.tsx
index 68086e5ce0..330809992d 100644
--- a/web/src/ee/features/audit-log-viewer/OrgAuditLogsSettingsPage.tsx
+++ b/web/src/ee/features/audit-log-viewer/OrgAuditLogsSettingsPage.tsx
@@ -2,7 +2,7 @@ import Header from "@/src/components/layouts/header";
import { Alert } from "@/src/components/design-system/Alert/Alert";
import { AuditLogsTable } from "@/src/ee/features/audit-log-viewer/AuditLogsTable";
import { useHasEntitlement } from "@/src/features/entitlements/hooks";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { useHasOrganizationAccess } from "@/src/features/rbac";
export function OrgAuditLogsSettingsPage(props: { orgId: string }) {
const hasAccess = useHasOrganizationAccess({
diff --git a/web/src/ee/features/billing/components/BillingSettings.tsx b/web/src/ee/features/billing/components/BillingSettings.tsx
index 9dbdc8a6cc..b7ff8d9a86 100644
--- a/web/src/ee/features/billing/components/BillingSettings.tsx
+++ b/web/src/ee/features/billing/components/BillingSettings.tsx
@@ -1,9 +1,9 @@
// Langfuse Cloud only
+import { useHasOrganizationAccess } from "@/src/features/rbac";
import Header from "@/src/components/layouts/header";
import { useHasEntitlement } from "@/src/features/entitlements/hooks";
import { useRouter } from "next/router";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
import { Alert } from "@/src/components/design-system/Alert/Alert";
import { BillingUsageChart } from "./BillingUsageChart";
diff --git a/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsSection.tsx b/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsSection.tsx
index 724c56bf52..2d92379cab 100644
--- a/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsSection.tsx
+++ b/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsSection.tsx
@@ -3,7 +3,7 @@ import { Button } from "@/src/components/ui/button";
import { Plus } from "lucide-react";
import { SpendAlertsTable } from "./SpendAlertsTable";
import { SpendAlertDialog } from "./SpendAlertDialog";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { useHasOrganizationAccess } from "@/src/features/rbac";
import { useHasEntitlement } from "@/src/features/entitlements/hooks";
interface SpendAlertsSectionProps {
diff --git a/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsTable.tsx b/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsTable.tsx
index 4767ffec13..5878662d94 100644
--- a/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsTable.tsx
+++ b/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsTable.tsx
@@ -2,7 +2,7 @@ import { useMemo, useState } from "react";
import { DropdownMenuItem } from "@/src/components/ui/dropdown-menu";
import { Edit, Trash2 } from "lucide-react";
import { api } from "@/src/utils/api";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { useHasOrganizationAccess } from "@/src/features/rbac";
import { formatDistanceToNow } from "date-fns";
import { SpendAlertDialog } from "./SpendAlertDialog";
import { DeleteSpendAlertDialog } from "./DeleteSpendAlertDialog";
diff --git a/web/src/ee/features/billing/components/StripeCustomerPortalButton.tsx b/web/src/ee/features/billing/components/StripeCustomerPortalButton.tsx
index 823c09701e..2be27d478c 100644
--- a/web/src/ee/features/billing/components/StripeCustomerPortalButton.tsx
+++ b/web/src/ee/features/billing/components/StripeCustomerPortalButton.tsx
@@ -1,5 +1,5 @@
import { Button } from "@/src/components/ui/button";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { useHasOrganizationAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
import { useEffect, useState } from "react";
import { toast } from "sonner";
diff --git a/web/src/ee/features/billing/server/cloudBillingRouter.ts b/web/src/ee/features/billing/server/cloudBillingRouter.ts
index b036191690..7afd8c4d78 100644
--- a/web/src/ee/features/billing/server/cloudBillingRouter.ts
+++ b/web/src/ee/features/billing/server/cloudBillingRouter.ts
@@ -7,7 +7,7 @@ import {
protectedOrganizationProcedure,
} from "@/src/server/api/trpc";
import { TRPCError } from "@trpc/server";
-import { throwIfNoOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { throwIfNoOrganizationAccess } from "@/src/features/rbac";
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { logger } from "@langfuse/shared/src/server";
import { type BillingProvider } from "@langfuse/shared";
diff --git a/web/src/ee/features/billing/server/spendAlertRouter.ts b/web/src/ee/features/billing/server/spendAlertRouter.ts
index 4dc1f3328d..88da3354b7 100644
--- a/web/src/ee/features/billing/server/spendAlertRouter.ts
+++ b/web/src/ee/features/billing/server/spendAlertRouter.ts
@@ -7,7 +7,7 @@ import {
protectedOrganizationProcedure,
} from "@/src/server/api/trpc";
import { TRPCError } from "@trpc/server";
-import { throwIfNoOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { throwIfNoOrganizationAccess } from "@/src/features/rbac";
import { auditLog } from "@/src/features/audit-logs/auditLog";
export const spendAlertRouter = createTRPCRouter({
diff --git a/web/src/ee/features/multi-tenant-sso/server/ssoConfigRouter.ts b/web/src/ee/features/multi-tenant-sso/server/ssoConfigRouter.ts
index de426ac462..c1cc15ea89 100644
--- a/web/src/ee/features/multi-tenant-sso/server/ssoConfigRouter.ts
+++ b/web/src/ee/features/multi-tenant-sso/server/ssoConfigRouter.ts
@@ -1,6 +1,6 @@
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { throwIfNoEntitlement } from "@/src/features/entitlements/server/hasEntitlement";
-import { throwIfNoOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { throwIfNoOrganizationAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedOrganizationProcedure,
diff --git a/web/src/ee/features/sso-settings/components/SSOSettings.tsx b/web/src/ee/features/sso-settings/components/SSOSettings.tsx
index b45be05607..9c061d92e8 100644
--- a/web/src/ee/features/sso-settings/components/SSOSettings.tsx
+++ b/web/src/ee/features/sso-settings/components/SSOSettings.tsx
@@ -54,7 +54,7 @@ import Header from "@/src/components/layouts/header";
import { useHasEntitlement } from "@/src/features/entitlements/hooks";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { useHasOrganizationAccess } from "@/src/features/rbac";
import { VerifiedDomainsSettings } from "@/src/ee/features/verified-domains/components/VerifiedDomainsSettings";
import { SsoProviderSchema } from "@/src/ee/features/multi-tenant-sso/types";
import { api } from "@/src/utils/api";
diff --git a/web/src/ee/features/verified-domains/components/VerifiedDomainsSettings.tsx b/web/src/ee/features/verified-domains/components/VerifiedDomainsSettings.tsx
index fd9c766205..af9d7e67b1 100644
--- a/web/src/ee/features/verified-domains/components/VerifiedDomainsSettings.tsx
+++ b/web/src/ee/features/verified-domains/components/VerifiedDomainsSettings.tsx
@@ -45,7 +45,7 @@ import Header from "@/src/components/layouts/header";
import { useHasEntitlement } from "@/src/features/entitlements/hooks";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { useHasOrganizationAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
import { zodResolver } from "@hookform/resolvers/zod";
import { AlertCircle, ChevronRight, TrashIcon } from "lucide-react";
diff --git a/web/src/ee/features/verified-domains/server/verifiedDomainRouter.ts b/web/src/ee/features/verified-domains/server/verifiedDomainRouter.ts
index e2fb8df8e5..09e1b06fd5 100644
--- a/web/src/ee/features/verified-domains/server/verifiedDomainRouter.ts
+++ b/web/src/ee/features/verified-domains/server/verifiedDomainRouter.ts
@@ -1,6 +1,6 @@
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { throwIfNoEntitlement } from "@/src/features/entitlements/server/hasEntitlement";
-import { throwIfNoOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { throwIfNoOrganizationAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedOrganizationProcedure,
diff --git a/web/src/features/annotation-queues/components/AddTracesToAnnotationQueueDialogController.tsx b/web/src/features/annotation-queues/components/AddTracesToAnnotationQueueDialogController.tsx
index d3351e21bc..c9adbf8122 100644
--- a/web/src/features/annotation-queues/components/AddTracesToAnnotationQueueDialogController.tsx
+++ b/web/src/features/annotation-queues/components/AddTracesToAnnotationQueueDialogController.tsx
@@ -2,7 +2,7 @@ import { type ReactNode, useState } from "react";
import { ActionId, BatchExportTableName } from "@langfuse/shared";
import { api } from "@/src/utils/api";
import { Dialog, DialogContent } from "@/src/components/ui/dialog";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useEntitlementLimit } from "@/src/features/entitlements/hooks";
import { AddTracesToAnnotationQueueSelectDialogContent } from "@/src/features/annotation-queues/components/AddTracesToAnnotationQueueSelectDialogContent";
import { AnnotationQueueFormDialogController } from "@/src/features/annotation-queues/components/AnnotationQueueFormDialogController";
diff --git a/web/src/features/annotation-queues/components/AnnotationQueueFormDialogController.tsx b/web/src/features/annotation-queues/components/AnnotationQueueFormDialogController.tsx
index 704ee75147..3e101c8934 100644
--- a/web/src/features/annotation-queues/components/AnnotationQueueFormDialogController.tsx
+++ b/web/src/features/annotation-queues/components/AnnotationQueueFormDialogController.tsx
@@ -1,3 +1,4 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import {
type CreateQueueWithAssignments,
type ScoreConfigDomain,
@@ -8,7 +9,6 @@ import { Dialog, DialogContent } from "@/src/components/ui/dialog";
import { AnnotationQueueFormDialogContent } from "@/src/features/annotation-queues/components/AnnotationQueueFormDialogContent";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { useWatchedPromiseCallback } from "@/src/hooks/useWatchedPromiseCallback";
import { api } from "@/src/utils/api";
diff --git a/web/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController.tsx b/web/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController.tsx
index 815547a2b0..6480f71132 100644
--- a/web/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController.tsx
+++ b/web/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController.tsx
@@ -6,7 +6,7 @@ import {
AnnotationQueueItemMenuContent,
type AnnotationQueueItemMenuQueue,
} from "@/src/features/annotation-queues/components/AnnotationQueueItemMenuContent";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api, reportNonTrpcError } from "@/src/utils/api";
import { type AnnotationQueueObjectType } from "@langfuse/shared";
import { type ReactNode, useCallback, useState } from "react";
diff --git a/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx b/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx
index 12fb92a38f..3c6ac9d8e9 100644
--- a/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx
+++ b/web/src/features/annotation-queues/components/AnnotationQueueItemPage.tsx
@@ -1,6 +1,6 @@
import { Card } from "@/src/components/ui/card";
import { Skeleton } from "@/src/components/ui/skeleton";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
import { type RouterOutput } from "@/src/utils/types";
import {
diff --git a/web/src/features/annotation-queues/components/AnnotationQueueItemsTable.tsx b/web/src/features/annotation-queues/components/AnnotationQueueItemsTable.tsx
index 6d64ff45dc..ff0d33ce3f 100644
--- a/web/src/features/annotation-queues/components/AnnotationQueueItemsTable.tsx
+++ b/web/src/features/annotation-queues/components/AnnotationQueueItemsTable.tsx
@@ -28,7 +28,7 @@ import {
DialogTitle,
} from "@/src/components/ui/dialog";
import { Checkbox } from "@/src/components/design-system/Checkbox/Checkbox";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { createStatusTableColumn } from "@/src/components/design-system/table/columns/createStatusTableColumn";
import { type Status } from "@/src/components/ui/StatusBadge/StatusBadge";
import { createIdTableColumn } from "@/src/components/design-system/table/columns/createIdTableColumn";
diff --git a/web/src/features/annotation-queues/components/AnnotationQueuesItem.tsx b/web/src/features/annotation-queues/components/AnnotationQueuesItem.tsx
index 1f646d6639..62a6b932e6 100644
--- a/web/src/features/annotation-queues/components/AnnotationQueuesItem.tsx
+++ b/web/src/features/annotation-queues/components/AnnotationQueuesItem.tsx
@@ -1,5 +1,5 @@
import { SupportOrUpgradePage } from "@/src/ee/features/billing/components/SupportOrUpgradePage";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { AnnotationQueueItemPage } from "@/src/features/annotation-queues/components/AnnotationQueueItemPage";
import { api } from "@/src/utils/api";
import Page from "@/src/components/layouts/page";
diff --git a/web/src/features/annotation-queues/components/AnnotationQueuesTable.tsx b/web/src/features/annotation-queues/components/AnnotationQueuesTable.tsx
index e1ba892bf2..0ca10da50e 100644
--- a/web/src/features/annotation-queues/components/AnnotationQueuesTable.tsx
+++ b/web/src/features/annotation-queues/components/AnnotationQueuesTable.tsx
@@ -16,7 +16,7 @@ import { createLinkTableColumn } from "@/src/components/design-system/table/colu
import { createNumberTableColumn } from "@/src/components/design-system/table/columns/createNumberTableColumn";
import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";
import Link from "next/link";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { DeleteAnnotationQueueButton } from "@/src/features/annotation-queues/components/DeleteAnnotationQueueButton";
import { getScoreDataTypeIcon } from "@/src/features/scores/lib/scoreColumns";
import { type ScoreConfigDataType } from "@langfuse/shared";
diff --git a/web/src/features/annotation-queues/components/CreateOrEditAnnotationQueueButton.tsx b/web/src/features/annotation-queues/components/CreateOrEditAnnotationQueueButton.tsx
index 47d3e8f5bc..fe317d9a34 100644
--- a/web/src/features/annotation-queues/components/CreateOrEditAnnotationQueueButton.tsx
+++ b/web/src/features/annotation-queues/components/CreateOrEditAnnotationQueueButton.tsx
@@ -1,5 +1,5 @@
import { type ButtonProps } from "@/src/components/ui/button";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Edit, Pen, PlusIcon } from "lucide-react";
import { api } from "@/src/utils/api";
import { useEntitlementLimit } from "@/src/features/entitlements/hooks";
diff --git a/web/src/features/annotation-queues/components/UserAssignmentSection.tsx b/web/src/features/annotation-queues/components/UserAssignmentSection.tsx
index 970f1c140c..86a76757c3 100644
--- a/web/src/features/annotation-queues/components/UserAssignmentSection.tsx
+++ b/web/src/features/annotation-queues/components/UserAssignmentSection.tsx
@@ -1,6 +1,6 @@
import { api } from "@/src/utils/api";
import { MoreHorizontal, X } from "lucide-react";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Button } from "@/src/components/ui/button";
import { MultiSelectCombobox } from "@/src/components/ui/multi-select-combobox";
import { useUserSearch } from "@/src/hooks/useUserSearch";
diff --git a/web/src/features/annotation-queues/hooks/useSelectedUsers.ts b/web/src/features/annotation-queues/hooks/useSelectedUsers.ts
index 613dffd9fb..b9bfe362a3 100644
--- a/web/src/features/annotation-queues/hooks/useSelectedUsers.ts
+++ b/web/src/features/annotation-queues/hooks/useSelectedUsers.ts
@@ -1,5 +1,5 @@
import { api } from "@/src/utils/api";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
interface UseSelectedUsersProps {
projectId: string;
diff --git a/web/src/features/annotation-queues/pages/AnnotationQueueItems.tsx b/web/src/features/annotation-queues/pages/AnnotationQueueItems.tsx
index 3bfe297a95..3d45a92863 100644
--- a/web/src/features/annotation-queues/pages/AnnotationQueueItems.tsx
+++ b/web/src/features/annotation-queues/pages/AnnotationQueueItems.tsx
@@ -6,7 +6,7 @@ import { ClipboardPen, Lock } from "lucide-react";
import { Badge } from "@/src/components/ui/badge";
import Link from "next/link";
import { CreateOrEditAnnotationQueueButton } from "@/src/features/annotation-queues/components/CreateOrEditAnnotationQueueButton";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { SupportOrUpgradePage } from "@/src/ee/features/billing/components/SupportOrUpgradePage";
import { Skeleton } from "@/src/components/ui/skeleton";
import Page from "@/src/components/layouts/page";
diff --git a/web/src/features/annotation-queues/pages/AnnotationQueues.tsx b/web/src/features/annotation-queues/pages/AnnotationQueues.tsx
index 4b42c85588..8f707a00a9 100644
--- a/web/src/features/annotation-queues/pages/AnnotationQueues.tsx
+++ b/web/src/features/annotation-queues/pages/AnnotationQueues.tsx
@@ -1,6 +1,6 @@
import { useRouter } from "next/router";
import { AnnotationQueuesTable } from "@/src/features/annotation-queues/components/AnnotationQueuesTable";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { SupportOrUpgradePage } from "@/src/ee/features/billing/components/SupportOrUpgradePage";
import Page from "@/src/components/layouts/page";
import { AnnotationQueuesOnboarding } from "@/src/components/onboarding/AnnotationQueuesOnboarding";
diff --git a/web/src/features/annotation-queues/server/annotationQueueAssignmentsRouter.ts b/web/src/features/annotation-queues/server/annotationQueueAssignmentsRouter.ts
index cd5efa9e4d..a11da0758a 100644
--- a/web/src/features/annotation-queues/server/annotationQueueAssignmentsRouter.ts
+++ b/web/src/features/annotation-queues/server/annotationQueueAssignmentsRouter.ts
@@ -1,5 +1,5 @@
import { auditLog } from "@/src/features/audit-logs/auditLog";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/annotation-queues/server/annotationQueueItemsRouter.ts b/web/src/features/annotation-queues/server/annotationQueueItemsRouter.ts
index c9b5839870..aa0e821d16 100644
--- a/web/src/features/annotation-queues/server/annotationQueueItemsRouter.ts
+++ b/web/src/features/annotation-queues/server/annotationQueueItemsRouter.ts
@@ -1,5 +1,5 @@
import { auditLog } from "@/src/features/audit-logs/auditLog";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import { createBatchActionJob } from "@/src/features/table/server/createBatchActionJob";
import {
createTRPCRouter,
diff --git a/web/src/features/annotation-queues/server/annotationQueuesRouter.ts b/web/src/features/annotation-queues/server/annotationQueuesRouter.ts
index 13e9d8fe83..c143c35b57 100644
--- a/web/src/features/annotation-queues/server/annotationQueuesRouter.ts
+++ b/web/src/features/annotation-queues/server/annotationQueuesRouter.ts
@@ -1,6 +1,6 @@
import { env } from "@/src/env.mjs";
import { auditLog } from "@/src/features/audit-logs/auditLog";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/automations/components/AutomationButton.tsx b/web/src/features/automations/components/AutomationButton.tsx
index 91adfc660d..9948392770 100644
--- a/web/src/features/automations/components/AutomationButton.tsx
+++ b/web/src/features/automations/components/AutomationButton.tsx
@@ -1,5 +1,5 @@
import { ActionButton } from "@/src/components/ActionButton";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Zap } from "lucide-react";
import { api } from "@/src/utils/api";
import Spinner from "@/src/components/design-system/Spinner/Spinner";
diff --git a/web/src/features/automations/components/DeleteAutomationDialogController.tsx b/web/src/features/automations/components/DeleteAutomationDialogController.tsx
index 5ac50bae19..2f2a89df24 100644
--- a/web/src/features/automations/components/DeleteAutomationDialogController.tsx
+++ b/web/src/features/automations/components/DeleteAutomationDialogController.tsx
@@ -3,7 +3,7 @@ import { useState } from "react";
import { api } from "@/src/utils/api";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { DeleteAutomationDialog } from "./DeleteAutomationDialog";
type DeleteAutomationDialogControllerProps = {
diff --git a/web/src/features/automations/components/actions/SlackActionForm.tsx b/web/src/features/automations/components/actions/SlackActionForm.tsx
index eb84635dce..38e4e8692f 100644
--- a/web/src/features/automations/components/actions/SlackActionForm.tsx
+++ b/web/src/features/automations/components/actions/SlackActionForm.tsx
@@ -17,7 +17,7 @@ import {
} from "@/src/features/slack/components/ChannelSelector";
import { SlackTestMessageButton } from "@/src/features/slack/components/SlackTestMessageButton";
import { useState } from "react";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
interface SlackActionFormProps {
form: UseFormReturn<any>;
diff --git a/web/src/features/automations/components/automationForm.tsx b/web/src/features/automations/components/automationForm.tsx
index a51a06640a..7176736f5e 100644
--- a/web/src/features/automations/components/automationForm.tsx
+++ b/web/src/features/automations/components/automationForm.tsx
@@ -45,7 +45,7 @@ import {
import { InlineFilterBuilder } from "@/src/features/filters/components/filter-builder";
import { DeleteAutomationDialogController } from "./DeleteAutomationDialogController";
import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { ActionHandlerRegistry } from "./actions";
diff --git a/web/src/features/automations/server/router.ts b/web/src/features/automations/server/router.ts
index 5714aa5a18..f637351313 100644
--- a/web/src/features/automations/server/router.ts
+++ b/web/src/features/automations/server/router.ts
@@ -13,7 +13,7 @@ import {
TriggerEventSourceSchema,
ProjectNotificationEventTypeSchema,
} from "@langfuse/shared";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import { v4 } from "uuid";
import {
convertActionToDomain,
diff --git a/web/src/features/batch-actions/components/BatchActionsSettingsPage.tsx b/web/src/features/batch-actions/components/BatchActionsSettingsPage.tsx
index 3b0a55b8ba..4cadd9c10f 100644
--- a/web/src/features/batch-actions/components/BatchActionsSettingsPage.tsx
+++ b/web/src/features/batch-actions/components/BatchActionsSettingsPage.tsx
@@ -1,7 +1,7 @@
import Header from "@/src/components/layouts/header";
import { Alert } from "@/src/components/design-system/Alert/Alert";
import { SettingsTableCard } from "@/src/components/layouts/settings-table-card";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { BatchActionsTable } from "./BatchActionsTable";
export function BatchActionsSettingsPage(props: { projectId: string }) {
diff --git a/web/src/features/batch-actions/server/addToDatasetRouter.ts b/web/src/features/batch-actions/server/addToDatasetRouter.ts
index 997f850130..f59f647cc6 100644
--- a/web/src/features/batch-actions/server/addToDatasetRouter.ts
+++ b/web/src/features/batch-actions/server/addToDatasetRouter.ts
@@ -1,5 +1,5 @@
import { auditLog } from "@/src/features/audit-logs/auditLog";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/batch-actions/server/batchActionRouter.ts b/web/src/features/batch-actions/server/batchActionRouter.ts
index b6c318b01d..625a46bbc6 100644
--- a/web/src/features/batch-actions/server/batchActionRouter.ts
+++ b/web/src/features/batch-actions/server/batchActionRouter.ts
@@ -1,4 +1,4 @@
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/batch-actions/server/runEvaluationRouter.ts b/web/src/features/batch-actions/server/runEvaluationRouter.ts
index e7927e5730..d3578ee531 100644
--- a/web/src/features/batch-actions/server/runEvaluationRouter.ts
+++ b/web/src/features/batch-actions/server/runEvaluationRouter.ts
@@ -1,5 +1,5 @@
import { auditLog } from "@/src/features/audit-logs/auditLog";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/batch-exports/components/BatchExportsSettingsPage.tsx b/web/src/features/batch-exports/components/BatchExportsSettingsPage.tsx
index 3b9541fd5c..c1c448bc3e 100644
--- a/web/src/features/batch-exports/components/BatchExportsSettingsPage.tsx
+++ b/web/src/features/batch-exports/components/BatchExportsSettingsPage.tsx
@@ -1,7 +1,7 @@
import Header from "@/src/components/layouts/header";
import { Alert } from "@/src/components/design-system/Alert/Alert";
import { BatchExportsTable } from "@/src/features/batch-exports/components/BatchExportsTable";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { SettingsTableCard } from "@/src/components/layouts/settings-table-card";
export function BatchExportsSettingsPage(props: { projectId: string }) {
diff --git a/web/src/features/batch-exports/components/BatchExportsTable.tsx b/web/src/features/batch-exports/components/BatchExportsTable.tsx
index dc865b9efd..3a80a84dae 100644
--- a/web/src/features/batch-exports/components/BatchExportsTable.tsx
+++ b/web/src/features/batch-exports/components/BatchExportsTable.tsx
@@ -25,7 +25,7 @@ import {
AlertDialogTrigger,
} from "@/src/components/ui/alert-dialog";
import { useState } from "react";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { createUserTableColumn } from "@/src/components/design-system/table/columns/createUserTableColumn";
type BatchExportRow = RouterOutputs["batchExport"]["all"]["exports"][number];
diff --git a/web/src/features/batch-exports/server/batchExport.ts b/web/src/features/batch-exports/server/batchExport.ts
index 1ab9b7723b..be62a6802b 100644
--- a/web/src/features/batch-exports/server/batchExport.ts
+++ b/web/src/features/batch-exports/server/batchExport.ts
@@ -6,10 +6,7 @@ import {
hasEntitlement,
throwIfNoEntitlement,
} from "@/src/features/entitlements/server/hasEntitlement";
-import {
- hasProjectAccess,
- throwIfNoProjectAccess,
-} from "@/src/features/rbac/utils/checkProjectAccess";
+import { hasProjectAccess, throwIfNoProjectAccess } from "@/src/features/rbac";
import {
type AuthedSession,
createTRPCRouter,
diff --git a/web/src/features/blobstorage-integration/blobstorage-integration-router.ts b/web/src/features/blobstorage-integration/blobstorage-integration-router.ts
index 0d913b0abf..5efb6853f0 100644
--- a/web/src/features/blobstorage-integration/blobstorage-integration-router.ts
+++ b/web/src/features/blobstorage-integration/blobstorage-integration-router.ts
@@ -2,7 +2,7 @@ import { z } from "zod";
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { throwIfNoEntitlement } from "@/src/features/entitlements/server/hasEntitlement";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/chart-view/components/AddToDashboardButton.tsx b/web/src/features/chart-view/components/AddToDashboardButton.tsx
index 269fef8146..f31a48a28b 100644
--- a/web/src/features/chart-view/components/AddToDashboardButton.tsx
+++ b/web/src/features/chart-view/components/AddToDashboardButton.tsx
@@ -3,7 +3,7 @@ import { useRouter } from "next/router";
import { LayoutDashboard } from "lucide-react";
import { Button } from "@/src/components/ui/button";
import { api } from "@/src/utils/api";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { SelectDashboardDialog } from "@/src/features/dashboard/components/SelectDashboardDialog";
import { type ChartWidgetInput } from "../lib/chartConfigToWidget";
diff --git a/web/src/features/comments/CommentDrawerController.tsx b/web/src/features/comments/CommentDrawerController.tsx
index fc1795c61c..93cd91bada 100644
--- a/web/src/features/comments/CommentDrawerController.tsx
+++ b/web/src/features/comments/CommentDrawerController.tsx
@@ -6,7 +6,7 @@ import {
DrawerTitle,
} from "@/src/components/ui/drawer";
import { CommentList } from "@/src/features/comments/CommentList";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { type CommentObjectType } from "@langfuse/shared";
import { useRouter } from "next/router";
import { type ReactNode, useEffect, useRef, useState } from "react";
diff --git a/web/src/features/comments/CommentList.tsx b/web/src/features/comments/CommentList.tsx
index d8fae1a3af..a8ece03e63 100644
--- a/web/src/features/comments/CommentList.tsx
+++ b/web/src/features/comments/CommentList.tsx
@@ -22,7 +22,7 @@ import {
import { MarkdownView } from "@/src/components/ui/MarkdownViewer";
import { Textarea } from "@/src/components/ui/textarea";
import { Input } from "@/src/components/ui/input";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
import { getRelativeTimestampFromNow } from "@/src/utils/dates";
import { cn } from "@/src/utils/tailwind";
diff --git a/web/src/features/dashboard/components/DashboardTable.tsx b/web/src/features/dashboard/components/DashboardTable.tsx
index f75319b405..a8c4a24f9e 100644
--- a/web/src/features/dashboard/components/DashboardTable.tsx
+++ b/web/src/features/dashboard/components/DashboardTable.tsx
@@ -1,3 +1,4 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useEffect, useState } from "react";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
import { useOrderByState } from "@/src/features/orderBy/hooks/useOrderByState";
@@ -13,7 +14,6 @@ import { createLinkTableColumn } from "@/src/components/design-system/table/colu
import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";
import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
import { Button } from "@/src/components/ui/button";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { Copy, Edit, User as UserIcon } from "lucide-react";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
diff --git a/web/src/features/dashboard/components/HomeDashboardSelect.tsx b/web/src/features/dashboard/components/HomeDashboardSelect.tsx
index 24619be906..0e8bbb5fee 100644
--- a/web/src/features/dashboard/components/HomeDashboardSelect.tsx
+++ b/web/src/features/dashboard/components/HomeDashboardSelect.tsx
@@ -4,7 +4,7 @@ import { api } from "@/src/utils/api";
import { Combobox } from "@/src/components/ui/combobox";
import { LangfuseIcon } from "@/src/components/design-system/LangfuseIcon/LangfuseIcon";
import { Button } from "@/src/components/ui/button";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
/**
* Home's dashboard picker: selecting immediately shows ("peeks") the chosen
diff --git a/web/src/features/dashboard/server/dashboard-router.ts b/web/src/features/dashboard/server/dashboard-router.ts
index 088543aeb1..aa4d908aba 100644
--- a/web/src/features/dashboard/server/dashboard-router.ts
+++ b/web/src/features/dashboard/server/dashboard-router.ts
@@ -38,7 +38,7 @@ import {
LANGFUSE_HOME_DASHBOARD_ID,
type FilterState,
} from "@langfuse/shared";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
// Define the dashboard list input schema
const ListDashboardsInput = z.object({
diff --git a/web/src/features/datasets/components/CreateDatasetDialogController.tsx b/web/src/features/datasets/components/CreateDatasetDialogController.tsx
index 5d4f176977..27ac5fee86 100644
--- a/web/src/features/datasets/components/CreateDatasetDialogController.tsx
+++ b/web/src/features/datasets/components/CreateDatasetDialogController.tsx
@@ -1,10 +1,10 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Dialog } from "@/src/components/ui/dialog";
import {
CreateDatasetDialogContent,
type CreateDatasetDialogProps,
} from "@/src/features/datasets/components/CreateDatasetDialogContent";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { type ReactNode, useState } from "react";
export function CreateDatasetDialogController({
diff --git a/web/src/features/datasets/components/DatasetAggregateTableCell.tsx b/web/src/features/datasets/components/DatasetAggregateTableCell.tsx
index 641a21b533..5fbb216a1f 100644
--- a/web/src/features/datasets/components/DatasetAggregateTableCell.tsx
+++ b/web/src/features/datasets/components/DatasetAggregateTableCell.tsx
@@ -12,7 +12,7 @@ import { type EnrichedDatasetRunItem } from "@langfuse/shared/src/server";
import { ScoreRow } from "@/src/features/scores/components/ScoreRow";
import { type ScoreColumn } from "@/src/features/scores/types";
import { useRouter } from "next/router";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useMergedAggregates } from "@/src/features/scores/lib/useMergedAggregates";
import { useMergeScoreColumns } from "@/src/features/scores/lib/mergeScoreColumns";
import { useTrpcError } from "@/src/hooks/useTrpcError";
diff --git a/web/src/features/datasets/components/DatasetItemDetailPage.tsx b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
index 595f135667..701671ce23 100644
--- a/web/src/features/datasets/components/DatasetItemDetailPage.tsx
+++ b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
@@ -1,3 +1,4 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import Page from "@/src/components/layouts/page";
import { ActionButton } from "@/src/components/ActionButton";
import { Button } from "@/src/components/ui/button";
@@ -8,7 +9,6 @@ import { CopyIcon, ListTree, MoreVertical, Pencil, Trash2 } from "lucide-react";
import Link from "next/link";
import { useRouter } from "next/router";
import { DatasetStatus } from "@langfuse/shared";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import {
DropdownMenu,
diff --git a/web/src/features/datasets/components/DatasetItemsTable.tsx b/web/src/features/datasets/components/DatasetItemsTable.tsx
index 66a37fa4f3..ce9b2fe293 100644
--- a/web/src/features/datasets/components/DatasetItemsTable.tsx
+++ b/web/src/features/datasets/components/DatasetItemsTable.tsx
@@ -27,7 +27,7 @@ import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import useColumnOrder from "@/src/features/column-visibility/hooks/useColumnOrder";
import { createStatusTableColumn } from "@/src/components/design-system/table/columns/createStatusTableColumn";
import { type Status } from "@/src/components/ui/StatusBadge/StatusBadge";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { createDateTableColumn } from "@/src/components/design-system/table/columns/createDateTableColumn";
import { BatchExportTableButton } from "@/src/components/BatchExportTableButton";
import { useQueryFilterState } from "@/src/features/filters/hooks/useFilterState";
diff --git a/web/src/features/datasets/components/DeleteDatasetDialogController.tsx b/web/src/features/datasets/components/DeleteDatasetDialogController.tsx
index 7ddf85e4ab..4e2d5f9919 100644
--- a/web/src/features/datasets/components/DeleteDatasetDialogController.tsx
+++ b/web/src/features/datasets/components/DeleteDatasetDialogController.tsx
@@ -1,9 +1,9 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import {
DeleteDatasetDialog,
type DeleteDatasetDialogDataProps,
} from "@/src/features/datasets/components/DeleteDatasetDialog";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { type ReactNode, useState } from "react";
export type DeleteDatasetDialogSource = "dataset" | "table-single-row";
diff --git a/web/src/features/datasets/components/DeleteDatasetRunButton.tsx b/web/src/features/datasets/components/DeleteDatasetRunButton.tsx
index 3e03ab6c5f..ac066f0eae 100644
--- a/web/src/features/datasets/components/DeleteDatasetRunButton.tsx
+++ b/web/src/features/datasets/components/DeleteDatasetRunButton.tsx
@@ -1,7 +1,7 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Trash } from "lucide-react";
import { Button } from "@/src/components/ui/button";
import { ConfirmDialog } from "@/src/components/ui/confirm-dialog";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { api } from "@/src/utils/api";
import React, { useState } from "react";
diff --git a/web/src/features/datasets/components/DuplicateDatasetButton.tsx b/web/src/features/datasets/components/DuplicateDatasetButton.tsx
index c0d6aeb482..9f2eb1531c 100644
--- a/web/src/features/datasets/components/DuplicateDatasetButton.tsx
+++ b/web/src/features/datasets/components/DuplicateDatasetButton.tsx
@@ -2,7 +2,7 @@ import { useRouter } from "next/router";
import { Button } from "@/src/components/ui/button";
import { api } from "@/src/utils/api";
import { Copy } from "lucide-react";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
export const DuplicateDatasetButton: React.FC<{
projectId: string;
diff --git a/web/src/features/datasets/components/EditDatasetItemDialog.tsx b/web/src/features/datasets/components/EditDatasetItemDialog.tsx
index c4113af176..3d7fdbeab0 100644
--- a/web/src/features/datasets/components/EditDatasetItemDialog.tsx
+++ b/web/src/features/datasets/components/EditDatasetItemDialog.tsx
@@ -13,7 +13,7 @@ import {
DialogHeader,
DialogTitle,
} from "@/src/components/ui/dialog";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useDatasetItemValidation } from "../hooks/useDatasetItemValidation";
import {
useDatasetItemMediaUpload,
diff --git a/web/src/features/datasets/components/NewDatasetItemButton.tsx b/web/src/features/datasets/components/NewDatasetItemButton.tsx
index cd14b1292c..498227cc88 100644
--- a/web/src/features/datasets/components/NewDatasetItemButton.tsx
+++ b/web/src/features/datasets/components/NewDatasetItemButton.tsx
@@ -8,7 +8,7 @@ import {
import { useState } from "react";
import { NewDatasetItemForm } from "@/src/features/datasets/components/NewDatasetItemForm";
import { DialogTrigger } from "@radix-ui/react-dialog";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { ActionButton } from "@/src/components/ActionButton";
export const NewDatasetItemButton = (props: {
diff --git a/web/src/features/datasets/components/UpdateDatasetDialogController.tsx b/web/src/features/datasets/components/UpdateDatasetDialogController.tsx
index 54d75a1faf..b7c7305071 100644
--- a/web/src/features/datasets/components/UpdateDatasetDialogController.tsx
+++ b/web/src/features/datasets/components/UpdateDatasetDialogController.tsx
@@ -1,10 +1,10 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Dialog } from "@/src/components/ui/dialog";
import {
UpdateDatasetDialogContent,
type UpdateDatasetDialogProps,
} from "@/src/features/datasets/components/UpdateDatasetDialogContent";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { type ReactNode, useState } from "react";
export type UpdateDatasetDialogSource = "dataset" | "table-single-row";
diff --git a/web/src/features/datasets/components/UploadDatasetCsvButton.tsx b/web/src/features/datasets/components/UploadDatasetCsvButton.tsx
index c3dd42138b..916d8e69ba 100644
--- a/web/src/features/datasets/components/UploadDatasetCsvButton.tsx
+++ b/web/src/features/datasets/components/UploadDatasetCsvButton.tsx
@@ -1,7 +1,7 @@
import { UploadIcon } from "lucide-react";
import { DialogTrigger } from "@radix-ui/react-dialog";
import { useState } from "react";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { ActionButton } from "@/src/components/ActionButton";
import { CsvUploadDialog } from "@/src/features/datasets/components/CsvUploadDialog";
diff --git a/web/src/features/datasets/hooks/useDatasetItemFromTraceOrObservation.ts b/web/src/features/datasets/hooks/useDatasetItemFromTraceOrObservation.ts
index 8dc234fe60..a12ac5ad95 100644
--- a/web/src/features/datasets/hooks/useDatasetItemFromTraceOrObservation.ts
+++ b/web/src/features/datasets/hooks/useDatasetItemFromTraceOrObservation.ts
@@ -1,6 +1,6 @@
import { useIsAuthenticatedAndProjectMember } from "@/src/features/auth/hooks";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
export const useDatasetItemFromTraceOrObservation = (props: {
diff --git a/web/src/features/datasets/server/dataset-router.ts b/web/src/features/datasets/server/dataset-router.ts
index 0bb1776192..391e1f817d 100644
--- a/web/src/features/datasets/server/dataset-router.ts
+++ b/web/src/features/datasets/server/dataset-router.ts
@@ -5,7 +5,7 @@ import {
} from "@/src/server/api/trpc";
import { Prisma, type Dataset } from "@langfuse/shared/src/db";
import { env as sharedEnv } from "@langfuse/shared/src/env";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { createMediaUploadUrl } from "@/src/features/media/server/mediaService";
import {
diff --git a/web/src/features/evals/components/deactivate-config.tsx b/web/src/features/evals/components/deactivate-config.tsx
index 951773def0..3a9e3e3af9 100644
--- a/web/src/features/evals/components/deactivate-config.tsx
+++ b/web/src/features/evals/components/deactivate-config.tsx
@@ -1,7 +1,7 @@
/* eslint-disable @repo/no-abstracted-overlay-trigger */
+import { useHasProjectAccess } from "@/src/features/rbac";
import { EvaluatorStatus } from "@/src/features/evals/types";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { api, type RouterOutputs } from "@/src/utils/api";
import { useState } from "react";
import {
diff --git a/web/src/features/evals/components/default-eval-model-setup.tsx b/web/src/features/evals/components/default-eval-model-setup.tsx
index eb8e4d7f82..b4852f5d7a 100644
--- a/web/src/features/evals/components/default-eval-model-setup.tsx
+++ b/web/src/features/evals/components/default-eval-model-setup.tsx
@@ -1,5 +1,5 @@
/* eslint-disable @repo/no-abstracted-overlay-trigger, @repo/no-style-props */
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { ModelParameters } from "@/src/components/ModelParameters";
import { CardContent, Card } from "@/src/components/ui/card";
import { useModelParams } from "@/src/features/playground/page/hooks/useModelParams";
diff --git a/web/src/features/evals/components/eval-template-detail.tsx b/web/src/features/evals/components/eval-template-detail.tsx
index e14f457ad5..6d3b479fd1 100644
--- a/web/src/features/evals/components/eval-template-detail.tsx
+++ b/web/src/features/evals/components/eval-template-detail.tsx
@@ -1,9 +1,9 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import * as React from "react";
import { EvalTemplateForm } from "@/src/features/evals/components/template-form";
import { api } from "@/src/utils/api";
import { type EvalTemplate } from "@langfuse/shared";
import { useRouter } from "next/router";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import Page from "@/src/components/layouts/page";
import { Switch } from "@/src/components/design-system/Switch/Switch";
diff --git a/web/src/features/evals/components/eval-templates-table.tsx b/web/src/features/evals/components/eval-templates-table.tsx
index 8986627dde..e71fe8420c 100644
--- a/web/src/features/evals/components/eval-templates-table.tsx
+++ b/web/src/features/evals/components/eval-templates-table.tsx
@@ -40,7 +40,7 @@ import { getMaintainer } from "@/src/features/evals/utils/typeHelpers";
import { MaintainerTooltip } from "@/src/features/evals/components/maintainer-tooltip";
import { ActionButton } from "@/src/components/ActionButton";
import { useEntitlementLimit } from "@/src/features/entitlements/hooks";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Badge } from "@/src/components/ui/badge";
import { getTemplateResultType } from "@/src/features/evals/utils/template-output";
import {
diff --git a/web/src/features/evals/components/evaluator-table.tsx b/web/src/features/evals/components/evaluator-table.tsx
index ed80aaed1e..6554292c99 100644
--- a/web/src/features/evals/components/evaluator-table.tsx
+++ b/web/src/features/evals/components/evaluator-table.tsx
@@ -42,7 +42,7 @@ import { EvaluatorForm } from "@/src/features/evals/components/evaluator-form";
import { useRouter } from "next/router";
import { DeleteEvalConfigButton } from "@/src/components/deleteButton";
import { MaintainerTooltip } from "@/src/features/evals/components/maintainer-tooltip";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Skeleton } from "@/src/components/ui/skeleton";
import { usdFormatter } from "@/src/utils/numbers";
import { createDateTableColumn } from "@/src/components/design-system/table/columns/createDateTableColumn";
diff --git a/web/src/features/evals/components/manage-default-eval-model.tsx b/web/src/features/evals/components/manage-default-eval-model.tsx
index a31bf15b69..26f4b7adfe 100644
--- a/web/src/features/evals/components/manage-default-eval-model.tsx
+++ b/web/src/features/evals/components/manage-default-eval-model.tsx
@@ -1,6 +1,6 @@
/* eslint-disable @repo/no-style-props */
import { Button } from "@/src/components/ui/button";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
import { cn } from "@/src/utils/tailwind";
import { Check, Pencil, TriangleAlert } from "lucide-react";
diff --git a/web/src/features/evals/pages/default-evaluation-model.tsx b/web/src/features/evals/pages/default-evaluation-model.tsx
index c8d24f99de..1f1ac6e12e 100644
--- a/web/src/features/evals/pages/default-evaluation-model.tsx
+++ b/web/src/features/evals/pages/default-evaluation-model.tsx
@@ -1,6 +1,6 @@
import Page from "@/src/components/layouts/page";
import { useRouter } from "next/router";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { SupportOrUpgradePage } from "@/src/ee/features/billing/components/SupportOrUpgradePage";
import { DefaultEvalModelSetup } from "@/src/features/evals/components/default-eval-model-setup";
diff --git a/web/src/features/evals/pages/evaluators.tsx b/web/src/features/evals/pages/evaluators.tsx
index c0efd92680..ca27efbd51 100644
--- a/web/src/features/evals/pages/evaluators.tsx
+++ b/web/src/features/evals/pages/evaluators.tsx
@@ -1,6 +1,6 @@
import Page from "@/src/components/layouts/page";
import { useRouter } from "next/router";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Plus } from "lucide-react";
import EvaluatorTable from "@/src/features/evals/components/evaluator-table";
import {
diff --git a/web/src/features/evals/pages/new-evaluator.tsx b/web/src/features/evals/pages/new-evaluator.tsx
index 5973ff2a59..7aa492ae41 100644
--- a/web/src/features/evals/pages/new-evaluator.tsx
+++ b/web/src/features/evals/pages/new-evaluator.tsx
@@ -12,7 +12,7 @@ import { useRouter } from "next/router";
import { SelectEvaluatorList } from "@/src/features/evals/components/select-evaluator-list";
import { RunEvaluatorForm } from "@/src/features/evals/components/run-evaluator-form";
import { api } from "@/src/utils/api";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { getMaintainer } from "@/src/features/evals/utils/typeHelpers";
import { MaintainerTooltip } from "@/src/features/evals/components/maintainer-tooltip";
import { DefaultEvalModelSetup } from "@/src/features/evals/components/default-eval-model-setup";
diff --git a/web/src/features/evals/pages/new-template.tsx b/web/src/features/evals/pages/new-template.tsx
index ebcd81f71a..bce6bb6bc1 100644
--- a/web/src/features/evals/pages/new-template.tsx
+++ b/web/src/features/evals/pages/new-template.tsx
@@ -1,6 +1,6 @@
import Page from "@/src/components/layouts/page";
import { EvalTemplateForm } from "@/src/features/evals/components/template-form";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useRouter } from "next/router";
export default function NewTemplatesPage() {
diff --git a/web/src/features/evals/pages/templates.tsx b/web/src/features/evals/pages/templates.tsx
index 6e17ca2f31..cb86e70030 100644
--- a/web/src/features/evals/pages/templates.tsx
+++ b/web/src/features/evals/pages/templates.tsx
@@ -2,7 +2,7 @@ import Page from "@/src/components/layouts/page";
import { useRouter } from "next/router";
import { Button } from "@/src/components/ui/button";
import Link from "next/link";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Lock, Plus } from "lucide-react";
import EvalsTemplateTable from "@/src/features/evals/components/eval-templates-table";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
diff --git a/web/src/features/evals/server/defaultEvalModelRouter.ts b/web/src/features/evals/server/defaultEvalModelRouter.ts
index f1a622c177..0fd07faa1c 100644
--- a/web/src/features/evals/server/defaultEvalModelRouter.ts
+++ b/web/src/features/evals/server/defaultEvalModelRouter.ts
@@ -1,4 +1,4 @@
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/evals/server/router.ts b/web/src/features/evals/server/router.ts
index ed0d90bd8a..63d24bf636 100644
--- a/web/src/features/evals/server/router.ts
+++ b/web/src/features/evals/server/router.ts
@@ -4,7 +4,7 @@ import {
createTRPCRouter,
protectedProjectProcedure,
} from "@/src/server/api/trpc";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import { auditLog } from "@/src/features/audit-logs/auditLog";
import {
DEFAULT_TRACE_JOB_DELAY,
diff --git a/web/src/features/evals/v2/components/Rules/EvaluatorRuleRelationships/EvaluatorRuleRelationships.tsx b/web/src/features/evals/v2/components/Rules/EvaluatorRuleRelationships/EvaluatorRuleRelationships.tsx
index 069bf4306d..14eee15869 100644
--- a/web/src/features/evals/v2/components/Rules/EvaluatorRuleRelationships/EvaluatorRuleRelationships.tsx
+++ b/web/src/features/evals/v2/components/Rules/EvaluatorRuleRelationships/EvaluatorRuleRelationships.tsx
@@ -1,3 +1,4 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import { EvalTargetObject, EvalTemplateType } from "@langfuse/shared";
import { Link2, Plus, Unlink } from "lucide-react";
import { useRouter } from "next/router";
@@ -18,7 +19,6 @@ import { ActivationConfirmationDialog } from "@/src/features/evals/v2/components
import { CreateRuleDialog } from "@/src/features/evals/v2/components/Rules/CreateRuleDialog/CreateRuleDialog";
import { EvaluationRulePicker } from "@/src/features/evals/v2/components/Rules/EvaluationRulePicker/EvaluationRulePicker";
import { useActivationConfirmation } from "@/src/features/evals/v2/hooks/useActivationConfirmation";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { api } from "@/src/utils/api";
import { trpcErrorToast } from "@/src/utils/trpcErrorToast";
diff --git a/web/src/features/evals/v2/hooks/useEvaluatorAlerts.ts b/web/src/features/evals/v2/hooks/useEvaluatorAlerts.ts
index 1cbc865778..0016e46ebd 100644
--- a/web/src/features/evals/v2/hooks/useEvaluatorAlerts.ts
+++ b/web/src/features/evals/v2/hooks/useEvaluatorAlerts.ts
@@ -1,5 +1,5 @@
import { useEntitlementLimit } from "@/src/features/entitlements";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
/** Owns evaluator alert permissions, linked-alert loading, and creation limits. */
diff --git a/web/src/features/evals/v2/hooks/useProjectDefaultModel.ts b/web/src/features/evals/v2/hooks/useProjectDefaultModel.ts
index c351c0c086..c54ff3749f 100644
--- a/web/src/features/evals/v2/hooks/useProjectDefaultModel.ts
+++ b/web/src/features/evals/v2/hooks/useProjectDefaultModel.ts
@@ -1,3 +1,4 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useState } from "react";
import { supportedModels } from "@langfuse/shared";
@@ -6,7 +7,6 @@ import { getJudgeModelProviderAdapters } from "@/src/features/evals/v2/judgeMode
import type { ProjectDefaultModelConfig } from "@/src/features/evals/v2/types/ProjectDefaultModelConfig";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { api } from "@/src/utils/api";
import { trpcErrorToast } from "@/src/utils/trpcErrorToast";
diff --git a/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx b/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
index a44f3a5a64..6c5dbb3eee 100644
--- a/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
+++ b/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
@@ -53,7 +53,7 @@ import { useProject } from "@/src/features/projects/hooks";
import { EvaluatorBlockedBanner } from "@/src/features/evals/v2/components/Evaluators/EvaluatorBlockedBanner/EvaluatorBlockedBanner";
import { useIsMobile } from "@/src/hooks/use-mobile";
import { prepareEvaluatorMetadataForSave } from "@/src/features/evals/v2/fns/prepareEvaluatorMetadataForSave";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useEvaluatorAlerts } from "@/src/features/evals/v2/hooks/useEvaluatorAlerts";
import { useCodeEvalSourceValidation } from "@/src/features/evals/hooks/useCodeEvalSourceValidation";
import { EvaluatorAlertButton } from "@/src/features/evals/v2/components/Evaluators/EvaluatorAlertButton/EvaluatorAlertButton";
diff --git a/web/src/features/evals/v2/pages/EvaluatorsPage.tsx b/web/src/features/evals/v2/pages/EvaluatorsPage.tsx
index b3ef4b696b..337d76b77c 100644
--- a/web/src/features/evals/v2/pages/EvaluatorsPage.tsx
+++ b/web/src/features/evals/v2/pages/EvaluatorsPage.tsx
@@ -35,7 +35,7 @@ import { showSuccessToast } from "@/src/features/notifications/showSuccessToast"
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import useColumnOrder from "@/src/features/column-visibility/hooks/useColumnOrder";
import useColumnVisibility from "@/src/features/column-visibility/hooks/useColumnVisibility";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useEvaluatorAlerts } from "@/src/features/evals/v2/hooks/useEvaluatorAlerts";
import { TableSelectionManager } from "@/src/features/table/components/TableSelectionManager";
import { usePaginationState } from "@/src/hooks/usePaginationState";
diff --git a/web/src/features/evals/v2/pages/RulesPage.tsx b/web/src/features/evals/v2/pages/RulesPage.tsx
index f6a979d335..f8dd1d38ec 100644
--- a/web/src/features/evals/v2/pages/RulesPage.tsx
+++ b/web/src/features/evals/v2/pages/RulesPage.tsx
@@ -6,7 +6,7 @@ import { Button } from "@/src/components/ui/button";
import { SupportOrUpgradePage } from "@/src/ee/features/billing/components/SupportOrUpgradePage";
import { CreateRuleDialog } from "@/src/features/evals/v2/components/Rules/CreateRuleDialog/CreateRuleDialog";
import { RulesTable } from "@/src/features/evals/v2/components/Rules/RulesTable/RulesTable";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import {
EVALS_V2_TABS,
getEvalsV2Tabs,
diff --git a/web/src/features/evals/v2/server/evaluators/evaluatorRouter.ts b/web/src/features/evals/v2/server/evaluators/evaluatorRouter.ts
index bb0cca9a1a..e90effce4b 100644
--- a/web/src/features/evals/v2/server/evaluators/evaluatorRouter.ts
+++ b/web/src/features/evals/v2/server/evaluators/evaluatorRouter.ts
@@ -1,5 +1,5 @@
import { auditLog } from "@/src/features/audit-logs/auditLog";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/evals/v2/server/rules/ruleRouter.ts b/web/src/features/evals/v2/server/rules/ruleRouter.ts
index 2d0870a226..b1c399f4d3 100644
--- a/web/src/features/evals/v2/server/rules/ruleRouter.ts
+++ b/web/src/features/evals/v2/server/rules/ruleRouter.ts
@@ -1,6 +1,6 @@
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { JOB_CONFIGURATION_AUDIT_LOG_RESOURCE_TYPE } from "@/src/features/evals/server/audit-log-resource-types";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/experiments/components/CreateExperimentsForm.tsx b/web/src/features/experiments/components/CreateExperimentsForm.tsx
index 38b32a22d4..a543183aa8 100644
--- a/web/src/features/experiments/components/CreateExperimentsForm.tsx
+++ b/web/src/features/experiments/components/CreateExperimentsForm.tsx
@@ -10,7 +10,7 @@ import {
CardContent,
CardFooter,
} from "@/src/components/ui/card";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import {
DialogHeader,
DialogTitle,
diff --git a/web/src/features/experiments/components/MultiStepExperimentForm.tsx b/web/src/features/experiments/components/MultiStepExperimentForm.tsx
index a7c4d85681..634de19711 100644
--- a/web/src/features/experiments/components/MultiStepExperimentForm.tsx
+++ b/web/src/features/experiments/components/MultiStepExperimentForm.tsx
@@ -1,3 +1,4 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import React, { useEffect, useRef, useState } from "react";
import { Button } from "@/src/components/ui/button";
import { Form } from "@/src/components/ui/form";
@@ -22,7 +23,6 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useForm, type UseFormReturn } from "react-hook-form";
import { api } from "@/src/utils/api";
import { useModelParams } from "@/src/features/playground/page/hooks/useModelParams";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useEvaluatorDefaults } from "@/src/features/experiments/hooks/useEvaluatorDefaults";
import { useExperimentEvaluatorData } from "@/src/features/experiments/hooks/useExperimentEvaluatorData";
diff --git a/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx b/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx
index c82bc1fff4..137b6cb0a6 100644
--- a/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx
+++ b/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx
@@ -21,7 +21,7 @@ import {
} from "@/src/components/ui/form";
import { CodeMirrorEditor } from "@/src/components/editor/CodeMirrorEditor";
import { api } from "@/src/utils/api";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { getFormattedPayload } from "@/src/features/experiments/utils/format";
diff --git a/web/src/features/experiments/components/RemoteExperimentUpsertForm.tsx b/web/src/features/experiments/components/RemoteExperimentUpsertForm.tsx
index 7749879cef..1980073ed9 100644
--- a/web/src/features/experiments/components/RemoteExperimentUpsertForm.tsx
+++ b/web/src/features/experiments/components/RemoteExperimentUpsertForm.tsx
@@ -29,7 +29,7 @@ import {
import { Input } from "@/src/components/ui/input";
import { Switch } from "@/src/components/design-system/Switch/Switch";
import { api } from "@/src/utils/api";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { CodeMirrorEditor } from "@/src/components/editor/CodeMirrorEditor";
diff --git a/web/src/features/experiments/components/table/ExperimentItemsTable.tsx b/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
index 1334e49692..9a84023a8e 100644
--- a/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
+++ b/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
@@ -9,7 +9,7 @@ import { ResizableFilterLayout } from "@/src/components/table/resizable-filter-l
import { useEffect, useMemo, useState, useRef, useCallback } from "react";
import { RunEvaluationDialog } from "@/src/features/batch-actions/components/RunEvaluationDialog";
import { LightbulbIcon } from "lucide-react";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { TableActionMenu } from "@/src/features/table/components/TableActionMenu";
import { type TableAction } from "@/src/features/table/types";
import { usePaginationState } from "@/src/hooks/usePaginationState";
diff --git a/web/src/features/experiments/components/table/ExperimentsTable.tsx b/web/src/features/experiments/components/table/ExperimentsTable.tsx
index a6d6b86d55..4f1c68e645 100644
--- a/web/src/features/experiments/components/table/ExperimentsTable.tsx
+++ b/web/src/features/experiments/components/table/ExperimentsTable.tsx
@@ -58,7 +58,7 @@ import { useExperimentsTableData } from "../../hooks/useExperimentsTableData";
import { type ExperimentsTableRow, type ExperimentsTableProps } from "./types";
import { useExperimentFilterOptions } from "../../hooks/useExperimentFilterOptions";
import { RunEvaluationDialog } from "@/src/features/batch-actions/components/RunEvaluationDialog";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import {
Accordion,
AccordionContent,
diff --git a/web/src/features/experiments/hooks/useExperimentNames.ts b/web/src/features/experiments/hooks/useExperimentNames.ts
index 189891dbc5..9e6c7eb164 100644
--- a/web/src/features/experiments/hooks/useExperimentNames.ts
+++ b/web/src/features/experiments/hooks/useExperimentNames.ts
@@ -1,4 +1,4 @@
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
type UseExperimentNamesResponse = {
diff --git a/web/src/features/experiments/server/router.ts b/web/src/features/experiments/server/router.ts
index 952f30869c..b41560a9fb 100644
--- a/web/src/features/experiments/server/router.ts
+++ b/web/src/features/experiments/server/router.ts
@@ -53,7 +53,7 @@ import {
parsePromptToolConfig,
PROMPT_TOOL_STRUCTURED_OUTPUT_CONFLICT_MESSAGE,
} from "@langfuse/shared";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import { aggregateScores } from "@/src/features/scores/lib/aggregateScores";
const ExperimentFilterOptions = z.object({
diff --git a/web/src/features/llm-api-key/server/router.ts b/web/src/features/llm-api-key/server/router.ts
index 54663adb49..087b38ff15 100644
--- a/web/src/features/llm-api-key/server/router.ts
+++ b/web/src/features/llm-api-key/server/router.ts
@@ -7,7 +7,7 @@ import {
SafeLlmApiKeySchema,
type BedrockAuthMethod,
} from "@/src/features/llm-api-key/types";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/llm-schemas/server/router.ts b/web/src/features/llm-schemas/server/router.ts
index b6584ea052..eaac8cca46 100644
--- a/web/src/features/llm-schemas/server/router.ts
+++ b/web/src/features/llm-schemas/server/router.ts
@@ -4,7 +4,7 @@ import {
createTRPCRouter,
protectedProjectProcedure,
} from "@/src/server/api/trpc";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import { TRPCError } from "@trpc/server";
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { logger } from "@langfuse/shared/src/server";
diff --git a/web/src/features/llm-tools/server/router.ts b/web/src/features/llm-tools/server/router.ts
index 8fc3973aab..f416674fa9 100644
--- a/web/src/features/llm-tools/server/router.ts
+++ b/web/src/features/llm-tools/server/router.ts
@@ -4,7 +4,7 @@ import {
createTRPCRouter,
protectedProjectProcedure,
} from "@/src/server/api/trpc";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import { TRPCError } from "@trpc/server";
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { logger } from "@langfuse/shared/src/server";
diff --git a/web/src/features/mixpanel-integration/mixpanel-integration-router.ts b/web/src/features/mixpanel-integration/mixpanel-integration-router.ts
index d498130c93..d001c8c5e5 100644
--- a/web/src/features/mixpanel-integration/mixpanel-integration-router.ts
+++ b/web/src/features/mixpanel-integration/mixpanel-integration-router.ts
@@ -6,7 +6,7 @@ import {
resolveExportSource,
} from "@/src/features/analytics-integrations/server/exportSource";
import { isPrismaRecordNotFoundError } from "@/src/features/analytics-integrations/server/isPrismaRecordNotFoundError";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/models/components/CloneModelButton.tsx b/web/src/features/models/components/CloneModelButton.tsx
index 91717aad95..3f1d41b9c6 100644
--- a/web/src/features/models/components/CloneModelButton.tsx
+++ b/web/src/features/models/components/CloneModelButton.tsx
@@ -1,5 +1,5 @@
import { Button } from "@/src/components/ui/button";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { UpsertModelFormDialog } from "@/src/features/models/components/UpsertModelFormDialog/UpsertModelFormDialog";
import { type GetModelResult } from "@/src/features/models/validation";
diff --git a/web/src/features/models/components/DeleteModelButton.tsx b/web/src/features/models/components/DeleteModelButton.tsx
index c354269ca2..333d6f1caa 100644
--- a/web/src/features/models/components/DeleteModelButton.tsx
+++ b/web/src/features/models/components/DeleteModelButton.tsx
@@ -1,4 +1,5 @@
/* eslint-disable @repo/no-abstracted-overlay-trigger */
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useState } from "react";
import { Button } from "@/src/components/ui/button";
@@ -9,7 +10,6 @@ import {
} from "@/src/components/ui/popover";
import { type GetModelResult } from "@/src/features/models/validation";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { api } from "@/src/utils/api";
export const DeleteModelButton = ({
diff --git a/web/src/features/models/components/EditModelButton.tsx b/web/src/features/models/components/EditModelButton.tsx
index d55bec8e05..450cd9b010 100644
--- a/web/src/features/models/components/EditModelButton.tsx
+++ b/web/src/features/models/components/EditModelButton.tsx
@@ -1,5 +1,5 @@
import { Button } from "@/src/components/ui/button";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { UpsertModelFormDialog } from "@/src/features/models/components/UpsertModelFormDialog/UpsertModelFormDialog";
import { type GetModelResult } from "@/src/features/models/validation";
diff --git a/web/src/features/monitors/components/MonitorForm.tsx b/web/src/features/monitors/components/MonitorForm.tsx
index 06a69801cf..794e4ffe8c 100644
--- a/web/src/features/monitors/components/MonitorForm.tsx
+++ b/web/src/features/monitors/components/MonitorForm.tsx
@@ -41,7 +41,7 @@ import {
SelectTrigger,
SelectValue,
} from "@/src/components/ui/select";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useProject } from "@/src/features/projects";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
diff --git a/web/src/features/monitors/components/MonitorPagePermissions.tsx b/web/src/features/monitors/components/MonitorPagePermissions.tsx
index 0973eb0bba..5742734222 100644
--- a/web/src/features/monitors/components/MonitorPagePermissions.tsx
+++ b/web/src/features/monitors/components/MonitorPagePermissions.tsx
@@ -3,7 +3,7 @@ import { type ReactNode } from "react";
import { ErrorPage } from "@/src/components/error-page";
import { SupportOrUpgradePage } from "@/src/ee/features/billing/components/SupportOrUpgradePage";
import { useLangfuseV4WriteMode } from "@/src/features/organizations/hooks";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
/** MonitorScope is the RBAC scope a monitor page can require for entry. */
diff --git a/web/src/features/monitors/components/MonitorsTable.tsx b/web/src/features/monitors/components/MonitorsTable.tsx
index f6e6fefea8..006f862d8c 100644
--- a/web/src/features/monitors/components/MonitorsTable.tsx
+++ b/web/src/features/monitors/components/MonitorsTable.tsx
@@ -23,7 +23,7 @@ import { useSidebarFilterState } from "@/src/features/filters/hooks/useSidebarFi
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
import { useOrderByState } from "@/src/features/orderBy/hooks/useOrderByState";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import TagList from "@/src/features/tag/components/TagList";
import { usePaginationState } from "@/src/hooks/usePaginationState";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
diff --git a/web/src/features/monitors/pages/EditMonitorPage.tsx b/web/src/features/monitors/pages/EditMonitorPage.tsx
index c31af08b95..55565a1f4e 100644
--- a/web/src/features/monitors/pages/EditMonitorPage.tsx
+++ b/web/src/features/monitors/pages/EditMonitorPage.tsx
@@ -9,7 +9,7 @@ import { MonitorPagePermissions } from "@/src/features/monitors/components/Monit
import { invalidateMonitorQueriesAfterDelete } from "@/src/features/monitors/fns/invalidateMonitorQueriesAfterDelete";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api, type APIError } from "@/src/utils/api";
import { type Monitor } from "@langfuse/shared/monitors";
diff --git a/web/src/features/monitors/pages/ListMonitorsPage.tsx b/web/src/features/monitors/pages/ListMonitorsPage.tsx
index b99913399f..e3422a3122 100644
--- a/web/src/features/monitors/pages/ListMonitorsPage.tsx
+++ b/web/src/features/monitors/pages/ListMonitorsPage.tsx
@@ -10,7 +10,7 @@ import { monitorFilterConfig } from "@/src/features/filters/config/monitors-conf
import { MonitorPagePermissions } from "@/src/features/monitors/components/MonitorPagePermissions";
import { MonitorsOnboarding } from "@/src/features/monitors/components/MonitorsOnboarding";
import { MonitorsTable } from "@/src/features/monitors/components/MonitorsTable";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
import { api } from "@/src/utils/api";
diff --git a/web/src/features/natural-language-filters/server/router.ts b/web/src/features/natural-language-filters/server/router.ts
index 4a9568b195..24a65644b0 100644
--- a/web/src/features/natural-language-filters/server/router.ts
+++ b/web/src/features/natural-language-filters/server/router.ts
@@ -19,7 +19,7 @@ import {
import { env } from "@/src/env.mjs";
import { CreateNaturalLanguageFilterCompletion } from "./validation";
import { parseFiltersFromCompletion, getLangfuseClient } from "./utils";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
export const naturalLanguageFilterRouter = createTRPCRouter({
createCompletion: protectedProjectProcedure
diff --git a/web/src/features/notifications/components/PersonalNotificationSettings.tsx b/web/src/features/notifications/components/PersonalNotificationSettings.tsx
index 37c329bf34..ecf21fe5dc 100644
--- a/web/src/features/notifications/components/PersonalNotificationSettings.tsx
+++ b/web/src/features/notifications/components/PersonalNotificationSettings.tsx
@@ -4,7 +4,7 @@ import { api } from "@/src/utils/api";
import Header from "@/src/components/layouts/header";
import { Label } from "@/src/components/ui/label";
import { Switch } from "@/src/components/design-system/Switch/Switch";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
export function PersonalNotificationSettings() {
const router = useRouter();
diff --git a/web/src/features/notifications/hooks/useProjectNotificationChannels.ts b/web/src/features/notifications/hooks/useProjectNotificationChannels.ts
index 42b9f3036e..844046c660 100644
--- a/web/src/features/notifications/hooks/useProjectNotificationChannels.ts
+++ b/web/src/features/notifications/hooks/useProjectNotificationChannels.ts
@@ -1,7 +1,7 @@
import { useState } from "react";
import { api } from "@/src/utils/api";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import {
TriggerEventSource,
type AutomationDomain,
diff --git a/web/src/features/onboarding/server/onboardingService.ts b/web/src/features/onboarding/server/onboardingService.ts
index 20f4434097..8909ad4694 100644
--- a/web/src/features/onboarding/server/onboardingService.ts
+++ b/web/src/features/onboarding/server/onboardingService.ts
@@ -10,7 +10,7 @@ import { auditLog } from "@/src/features/audit-logs/auditLog";
import {
organizationRoleAccessRights,
type OrganizationScope,
-} from "@/src/features/rbac/constants/organizationAccessRights";
+} from "@/src/features/rbac";
import { projectRoleAccessRights } from "@langfuse/shared";
import { createProjectRoute } from "@/src/features/setup/setupRoutes";
diff --git a/web/src/features/organizations/components/AIFeatureSwitch.tsx b/web/src/features/organizations/components/AIFeatureSwitch.tsx
index c35429b46c..be34b67150 100644
--- a/web/src/features/organizations/components/AIFeatureSwitch.tsx
+++ b/web/src/features/organizations/components/AIFeatureSwitch.tsx
@@ -1,3 +1,4 @@
+import { useHasOrganizationAccess } from "@/src/features/rbac";
import { Button } from "@/src/components/ui/button";
import { Switch } from "@/src/components/design-system/Switch/Switch";
import { api } from "@/src/utils/api";
@@ -12,7 +13,6 @@ import {
} from "@/src/components/ui/dialog";
import Header from "@/src/components/layouts/header";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
import {
useLangfuseCloudRegion,
useQueryOrganization,
diff --git a/web/src/features/organizations/components/AIFeaturesDisabledNotice.tsx b/web/src/features/organizations/components/AIFeaturesDisabledNotice.tsx
index a3bd477970..b0137ea0f8 100644
--- a/web/src/features/organizations/components/AIFeaturesDisabledNotice.tsx
+++ b/web/src/features/organizations/components/AIFeaturesDisabledNotice.tsx
@@ -2,7 +2,7 @@ import { type ReactNode } from "react";
import { ExternalLink } from "lucide-react";
import { Button } from "@/src/components/ui/button";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { useHasOrganizationAccess } from "@/src/features/rbac";
export function openAIFeaturesSettings(organizationId: string) {
window.open(
diff --git a/web/src/features/organizations/components/DeleteOrganizationDialogController.tsx b/web/src/features/organizations/components/DeleteOrganizationDialogController.tsx
index 0ee803e73e..ae45befed8 100644
--- a/web/src/features/organizations/components/DeleteOrganizationDialogController.tsx
+++ b/web/src/features/organizations/components/DeleteOrganizationDialogController.tsx
@@ -4,7 +4,7 @@ import { Dialog, DialogContent } from "@/src/components/ui/dialog";
import { DeleteOrganizationDialogContent } from "@/src/features/organizations/components/DeleteOrganizationDialogContent";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useQueryOrganization } from "@/src/features/organizations/hooks";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { useHasOrganizationAccess } from "@/src/features/rbac";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
import { api, reportNonTrpcError } from "@/src/utils/api";
import { env } from "@/src/env.mjs";
diff --git a/web/src/features/organizations/components/ProjectOverview.tsx b/web/src/features/organizations/components/ProjectOverview.tsx
index 8987f2dd6c..7d1ab6e099 100644
--- a/web/src/features/organizations/components/ProjectOverview.tsx
+++ b/web/src/features/organizations/components/ProjectOverview.tsx
@@ -20,7 +20,7 @@ import { Button } from "@/src/components/ui/button";
import Link from "next/link";
import { StringParam, useQueryParams } from "use-query-params";
import { Input } from "@/src/components/ui/input";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { useHasOrganizationAccess } from "@/src/features/rbac";
import { env } from "@/src/env.mjs";
import { Fragment } from "react";
import { useRouter } from "next/router";
diff --git a/web/src/features/organizations/components/RenameOrganization.tsx b/web/src/features/organizations/components/RenameOrganization.tsx
index 3dc22dc214..9f964231f1 100644
--- a/web/src/features/organizations/components/RenameOrganization.tsx
+++ b/web/src/features/organizations/components/RenameOrganization.tsx
@@ -1,3 +1,4 @@
+import { useHasOrganizationAccess } from "@/src/features/rbac";
import { Button } from "@/src/components/ui/button";
import { Input } from "@/src/components/ui/input";
import { api, reportTrpcErrorWithoutToast } from "@/src/utils/api";
@@ -14,7 +15,6 @@ import {
import { projectNameSchema } from "@/src/features/auth/lib/projectNameSchema";
import Header from "@/src/components/layouts/header";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
import { useQueryOrganization } from "@/src/features/organizations/hooks";
import { Card } from "@/src/components/ui/card";
import { LockIcon } from "lucide-react";
diff --git a/web/src/features/organizations/server/organizationRouter.ts b/web/src/features/organizations/server/organizationRouter.ts
index dc6614cad3..84314be0ca 100644
--- a/web/src/features/organizations/server/organizationRouter.ts
+++ b/web/src/features/organizations/server/organizationRouter.ts
@@ -9,7 +9,7 @@ import {
organizationOptionalNameSchema,
} from "@/src/features/organizations/utils/organizationNameSchema";
import * as z from "zod";
-import { throwIfNoOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { throwIfNoOrganizationAccess } from "@/src/features/rbac";
import { TRPCError } from "@trpc/server";
import { ApiAuthService } from "@/src/features/public-api/server/apiAuth";
import {
diff --git a/web/src/features/payment-banner/PaymentBanner.tsx b/web/src/features/payment-banner/PaymentBanner.tsx
index ee884ac4ab..af98109f0a 100644
--- a/web/src/features/payment-banner/PaymentBanner.tsx
+++ b/web/src/features/payment-banner/PaymentBanner.tsx
@@ -4,7 +4,7 @@ import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
import { useIsCloudBillingAvailable } from "@/src/ee/features/billing/utils/isCloudBilling";
import { useTopBannerRegistration } from "@/src/features/top-banner";
import { env } from "@/src/env.mjs";
-import { hasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { hasOrganizationAccess } from "@/src/features/rbac";
import { PaymentBannerView } from "./PaymentBannerView";
const PAYMENT_BANNER_ID = "payment-banner";
diff --git a/web/src/features/playground/server/authorizeRequest.ts b/web/src/features/playground/server/authorizeRequest.ts
index 4616ce848c..2b1f8c8e02 100644
--- a/web/src/features/playground/server/authorizeRequest.ts
+++ b/web/src/features/playground/server/authorizeRequest.ts
@@ -1,7 +1,7 @@
import { getServerAuthSessionForRequest } from "@/src/server/auth";
import { isProjectMemberOrAdmin } from "@/src/server/utils/checkProjectMembershipOrAdmin";
import { ForbiddenError, UnauthorizedError } from "@langfuse/shared";
-import { hasProjectAccess } from "../../rbac/utils/checkProjectAccess";
+import { hasProjectAccess } from "@/src/features/rbac";
export type AuthorizeRequestResult = {
userId: string;
diff --git a/web/src/features/posthog-integration/posthog-integration-router.ts b/web/src/features/posthog-integration/posthog-integration-router.ts
index 2ee62afdb1..a06d64291e 100644
--- a/web/src/features/posthog-integration/posthog-integration-router.ts
+++ b/web/src/features/posthog-integration/posthog-integration-router.ts
@@ -6,7 +6,7 @@ import {
resolveExportSource,
} from "@/src/features/analytics-integrations/server/exportSource";
import { isPrismaRecordNotFoundError } from "@/src/features/analytics-integrations/server/isPrismaRecordNotFoundError";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/projects/components/ConfigureRetention.tsx b/web/src/features/projects/components/ConfigureRetention.tsx
index 8c2d65cab1..7cae6784ed 100644
--- a/web/src/features/projects/components/ConfigureRetention.tsx
+++ b/web/src/features/projects/components/ConfigureRetention.tsx
@@ -16,7 +16,7 @@ import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { LockIcon } from "lucide-react";
import { useQueryProject } from "@/src/features/projects/hooks";
import { useSession } from "next-auth/react";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { projectRetentionSchema } from "@/src/features/auth/lib/projectRetentionSchema";
import { ActionButton } from "@/src/components/ActionButton";
import { useHasEntitlement } from "@/src/features/entitlements/hooks";
diff --git a/web/src/features/projects/components/DeleteProjectDialogController.tsx b/web/src/features/projects/components/DeleteProjectDialogController.tsx
index 1ef742d5d8..d3d8d2f86c 100644
--- a/web/src/features/projects/components/DeleteProjectDialogController.tsx
+++ b/web/src/features/projects/components/DeleteProjectDialogController.tsx
@@ -7,7 +7,7 @@ import {
import { env } from "@/src/env.mjs";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useQueryProject } from "@/src/features/projects/hooks";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api, reportNonTrpcError } from "@/src/utils/api";
import { DeleteProjectDialog } from "./DeleteProjectDialog";
diff --git a/web/src/features/projects/components/RenameProject.tsx b/web/src/features/projects/components/RenameProject.tsx
index b11b01eb06..7e760cafe3 100644
--- a/web/src/features/projects/components/RenameProject.tsx
+++ b/web/src/features/projects/components/RenameProject.tsx
@@ -18,7 +18,7 @@ import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { LockIcon } from "lucide-react";
import { useQueryProject } from "@/src/features/projects/hooks";
import { useSession } from "next-auth/react";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
export default function RenameProject() {
const { update: updateSession } = useSession();
diff --git a/web/src/features/projects/components/TransferProjectDialogController.tsx b/web/src/features/projects/components/TransferProjectDialogController.tsx
index 804c8b288d..22b6cb7a7c 100644
--- a/web/src/features/projects/components/TransferProjectDialogController.tsx
+++ b/web/src/features/projects/components/TransferProjectDialogController.tsx
@@ -6,7 +6,7 @@ import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import {
hasOrganizationAccess,
useHasOrganizationAccess,
-} from "@/src/features/rbac/utils/checkOrganizationAccess";
+} from "@/src/features/rbac";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
import { api } from "@/src/utils/api";
import { useSession } from "next-auth/react";
diff --git a/web/src/features/projects/server/projectsRouter.ts b/web/src/features/projects/server/projectsRouter.ts
index b2c7b82fd7..fbd156b6d6 100644
--- a/web/src/features/projects/server/projectsRouter.ts
+++ b/web/src/features/projects/server/projectsRouter.ts
@@ -4,12 +4,14 @@ import {
protectedProjectProcedure,
} from "@/src/server/api/trpc";
import * as z from "zod";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import {
+ throwIfNoOrganizationAccess,
+ throwIfNoProjectAccess,
+} from "@/src/features/rbac";
import { throwIfNoEntitlement } from "@/src/features/entitlements/server/hasEntitlement";
import { TRPCError } from "@trpc/server";
import { projectNameSchema } from "@/src/features/auth/lib/projectNameSchema";
import { auditLog } from "@/src/features/audit-logs/auditLog";
-import { throwIfNoOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
import { ApiAuthService } from "@/src/features/public-api/server/apiAuth";
import {
QueueJobs,
diff --git a/web/src/features/prompts/components/ImportPromptsButtonDialogController.tsx b/web/src/features/prompts/components/ImportPromptsButtonDialogController.tsx
index e409b45053..1b9fe2ed31 100644
--- a/web/src/features/prompts/components/ImportPromptsButtonDialogController.tsx
+++ b/web/src/features/prompts/components/ImportPromptsButtonDialogController.tsx
@@ -1,3 +1,4 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import { type ReactNode, useState } from "react";
import { CheckCircle, XCircle, Loader2 } from "lucide-react";
import { Dropzone } from "@/src/components/design-system/Dropzone/Dropzone";
@@ -12,7 +13,6 @@ import {
} from "@/src/components/ui/dialog";
import { api } from "@/src/utils/api";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { CreatePromptSchema } from "@langfuse/shared";
import { z } from "zod";
diff --git a/web/src/features/prompts/components/ProtectedLabelsSettings.tsx b/web/src/features/prompts/components/ProtectedLabelsSettings.tsx
index fafbf18b66..b23b1d7a41 100644
--- a/web/src/features/prompts/components/ProtectedLabelsSettings.tsx
+++ b/web/src/features/prompts/components/ProtectedLabelsSettings.tsx
@@ -11,7 +11,7 @@ import {
FormMessage,
} from "@/src/components/ui/form";
import Header from "@/src/components/layouts/header";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useHasEntitlement } from "@/src/features/entitlements/hooks";
import { zodResolver } from "@hookform/resolvers/zod";
import { z } from "zod";
diff --git a/web/src/features/prompts/components/SetPromptVersionLabels/index.tsx b/web/src/features/prompts/components/SetPromptVersionLabels/index.tsx
index 5836fa3416..3077caf98f 100644
--- a/web/src/features/prompts/components/SetPromptVersionLabels/index.tsx
+++ b/web/src/features/prompts/components/SetPromptVersionLabels/index.tsx
@@ -14,7 +14,7 @@ import {
PopoverContent,
PopoverTrigger,
} from "@/src/components/ui/popover";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
import { api, reportNonTrpcError } from "@/src/utils/api";
import {
diff --git a/web/src/features/prompts/components/delete-folder.tsx b/web/src/features/prompts/components/delete-folder.tsx
index 0d98fceebb..4cbd7e155b 100644
--- a/web/src/features/prompts/components/delete-folder.tsx
+++ b/web/src/features/prompts/components/delete-folder.tsx
@@ -1,6 +1,6 @@
/* eslint-disable @repo/no-abstracted-overlay-trigger */
import { Button } from "@/src/components/ui/button";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
import { useState } from "react";
import {
diff --git a/web/src/features/prompts/components/delete-prompt-version.tsx b/web/src/features/prompts/components/delete-prompt-version.tsx
index f0ccda4cd2..b0e6786465 100644
--- a/web/src/features/prompts/components/delete-prompt-version.tsx
+++ b/web/src/features/prompts/components/delete-prompt-version.tsx
@@ -1,6 +1,6 @@
/* eslint-disable @repo/no-abstracted-overlay-trigger */
import { Button } from "@/src/components/ui/button";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
import { Trash } from "lucide-react";
import { useState } from "react";
diff --git a/web/src/features/prompts/components/delete-prompt.tsx b/web/src/features/prompts/components/delete-prompt.tsx
index 7c9643ead4..f45570d478 100644
--- a/web/src/features/prompts/components/delete-prompt.tsx
+++ b/web/src/features/prompts/components/delete-prompt.tsx
@@ -1,6 +1,6 @@
/* eslint-disable @repo/no-abstracted-overlay-trigger */
import { Button } from "@/src/components/ui/button";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
import { Trash } from "lucide-react";
import { useState } from "react";
diff --git a/web/src/features/prompts/components/duplicate-folder.tsx b/web/src/features/prompts/components/duplicate-folder.tsx
index 30732346b8..102ca10093 100644
--- a/web/src/features/prompts/components/duplicate-folder.tsx
+++ b/web/src/features/prompts/components/duplicate-folder.tsx
@@ -1,6 +1,6 @@
/* eslint-disable @repo/no-abstracted-overlay-trigger */
import { Button } from "@/src/components/ui/button";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
import { useState } from "react";
import {
diff --git a/web/src/features/prompts/components/duplicate-prompt.tsx b/web/src/features/prompts/components/duplicate-prompt.tsx
index 746cee83ff..5fbe360212 100644
--- a/web/src/features/prompts/components/duplicate-prompt.tsx
+++ b/web/src/features/prompts/components/duplicate-prompt.tsx
@@ -3,7 +3,7 @@ import { useRouter } from "next/router";
import { Button } from "@/src/components/ui/button";
import { api, reportNonTrpcError } from "@/src/utils/api";
import { Copy } from "lucide-react";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import {
Dialog,
DialogBody,
diff --git a/web/src/features/prompts/components/prompt-detail.tsx b/web/src/features/prompts/components/prompt-detail.tsx
index c6b1e660e5..fe5b4397f3 100644
--- a/web/src/features/prompts/components/prompt-detail.tsx
+++ b/web/src/features/prompts/components/prompt-detail.tsx
@@ -46,7 +46,7 @@ import {
Plus,
Terminal,
} from "lucide-react";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Button } from "@/src/components/ui/button";
import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
diff --git a/web/src/features/prompts/server/routers/promptRouter.ts b/web/src/features/prompts/server/routers/promptRouter.ts
index 31c4e219e2..40d69f33ad 100644
--- a/web/src/features/prompts/server/routers/promptRouter.ts
+++ b/web/src/features/prompts/server/routers/promptRouter.ts
@@ -1,6 +1,6 @@
import { z } from "zod";
import { auditLog } from "@/src/features/audit-logs/auditLog";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import { throwIfNoEntitlement } from "@/src/features/entitlements/server/hasEntitlement";
import {
createTRPCRouter,
diff --git a/web/src/features/public-api/components/ApiKeyList.tsx b/web/src/features/public-api/components/ApiKeyList.tsx
index e994338501..860469aa93 100644
--- a/web/src/features/public-api/components/ApiKeyList.tsx
+++ b/web/src/features/public-api/components/ApiKeyList.tsx
@@ -15,8 +15,10 @@ import {
} from "@/src/components/ui/table";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { CreateApiKeyButton } from "@/src/features/public-api/components/CreateApiKeyButton";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import {
+ useHasOrganizationAccess,
+ useHasProjectAccess,
+} from "@/src/features/rbac";
import { api, reportNonTrpcError } from "@/src/utils/api";
import { TrashIcon } from "lucide-react";
import { useState } from "react";
diff --git a/web/src/features/public-api/components/CreateApiKeyButton.tsx b/web/src/features/public-api/components/CreateApiKeyButton.tsx
index 3fe0b32c63..cece50d0cb 100644
--- a/web/src/features/public-api/components/CreateApiKeyButton.tsx
+++ b/web/src/features/public-api/components/CreateApiKeyButton.tsx
@@ -1,10 +1,12 @@
+import {
+ useHasProjectAccess,
+ useHasOrganizationAccess,
+} from "@/src/features/rbac";
import { Button } from "@/src/components/ui/button";
import { Dialog, DialogTrigger } from "@/src/components/ui/dialog";
import { api, reportNonTrpcError } from "@/src/utils/api";
import { useState } from "react";
import { PlusIcon } from "lucide-react";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useLangfuseBaseUrl } from "@/src/features/public-api/hooks/useLangfuseEnvCode";
import { ApiKeyCreateDialogContent } from "@/src/features/public-api/components/ApiKeyCreateDialogContent";
diff --git a/web/src/features/public-api/components/CreateLLMApiKeyDialog.tsx b/web/src/features/public-api/components/CreateLLMApiKeyDialog.tsx
index af38ea2930..6f4a856d7c 100644
--- a/web/src/features/public-api/components/CreateLLMApiKeyDialog.tsx
+++ b/web/src/features/public-api/components/CreateLLMApiKeyDialog.tsx
@@ -8,7 +8,7 @@ import {
DialogTitle,
DialogTrigger,
} from "@/src/components/ui/dialog";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
import { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
import { CreateLLMApiKeyForm } from "@/src/features/public-api/components/CreateLLMApiKeyForm";
diff --git a/web/src/features/public-api/components/LLMApiKeyList.tsx b/web/src/features/public-api/components/LLMApiKeyList.tsx
index d588d183ab..30e0303128 100644
--- a/web/src/features/public-api/components/LLMApiKeyList.tsx
+++ b/web/src/features/public-api/components/LLMApiKeyList.tsx
@@ -1,3 +1,4 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import { TrashIcon } from "lucide-react";
import { useState } from "react";
import Header from "@/src/components/layouts/header";
@@ -13,7 +14,6 @@ import {
TableRow,
} from "@/src/components/ui/table";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { api, reportNonTrpcError } from "@/src/utils/api";
import { Alert } from "@/src/components/design-system/Alert/Alert";
import { CreateLLMApiKeyDialog } from "./CreateLLMApiKeyDialog";
diff --git a/web/src/features/public-api/components/UpdateLLMApiKeyDialog.tsx b/web/src/features/public-api/components/UpdateLLMApiKeyDialog.tsx
index 4bcb531901..b2f100784b 100644
--- a/web/src/features/public-api/components/UpdateLLMApiKeyDialog.tsx
+++ b/web/src/features/public-api/components/UpdateLLMApiKeyDialog.tsx
@@ -10,7 +10,7 @@ import {
} from "@/src/components/ui/dialog";
import { CreateLLMApiKeyForm } from "./CreateLLMApiKeyForm";
import { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { PencilIcon } from "lucide-react";
import { type RouterOutputs } from "@/src/utils/api";
diff --git a/web/src/features/public-api/server/organizationApiKeyRouter.ts b/web/src/features/public-api/server/organizationApiKeyRouter.ts
index ff9052ff69..354ddc19c3 100644
--- a/web/src/features/public-api/server/organizationApiKeyRouter.ts
+++ b/web/src/features/public-api/server/organizationApiKeyRouter.ts
@@ -1,5 +1,5 @@
import { auditLog } from "@/src/features/audit-logs/auditLog";
-import { throwIfNoOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { throwIfNoOrganizationAccess } from "@/src/features/rbac";
import { throwIfNoEntitlement } from "@/src/features/entitlements/server/hasEntitlement";
import {
createTRPCRouter,
diff --git a/web/src/features/public-api/server/projectApiKeyRouter.ts b/web/src/features/public-api/server/projectApiKeyRouter.ts
index 8b638198c7..0a5e1e22fc 100644
--- a/web/src/features/public-api/server/projectApiKeyRouter.ts
+++ b/web/src/features/public-api/server/projectApiKeyRouter.ts
@@ -1,5 +1,5 @@
import { auditLog } from "@/src/features/audit-logs/auditLog";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/rbac/index.ts b/web/src/features/rbac/index.ts
new file mode 100644
index 0000000000..544e53a4f2
--- /dev/null
+++ b/web/src/features/rbac/index.ts
@@ -0,0 +1,25 @@
+// The rbac feature's public surface (RFC rule 8). Named re-exports only —
+// this is the whole list of what anything outside the feature may use, and it
+// starts as exactly what they already imported, nothing added for the future.
+//
+// Access helpers live in utils/ and mix a React hook with TRPC throws in the
+// same file. Re-exporting them here does not change the bundle versus today's
+// deep import of those files. `server/` is deliberately absent: membersRouter
+// stays a direct import from the tRPC root, which is not a feature.
+
+export {
+ hasProjectAccess,
+ throwIfNoProjectAccess,
+ useHasProjectAccess,
+} from "@/src/features/rbac/utils/checkProjectAccess";
+
+export {
+ hasOrganizationAccess,
+ throwIfNoOrganizationAccess,
+ useHasOrganizationAccess,
+} from "@/src/features/rbac/utils/checkOrganizationAccess";
+
+export {
+ organizationRoleAccessRights,
+ type OrganizationScope,
+} from "@/src/features/rbac/constants/organizationAccessRights";
diff --git a/web/src/features/score-configs/components/ArchiveScoreConfigButton.tsx b/web/src/features/score-configs/components/ArchiveScoreConfigButton.tsx
index eba50bef87..c8a44b8a62 100644
--- a/web/src/features/score-configs/components/ArchiveScoreConfigButton.tsx
+++ b/web/src/features/score-configs/components/ArchiveScoreConfigButton.tsx
@@ -1,8 +1,8 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Button } from "@/src/components/ui/button";
import { PopoverController } from "@/src/components/ui/popover";
import type * as React from "react";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { api } from "@/src/utils/api";
import { useEmptyScoreConfigs } from "@/src/features/scores/hooks/useEmptyConfigs";
diff --git a/web/src/features/score-configs/components/ScoreConfigSettings.tsx b/web/src/features/score-configs/components/ScoreConfigSettings.tsx
index e30a16db5f..1f43580dd1 100644
--- a/web/src/features/score-configs/components/ScoreConfigSettings.tsx
+++ b/web/src/features/score-configs/components/ScoreConfigSettings.tsx
@@ -1,6 +1,6 @@
import React from "react";
import Header from "@/src/components/layouts/header";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { ScoreConfigsTable } from "@/src/components/table/use-cases/score-configs";
export function ScoreConfigSettings({ projectId }: { projectId: string }) {
diff --git a/web/src/features/score-configs/components/UpsertScoreConfigDialogController.tsx b/web/src/features/score-configs/components/UpsertScoreConfigDialogController.tsx
index c62a5ab438..d4c55c2d50 100644
--- a/web/src/features/score-configs/components/UpsertScoreConfigDialogController.tsx
+++ b/web/src/features/score-configs/components/UpsertScoreConfigDialogController.tsx
@@ -1,3 +1,4 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import { ScoreDataTypeEnum } from "@langfuse/shared";
import { type ReactNode, useState } from "react";
@@ -7,7 +8,6 @@ import {
DialogTrigger,
} from "@/src/components/ui/dialog";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { UpsertScoreConfigDialogContent } from "@/src/features/score-configs/components/UpsertScoreConfigDialogContent";
import {
type CreateConfig,
diff --git a/web/src/features/scores/components/AnnotateDrawerController.tsx b/web/src/features/scores/components/AnnotateDrawerController.tsx
index 96d7e72d15..0f558797cb 100644
--- a/web/src/features/scores/components/AnnotateDrawerController.tsx
+++ b/web/src/features/scores/components/AnnotateDrawerController.tsx
@@ -1,6 +1,6 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Drawer } from "@/src/components/ui/drawer";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import {
type AnalyticsData,
type ScoreTarget,
diff --git a/web/src/features/scores/components/CategoricalScoreInput.tsx b/web/src/features/scores/components/CategoricalScoreInput.tsx
index 9e0aa397d4..53c9aa5b29 100644
--- a/web/src/features/scores/components/CategoricalScoreInput.tsx
+++ b/web/src/features/scores/components/CategoricalScoreInput.tsx
@@ -8,7 +8,7 @@ import { Button } from "@/src/components/ui/button";
import { Combobox } from "@/src/components/ui/combobox";
import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";
import { ToggleGroup, ToggleGroupItem } from "@/src/components/ui/toggle-group";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { isCategoricalDataType } from "@/src/features/scores/lib/helpers";
import { getAddCategoryActionLabel } from "@/src/features/scores/lib/annotationFormHelpers";
import { AddScoreCategoryDialog } from "@/src/features/scores/components/AddScoreCategoryDialog";
diff --git a/web/src/features/search-bar/server/router.ts b/web/src/features/search-bar/server/router.ts
index 24e83c6003..d91b65cca3 100644
--- a/web/src/features/search-bar/server/router.ts
+++ b/web/src/features/search-bar/server/router.ts
@@ -35,7 +35,7 @@ import {
import { env } from "@/src/env.mjs";
import { randomBytes } from "crypto";
import { z } from "zod";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
MAX_SCORE_NAME_LENGTH,
MAX_SCORE_NAMES_PER_TYPE,
diff --git a/web/src/features/setup/components/SetupTracingButton.tsx b/web/src/features/setup/components/SetupTracingButton.tsx
index 6c16167bab..cc4383ca1c 100644
--- a/web/src/features/setup/components/SetupTracingButton.tsx
+++ b/web/src/features/setup/components/SetupTracingButton.tsx
@@ -3,7 +3,7 @@ import Link from "next/link";
import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
import { api } from "@/src/utils/api";
import { setupTracingRoute } from "@/src/features/setup/setupRoutes";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { LockIcon } from "lucide-react";
import { useRouter } from "next/router";
import { useEffect, useRef } from "react";
diff --git a/web/src/features/setup/components/TracesSetupOnboardingCard.tsx b/web/src/features/setup/components/TracesSetupOnboardingCard.tsx
index 121f875a2f..c955d4e694 100644
--- a/web/src/features/setup/components/TracesSetupOnboardingCard.tsx
+++ b/web/src/features/setup/components/TracesSetupOnboardingCard.tsx
@@ -5,7 +5,7 @@ import { SplashScreen } from "@/src/components/ui/splash-screen";
import { copyTextToClipboard } from "@/src/utils/clipboard";
import { ApiKeyDetailContent } from "@/src/features/public-api/components/ApiKeyDetailContent";
import { useLangfuseBaseUrl } from "@/src/features/public-api/hooks/useLangfuseEnvCode";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api, reportNonTrpcError } from "@/src/utils/api";
import { type RouterOutput } from "@/src/utils/types";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
diff --git a/web/src/features/slack/server/router.ts b/web/src/features/slack/server/router.ts
index d7bf68f025..b5ff5869ff 100644
--- a/web/src/features/slack/server/router.ts
+++ b/web/src/features/slack/server/router.ts
@@ -8,7 +8,7 @@ import {
SlackApiError,
logger,
} from "@langfuse/shared/src/server";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import { TRPCError } from "@trpc/server";
import { auditLog } from "@/src/features/audit-logs/auditLog";
import { env } from "@/src/env.mjs";
diff --git a/web/src/features/table/components/TableActionDialog.tsx b/web/src/features/table/components/TableActionDialog.tsx
index 6c20ffef07..bdec5cccf9 100644
--- a/web/src/features/table/components/TableActionDialog.tsx
+++ b/web/src/features/table/components/TableActionDialog.tsx
@@ -24,7 +24,7 @@ import {
import { useForm } from "react-hook-form";
import { type TableAction } from "@/src/features/table/types";
import { TableActionTargetOptions } from "@/src/features/table/components/TableActionTargetOptions";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { ActionButton } from "@/src/components/ActionButton";
import { useOptionalEntitlement } from "@/src/features/entitlements/hooks";
import { type BatchExportTableName } from "@langfuse/shared";
diff --git a/web/src/features/tag/components/TagPromptDetailsPopover.tsx b/web/src/features/tag/components/TagPromptDetailsPopover.tsx
index 5a9610648c..127b8446c2 100644
--- a/web/src/features/tag/components/TagPromptDetailsPopover.tsx
+++ b/web/src/features/tag/components/TagPromptDetailsPopover.tsx
@@ -1,7 +1,7 @@
/* eslint-disable @repo/no-style-props */
import React, { useState } from "react";
import { api } from "@/src/utils/api";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { type RouterOutput } from "@/src/utils/types";
import TagManager from "@/src/features/tag/components/TagManager";
import { trpcErrorToast } from "@/src/utils/trpcErrorToast";
diff --git a/web/src/features/tag/components/TagPromptPopover.tsx b/web/src/features/tag/components/TagPromptPopover.tsx
index 305330fb55..1097e9486c 100644
--- a/web/src/features/tag/components/TagPromptPopover.tsx
+++ b/web/src/features/tag/components/TagPromptPopover.tsx
@@ -1,7 +1,7 @@
/* eslint-disable @repo/no-style-props */
import React, { useState } from "react";
import { api } from "@/src/utils/api";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { type RouterOutput, type RouterInput } from "@/src/utils/types";
import TagManager from "@/src/features/tag/components/TagManager";
import { trpcErrorToast } from "@/src/utils/trpcErrorToast";
diff --git a/web/src/features/traces/components/IOPreview/components/CorrectedOutputField.tsx b/web/src/features/traces/components/IOPreview/components/CorrectedOutputField.tsx
index 9ae632c9c7..7205f3339e 100644
--- a/web/src/features/traces/components/IOPreview/components/CorrectedOutputField.tsx
+++ b/web/src/features/traces/components/IOPreview/components/CorrectedOutputField.tsx
@@ -7,7 +7,7 @@ import { useCorrectionMutations } from "../hooks/useCorrectionMutations";
import { useCorrectionEditor } from "../hooks/useCorrectionEditor";
import { useMemo, useState } from "react";
import { CodeMirrorEditor } from "@/src/components/editor/CodeMirrorEditor";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Switch } from "@/src/components/design-system/Switch/Switch";
import useLocalStorage from "@/src/components/useLocalStorage";
import { CorrectedOutputDiffDialog } from "./CorrectedOutputDiffDialog";
diff --git a/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx b/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
index a9fb36f072..b3a8653828 100644
--- a/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
@@ -62,7 +62,7 @@ import {
aggregateTraceMetrics,
getDescendantIds,
} from "@/src/features/traces/fns/traceAggregation";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useSession } from "next-auth/react";
import useIsFeatureEnabled from "@/src/features/feature-flags/hooks/useIsFeatureEnabled";
import { ObservationPreview } from "./ObservationPreview";
diff --git a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
index f0612dd6fc..f70f93029c 100644
--- a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
@@ -82,7 +82,7 @@ import {
PopoverContent,
PopoverTrigger,
} from "@/src/components/ui/popover";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { DualAnnotationContent } from "@/src/features/scores/components/DualAnnotationContent";
import { CollapsibleBadgeRow } from "@/src/features/traces/components/CollapsibleBadgeRow";
import { useIsMobile } from "@/src/hooks/use-mobile";
diff --git a/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx b/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
index 8bbcaa0412..905dc31942 100644
--- a/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
+++ b/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
@@ -41,7 +41,7 @@ import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferenc
import { useSelection } from "@/src/features/traces/contexts/SelectionContext";
import { useIsAuthenticatedAndProjectMember } from "@/src/features/auth/hooks";
import { useCommentedPaths } from "@/src/features/comments/hooks/useCommentedPaths";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useSession } from "next-auth/react";
import useIsFeatureEnabled from "@/src/features/feature-flags/hooks/useIsFeatureEnabled";
diff --git a/web/src/features/v4-migration/EvaluatorMigrationDialog.tsx b/web/src/features/v4-migration/EvaluatorMigrationDialog.tsx
index fc10176319..4e040b0783 100644
--- a/web/src/features/v4-migration/EvaluatorMigrationDialog.tsx
+++ b/web/src/features/v4-migration/EvaluatorMigrationDialog.tsx
@@ -16,7 +16,7 @@ import {
} from "@/src/features/in-app-agent/components/InAppAiAgentProvider";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
+import { useHasOrganizationAccess } from "@/src/features/rbac";
type EvaluatorMigrationScope = { type: "all" } | { type: "single" };
diff --git a/web/src/features/v4-migration/V4MigrationContent.tsx b/web/src/features/v4-migration/V4MigrationContent.tsx
index 60f7c6ab9e..eea8fc8a6c 100644
--- a/web/src/features/v4-migration/V4MigrationContent.tsx
+++ b/web/src/features/v4-migration/V4MigrationContent.tsx
@@ -61,7 +61,7 @@ import {
useEvalUpgradeAssistantPlan,
V4_CODING_AGENT_PROMPT,
} from "@/src/features/v4-migration/useV4UpgradeAssistantSupport";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
import { encodeFiltersGeneric, type FilterState } from "@langfuse/shared";
import { EvaluatorMigrationDialog } from "@/src/features/v4-migration/EvaluatorMigrationDialog";
diff --git a/web/src/features/web-callouts/components/WebCalloutSettingsPage.tsx b/web/src/features/web-callouts/components/WebCalloutSettingsPage.tsx
index 5d424f4216..65189c974e 100644
--- a/web/src/features/web-callouts/components/WebCalloutSettingsPage.tsx
+++ b/web/src/features/web-callouts/components/WebCalloutSettingsPage.tsx
@@ -46,7 +46,7 @@ import {
} from "@/src/components/ui/tooltip";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import {
WEB_CALLOUT_BLOCKED_HEADER_NAMES,
WEB_CALLOUT_HEADER_NAME_PATTERN,
diff --git a/web/src/features/web-callouts/server/router.ts b/web/src/features/web-callouts/server/router.ts
index 898ca371a7..c769393c2e 100644
--- a/web/src/features/web-callouts/server/router.ts
+++ b/web/src/features/web-callouts/server/router.ts
@@ -2,7 +2,7 @@ import { z } from "zod";
import { TRPCError } from "@trpc/server";
import { auditLog } from "@/src/features/audit-logs/auditLog";
-import { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { throwIfNoProjectAccess } from "@/src/features/rbac";
import {
WebCalloutEndpointUpsertInputSchema,
WebCalloutInvokeInputSchema,
diff --git a/web/src/features/widgets/components/DashboardWidget.tsx b/web/src/features/widgets/components/DashboardWidget.tsx
index adc0ac70e4..a64576ab17 100644
--- a/web/src/features/widgets/components/DashboardWidget.tsx
+++ b/web/src/features/widgets/components/DashboardWidget.tsx
@@ -31,7 +31,7 @@ import {
buildTableFilterHref,
buildViewAsTableHint,
} from "@/src/features/dashboard/lib/buildTableFilterHref";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
import { downloadChartDataCsv } from "@/src/features/widgets/chart-library/downloadChartDataCsv";
diff --git a/web/src/features/widgets/components/PresetDashboardWidget.tsx b/web/src/features/widgets/components/PresetDashboardWidget.tsx
index 4f0d343676..57f542f57e 100644
--- a/web/src/features/widgets/components/PresetDashboardWidget.tsx
+++ b/web/src/features/widgets/components/PresetDashboardWidget.tsx
@@ -1,3 +1,4 @@
+import { useHasProjectAccess } from "@/src/features/rbac";
import { useMemo } from "react";
import {
CopyIcon,
@@ -8,7 +9,6 @@ import {
} from "lucide-react";
import { type FilterState } from "@langfuse/shared";
import { type ViewVersion } from "@langfuse/shared/query";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
import { type ResolvedReadPath } from "@/src/features/events/hooks/useReadPath";
import { findClosestDashboardInterval } from "@/src/utils/date-range-utils";
import {
diff --git a/web/src/features/widgets/components/WidgetTable.tsx b/web/src/features/widgets/components/WidgetTable.tsx
index c01e9a900c..517a2cbe14 100644
--- a/web/src/features/widgets/components/WidgetTable.tsx
+++ b/web/src/features/widgets/components/WidgetTable.tsx
@@ -12,7 +12,7 @@ import { createTextTableColumn } from "@/src/components/design-system/table/colu
import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
import startCase from "lodash/startCase";
import { Button } from "@/src/components/ui/button";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { useHasProjectAccess } from "@/src/features/rbac";
import { Copy, CopyPlus, FileJson, MoreVertical, Trash } from "lucide-react";
import {
buildWidgetExport,