Skip to content

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

refactor(web): reroute leftover feature deep imports through index.ts (#17749)

Nikita Kabardin623fd375ba63
diff --git a/web/src/__tests__/eventsTablePaths.clienttest.ts b/web/src/__tests__/eventsTablePaths.clienttest.ts
index f104b5d331..3639aec39d 100644
--- a/web/src/__tests__/eventsTablePaths.clienttest.ts
+++ b/web/src/__tests__/eventsTablePaths.clienttest.ts
@@ -3,8 +3,7 @@
import {
buildEventsTablePathForObservationType,
buildEventsTablePathForSpanName,
-} from "@/src/features/events/lib/eventsTablePaths";
-
+} from "@/src/features/events";
describe("buildEventsTablePathForSpanName", () => {
it("opens the observations table with a name filter", () => {
const result = buildEventsTablePathForSpanName({
diff --git a/web/src/__tests__/organization-settings-pages.clienttest.tsx b/web/src/__tests__/organization-settings-pages.clienttest.tsx
index 87c8f7fcac..5ad3b88f88 100644
--- a/web/src/__tests__/organization-settings-pages.clienttest.tsx
+++ b/web/src/__tests__/organization-settings-pages.clienttest.tsx
@@ -1,8 +1,8 @@
import { renderHook } from "@testing-library/react";
-import { useHasEntitlement, usePlan } from "@/src/features/entitlements/hooks";
+import { useHasEntitlement, usePlan } from "@/src/features/entitlements";
import useIsFeatureEnabled from "@/src/features/feature-flags/hooks/useIsFeatureEnabled";
-import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
+import { useQueryProjectOrOrganization } from "@/src/features/projects";
import { useHasOrganizationAccess } from "@/src/features/rbac";
import { useIsCloudBillingAvailable } from "@/src/ee/features/billing/utils/isCloudBilling";
import { useV4UpgradeUiFlag } from "@/src/features/v4-migration/useV4UpgradeUiEnabled";
diff --git a/web/src/components/BatchExportTableButton.tsx b/web/src/components/BatchExportTableButton.tsx
index 6ee76ee822..08294f9489 100644
--- a/web/src/components/BatchExportTableButton.tsx
+++ b/web/src/components/BatchExportTableButton.tsx
@@ -20,7 +20,7 @@ import {
} from "@langfuse/shared";
import React from "react";
import { api } from "@/src/utils/api";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
+import { showSuccessToast } from "@/src/features/notifications";
export type BatchExportTableButtonProps = {
projectId: string;
diff --git a/web/src/components/JSONSchemaEditor.tsx b/web/src/components/JSONSchemaEditor.tsx
index fccab4f5d4..8d7aafa8e4 100644
--- a/web/src/components/JSONSchemaEditor.tsx
+++ b/web/src/components/JSONSchemaEditor.tsx
@@ -3,7 +3,7 @@ import React from "react";
import { ArrowUpRight } from "lucide-react";
import { Button } from "@/src/components/ui/button";
import { CodeMirrorEditor } from "@/src/components/editor";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showErrorToast } from "@/src/features/notifications";
import { assertUnreachable } from "@langfuse/shared";
type JSONSchemaEditorMode = "json"; // Future: "json" | "builder"
diff --git a/web/src/components/date-range-dropdowns.tsx b/web/src/components/date-range-dropdowns.tsx
index c260f84b3d..21073c9520 100644
--- a/web/src/components/date-range-dropdowns.tsx
+++ b/web/src/components/date-range-dropdowns.tsx
@@ -18,7 +18,7 @@ import {
getAbbreviatedTimeRange,
getTimeRangeLabel,
} from "@/src/utils/date-range-utils";
-import { useEntitlementLimit } from "@/src/features/entitlements/hooks";
+import { useEntitlementLimit } from "@/src/features/entitlements";
import { useMemo } from "react";
import {
HoverCard,
diff --git a/web/src/components/deleteButton.tsx b/web/src/components/deleteButton.tsx
index adeffdbeb2..9540a7b6c0 100644
--- a/web/src/components/deleteButton.tsx
+++ b/web/src/components/deleteButton.tsx
@@ -14,8 +14,8 @@ import { useHasProjectAccess } from "@/src/features/rbac";
import { type ProjectScope } from "@langfuse/shared";
import { api } from "@/src/utils/api";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { useHasEntitlement } from "@/src/features/entitlements/hooks";
+import { showSuccessToast } from "@/src/features/notifications";
+import { useHasEntitlement } from "@/src/features/entitlements";
import { ConfirmationDialogController } from "@/src/components/design-system/ConfirmationDialogController/ConfirmationDialogController";
export type DeleteButtonProps = {
diff --git a/web/src/components/layouts/app-layout/hooks/useFilteredNavigation.ts b/web/src/components/layouts/app-layout/hooks/useFilteredNavigation.ts
index b5772bbc0e..20ae863dd4 100644
--- a/web/src/components/layouts/app-layout/hooks/useFilteredNavigation.ts
+++ b/web/src/components/layouts/app-layout/hooks/useFilteredNavigation.ts
@@ -6,7 +6,7 @@
import { useRouter } from "next/router";
import { useMemo } from "react";
import type { Session } from "next-auth";
-import { useEntitlements } from "@/src/features/entitlements/hooks";
+import { useEntitlements } from "@/src/features/entitlements";
import { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useForceV3Experience } from "@/src/features/v4-migration/useForceV3Experience";
diff --git a/web/src/components/layouts/app-layout/index.tsx b/web/src/components/layouts/app-layout/index.tsx
index bbec673aaa..8b4f3e2977 100644
--- a/web/src/components/layouts/app-layout/index.tsx
+++ b/web/src/components/layouts/app-layout/index.tsx
@@ -14,7 +14,7 @@ import { useRouter } from "next/router";
import { signOut, useSession } from "next-auth/react";
import { signOutCleanly } from "@/src/features/auth/lib/signOut";
import { clearV4BetaEnabledSentryTag } from "@/src/utils/sentryV4BetaTag";
-import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
+import { useQueryProjectOrOrganization } from "@/src/features/projects";
import { ErrorPage } from "@/src/components/error-page";
// Layout variants
diff --git a/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx b/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx
index 1d1e7f12cb..e45a111ad8 100644
--- a/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx
+++ b/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx
@@ -45,12 +45,12 @@ import {
import { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
import { findCurrentInstance } from "@/src/ee/features/ui-customization/instanceLinks";
import { api } from "@/src/utils/api";
-import { usePlan } from "@/src/features/entitlements/hooks";
+import { usePlan } from "@/src/features/entitlements";
import { env } from "@/src/env.mjs";
import useLocalStorage from "@/src/components/useLocalStorage";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useSession } from "next-auth/react";
-import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
+import { useQueryProjectOrOrganization } from "@/src/features/projects";
import { useHasOrganizationAccess } from "@/src/features/rbac";
import {
PaymentBannerView,
diff --git a/web/src/components/layouts/breadcrumb.tsx b/web/src/components/layouts/breadcrumb.tsx
index 2035c70db4..2627fc3322 100644
--- a/web/src/components/layouts/breadcrumb.tsx
+++ b/web/src/components/layouts/breadcrumb.tsx
@@ -12,7 +12,7 @@ import { env } from "@/src/env.mjs";
import {
useOrgProjectSwitchPaths,
useQueryProjectOrOrganization,
-} from "@/src/features/projects/hooks";
+} from "@/src/features/projects";
import { useSession } from "next-auth/react";
import { useHasOrganizationAccess } from "@/src/features/rbac";
import { isCloudPlan, planLabels } from "@langfuse/shared";
diff --git a/web/src/components/layouts/routes.tsx b/web/src/components/layouts/routes.tsx
index 43791d15ef..047cc5761b 100644
--- a/web/src/components/layouts/routes.tsx
+++ b/web/src/components/layouts/routes.tsx
@@ -27,7 +27,7 @@ import { type Session } from "next-auth";
import { type OrganizationScope } from "@/src/features/rbac";
import { SupportButton } from "@/src/components/nav/support-button";
import { V4MigrationNavItem } from "@/src/features/v4-migration/V4MigrationNavItem";
-import { V4SidebarToggle } from "@/src/features/events/components/V4SidebarToggle";
+import { V4SidebarToggle } from "@/src/features/events";
import { BookACallButton } from "@/src/components/nav/book-a-call-button";
import { SidebarMenuButton } from "@/src/components/ui/sidebar";
import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";
diff --git a/web/src/components/nav/AppSidebar/AppSidebar.tsx b/web/src/components/nav/AppSidebar/AppSidebar.tsx
index 01d8eb0db4..b76fe4cd69 100644
--- a/web/src/components/nav/AppSidebar/AppSidebar.tsx
+++ b/web/src/components/nav/AppSidebar/AppSidebar.tsx
@@ -63,7 +63,7 @@ import { OrganizationDropdownMenu } from "@/src/components/OrganizationDropdownM
import { ProjectDropdownMenu } from "@/src/components/ProjectDropdownMenu/ProjectDropdownMenu";
import { assertUnreachable } from "@/src/utils/types";
import { SIDEBAR_NOTIFICATIONS, type SidebarNotification } from "./utils";
-import { useOrgProjectSwitchPaths } from "@/src/features/projects/hooks";
+import { useOrgProjectSwitchPaths } from "@/src/features/projects";
import {
APP_SHELL_CHROME_ROW_CLASS,
APP_SHELL_CHROME_ROW_TEST_ID,
diff --git a/web/src/components/onboarding/AnnotationQueuesOnboarding.tsx b/web/src/components/onboarding/AnnotationQueuesOnboarding.tsx
index 205b61e271..71dfb8949f 100644
--- a/web/src/components/onboarding/AnnotationQueuesOnboarding.tsx
+++ b/web/src/components/onboarding/AnnotationQueuesOnboarding.tsx
@@ -3,7 +3,7 @@ import {
type ValueProposition,
} from "@/src/components/ui/splash-screen";
import { ClipboardCheck, Users, BarChart4, GitMerge } from "lucide-react";
-import { CreateOrEditAnnotationQueueButton } from "@/src/features/annotation-queues/components/CreateOrEditAnnotationQueueButton";
+import { CreateOrEditAnnotationQueueButton } from "@/src/features/annotation-queues";
export function AnnotationQueuesOnboarding({
projectId,
diff --git a/web/src/components/publish-object-switch.tsx b/web/src/components/publish-object-switch.tsx
index 6ec3036f9c..94bebbce36 100644
--- a/web/src/components/publish-object-switch.tsx
+++ b/web/src/components/publish-object-switch.tsx
@@ -10,7 +10,7 @@ import {
TooltipContent,
TooltipTrigger,
} from "@/src/components/ui/tooltip";
-import { useReadPath } from "@/src/features/events/hooks/useReadPath";
+import { useReadPath } from "@/src/features/events";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useHasProjectAccess } from "@/src/features/rbac";
import { env } from "@/src/env.mjs";
diff --git a/web/src/components/table/ValueCell.tsx b/web/src/components/table/ValueCell.tsx
index 854b7323f1..dc0be3f028 100644
--- a/web/src/components/table/ValueCell.tsx
+++ b/web/src/components/table/ValueCell.tsx
@@ -22,7 +22,7 @@ import { cn } from "@/src/utils/tailwind";
import {
buildEventsTablePathForMetadataFilter,
type MetadataFilterOperator,
-} from "@/src/features/events/lib/eventsTablePaths";
+} from "@/src/features/events";
import { Copy, Check, EllipsisVertical, Filter, FilterX } from "lucide-react";
/**
diff --git a/web/src/components/table/data-table-ai-filters.tsx b/web/src/components/table/data-table-ai-filters.tsx
index 0f0f04774f..0db9b1fa32 100644
--- a/web/src/components/table/data-table-ai-filters.tsx
+++ b/web/src/components/table/data-table-ai-filters.tsx
@@ -8,7 +8,7 @@ import {
TooltipTrigger,
} from "@/src/components/ui/tooltip";
import { Info } from "lucide-react";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
import { AIFeaturesDisabledNotice } from "@/src/features/organizations";
import { api, reportNonTrpcError } from "@/src/utils/api";
diff --git a/web/src/components/table/data-table-toolbar.clienttest.tsx b/web/src/components/table/data-table-toolbar.clienttest.tsx
index bc7cec5069..f12e019b2f 100644
--- a/web/src/components/table/data-table-toolbar.clienttest.tsx
+++ b/web/src/components/table/data-table-toolbar.clienttest.tsx
@@ -1,6 +1,6 @@
import { fireEvent, render, screen } from "@testing-library/react";
import { vi } from "vitest";
-import { ExperimentFormatSetting } from "@/src/features/experiments/components/ExperimentFormatSetting";
+import { ExperimentFormatSetting } from "@/src/features/experiments";
import {
DataTableToolbar,
type MultiSelect,
diff --git a/web/src/components/table/peek/peek-evaluator-config-detail.tsx b/web/src/components/table/peek/peek-evaluator-config-detail.tsx
index 4409efd3df..0c1378c763 100644
--- a/web/src/components/table/peek/peek-evaluator-config-detail.tsx
+++ b/web/src/components/table/peek/peek-evaluator-config-detail.tsx
@@ -21,7 +21,7 @@ import { Switch } from "@/src/components/design-system/Switch/Switch";
import { useHasProjectAccess } from "@/src/features/rbac";
import { useState } from "react";
import { cn } from "@/src/utils/tailwind";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
+import { showSuccessToast } from "@/src/features/notifications";
import { api } from "@/src/utils/api";
import { EvaluatorPausedCallout } from "@/src/features/evals/components/evaluator-paused-callout";
import {
diff --git a/web/src/components/table/peek/peek-experiment-item-detail.tsx b/web/src/components/table/peek/peek-experiment-item-detail.tsx
index f799c9b4d3..3ebaf2f97b 100644
--- a/web/src/components/table/peek/peek-experiment-item-detail.tsx
+++ b/web/src/components/table/peek/peek-experiment-item-detail.tsx
@@ -2,8 +2,10 @@ import { useRouter } from "next/router";
import { usePeekData } from "@/src/components/table/peek/hooks/usePeekData";
import { TraceDetailBody } from "@/src/features/traces";
import { TablePeekView } from "@/src/components/table/peek";
-import { ExperimentPeekFooter } from "@/src/features/experiments/components/ExperimentPeekFooter";
-import { useExperimentPeekNavigation } from "@/src/features/experiments/hooks/useExperimentPeekNavigation";
+import {
+ ExperimentPeekFooter,
+ useExperimentPeekNavigation,
+} from "@/src/features/experiments";
import { parseTraceTimestampFromQuery } from "@/src/fns/parseTraceTimestampFromQuery/parseTraceTimestampFromQuery";
const PeekViewExperimentItemDetail = ({ projectId }: { projectId: string }) => {
diff --git a/web/src/components/table/table-view-presets/components/data-table-view-presets-drawer.tsx b/web/src/components/table/table-view-presets/components/data-table-view-presets-drawer.tsx
index a04a3b15e1..957cd5402b 100644
--- a/web/src/components/table/table-view-presets/components/data-table-view-presets-drawer.tsx
+++ b/web/src/components/table/table-view-presets/components/data-table-view-presets-drawer.tsx
@@ -71,8 +71,7 @@ import {
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { z } from "zod";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
+import { showErrorToast, showSuccessToast } from "@/src/features/notifications";
import { copyTextToClipboard } from "@/src/utils/clipboard";
import { useUniqueNameValidation } from "@/src/hooks/useUniqueNameValidation";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
diff --git a/web/src/components/table/table-view-presets/hooks/useDefaultViewMutations.ts b/web/src/components/table/table-view-presets/hooks/useDefaultViewMutations.ts
index 220d572e50..aa54fc7d08 100644
--- a/web/src/components/table/table-view-presets/hooks/useDefaultViewMutations.ts
+++ b/web/src/components/table/table-view-presets/hooks/useDefaultViewMutations.ts
@@ -1,6 +1,5 @@
import { api } from "@/src/utils/api";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showSuccessToast, showErrorToast } from "@/src/features/notifications";
import { type DefaultViewScope } from "@langfuse/shared/src/server";
interface UseDefaultViewMutationsProps {
diff --git a/web/src/components/table/table-view-presets/hooks/useTableViewManager.ts b/web/src/components/table/table-view-presets/hooks/useTableViewManager.ts
index 33d32711e5..9dda0585f9 100644
--- a/web/src/components/table/table-view-presets/hooks/useTableViewManager.ts
+++ b/web/src/components/table/table-view-presets/hooks/useTableViewManager.ts
@@ -17,7 +17,7 @@ import {
import useSessionStorage from "@/src/components/useSessionStorage";
import { useKeyedSessionStorageState } from "@/src/features/filters/hooks/useKeyedSessionStorageState";
import { type LangfuseColumnDef } from "@/src/components/table/types";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showErrorToast } from "@/src/features/notifications";
import isEqual from "lodash/isEqual";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { validateOrderBy, validateFilters } from "../validation";
diff --git a/web/src/components/table/table-view-presets/hooks/useViewMutations.ts b/web/src/components/table/table-view-presets/hooks/useViewMutations.ts
index 042ced46cf..187b3ceddd 100644
--- a/web/src/components/table/table-view-presets/hooks/useViewMutations.ts
+++ b/web/src/components/table/table-view-presets/hooks/useViewMutations.ts
@@ -1,5 +1,4 @@
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showSuccessToast, showErrorToast } from "@/src/features/notifications";
import { api } from "@/src/utils/api";
import { copyTextToClipboard } from "@/src/utils/clipboard";
import type { TableViewPresetState } from "@langfuse/shared";
diff --git a/web/src/features/account/AccountSettingsPage.tsx b/web/src/features/account/AccountSettingsPage.tsx
index 8fb5e72873..46d584b4bd 100644
--- a/web/src/features/account/AccountSettingsPage.tsx
+++ b/web/src/features/account/AccountSettingsPage.tsx
@@ -32,8 +32,7 @@ import ContainerPage from "@/src/components/layouts/container-page";
import { useRouter } from "next/router";
import { StringNoHTML } from "@langfuse/shared";
import Link from "next/link";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showSuccessToast, showErrorToast } from "@/src/features/notifications";
import { useV4UpgradeUiFlag } from "@/src/features/v4-migration/useV4UpgradeUiEnabled";
import { ConfirmationDialogController } from "@/src/components/design-system/ConfirmationDialogController/ConfirmationDialogController";
diff --git a/web/src/features/annotation-queues/index.ts b/web/src/features/annotation-queues/index.ts
new file mode 100644
index 0000000000..91dd4f0214
--- /dev/null
+++ b/web/src/features/annotation-queues/index.ts
@@ -0,0 +1,11 @@
+// The annotation-queues feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported.
+//
+// `server/` is a separate door. queue routers stay a direct import from the
+// tRPC root. Page modules and AnnotationQueuesItem stay page-shim deep
+// imports.
+export { AddTracesToAnnotationQueueDialogController } from "@/src/features/annotation-queues/components/AddTracesToAnnotationQueueDialogController";
+export { AnnotationQueueItemCountBadge } from "@/src/features/annotation-queues/components/AnnotationQueueItemCountBadge";
+export { AnnotationQueueItemDropdownMenuController } from "@/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController";
+export { CreateOrEditAnnotationQueueButton } from "@/src/features/annotation-queues/components/CreateOrEditAnnotationQueueButton";
+export { CommentsSection } from "@/src/features/annotation-queues/components/shared/CommentsSection";
diff --git a/web/src/features/annotation-queues/server/index.ts b/web/src/features/annotation-queues/server/index.ts
new file mode 100644
index 0000000000..640e57cc84
--- /dev/null
+++ b/web/src/features/annotation-queues/server/index.ts
@@ -0,0 +1,16 @@
+// The annotation-queues feature's public server surface (RFC rules 8 and 10).
+// queueRouter / queueItemRouter / queueAssignmentRouter stay a direct import
+// from the tRPC root, which is not a feature.
+export {
+ createAnnotationQueueAssignmentForApi,
+ createAnnotationQueueForApi,
+ createAnnotationQueueItemForApi,
+ deleteAnnotationQueueAssignment,
+ deleteAnnotationQueueAssignmentForApi,
+ deleteAnnotationQueueItemForApi,
+ getAnnotationQueueForApi,
+ getAnnotationQueueItemForApi,
+ listAnnotationQueueItemsForApi,
+ listAnnotationQueuesForApi,
+ updateAnnotationQueueItemForApi,
+} from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
diff --git a/web/src/features/blobstorage-integration/BlobStorageIntegrationPage.tsx b/web/src/features/blobstorage-integration/BlobStorageIntegrationPage.tsx
index 32a5110bc5..506a11babb 100644
--- a/web/src/features/blobstorage-integration/BlobStorageIntegrationPage.tsx
+++ b/web/src/features/blobstorage-integration/BlobStorageIntegrationPage.tsx
@@ -7,7 +7,7 @@ import { Card } from "@/src/components/ui/card";
import { IntegrationSettingsSkeleton } from "@/src/features/analytics-integrations/components/IntegrationSettingsSkeleton";
import Link from "next/link";
import { useRouter } from "next/router";
-import { useHasEntitlement } from "@/src/features/entitlements/hooks";
+import { useHasEntitlement } from "@/src/features/entitlements";
import { useHasProjectAccess } from "@/src/features/rbac";
import { api, type RouterOutputs } from "@/src/utils/api";
import { deriveSyncStatus } from "@/src/features/blobstorage-integration/deriveSyncStatus";
diff --git a/web/src/features/blobstorage-integration/components/BlobStorageIntegrationContainer.tsx b/web/src/features/blobstorage-integration/components/BlobStorageIntegrationContainer.tsx
index c18ebb9d80..9fc11618b7 100644
--- a/web/src/features/blobstorage-integration/components/BlobStorageIntegrationContainer.tsx
+++ b/web/src/features/blobstorage-integration/components/BlobStorageIntegrationContainer.tsx
@@ -12,7 +12,7 @@ import {
import { buildExportSourceContext } from "@/src/features/analytics-integrations/exportSource";
import { type BlobStorageIntegrationFormSchema } from "@/src/features/blobstorage-integration/types";
import { useLangfuseCloudRegion } from "@/src/features/organizations";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
import { buildBlobStorageFormValues } from "@/src/features/blobstorage-integration/components/formValues";
import { BlobStorageIntegrationForm } from "@/src/features/blobstorage-integration/components/BlobStorageIntegrationForm";
diff --git a/web/src/features/chart-view-prototype/components/ChartViewPrototype.tsx b/web/src/features/chart-view-prototype/components/ChartViewPrototype.tsx
index d084c8cd94..46fdd665db 100644
--- a/web/src/features/chart-view-prototype/components/ChartViewPrototype.tsx
+++ b/web/src/features/chart-view-prototype/components/ChartViewPrototype.tsx
@@ -4,6 +4,7 @@ import { SlidersHorizontal } from "lucide-react";
import { type DashboardWidgetChartType } from "@langfuse/shared/src/db";
import { Button } from "@/src/components/ui/button";
import { Separator } from "@/src/components/ui/separator";
+
// Shared, production chart-view components — the harness renders the exact same
// UI as the real EventsChartView, fed with mock-aggregated data.
import {
@@ -12,10 +13,10 @@ import {
ChartTypePicker,
GranularitySelect,
MetricSelect,
-} from "@/src/features/chart-view/components/ConfigControls";
-import { ChartCanvas } from "@/src/features/chart-view/components/ChartCanvas";
-import { ChartViewPanel } from "@/src/features/chart-view/components/ChartViewPanel";
-import { ViewModeToggle } from "@/src/features/chart-view/components/ViewModeToggle";
+ ChartCanvas,
+ ChartViewPanel,
+ ViewModeToggle,
+} from "@/src/features/chart-view";
import {
coerceConfig,
DEFAULT_CONFIG,
diff --git a/web/src/features/chart-view/components/AddToDashboardButton.tsx b/web/src/features/chart-view/components/AddToDashboardButton.tsx
index d905d0425f..7be4e86ce4 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 { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showErrorToast } from "@/src/features/notifications";
import { SelectDashboardDialog } from "@/src/features/dashboard/components/SelectDashboardDialog";
import { type ChartWidgetInput } from "../lib/chartConfigToWidget";
diff --git a/web/src/features/chart-view/index.ts b/web/src/features/chart-view/index.ts
new file mode 100644
index 0000000000..c0b5240743
--- /dev/null
+++ b/web/src/features/chart-view/index.ts
@@ -0,0 +1,20 @@
+// The chart-view feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported.
+//
+// EventsChartView stays a page-level deep import. types, vocab, and
+// chartFilterCompatibility stay off this door: the last pulls search-bar,
+// and putting it (or the page) on a barrel that scores-chart-view types
+// would share would load that graph into type-only consumers.
+export { AddToDashboardButton } from "@/src/features/chart-view/components/AddToDashboardButton";
+export { ChartCanvas } from "@/src/features/chart-view/components/ChartCanvas";
+export { ChartViewPanel } from "@/src/features/chart-view/components/ChartViewPanel";
+export {
+ AggregationSelect,
+ BreakdownSelect,
+ ChartTypePicker,
+ GranularitySelect,
+ MetricSelect,
+} from "@/src/features/chart-view/components/ConfigControls";
+export { ViewModeToggle } from "@/src/features/chart-view/components/ViewModeToggle";
+export type { ChartWidgetInput } from "@/src/features/chart-view/lib/chartConfigToWidget";
+export { useChartViewState } from "@/src/features/chart-view/lib/useChartViewState";
diff --git a/web/src/features/command-k-menu/CommandMenu.tsx b/web/src/features/command-k-menu/CommandMenu.tsx
index 5e430a7659..3572bb2296 100644
--- a/web/src/features/command-k-menu/CommandMenu.tsx
+++ b/web/src/features/command-k-menu/CommandMenu.tsx
@@ -15,10 +15,10 @@ import { env } from "@/src/env.mjs";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useDebounce } from "@/src/hooks/useDebounce";
import { useCommandMenu } from "@/src/features/command-k-menu/CommandMenuProvider";
-import { useProjectSettingsPages } from "@/src/features/projects";
import { useOrganizationSettingsPages } from "@/src/features/organizations/OrganizationSettingsPage";
import { useAccountSettingsPages } from "@/src/features/account";
-import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
+import { useQueryProjectOrOrganization } from "@/src/features/projects";
+import { useProjectSettingsPages } from "@/src/features/projects/ProjectSettingsPage";
import { api } from "@/src/utils/api";
import { type NavigationItem } from "@/src/components/layouts/utilities/routes";
import { useReadPath } from "@/src/features/events";
diff --git a/web/src/features/dashboard/DashboardDetailPage.tsx b/web/src/features/dashboard/DashboardDetailPage.tsx
index 99e522eb06..80d7e9307b 100644
--- a/web/src/features/dashboard/DashboardDetailPage.tsx
+++ b/web/src/features/dashboard/DashboardDetailPage.tsx
@@ -1,10 +1,7 @@
/* eslint-disable no-nested-ternary */
import { useRouter } from "next/router";
import { api } from "@/src/utils/api";
-import {
- useReadPath,
- type ResolvedReadPath,
-} from "@/src/features/events/hooks/useReadPath";
+import { useReadPath, type ResolvedReadPath } from "@/src/features/events";
import { useDashboardFilterOptions } from "@/src/hooks/useDashboardFilterOptions";
import Page from "@/src/components/layouts/page";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
@@ -28,7 +25,7 @@ import {
MoreVertical,
PencilIcon,
} from "lucide-react";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showErrorToast, showSuccessToast } from "@/src/features/notifications";
import {
SelectWidgetDialog,
type WidgetItem,
@@ -57,7 +54,7 @@ import {
DASHBOARD_AGGREGATION_OPTIONS,
toAbsoluteTimeRange,
} from "@/src/utils/date-range-utils";
-import { useEntitlementLimit } from "@/src/features/entitlements/hooks";
+import { useEntitlementLimit } from "@/src/features/entitlements";
import { useEnvironmentFilterOptionsCache } from "@/src/hooks/use-environment-filter-options-cache";
import {
@@ -88,7 +85,6 @@ import { readTextFromClipboard } from "@/src/utils/clipboard";
import { useClipboardWidgetProbe } from "@/src/features/widgets/hooks/useClipboardWidgetProbe";
import { extractTransferFiles } from "@/src/components/editor/fileDropPaste";
import { Layer } from "@/src/components/design-system/Layer/Layer";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
import { useDashboardDefinitionDraft } from "@/src/features/dashboard/hooks/useDashboardDefinitionDraft";
import {
RouteParamsPendingFallback,
diff --git a/web/src/features/dashboard/NewDashboardPage.tsx b/web/src/features/dashboard/NewDashboardPage.tsx
index 028424278a..5b6d9cbbf7 100644
--- a/web/src/features/dashboard/NewDashboardPage.tsx
+++ b/web/src/features/dashboard/NewDashboardPage.tsx
@@ -6,9 +6,9 @@ import { Button } from "@/src/components/ui/button";
import { Input } from "@/src/components/ui/input";
import { Textarea } from "@/src/components/ui/textarea";
import { Label } from "@/src/components/ui/label";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showSuccessToast, showErrorToast } from "@/src/features/notifications";
import { useHasProjectAccess } from "@/src/features/rbac";
+
export default function NewDashboardPage() {
const router = useRouter();
const { projectId } = router.query as { projectId: string };
diff --git a/web/src/features/dashboard/ProjectHomePage.tsx b/web/src/features/dashboard/ProjectHomePage.tsx
index baec42639f..0f0b11cb30 100644
--- a/web/src/features/dashboard/ProjectHomePage.tsx
+++ b/web/src/features/dashboard/ProjectHomePage.tsx
@@ -24,17 +24,14 @@ import {
} from "@/src/utils/date-range-utils";
import { useDashboardDateRange } from "@/src/hooks/useDashboardDateRange";
import { useDebounce } from "@/src/hooks/useDebounce";
-import { useEntitlementLimit } from "@/src/features/entitlements/hooks";
+import { useEntitlementLimit } from "@/src/features/entitlements";
import Page from "@/src/components/layouts/page";
import {
convertSelectedEnvironmentsToFilter,
useEnvironmentFilter,
} from "@/src/hooks/useEnvironmentFilter";
-import {
- useReadPath,
- type ResolvedReadPath,
-} from "@/src/features/events/hooks/useReadPath";
+import { useReadPath, type ResolvedReadPath } from "@/src/features/events";
import { type ViewVersion } from "@langfuse/shared/query";
import { useEnvironmentFilterOptionsCache } from "@/src/hooks/use-environment-filter-options-cache";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
@@ -45,13 +42,13 @@ import {
} from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
import Link from "next/link";
import { LockIcon, PencilIcon } from "lucide-react";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showErrorToast } from "@/src/features/notifications";
import { useHasProjectAccess } from "@/src/features/rbac";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { Button } from "@/src/components/ui/button";
import { DashboardGrid } from "@/src/features/widgets/components/DashboardGrid";
import { HomeDashboardSelect } from "@/src/features/dashboard/components/HomeDashboardSelect";
-import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
+import { useQueryProjectOrOrganization } from "@/src/features/projects";
import { setupTracingRoute } from "@/src/features/setup/setupRoutes";
// Controller: no widget query may fire before the session resolves the v3/v4
diff --git a/web/src/features/dashboard/index.ts b/web/src/features/dashboard/index.ts
new file mode 100644
index 0000000000..cbbff03f84
--- /dev/null
+++ b/web/src/features/dashboard/index.ts
@@ -0,0 +1,38 @@
+// The dashboard feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported from this
+// feature's client modules.
+//
+// SelectDashboardDialog, home-preset-registry, and
+// useDashboardQueryScheduler stay off this door: mapping helpers are
+// imported by widgets/utils and scores adapters, and putting the dialog or
+// home-chart registry here would load that UI into every mapping consumer.
+// dashboardUiTableToViewMapping stays a deep import for server callers
+// (rule 10). Pages and dashboardRouter stay off this door.
+export {
+ buildTableFilterHref,
+ buildViewAsTableHint,
+} from "@/src/features/dashboard/lib/buildTableFilterHref";
+export {
+ compareViewChartDataToDataPoints,
+ getCompareViewChartUnit,
+} from "@/src/features/dashboard/lib/chart-data-adapters";
+export {
+ displayNameForFilterColumn,
+ getWidgetImportFilterConfig,
+ mapLegacyUiTableFilterToView,
+ mapViewFilterToUiTableFilter,
+ mapWidgetUiTableFilterToView,
+ normalizeStoredWidgetFiltersForEditor,
+ partitionStoredUiTableFiltersToView,
+ partitionWidgetUiTableFiltersToView,
+} from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
+export {
+ isEmptyChart,
+ RESOURCE_METRICS,
+ transformAggregatedRunMetricsToChartData,
+ transformCategoricalScoresToChartData,
+ uniqueAndSort,
+} from "@/src/features/dashboard/lib/score-analytics-utils";
+// buildPresetExport stays a deep import: dashboard-import-export loads
+// @/src/features/widgets, so putting it on this door would close a
+// widgets/dashboard cycle.
diff --git a/web/src/features/datasets/DatasetCompareChartsPage.tsx b/web/src/features/datasets/DatasetCompareChartsPage.tsx
index d71d6f46b7..589853bab2 100644
--- a/web/src/features/datasets/DatasetCompareChartsPage.tsx
+++ b/web/src/features/datasets/DatasetCompareChartsPage.tsx
@@ -14,17 +14,19 @@ import {
DialogContent,
DialogTrigger,
} from "@/src/components/ui/dialog";
-import { CreateExperimentsForm } from "@/src/features/experiments/components/CreateExperimentsForm";
+import {
+ CreateExperimentsForm,
+ useExperimentAccess,
+ toExperimentsResultsUrl,
+} from "@/src/features/experiments";
import { useHasProjectAccess } from "@/src/features/rbac";
import { DatasetAnalytics } from "@/src/features/datasets/components/DatasetAnalytics";
import {
RESOURCE_METRICS,
isEmptyChart,
-} from "@/src/features/dashboard/lib/score-analytics-utils";
-import {
compareViewChartDataToDataPoints,
getCompareViewChartUnit,
-} from "@/src/features/dashboard/lib/chart-data-adapters";
+} from "@/src/features/dashboard";
import { Chart } from "@/src/features/widgets/chart-library/Chart";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import Page from "@/src/components/layouts/page";
@@ -44,8 +46,6 @@ import {
getDatasetRunCompareTabs,
} from "@/src/features/navigation/utils/dataset-run-compare-tabs";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
-import { useExperimentAccess } from "@/src/features/experiments/hooks/useExperimentAccess";
-import { toExperimentsResultsUrl } from "@/src/features/experiments/utils/experimentUrlTranslation";
function DatasetCompareChartsLegacy() {
const router = useRouter();
diff --git a/web/src/features/datasets/DatasetComparePage.tsx b/web/src/features/datasets/DatasetComparePage.tsx
index 26a47013e3..bd7de05981 100644
--- a/web/src/features/datasets/DatasetComparePage.tsx
+++ b/web/src/features/datasets/DatasetComparePage.tsx
@@ -9,7 +9,11 @@ import {
DialogContent,
DialogTrigger,
} from "@/src/components/ui/dialog";
-import { CreateExperimentsForm } from "@/src/features/experiments/components/CreateExperimentsForm";
+import {
+ CreateExperimentsForm,
+ useExperimentAccess,
+ toExperimentsResultsUrl,
+} from "@/src/features/experiments";
import { useHasProjectAccess } from "@/src/features/rbac";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import Page from "@/src/components/layouts/page";
@@ -24,8 +28,6 @@ import {
} from "@/src/features/datasets/contexts/ActiveCellContext";
import { SidePanel, SidePanelContent } from "@/src/components/ui/side-panel";
import { AnnotationPanel } from "@/src/features/datasets/components/AnnotationPanel";
-import { useExperimentAccess } from "@/src/features/experiments/hooks/useExperimentAccess";
-import { toExperimentsResultsUrl } from "@/src/features/experiments/utils/experimentUrlTranslation";
import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
function DatasetCompareLegacy() {
diff --git a/web/src/features/datasets/DatasetExperimentsPage.tsx b/web/src/features/datasets/DatasetExperimentsPage.tsx
index 44ef47d1e7..aa0501b17e 100644
--- a/web/src/features/datasets/DatasetExperimentsPage.tsx
+++ b/web/src/features/datasets/DatasetExperimentsPage.tsx
@@ -12,10 +12,16 @@ import {
DialogTrigger,
} from "@/src/components/ui/dialog";
import { Button } from "@/src/components/ui/button";
-import { CreateExperimentsForm } from "@/src/features/experiments/components/CreateExperimentsForm";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
+import {
+ CreateExperimentsForm,
+ useEvaluatorDefaults,
+ useExperimentEvaluatorData,
+ useExperimentAccess,
+ singleRunToExperimentsUrl,
+} from "@/src/features/experiments";
+import { showSuccessToast } from "@/src/features/notifications";
import { DatasetAnalytics } from "@/src/features/datasets/components/DatasetAnalytics";
-import { RESOURCE_METRICS } from "@/src/features/dashboard/lib/score-analytics-utils";
+import { RESOURCE_METRICS } from "@/src/features/dashboard";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import Page from "@/src/components/layouts/page";
import {
@@ -23,9 +29,6 @@ import {
DATASET_TABS,
} from "@/src/features/navigation/utils/dataset-tabs";
import { TemplateSelector } from "@/src/features/evals/components/template-selector";
-import { useEvaluatorDefaults } from "@/src/features/experiments/hooks/useEvaluatorDefaults";
-import { useExperimentEvaluatorData } from "@/src/features/experiments/hooks/useExperimentEvaluatorData";
-import { useExperimentAccess } from "@/src/features/experiments/hooks/useExperimentAccess";
import {
EvaluatorForm,
useEvaluatorFormTemplate,
@@ -33,7 +36,6 @@ import {
import useLocalStorage from "@/src/components/useLocalStorage";
import { getDatasetBreadcrumb } from "@/src/features/datasets/utils/getDatasetBreadcrumb";
import { ExperimentsTable } from "@/src/features/experiments/components/table";
-import { singleRunToExperimentsUrl } from "@/src/features/experiments/utils/experimentUrlTranslation";
import { Skeleton } from "@/src/components/ui/skeleton";
import {
RouteParamsPendingFallback,
diff --git a/web/src/features/datasets/DatasetItemRunsPage.tsx b/web/src/features/datasets/DatasetItemRunsPage.tsx
index e88604a00f..bf29e8921d 100644
--- a/web/src/features/datasets/DatasetItemRunsPage.tsx
+++ b/web/src/features/datasets/DatasetItemRunsPage.tsx
@@ -3,7 +3,7 @@ import { useEffect } from "react";
import { DatasetRunItemsByItemTable } from "@/src/features/datasets/components/DatasetRunItemsByItemTable";
import { DATASET_ITEM_TABS } from "@/src/features/navigation/utils/dataset-item-tabs";
import { DatasetItemDetailPage } from "@/src/features/datasets/components/DatasetItemDetailPage";
-import { useExperimentAccess } from "@/src/features/experiments/hooks/useExperimentAccess";
+import { useExperimentAccess } from "@/src/features/experiments";
import {
RouteParamsPendingFallback,
useReadyRouteParams,
diff --git a/web/src/features/datasets/DatasetRunPage.tsx b/web/src/features/datasets/DatasetRunPage.tsx
index 1265295d65..1e410af63c 100644
--- a/web/src/features/datasets/DatasetRunPage.tsx
+++ b/web/src/features/datasets/DatasetRunPage.tsx
@@ -23,8 +23,10 @@ import {
} from "@/src/components/ui/side-panel";
import { Skeleton } from "@/src/components/ui/skeleton";
import { getDatasetBreadcrumb } from "@/src/features/datasets/utils/getDatasetBreadcrumb";
-import { useExperimentAccess } from "@/src/features/experiments/hooks/useExperimentAccess";
-import { singleRunToExperimentsUrl } from "@/src/features/experiments/utils/experimentUrlTranslation";
+import {
+ useExperimentAccess,
+ singleRunToExperimentsUrl,
+} from "@/src/features/experiments";
import { buildLocalIsoDatePresentation } from "@/src/utils/dates";
function DatasetRunLegacy() {
diff --git a/web/src/features/datasets/components/AnnotationPanel.tsx b/web/src/features/datasets/components/AnnotationPanel.tsx
index 5365b51f0e..77bc138c13 100644
--- a/web/src/features/datasets/components/AnnotationPanel.tsx
+++ b/web/src/features/datasets/components/AnnotationPanel.tsx
@@ -6,7 +6,7 @@ import {
} from "@/src/components/ui/resizable";
import { Skeleton } from "@/src/components/ui/skeleton";
import useSessionStorage from "@/src/components/useSessionStorage";
-import { CommentsSection } from "@/src/features/annotation-queues/components/shared/CommentsSection";
+import { CommentsSection } from "@/src/features/annotation-queues";
import { useActiveCell } from "@/src/features/datasets/contexts/ActiveCellContext";
import {
AnnotationForm,
diff --git a/web/src/features/datasets/components/DatasetAnalytics.tsx b/web/src/features/datasets/components/DatasetAnalytics.tsx
index 13cf6a4774..823c98786d 100644
--- a/web/src/features/datasets/components/DatasetAnalytics.tsx
+++ b/web/src/features/datasets/components/DatasetAnalytics.tsx
@@ -1,5 +1,5 @@
import { DropdownMenuItem } from "@/src/components/ui/dropdown-menu";
-import { RESOURCE_METRICS } from "@/src/features/dashboard/lib/score-analytics-utils";
+import { RESOURCE_METRICS } from "@/src/features/dashboard";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { MultiSelectKeyValues } from "@/src/features/scores";
diff --git a/web/src/features/datasets/components/DatasetItemDetailPage.tsx b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
index 3b76930888..77dea8ae88 100644
--- a/web/src/features/datasets/components/DatasetItemDetailPage.tsx
+++ b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
@@ -28,11 +28,12 @@ import {
DATASET_ITEM_TABS,
type DatasetItemTab,
} from "@/src/features/navigation/utils/dataset-item-tabs";
-import { useExperimentAccess } from "@/src/features/experiments/hooks/useExperimentAccess";
+import { useExperimentAccess } from "@/src/features/experiments";
import { Skeleton } from "@/src/components/ui/skeleton";
import { EditDatasetItemDialog } from "@/src/features/datasets/components/EditDatasetItemDialog";
import { useDatasetVersion } from "@/src/features/datasets/hooks/useDatasetVersion";
import { toDatasetSchema } from "@/src/features/datasets/utils/datasetItemUtils";
+
export const DatasetItemDetailPage = ({
activeTab,
withPadding = true,
diff --git a/web/src/features/datasets/components/DatasetRunsTable.tsx b/web/src/features/datasets/components/DatasetRunsTable.tsx
index 77034a8ae9..59f71b3ef3 100644
--- a/web/src/features/datasets/components/DatasetRunsTable.tsx
+++ b/web/src/features/datasets/components/DatasetRunsTable.tsx
@@ -41,11 +41,9 @@ import { Skeleton } from "@/src/components/ui/skeleton";
import {
RESOURCE_METRICS,
transformAggregatedRunMetricsToChartData,
-} from "@/src/features/dashboard/lib/score-analytics-utils";
-import {
compareViewChartDataToDataPoints,
getCompareViewChartUnit,
-} from "@/src/features/dashboard/lib/chart-data-adapters";
+} from "@/src/features/dashboard";
import { Chart } from "@/src/features/widgets";
import {
addPrefixToScoreKeys,
diff --git a/web/src/features/datasets/hooks/useDatasetRunCompareChartData.ts b/web/src/features/datasets/hooks/useDatasetRunCompareChartData.ts
index ea36260456..b41c1e1c66 100644
--- a/web/src/features/datasets/hooks/useDatasetRunCompareChartData.ts
+++ b/web/src/features/datasets/hooks/useDatasetRunCompareChartData.ts
@@ -4,7 +4,7 @@ import {
convertScoreColumnsToAnalyticsData,
scoreFilters,
} from "@/src/features/scores";
-import { transformAggregatedRunMetricsToChartData } from "@/src/features/dashboard/lib/score-analytics-utils";
+import { transformAggregatedRunMetricsToChartData } from "@/src/features/dashboard";
export function useDatasetRunCompareChartData(
projectId: string,
diff --git a/web/src/features/entitlements/index.ts b/web/src/features/entitlements/index.ts
index b061ef7bb4..f6f1bdec44 100644
--- a/web/src/features/entitlements/index.ts
+++ b/web/src/features/entitlements/index.ts
@@ -5,6 +5,7 @@
export type { Entitlement } from "@/src/features/entitlements/constants/entitlements";
export {
useEntitlementLimit,
+ useEntitlements,
useHasEntitlement,
useOptionalEntitlement,
usePlan,
diff --git a/web/src/features/evals/v2/components/Rules/CreateRuleDialog/components/CreateRuleDialogContent/CreateRuleDialogContent.tsx b/web/src/features/evals/v2/components/Rules/CreateRuleDialog/components/CreateRuleDialogContent/CreateRuleDialogContent.tsx
index 309900c039..f89fd1ae83 100644
--- a/web/src/features/evals/v2/components/Rules/CreateRuleDialog/components/CreateRuleDialogContent/CreateRuleDialogContent.tsx
+++ b/web/src/features/evals/v2/components/Rules/CreateRuleDialog/components/CreateRuleDialogContent/CreateRuleDialogContent.tsx
@@ -21,7 +21,7 @@ import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { api } from "@/src/utils/api";
import { trpcErrorToast } from "@/src/utils/trpcErrorToast";
import { useLangfuseCloudRegion } from "@/src/features/organizations";
-import { useProject } from "@/src/features/projects/hooks";
+import { useProject } from "@/src/features/projects";
import { prepareNameForSave } from "@/src/features/evals/v2/fns/prepareNameForSave";
import { getFilterAnalyticsProperties } from "@/src/features/evals/v2/fns/getFilterAnalyticsProperties";
import { resolveInitialRuleFilters } from "./resolveInitialRuleFilters";
diff --git a/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx b/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
index 981cae5ae4..0543aecb89 100644
--- a/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
+++ b/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
@@ -49,7 +49,7 @@ import { EvaluatorSavedDialogContainer } from "@/src/features/evals/v2/component
import { EVALUATOR_FILTER_EXPERIENCE_STORAGE_KEY } from "@/src/features/evals/v2/constants/evaluatorFilterExperience";
import type { EvaluatorFilterExperience } from "@/src/features/evals/v2/types/evaluatorFilterExperience";
import { useLangfuseCloudRegion } from "@/src/features/organizations";
-import { useProject } from "@/src/features/projects/hooks";
+import { useProject } from "@/src/features/projects";
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";
diff --git a/web/src/features/events/EventsPage.tsx b/web/src/features/events/EventsPage.tsx
index 8c7877c510..12c8bfa601 100644
--- a/web/src/features/events/EventsPage.tsx
+++ b/web/src/features/events/EventsPage.tsx
@@ -8,7 +8,7 @@ import {
getTracingTabs,
TRACING_TABS,
} from "@/src/features/navigation/utils/tracing-tabs";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
export default function EventsPage() {
const router = useRouter();
diff --git a/web/src/features/events/components/EventsTable.tsx b/web/src/features/events/components/EventsTable.tsx
index 55b35dd3e7..d35c5dc4ed 100644
--- a/web/src/features/events/components/EventsTable.tsx
+++ b/web/src/features/events/components/EventsTable.tsx
@@ -136,6 +136,7 @@ import {
import { getAppRootSavedViewComparisonFilters } from "@/src/features/events/lib/appRootDefaultFilterPolicy";
import { useEventsFilterOptions } from "@/src/features/events/hooks/useEventsFilterOptions";
import { getSafeRedirectPath } from "@/src/utils/redirect";
+
// Disabled for now because perhaps confusing
// import {
// useEventsViewMode,
@@ -157,8 +158,7 @@ import { MobileFullTextSearch } from "@/src/features/events/components/MobileFul
import { CategoryPresetChips } from "@/src/features/events/components/CategoryPresetChips";
import { TableViewPresetsDrawer } from "@/src/components/table/table-view-presets/components/data-table-view-presets-drawer";
import { EventsChartView } from "@/src/features/chart-view/EventsChartView";
-import { ViewModeToggle } from "@/src/features/chart-view/components/ViewModeToggle";
-import { useChartViewState } from "@/src/features/chart-view/lib/useChartViewState";
+import { ViewModeToggle, useChartViewState } from "@/src/features/chart-view";
import { EventsOutlierStrip } from "@/src/features/events/components/outlier-strip/EventsOutlierStrip";
import {
chartFilterExclusionReason,
@@ -171,7 +171,7 @@ import {
useObservedMetadataPaths,
useObservedMetadataRecorder,
} from "@/src/hooks/useObservedMetadata";
-import { AddTracesToAnnotationQueueDialogController } from "@/src/features/annotation-queues/components/AddTracesToAnnotationQueueDialogController";
+import { AddTracesToAnnotationQueueDialogController } from "@/src/features/annotation-queues";
export type EventsTableRow = {
// Identity fields
diff --git a/web/src/features/events/index.ts b/web/src/features/events/index.ts
index 1f52653154..58b558a3b1 100644
--- a/web/src/features/events/index.ts
+++ b/web/src/features/events/index.ts
@@ -4,7 +4,10 @@
// EventsTable stays a deep import: it reaches the whole trace/peek graph, so
// re-exporting it here would make every consumer of this index part of that
// graph and turn several feature pairs into runtime cycles.
-export { V4PreviewToggleRow } from "@/src/features/events/components/V4SidebarToggle";
+export {
+ V4PreviewToggleRow,
+ V4SidebarToggle,
+} from "@/src/features/events/components/V4SidebarToggle";
export {
canReuseOutlierPlaceholder,
formatBucketRange,
@@ -19,8 +22,11 @@ export { useMetadataValueOptions } from "@/src/features/events/hooks/useMetadata
export { useReadPath } from "@/src/features/events/hooks/useReadPath";
export type { ResolvedReadPath } from "@/src/features/events/hooks/useReadPath";
export {
+ buildEventsTablePathForColumnFilter,
+ buildEventsTablePathForMetadataFilter,
buildEventsTablePathForObservationType,
buildEventsTablePathForSpanName,
+ type MetadataFilterOperator,
} from "@/src/features/events/lib/eventsTablePaths";
export { V4_PREVIEW_LABEL } from "@/src/features/events/lib/v4PreviewLabel";
// shouldAutoEnableV4 / canToggleV4 stay on the deep lib path (or a future
diff --git a/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx b/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx
index 645c30c112..d0956f4c81 100644
--- a/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx
+++ b/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx
@@ -21,8 +21,7 @@ import {
} from "@/src/components/ui/form";
import { CodeMirrorEditor } from "@/src/components/editor/CodeMirrorEditor";
import { api } from "@/src/utils/api";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showSuccessToast, showErrorToast } from "@/src/features/notifications";
import { getFormattedPayload } from "@/src/features/experiments/utils/format";
import { type Prisma } from "@langfuse/shared";
import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
diff --git a/web/src/features/experiments/index.ts b/web/src/features/experiments/index.ts
new file mode 100644
index 0000000000..c4b7f40bf7
--- /dev/null
+++ b/web/src/features/experiments/index.ts
@@ -0,0 +1,20 @@
+// The experiments feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported.
+//
+// filter-config and experiment-items-filter-config stay deep: filters'
+// useFilterState imports them, and routing them here would close a runtime
+// cycle. experimentsSearchRegistry stays deep (search-bar server imports
+// it). ExperimentsTable, pages, and experimentsRouter stay off this door.
+// useExperimentEvaluatorSelection stays deep so evals' template-selector
+// does not load CreateExperimentsForm.
+export { CreateExperimentsForm } from "@/src/features/experiments/components/CreateExperimentsForm";
+export { ExperimentFormatSetting } from "@/src/features/experiments/components/ExperimentFormatSetting";
+export { ExperimentPeekFooter } from "@/src/features/experiments/components/ExperimentPeekFooter";
+export { useEvaluatorDefaults } from "@/src/features/experiments/hooks/useEvaluatorDefaults";
+export { useExperimentAccess } from "@/src/features/experiments/hooks/useExperimentAccess";
+export { useExperimentEvaluatorData } from "@/src/features/experiments/hooks/useExperimentEvaluatorData";
+export { useExperimentPeekNavigation } from "@/src/features/experiments/hooks/useExperimentPeekNavigation";
+export {
+ singleRunToExperimentsUrl,
+ toExperimentsResultsUrl,
+} from "@/src/features/experiments/utils/experimentUrlTranslation";
diff --git a/web/src/features/filters/components/filter-builder.tsx b/web/src/features/filters/components/filter-builder.tsx
index 0d52df8025..289df01641 100644
--- a/web/src/features/filters/components/filter-builder.tsx
+++ b/web/src/features/filters/components/filter-builder.tsx
@@ -67,7 +67,7 @@ import {
InputCommandItem,
InputCommandList,
} from "@/src/components/ui/input-command";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
import { openAIFeaturesSettings } from "@/src/features/organizations/components/AIFeaturesDisabledNotice";
diff --git a/web/src/features/in-app-agent/components/InAppAiAgentProvider.tsx b/web/src/features/in-app-agent/components/InAppAiAgentProvider.tsx
index 775c674568..170e5359bf 100644
--- a/web/src/features/in-app-agent/components/InAppAiAgentProvider.tsx
+++ b/web/src/features/in-app-agent/components/InAppAiAgentProvider.tsx
@@ -59,7 +59,7 @@ import {
} from "@/src/features/in-app-agent/components/utils/utils";
import { useHasEntitlement } from "@/src/features/entitlements";
import { showErrorToast } from "@/src/features/notifications";
-import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
+import { useQueryProjectOrOrganization } from "@/src/features/projects";
import { api } from "@/src/utils/api";
import {
createInAppAgentScreenContext,
diff --git a/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueue.ts b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueue.ts
index 6efc34f4af..6cef4e223b 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueue.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueue.ts
@@ -1,4 +1,4 @@
-import { createAnnotationQueueForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
+import { createAnnotationQueueForApi } from "@/src/features/annotation-queues/server";
import {
CreateAnnotationQueueBody,
CreateAnnotationQueueResponse,
diff --git a/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueAssignment.ts b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueAssignment.ts
index cea15f25f9..d0926b4345 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueAssignment.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueAssignment.ts
@@ -1,4 +1,4 @@
-import { createAnnotationQueueAssignmentForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
+import { createAnnotationQueueAssignmentForApi } from "@/src/features/annotation-queues/server";
import { CreateAnnotationQueueAssignmentResponse } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueItem.ts b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueItem.ts
index b506322fdc..53c452ad46 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueItem.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/createAnnotationQueueItem.ts
@@ -1,4 +1,4 @@
-import { createAnnotationQueueItemForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
+import { createAnnotationQueueItemForApi } from "@/src/features/annotation-queues/server";
import { CreateAnnotationQueueItemResponse } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { buildAnnotationQueueItemUrl } from "@langfuse/shared/src/server";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueAssignment.ts b/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueAssignment.ts
index d448c4ad10..bf8bc28850 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueAssignment.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueAssignment.ts
@@ -1,4 +1,4 @@
-import { deleteAnnotationQueueAssignment } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
+import { deleteAnnotationQueueAssignment } from "@/src/features/annotation-queues/server";
import { DeleteAnnotationQueueAssignmentResponse } from "@/src/features/public-api/server";
import { LangfuseNotFoundError, Prisma } from "@langfuse/shared";
import { defineTool } from "../../../core/define-tool";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueItem.ts b/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueItem.ts
index a91b6eca6c..1254a700a2 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueItem.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/deleteAnnotationQueueItem.ts
@@ -1,4 +1,4 @@
-import { deleteAnnotationQueueItemForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
+import { deleteAnnotationQueueItemForApi } from "@/src/features/annotation-queues/server";
import {
DeleteAnnotationQueueItemQuery,
DeleteAnnotationQueueItemResponse,
diff --git a/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueue.ts b/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueue.ts
index a0a2d22d77..4d1324972c 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueue.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueue.ts
@@ -2,7 +2,7 @@ import {
GetAnnotationQueueByIdQuery,
GetAnnotationQueueByIdResponse,
} from "@/src/features/public-api/server";
-import { getAnnotationQueueForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
+import { getAnnotationQueueForApi } from "@/src/features/annotation-queues/server";
import { defineTool } from "../../../core/define-tool";
import { buildAnnotationQueueUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueueItem.ts b/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueueItem.ts
index d2e549a206..60993cb1b9 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueueItem.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/getAnnotationQueueItem.ts
@@ -2,7 +2,7 @@ import {
GetAnnotationQueueItemByIdQuery,
GetAnnotationQueueItemByIdResponse,
} from "@/src/features/public-api/server";
-import { getAnnotationQueueItemForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
+import { getAnnotationQueueItemForApi } from "@/src/features/annotation-queues/server";
import { defineTool } from "../../../core/define-tool";
import { buildAnnotationQueueItemUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueueItems.ts b/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueueItems.ts
index a5707231b9..4510ed3e92 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueueItems.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueueItems.ts
@@ -2,7 +2,7 @@ import {
GetAnnotationQueueItemsQuery,
GetAnnotationQueueItemsResponse,
} from "@/src/features/public-api/server";
-import { listAnnotationQueueItemsForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
+import { listAnnotationQueueItemsForApi } from "@/src/features/annotation-queues/server";
import { defineTool } from "../../../core/define-tool";
import { buildAnnotationQueueItemUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueues.ts b/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueues.ts
index e25ab3cd23..16ab50c371 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueues.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/listAnnotationQueues.ts
@@ -2,7 +2,7 @@ import {
GetAnnotationQueuesQuery,
GetAnnotationQueuesResponse,
} from "@/src/features/public-api/server";
-import { listAnnotationQueuesForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
+import { listAnnotationQueuesForApi } from "@/src/features/annotation-queues/server";
import { defineTool } from "../../../core/define-tool";
import { buildAnnotationQueueUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/annotationQueues/tools/updateAnnotationQueueItem.ts b/web/src/features/mcp/server/annotationQueues/tools/updateAnnotationQueueItem.ts
index d851a9515a..766f4849fd 100644
--- a/web/src/features/mcp/server/annotationQueues/tools/updateAnnotationQueueItem.ts
+++ b/web/src/features/mcp/server/annotationQueues/tools/updateAnnotationQueueItem.ts
@@ -1,4 +1,4 @@
-import { updateAnnotationQueueItemForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
+import { updateAnnotationQueueItemForApi } from "@/src/features/annotation-queues/server";
import { UpdateAnnotationQueueItemResponse } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { buildAnnotationQueueItemUrl } from "@langfuse/shared/src/server";
diff --git a/web/src/features/metrics/components/MetricsFilterBuilder.tsx b/web/src/features/metrics/components/MetricsFilterBuilder.tsx
index f4bd503c69..1455d59324 100644
--- a/web/src/features/metrics/components/MetricsFilterBuilder.tsx
+++ b/web/src/features/metrics/components/MetricsFilterBuilder.tsx
@@ -18,7 +18,7 @@ import {
displayNameForFilterColumn,
mapViewFilterToUiTableFilter,
partitionWidgetUiTableFiltersToView,
-} from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
+} from "@/src/features/dashboard";
import { useMetadataValueOptions } from "@/src/features/events";
import {
InlineFilterBuilder,
diff --git a/web/src/features/mixpanel-integration/MixpanelIntegrationPage.tsx b/web/src/features/mixpanel-integration/MixpanelIntegrationPage.tsx
index 75e5ea9b33..3292a4311c 100644
--- a/web/src/features/mixpanel-integration/MixpanelIntegrationPage.tsx
+++ b/web/src/features/mixpanel-integration/MixpanelIntegrationPage.tsx
@@ -34,6 +34,7 @@ import {
type ExportSourceContext,
} from "@langfuse/shared";
import { Alert } from "@/src/components/design-system/Alert/Alert";
+
// Shared export-source UI adapters; policy in export-source-policy.ts.
import {
buildExportSourceContext,
@@ -42,7 +43,7 @@ import {
isExportSourceSelectable,
} from "@/src/features/analytics-integrations/exportSource";
import { useLangfuseCloudRegion } from "@/src/features/organizations";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
import { type RouterOutput } from "@/src/utils/types";
diff --git a/web/src/features/monitors/components/MonitorForm.tsx b/web/src/features/monitors/components/MonitorForm.tsx
index 2f461ce5c5..90f26d55fb 100644
--- a/web/src/features/monitors/components/MonitorForm.tsx
+++ b/web/src/features/monitors/components/MonitorForm.tsx
@@ -43,7 +43,7 @@ import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useProject } from "@/src/features/projects";
import { WidgetPropertySelectItem } from "@/src/features/widgets";
import { MetricsFilterBuilder } from "@/src/features/metrics/components/MetricsFilterBuilder";
-import { partitionWidgetUiTableFiltersToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
+import { partitionWidgetUiTableFiltersToView } from "@/src/features/dashboard";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { resolveMonitorNameForSave } from "@/src/features/monitors/fns/resolveMonitorNameForSave";
import { cn } from "@/src/utils/tailwind";
diff --git a/web/src/features/organizations/OrganizationSettingsPage.tsx b/web/src/features/organizations/OrganizationSettingsPage.tsx
index e4eebae15a..39f4ccea6e 100644
--- a/web/src/features/organizations/OrganizationSettingsPage.tsx
+++ b/web/src/features/organizations/OrganizationSettingsPage.tsx
@@ -11,12 +11,12 @@ import { useQueryOrganization } from "@/src/features/organizations/hooks";
import { useRouter } from "next/router";
import { SettingsDangerZone } from "@/src/components/SettingsDangerZone";
import { BillingSettings } from "@/src/ee/features/billing/components/BillingSettings";
-import { useHasEntitlement, usePlan } from "@/src/features/entitlements/hooks";
+import { useHasEntitlement, usePlan } from "@/src/features/entitlements";
import ContainerPage from "@/src/components/layouts/container-page";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
import { SSOSettings } from "@/src/ee/features/sso-settings/components/SSOSettings";
import { isCloudPlan } from "@langfuse/shared";
-import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
+import { useQueryProjectOrOrganization } from "@/src/features/projects";
import { ApiKeyList } from "@/src/features/public-api/components/ApiKeyList";
import AIFeatureSwitch from "@/src/features/organizations/components/AIFeatureSwitch";
import { useIsCloudBillingAvailable } from "@/src/ee/features/billing/utils/isCloudBilling";
diff --git a/web/src/features/payment-banner/PaymentBanner.tsx b/web/src/features/payment-banner/PaymentBanner.tsx
index 76ef1f4e86..6897829cd5 100644
--- a/web/src/features/payment-banner/PaymentBanner.tsx
+++ b/web/src/features/payment-banner/PaymentBanner.tsx
@@ -1,6 +1,6 @@
import { useMemo } from "react";
import { useSession } from "next-auth/react";
-import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
+import { useQueryProjectOrOrganization } from "@/src/features/projects";
import { useIsCloudBillingAvailable } from "@/src/ee/features/billing/utils/isCloudBilling";
import { env } from "@/src/env.mjs";
import { hasOrganizationAccess } from "@/src/features/rbac";
diff --git a/web/src/features/posthog-integration/PostHogIntegrationPage.tsx b/web/src/features/posthog-integration/PostHogIntegrationPage.tsx
index d014d2b8e4..593830faf8 100644
--- a/web/src/features/posthog-integration/PostHogIntegrationPage.tsx
+++ b/web/src/features/posthog-integration/PostHogIntegrationPage.tsx
@@ -21,7 +21,7 @@ import {
getExportSourceFormValue,
} from "@/src/features/analytics-integrations/exportSource";
import { useLangfuseCloudRegion } from "@/src/features/organizations";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
import { type RouterOutput } from "@/src/utils/types";
diff --git a/web/src/features/projects/ProjectSettingsPage.tsx b/web/src/features/projects/ProjectSettingsPage.tsx
index 8799b2ff29..dacb0aa8df 100644
--- a/web/src/features/projects/ProjectSettingsPage.tsx
+++ b/web/src/features/projects/ProjectSettingsPage.tsx
@@ -19,7 +19,7 @@ import { PostHogLogo } from "@/src/components/PosthogLogo";
import { MixpanelLogo } from "@/src/components/MixpanelLogo";
import { Card } from "@/src/components/ui/card";
import { TransferProjectDialogController } from "@/src/features/projects/components/TransferProjectDialogController";
-import { useHasEntitlement } from "@/src/features/entitlements/hooks";
+import { useHasEntitlement } from "@/src/features/entitlements";
import { useRouter } from "next/router";
import { SettingsDangerZone } from "@/src/components/SettingsDangerZone";
import { ActionButton } from "@/src/components/ActionButton";
diff --git a/web/src/features/projects/index.ts b/web/src/features/projects/index.ts
index 5b4daeb7d5..28758bc748 100644
--- a/web/src/features/projects/index.ts
+++ b/web/src/features/projects/index.ts
@@ -1,2 +1,17 @@
-export { useProject } from "@/src/features/projects/hooks";
-export { useProjectSettingsPages } from "@/src/features/projects/ProjectSettingsPage";
+// The projects feature's public client surface (RFC rule 8). Named re-exports
+// only — exactly the hooks other features already imported.
+//
+// useProjectSettingsPages stays off this door. CommandMenu and the settings
+// page shims import it from ProjectSettingsPage: the barrel is already
+// consumed by useQueryProject callers (including filter-builder on the
+// filters door that ComposerTokens imports), and adding the settings page
+// would pull that graph into every project-hook consumer.
+//
+// NewProjectForm stays a page-level deep import. projectsRouter stays a
+// direct import from the tRPC root via server/index.ts.
+export {
+ useOrgProjectSwitchPaths,
+ useProject,
+ useQueryProject,
+ useQueryProjectOrOrganization,
+} from "@/src/features/projects/hooks";
diff --git a/web/src/features/prompts/PromptsPage.tsx b/web/src/features/prompts/PromptsPage.tsx
index 7e5b3c04c2..b3230a3672 100644
--- a/web/src/features/prompts/PromptsPage.tsx
+++ b/web/src/features/prompts/PromptsPage.tsx
@@ -7,7 +7,7 @@ import { useHasProjectAccess } from "@/src/features/rbac";
import { Download, UploadIcon, PlusIcon } from "lucide-react";
import { api } from "@/src/utils/api";
import { PromptsOnboarding } from "@/src/components/onboarding/PromptsOnboarding";
-import { useEntitlementLimit } from "@/src/features/entitlements/hooks";
+import { useEntitlementLimit } from "@/src/features/entitlements";
import { PromptDetail } from "@/src/features/prompts/components/prompt-detail";
import PromptMetrics from "@/src/features/prompts/PromptMetricsPage";
import { useQueryParams, StringParam } from "use-query-params";
diff --git a/web/src/features/prompts/components/prompt-detail.tsx b/web/src/features/prompts/components/prompt-detail.tsx
index e50f216d3d..3ab65e6259 100644
--- a/web/src/features/prompts/components/prompt-detail.tsx
+++ b/web/src/features/prompts/components/prompt-detail.tsx
@@ -56,7 +56,7 @@ import {
DialogContent,
DialogTrigger,
} from "@/src/components/ui/dialog";
-import { CreateExperimentsForm } from "@/src/features/experiments/components/CreateExperimentsForm";
+import { CreateExperimentsForm } from "@/src/features/experiments";
import { useMemo, useState } from "react";
import { showSuccessToast } from "@/src/features/notifications";
import { DuplicatePromptButton } from "@/src/features/prompts/components/duplicate-prompt";
diff --git a/web/src/features/scores-chart-view/components/ScoreChartViewPanel/ScoreChartViewPanel.tsx b/web/src/features/scores-chart-view/components/ScoreChartViewPanel/ScoreChartViewPanel.tsx
index 028fd9724b..5514349645 100644
--- a/web/src/features/scores-chart-view/components/ScoreChartViewPanel/ScoreChartViewPanel.tsx
+++ b/web/src/features/scores-chart-view/components/ScoreChartViewPanel/ScoreChartViewPanel.tsx
@@ -4,9 +4,10 @@ import { AlertCircle, ChevronLeft, ChevronRight, Loader2 } from "lucide-react";
import { type DashboardWidgetChartType } from "@langfuse/shared/src/db";
import type { DataPoint } from "@/src/features/widgets";
import { Button } from "@/src/components/ui/button";
+
// Chart type picker is view-agnostic (only depends on `DashboardWidgetChartType`),
// so it's reused as-is rather than duplicated.
-import { ChartTypePicker } from "@/src/features/chart-view/components/ConfigControls";
+import { ChartTypePicker, ChartCanvas } from "@/src/features/chart-view";
import { type AggregationFn } from "@/src/features/chart-view/types";
import { isTimeSeriesChartType } from "@/src/features/chart-view/vocab";
import {
@@ -22,7 +23,6 @@ import {
// Shared with the observations chart view: once a metric resolves to a
// label/unit, rendering an already-aggregated series is identical regardless
// of which vocabulary (events vs. scores) picked that metric.
-import { ChartCanvas } from "@/src/features/chart-view/components/ChartCanvas";
import { DatasetSelect } from "@/src/features/scores-chart-view/components/DatasetSelect";
import { MetricSelect } from "@/src/features/scores-chart-view/components/MetricSelect";
import { AggregationSelect } from "@/src/features/scores-chart-view/components/AggregationSelect";
diff --git a/web/src/features/scores-chart-view/components/ScoresChartView.tsx b/web/src/features/scores-chart-view/components/ScoresChartView.tsx
index 82568250c4..997aa70945 100644
--- a/web/src/features/scores-chart-view/components/ScoresChartView.tsx
+++ b/web/src/features/scores-chart-view/components/ScoresChartView.tsx
@@ -3,7 +3,7 @@ import React, { useMemo } from "react";
import { type FilterState } from "@langfuse/shared";
import { type ViewVersion } from "@langfuse/shared/query";
import { api } from "@/src/utils/api";
-import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
+import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard";
import { VIEW_BY_DATASET } from "@/src/features/scores-chart-view/constants/viewByDataset";
import {
buildScoresChartQuery,
@@ -12,10 +12,12 @@ import {
} from "@/src/features/scores-chart-view/fns/scoreChartConfig";
import { type ScoreChartViewConfig } from "@/src/features/scores-chart-view/types";
import { ScoreChartViewPanel } from "@/src/features/scores-chart-view/components/ScoreChartViewPanel/ScoreChartViewPanel";
+
// Shared with the observations chart view; only the widget-input mapper
// passed to it (`scoreChartConfigToWidgetInput`) is scores-specific.
-import { AddToDashboardButton } from "@/src/features/chart-view/components/AddToDashboardButton";
+import { AddToDashboardButton } from "@/src/features/chart-view";
import { useHasProjectAccess } from "@/src/features/rbac";
+
/**
* Production chart view for the scores table. Mirrors `EventsChartView` (the
* observations chart view): builds the aggregate query from the same filters
diff --git a/web/src/features/scores-chart-view/components/ScoresOutlierStrip.tsx b/web/src/features/scores-chart-view/components/ScoresOutlierStrip.tsx
index 7a3b963df3..203e5808be 100644
--- a/web/src/features/scores-chart-view/components/ScoresOutlierStrip.tsx
+++ b/web/src/features/scores-chart-view/components/ScoresOutlierStrip.tsx
@@ -15,7 +15,7 @@ import {
canReuseOutlierPlaceholder,
pickChartGranularity,
} from "@/src/features/events";
-import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
+import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { ScoreOutlierStripHeader } from "@/src/features/scores-chart-view/components/ScoreOutlierStripHeader";
import { SCORE_OUTLIER_STRIP_METRICS } from "@/src/features/scores-chart-view/constants/scoreOutlierStripMetrics";
diff --git a/web/src/features/scores-chart-view/fns/outlierStripFilters.ts b/web/src/features/scores-chart-view/fns/outlierStripFilters.ts
index 5cef58c213..5be3cc7e7d 100644
--- a/web/src/features/scores-chart-view/fns/outlierStripFilters.ts
+++ b/web/src/features/scores-chart-view/fns/outlierStripFilters.ts
@@ -1,5 +1,5 @@
import { type FilterState } from "@langfuse/shared";
-import { partitionStoredUiTableFiltersToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
+import { partitionStoredUiTableFiltersToView } from "@/src/features/dashboard";
/**
* Whether every active scores-table filter can be forwarded to the strip's
diff --git a/web/src/features/scores-chart-view/fns/scoreChartConfig.ts b/web/src/features/scores-chart-view/fns/scoreChartConfig.ts
index 7744e36108..49d61fa5ef 100644
--- a/web/src/features/scores-chart-view/fns/scoreChartConfig.ts
+++ b/web/src/features/scores-chart-view/fns/scoreChartConfig.ts
@@ -6,7 +6,7 @@ import {
GRANULARITIES,
isTimeSeriesChartType,
} from "@/src/features/chart-view/vocab";
-import { type ChartWidgetInput } from "@/src/features/chart-view/lib/chartConfigToWidget";
+import { type ChartWidgetInput } from "@/src/features/chart-view";
import {
type DataPoint,
getWidgetMissingBucketValue,
diff --git a/web/src/features/scores/ScoresPage.tsx b/web/src/features/scores/ScoresPage.tsx
index 0809170fba..10404f8baf 100644
--- a/web/src/features/scores/ScoresPage.tsx
+++ b/web/src/features/scores/ScoresPage.tsx
@@ -8,7 +8,7 @@ import {
getScoresTabs,
SCORES_TABS,
} from "@/src/features/navigation/utils/scores-tabs";
-import { useReadPath } from "@/src/features/events/hooks/useReadPath";
+import { useReadPath } from "@/src/features/events";
export default function ScoresPage() {
const router = useRouter();
diff --git a/web/src/features/scores/ScoresTable.tsx b/web/src/features/scores/ScoresTable.tsx
index edfe400968..a4eb8da494 100644
--- a/web/src/features/scores/ScoresTable.tsx
+++ b/web/src/features/scores/ScoresTable.tsx
@@ -59,7 +59,7 @@ import TagList from "@/src/features/tag/components/TagList";
import { cn } from "@/src/utils/tailwind";
import useColumnOrder from "@/src/features/column-visibility/hooks/useColumnOrder";
import { BatchExportTableButton } from "@/src/components/BatchExportTableButton";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
+import { showSuccessToast } from "@/src/features/notifications";
import {
TableActionMenu,
type TableAction,
@@ -74,19 +74,19 @@ import React, {
useMemo,
} from "react";
import type { RowSelectionState } from "@tanstack/react-table";
-import { useHasEntitlement } from "@/src/features/entitlements/hooks";
+import { useHasEntitlement } from "@/src/features/entitlements";
import { useHasProjectAccess } from "@/src/features/rbac";
import { useTableViewManager } from "@/src/components/table/table-view-presets/hooks/useTableViewManager";
import { useTableViewFilterChange } from "@/src/components/table/table-view-presets/hooks/useTableViewFilterChange";
import { createIdTableColumn } from "@/src/components/design-system/table/columns/createIdTableColumn";
import { usePaginationState } from "@/src/hooks/usePaginationState";
-import { useReadPath } from "@/src/features/events/hooks/useReadPath";
+import { useReadPath } from "@/src/features/events";
import {
ScoreTag,
scoreLevelFromScore,
type ScoreLevel,
} from "@/src/components/score-tag";
-import { ViewModeToggle } from "@/src/features/chart-view/components/ViewModeToggle";
+import { ViewModeToggle } from "@/src/features/chart-view";
import {
ScoresChartView,
ScoresOutlierStrip,
diff --git a/web/src/features/scores/adapters/index.ts b/web/src/features/scores/adapters/index.ts
index c66282e563..2689b11c26 100644
--- a/web/src/features/scores/adapters/index.ts
+++ b/web/src/features/scores/adapters/index.ts
@@ -1,7 +1,7 @@
import {
transformCategoricalScoresToChartData,
uniqueAndSort,
-} from "@/src/features/dashboard/lib/score-analytics-utils";
+} from "@/src/features/dashboard";
import {
type ChartBin,
type ChartData,
diff --git a/web/src/features/search-bar/components/EventsSearchBarRow.tsx b/web/src/features/search-bar/components/EventsSearchBarRow.tsx
index bfb4f081fa..21dc68f4de 100644
--- a/web/src/features/search-bar/components/EventsSearchBarRow.tsx
+++ b/web/src/features/search-bar/components/EventsSearchBarRow.tsx
@@ -17,7 +17,7 @@
import * as React from "react";
import { type FilterState } from "@langfuse/shared";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
import { cn } from "@/src/utils/tailwind";
import type {
ObservedOptions,
diff --git a/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx b/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx
index 9561233200..f22dfa727c 100644
--- a/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx
+++ b/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx
@@ -11,7 +11,7 @@ import { type EventSessionTrace } from "@/src/features/sessions/sessionDetailPag
import { AnnotateDrawerController } from "@/src/features/scores";
import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
import { NewDatasetItemFromExistingObjectDialogController } from "@/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showErrorToast } from "@/src/features/notifications";
import { useHasProjectAccess } from "@/src/features/rbac";
import { api, sendAsPostOption, type RouterOutputs } from "@/src/utils/api";
diff --git a/web/src/features/sessions/SessionDetailPage.tsx b/web/src/features/sessions/SessionDetailPage.tsx
index 20e70c0969..5449bab089 100644
--- a/web/src/features/sessions/SessionDetailPage.tsx
+++ b/web/src/features/sessions/SessionDetailPage.tsx
@@ -2,7 +2,7 @@ import {
SessionEventsPage,
SessionPage,
} from "@/src/features/sessions/SessionPages";
-import { useReadPath } from "@/src/features/events/hooks/useReadPath";
+import { useReadPath } from "@/src/features/events";
import {
RouteParamsPendingFallback,
useReadyRouteParams,
diff --git a/web/src/features/sessions/SessionObservationIO.tsx b/web/src/features/sessions/SessionObservationIO.tsx
index 181a8723da..c653f4ad28 100644
--- a/web/src/features/sessions/SessionObservationIO.tsx
+++ b/web/src/features/sessions/SessionObservationIO.tsx
@@ -10,7 +10,7 @@ import {
} from "@/src/features/traces";
import { api, type RouterOutputs } from "@/src/utils/api";
import { downloadJsonFile } from "@/src/features/sessions/actions/downloadSessionAsJson";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showErrorToast } from "@/src/features/notifications";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { compactNumberFormatter } from "@/src/utils/numbers";
import { decodeUnicodeEscapesOnly } from "@/src/utils/unicode";
diff --git a/web/src/features/sessions/SessionPages.tsx b/web/src/features/sessions/SessionPages.tsx
index 2a2df36444..e014899ddb 100644
--- a/web/src/features/sessions/SessionPages.tsx
+++ b/web/src/features/sessions/SessionPages.tsx
@@ -57,8 +57,10 @@ import {
TableViewPresetTableName,
normalizeLegacySessionPositionInTraceFilters,
} from "@langfuse/shared";
-import { AnnotationQueueItemDropdownMenuController } from "@/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController";
-import { AnnotationQueueItemCountBadge } from "@/src/features/annotation-queues/components/AnnotationQueueItemCountBadge";
+import {
+ AnnotationQueueItemDropdownMenuController,
+ AnnotationQueueItemCountBadge,
+} from "@/src/features/annotation-queues";
import {
useWebCalloutAction,
WebCalloutButton,
@@ -71,8 +73,10 @@ import { useParsedTrace } from "@/src/hooks/useParsedTrace";
import useLocalStorage from "@/src/components/useLocalStorage";
import { Switch } from "@/src/components/design-system/Switch/Switch";
import { LazySessionTraceEventsRow } from "@/src/features/sessions/LazySessionTraceEventsRow";
-import { observationEventsFilterConfig } from "@/src/features/events/config/filter-config";
-import { useEventsFilterOptions } from "@/src/features/events/hooks/useEventsFilterOptions";
+import {
+ observationEventsFilterConfig,
+ useEventsFilterOptions,
+} from "@/src/features/events";
import {
decodeAndNormalizeFilters,
useSidebarFilterState,
diff --git a/web/src/features/sessions/SessionTraceActionButtons.tsx b/web/src/features/sessions/SessionTraceActionButtons.tsx
index 5b1039ba11..ab83c83941 100644
--- a/web/src/features/sessions/SessionTraceActionButtons.tsx
+++ b/web/src/features/sessions/SessionTraceActionButtons.tsx
@@ -9,8 +9,10 @@ import { CommentDrawerController } from "@/src/features/comments/CommentDrawerCo
import { ExistingDatasetItemsDropdownMenuController } from "@/src/features/datasets/components/ExistingDatasetItemsDropdownMenuController";
import { NewDatasetItemFromExistingObjectDialogController } from "@/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController";
import { useDatasetItemFromTraceOrObservation } from "@/src/features/datasets/hooks/useDatasetItemFromTraceOrObservation";
-import { AnnotationQueueItemDropdownMenuController } from "@/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController";
-import { AnnotationQueueItemCountBadge } from "@/src/features/annotation-queues/components/AnnotationQueueItemCountBadge";
+import {
+ AnnotationQueueItemDropdownMenuController,
+ AnnotationQueueItemCountBadge,
+} from "@/src/features/annotation-queues";
import { cn } from "@/src/utils/tailwind";
import {
ChevronDown,
diff --git a/web/src/features/sessions/SessionsPage.tsx b/web/src/features/sessions/SessionsPage.tsx
index b3910a86d6..8f04beaec8 100644
--- a/web/src/features/sessions/SessionsPage.tsx
+++ b/web/src/features/sessions/SessionsPage.tsx
@@ -4,7 +4,7 @@ import SessionsTable from "@/src/features/sessions/SessionsTable";
import Page from "@/src/components/layouts/page";
import { SessionsOnboarding } from "@/src/components/onboarding/SessionsOnboarding";
import { api } from "@/src/utils/api";
-import { useReadPath } from "@/src/features/events/hooks/useReadPath";
+import { useReadPath } from "@/src/features/events";
export default function SessionsPage() {
const router = useRouter();
diff --git a/web/src/features/sessions/SessionsTable.tsx b/web/src/features/sessions/SessionsTable.tsx
index e862ca0bc1..f1cf7d878b 100644
--- a/web/src/features/sessions/SessionsTable.tsx
+++ b/web/src/features/sessions/SessionsTable.tsx
@@ -66,7 +66,7 @@ import {
TableSelectionManager,
} from "@/src/features/table";
import { type RowSelectionState } from "@tanstack/react-table";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
+import { showSuccessToast } from "@/src/features/notifications";
import { useScoreColumns, scoreFilters } from "@/src/features/scores";
import { BatchExportTableButton } from "@/src/components/BatchExportTableButton";
diff --git a/web/src/features/setup/components/SetupPage.tsx b/web/src/features/setup/components/SetupPage.tsx
index db73edd3e2..bfcf154073 100644
--- a/web/src/features/setup/components/SetupPage.tsx
+++ b/web/src/features/setup/components/SetupPage.tsx
@@ -10,7 +10,7 @@ import {
import { Card } from "@/src/components/ui/card";
import { ConnectedNewOrganizationForm } from "@/src/features/organizations/components/ConnectedNewOrganizationForm";
import { NewProjectForm } from "@/src/features/projects/components/NewProjectForm";
-import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
+import { useQueryProjectOrOrganization } from "@/src/features/projects";
import { createProjectRoute } from "@/src/features/setup/setupRoutes";
import { cn } from "@/src/utils/tailwind";
import { Check } from "lucide-react";
diff --git a/web/src/features/support-chat/ConnectedSupportFormSection.tsx b/web/src/features/support-chat/ConnectedSupportFormSection.tsx
index 08ab62b367..fe0e06a6f4 100644
--- a/web/src/features/support-chat/ConnectedSupportFormSection.tsx
+++ b/web/src/features/support-chat/ConnectedSupportFormSection.tsx
@@ -1,7 +1,7 @@
"use client";
import { api } from "@/src/utils/api";
-import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
+import { useQueryProjectOrOrganization } from "@/src/features/projects";
import { showErrorToast } from "@/src/features/notifications";
import { useSupportDrawer } from "@/src/features/support-chat/SupportDrawerProvider";
import { useV4UpgradeUiEnabled } from "@/src/features/v4-migration/useV4UpgradeUiEnabled";
diff --git a/web/src/features/traces/TracesPage.tsx b/web/src/features/traces/TracesPage.tsx
index 47dccb5fe0..d796047474 100644
--- a/web/src/features/traces/TracesPage.tsx
+++ b/web/src/features/traces/TracesPage.tsx
@@ -8,9 +8,9 @@ import {
getTracingTabs,
TRACING_TABS,
} from "@/src/features/navigation/utils/tracing-tabs";
-import { useReadPath } from "@/src/features/events/hooks/useReadPath";
+import { useReadPath } from "@/src/features/events";
import ObservationsEventsTable from "@/src/features/events/components/EventsTable";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
import { V4MigrationDelayBadge } from "@/src/features/v4-migration/V4MigrationDelayBadge";
export default function TracesPage() {
diff --git a/web/src/features/traces/TracesSetupPage.tsx b/web/src/features/traces/TracesSetupPage.tsx
index 304db929de..0099d5ca9a 100644
--- a/web/src/features/traces/TracesSetupPage.tsx
+++ b/web/src/features/traces/TracesSetupPage.tsx
@@ -9,7 +9,7 @@ import { Button } from "@/src/components/ui/button";
import { ApiKeyDetailContent } from "@/src/features/public-api/components/ApiKeyDetailContent";
import { useLangfuseBaseUrl } from "@/src/features/public-api/hooks/useLangfuseEnvCode";
import { type RouterOutput } from "@/src/utils/types";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
export const TracingSetup = ({
projectId,
diff --git a/web/src/features/traces/TracesTable.tsx b/web/src/features/traces/TracesTable.tsx
index 37919eddce..ed1f653848 100644
--- a/web/src/features/traces/TracesTable.tsx
+++ b/web/src/features/traces/TracesTable.tsx
@@ -69,14 +69,14 @@ import useColumnOrder from "@/src/features/column-visibility/hooks/useColumnOrde
import { BatchExportTableButton } from "@/src/components/BatchExportTableButton";
import { BreakdownTooltip } from "@/src/features/traces/components/BreakdownTooltip";
import { InfoIcon, Trash2 } from "lucide-react";
-import { useHasEntitlement } from "@/src/features/entitlements/hooks";
+import { useHasEntitlement } from "@/src/features/entitlements";
import {
TableActionMenu,
useSelectAll,
TableSelectionManager,
type TableAction,
} from "@/src/features/table";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
+import { showSuccessToast } from "@/src/features/notifications";
import {
LevelCountsDisplay,
type LevelCount,
@@ -111,7 +111,7 @@ import {
import { TableHeaderControls } from "@/src/components/table/table-header-controls";
import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateContext";
import { useScoreColumns, scoreFilters } from "@/src/features/scores";
-import { AddTracesToAnnotationQueueDialogController } from "@/src/features/annotation-queues/components/AddTracesToAnnotationQueueDialogController";
+import { AddTracesToAnnotationQueueDialogController } from "@/src/features/annotation-queues";
import { useHasProjectAccess } from "@/src/features/rbac";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { ConfirmationDialogController } from "@/src/components/design-system/ConfirmationDialogController/ConfirmationDialogController";
diff --git a/web/src/features/traces/components/ObservationDetailView/AttributeRowActions.tsx b/web/src/features/traces/components/ObservationDetailView/AttributeRowActions.tsx
index c2fe82e602..d6faff40f7 100644
--- a/web/src/features/traces/components/ObservationDetailView/AttributeRowActions.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/AttributeRowActions.tsx
@@ -13,7 +13,7 @@ import {
import { getCopyValue } from "@/src/components/table/ValueCell";
import { type JsonTableRow } from "@/src/components/table/utils/jsonExpansionUtils";
import { copyTextToClipboard } from "@/src/utils/clipboard";
-import { buildEventsTablePathForColumnFilter } from "@/src/features/events/lib/eventsTablePaths";
+import { buildEventsTablePathForColumnFilter } from "@/src/features/events";
import { attributeColumnFilter } from "@/src/features/traces/fns/attributeColumnFilter";
import { attributeGrammar } from "@/src/features/traces/fns/attributeGrammar";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
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 7fb02af51f..1e8d68e34d 100644
--- a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
@@ -29,8 +29,10 @@ import {
AnnotateDrawerController,
DualAnnotationContent,
} from "@/src/features/scores";
-import { AnnotationQueueItemDropdownMenuController } from "@/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController";
-import { AnnotationQueueItemCountBadge } from "@/src/features/annotation-queues/components/AnnotationQueueItemCountBadge";
+import {
+ AnnotationQueueItemDropdownMenuController,
+ AnnotationQueueItemCountBadge,
+} from "@/src/features/annotation-queues";
import { JumpToPlaygroundDropdownMenuController } from "@/src/features/playground/page/components/JumpToPlaygroundDropdownMenuController";
import { PromptBadge } from "@/src/features/traces/components/PromptBadge";
import {
diff --git a/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx b/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
index 2b7405de93..d0aa7b682d 100644
--- a/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
+++ b/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
@@ -28,8 +28,10 @@ import {
} from "@/src/features/datasets";
import { AnnotateDrawerController } from "@/src/features/scores";
import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
-import { AnnotationQueueItemDropdownMenuController } from "@/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController";
-import { AnnotationQueueItemCountBadge } from "@/src/features/annotation-queues/components/AnnotationQueueItemCountBadge";
+import {
+ AnnotationQueueItemDropdownMenuController,
+ AnnotationQueueItemCountBadge,
+} from "@/src/features/annotation-queues";
import {
EnvironmentBadge,
ReleaseBadge,
diff --git a/web/src/features/tracing-tables/observations/ObservationsPage.tsx b/web/src/features/tracing-tables/observations/ObservationsPage.tsx
index 7854613617..6040339ff3 100644
--- a/web/src/features/tracing-tables/observations/ObservationsPage.tsx
+++ b/web/src/features/tracing-tables/observations/ObservationsPage.tsx
@@ -8,9 +8,9 @@ import {
getTracingTabs,
TRACING_TABS,
} from "@/src/features/navigation/utils/tracing-tabs";
-import { useReadPath } from "@/src/features/events/hooks/useReadPath";
+import { useReadPath } from "@/src/features/events";
import ObservationsEventsTable from "@/src/features/events/components/EventsTable";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
import { V4MigrationDelayBadge } from "@/src/features/v4-migration/V4MigrationDelayBadge";
export default function ObservationsPage() {
diff --git a/web/src/features/tracing-tables/observations/ObservationsTable.tsx b/web/src/features/tracing-tables/observations/ObservationsTable.tsx
index aab5bd75cf..8a5c60df2a 100644
--- a/web/src/features/tracing-tables/observations/ObservationsTable.tsx
+++ b/web/src/features/tracing-tables/observations/ObservationsTable.tsx
@@ -110,7 +110,7 @@ import {
TableActionMenu,
type TableAction,
} from "@/src/features/table";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
+import { showSuccessToast } from "@/src/features/notifications";
import { type DataTablePeekViewProps } from "@/src/components/table/peek";
import { useScoreColumns, scoreFilters } from "@/src/features/scores";
import { AddObservationsToDatasetDialog } from "@/src/features/batch-actions/components/AddObservationsToDatasetDialog/index";
diff --git a/web/src/features/users/UserDetailPage.tsx b/web/src/features/users/UserDetailPage.tsx
index cba76bcb76..181281d834 100644
--- a/web/src/features/users/UserDetailPage.tsx
+++ b/web/src/features/users/UserDetailPage.tsx
@@ -17,7 +17,7 @@ import { Badge } from "@/src/components/ui/badge";
import { ActionButton } from "@/src/components/ActionButton";
import { LayoutDashboard } from "lucide-react";
import Page from "@/src/components/layouts/page";
-import { useReadPath } from "@/src/features/events/hooks/useReadPath";
+import { useReadPath } from "@/src/features/events";
import { ObservationsEventsTable } from "@/src/features/events/components";
const tabs = ["Traces", "Sessions", "Scores"] as const;
diff --git a/web/src/features/users/UsersPage.tsx b/web/src/features/users/UsersPage.tsx
index 144f7ead77..d4f50b73f4 100644
--- a/web/src/features/users/UsersPage.tsx
+++ b/web/src/features/users/UsersPage.tsx
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import Page from "@/src/components/layouts/page";
import { UsersOnboarding } from "@/src/components/onboarding/UsersOnboarding";
-import { useReadPath } from "@/src/features/events/hooks/useReadPath";
+import { useReadPath } from "@/src/features/events";
import { api } from "@/src/utils/api";
import { UsersTable } from "@/src/features/users/UsersTable";
diff --git a/web/src/features/users/UsersTable.tsx b/web/src/features/users/UsersTable.tsx
index c45765c428..a8aad4a289 100644
--- a/web/src/features/users/UsersTable.tsx
+++ b/web/src/features/users/UsersTable.tsx
@@ -32,7 +32,7 @@ import {
} from "@/src/features/filters";
import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
-import { useEventsFilterOptions } from "@/src/features/events/hooks/useEventsFilterOptions";
+import { useEventsFilterOptions } from "@/src/features/events";
import { TableSearchBar, toObservedOptions } from "@/src/features/search-bar";
import { useTableViewManager } from "@/src/components/table/table-view-presets/hooks/useTableViewManager";
diff --git a/web/src/features/v4-migration/EvaluatorMigrationDialog.tsx b/web/src/features/v4-migration/EvaluatorMigrationDialog.tsx
index 3c7ae967a8..c761355cd3 100644
--- a/web/src/features/v4-migration/EvaluatorMigrationDialog.tsx
+++ b/web/src/features/v4-migration/EvaluatorMigrationDialog.tsx
@@ -16,7 +16,7 @@ import {
useInAppAiAgent,
} from "@/src/features/in-app-agent/components/InAppAiAgentProvider";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
+import { useQueryProjectOrOrganization } from "@/src/features/projects";
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 c989eacf05..5e818456ff 100644
--- a/web/src/features/v4-migration/V4MigrationContent.tsx
+++ b/web/src/features/v4-migration/V4MigrationContent.tsx
@@ -55,7 +55,7 @@ import {
import { useReadPath, V4PreviewToggleRow } from "@/src/features/events";
import { numberFormatter } from "@/src/utils/numbers";
import { formatCompactRelativeTime } from "@/src/utils/dates";
-import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
+import { useQueryProjectOrOrganization } from "@/src/features/projects";
import {
useEvalUpgradeAssistantPlan,
V4_CODING_AGENT_PROMPT,
diff --git a/web/src/features/v4-migration/V4MigrationDelayBadge.tsx b/web/src/features/v4-migration/V4MigrationDelayBadge.tsx
index e934966809..a5e8de1f0a 100644
--- a/web/src/features/v4-migration/V4MigrationDelayBadge.tsx
+++ b/web/src/features/v4-migration/V4MigrationDelayBadge.tsx
@@ -9,7 +9,7 @@ import {
import { useForceV3Experience } from "@/src/features/v4-migration/useForceV3Experience";
import { PARTNER_INTEGRATION_FAQ_URL } from "@/src/features/v4-migration/partnerIntegrationDocs";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
import { useOpenV4MigrationPanel } from "@/src/features/v4-migration/hooks/useOpenV4MigrationPanel";
import {
useProjectV4EvalData,
diff --git a/web/src/features/v4-migration/V4MigrationNavItem.tsx b/web/src/features/v4-migration/V4MigrationNavItem.tsx
index 65e85c7193..4da777f886 100644
--- a/web/src/features/v4-migration/V4MigrationNavItem.tsx
+++ b/web/src/features/v4-migration/V4MigrationNavItem.tsx
@@ -3,7 +3,7 @@ import { ChevronRight } from "lucide-react";
import { SidebarMenuButton, useSidebar } from "@/src/components/ui/sidebar";
import { useV4UpgradeUiEnabled } from "@/src/features/v4-migration/useV4UpgradeUiEnabled";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
import { useProjectV4MigrationActions } from "@/src/features/v4-migration/hooks/useV4MigrationData";
import { useOpenV4MigrationPanel } from "@/src/features/v4-migration/hooks/useOpenV4MigrationPanel";
diff --git a/web/src/features/v4-migration/V4MigrationPanel.tsx b/web/src/features/v4-migration/V4MigrationPanel.tsx
index de94571918..c5ba46076c 100644
--- a/web/src/features/v4-migration/V4MigrationPanel.tsx
+++ b/web/src/features/v4-migration/V4MigrationPanel.tsx
@@ -2,7 +2,7 @@
import { X } from "lucide-react";
import { Button } from "@/src/components/ui/button";
import { useV4MigrationPanel } from "@/src/features/v4-migration/V4MigrationPanelProvider";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
import {
V4MigrationHeaderContent,
V4MigrationDetailsContent,
diff --git a/web/src/features/v4-migration/V4MigrationPanelProvider.tsx b/web/src/features/v4-migration/V4MigrationPanelProvider.tsx
index fd3e2e1894..7fa1660256 100644
--- a/web/src/features/v4-migration/V4MigrationPanelProvider.tsx
+++ b/web/src/features/v4-migration/V4MigrationPanelProvider.tsx
@@ -7,7 +7,7 @@ import {
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useV4UpgradeUiEnabled } from "@/src/features/v4-migration/useV4UpgradeUiEnabled";
import type { ProjectMigrationReadiness } from "@/src/features/v4-migration/migrationData";
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
export type V4MigrationTargetProject = {
id: string;
diff --git a/web/src/features/widgets/EditWidgetPage.tsx b/web/src/features/widgets/EditWidgetPage.tsx
index 48999bed27..acc9dc81ab 100644
--- a/web/src/features/widgets/EditWidgetPage.tsx
+++ b/web/src/features/widgets/EditWidgetPage.tsx
@@ -3,12 +3,11 @@ import Page from "@/src/components/layouts/page";
import { api } from "@/src/utils/api";
import { WidgetForm } from "@/src/features/widgets/components/WidgetForm";
import { type WidgetSavePayload } from "@/src/features/widgets/components/widgetFormSchema";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
+import { showErrorToast, showSuccessToast } from "@/src/features/notifications";
import { type metricAggregations, type views } from "@langfuse/shared/query";
import { type z } from "zod";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useReadPath } from "@/src/features/events/hooks/useReadPath";
+import { useReadPath } from "@/src/features/events";
export default function EditWidgetPage() {
const router = useRouter();
diff --git a/web/src/features/widgets/NewWidgetPage.tsx b/web/src/features/widgets/NewWidgetPage.tsx
index 0f32b0d2b1..adeb0acd57 100644
--- a/web/src/features/widgets/NewWidgetPage.tsx
+++ b/web/src/features/widgets/NewWidgetPage.tsx
@@ -3,13 +3,12 @@ import Page from "@/src/components/layouts/page";
import { api } from "@/src/utils/api";
import { WidgetForm } from "@/src/features/widgets";
import { type WidgetSavePayload } from "@/src/features/widgets/components/widgetFormSchema";
-import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showSuccessToast, showErrorToast } from "@/src/features/notifications";
import { type metricAggregations, type views } from "@langfuse/shared/query";
import { type z } from "zod";
import { SelectDashboardDialog } from "@/src/features/dashboard/components/SelectDashboardDialog";
import { useState } from "react";
-import { useReadPath } from "@/src/features/events/hooks/useReadPath";
+import { useReadPath } from "@/src/features/events";
import { getDefaultView } from "@/src/features/widgets/utils";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
diff --git a/web/src/features/widgets/components/DashboardWidget.tsx b/web/src/features/widgets/components/DashboardWidget.tsx
index 2bb4b27e9f..312e07cb6b 100644
--- a/web/src/features/widgets/components/DashboardWidget.tsx
+++ b/web/src/features/widgets/components/DashboardWidget.tsx
@@ -32,7 +32,7 @@ import { useRouter } from "next/router";
import {
buildTableFilterHref,
buildViewAsTableHint,
-} from "@/src/features/dashboard/lib/buildTableFilterHref";
+} from "@/src/features/dashboard";
import { useHasProjectAccess } from "@/src/features/rbac";
import { downloadChartDataCsv } from "@/src/features/widgets/chart-library/downloadChartDataCsv";
import {
diff --git a/web/src/features/widgets/components/WidgetForm.tsx b/web/src/features/widgets/components/WidgetForm.tsx
index f88c248ba9..f6e24160a0 100644
--- a/web/src/features/widgets/components/WidgetForm.tsx
+++ b/web/src/features/widgets/components/WidgetForm.tsx
@@ -26,7 +26,7 @@ import {
import {
mapWidgetUiTableFilterToView,
partitionWidgetUiTableFiltersToView,
-} from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
+} from "@/src/features/dashboard";
import React, { useMemo, useRef } from "react";
import {
useController,
diff --git a/web/src/features/widgets/components/widgetFormAdapters.clienttest.ts b/web/src/features/widgets/components/widgetFormAdapters.clienttest.ts
index 1dfb00e7a6..ca00f63554 100644
--- a/web/src/features/widgets/components/widgetFormAdapters.clienttest.ts
+++ b/web/src/features/widgets/components/widgetFormAdapters.clienttest.ts
@@ -8,7 +8,7 @@ import { type metricAggregations } from "@langfuse/shared/query";
import {
mapWidgetUiTableFilterToView,
normalizeStoredWidgetFiltersForEditor,
-} from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
+} from "@/src/features/dashboard";
import { isTimeSeriesChart } from "@/src/features/widgets/chart-library/utils";
import {
buildWidgetDescription,
diff --git a/web/src/features/widgets/components/widgetFormSchema.ts b/web/src/features/widgets/components/widgetFormSchema.ts
index ab9ba3a3d6..1363e0687f 100644
--- a/web/src/features/widgets/components/widgetFormSchema.ts
+++ b/web/src/features/widgets/components/widgetFormSchema.ts
@@ -16,7 +16,7 @@ import {
import {
mapWidgetUiTableFilterToView,
normalizeStoredWidgetFiltersForEditor,
-} from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
+} from "@/src/features/dashboard";
import { isTimeSeriesChart } from "@/src/features/widgets/chart-library/utils";
import { dashboardWidgetChartTypeSchema } from "@/src/features/widgets/lib/dashboardWidgetChartTypes";
import {
diff --git a/web/src/features/widgets/utils.clienttest.ts b/web/src/features/widgets/utils.clienttest.ts
index a78e090f32..185443e502 100644
--- a/web/src/features/widgets/utils.clienttest.ts
+++ b/web/src/features/widgets/utils.clienttest.ts
@@ -1,5 +1,5 @@
import { type FilterState } from "@langfuse/shared";
-import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
+import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard";
import { mergeWidgetAndDashboardFilters } from "./utils";
/**
diff --git a/web/src/features/widgets/utils.ts b/web/src/features/widgets/utils.ts
index 755a071606..c5daf47332 100644
--- a/web/src/features/widgets/utils.ts
+++ b/web/src/features/widgets/utils.ts
@@ -12,7 +12,7 @@ import {
type MetricFormatterFunction,
type MissingBucketValue,
} from "@/src/features/widgets/chart-library/chart-props";
-import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
+import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard";
// Shared widget chart configuration types
export type WidgetChartConfig = {
diff --git a/web/src/features/widgets/utils/import-export-utils.ts b/web/src/features/widgets/utils/import-export-utils.ts
index 4ef802f140..bf446571c1 100644
--- a/web/src/features/widgets/utils/import-export-utils.ts
+++ b/web/src/features/widgets/utils/import-export-utils.ts
@@ -11,7 +11,7 @@ import {
getWidgetImportFilterConfig,
normalizeStoredWidgetFiltersForEditor,
partitionStoredUiTableFiltersToView,
-} from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
+} from "@/src/features/dashboard";
import startCase from "lodash/startCase";
import {
ChartConfigSchema,
diff --git a/web/src/pages/api/public/annotation-queues/[queueId]/assignments.ts b/web/src/pages/api/public/annotation-queues/[queueId]/assignments.ts
index 7ed3c25a98..58fa222504 100644
--- a/web/src/pages/api/public/annotation-queues/[queueId]/assignments.ts
+++ b/web/src/pages/api/public/annotation-queues/[queueId]/assignments.ts
@@ -10,8 +10,7 @@ import {
import {
createAnnotationQueueAssignmentForApi,
deleteAnnotationQueueAssignmentForApi,
-} from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
-
+} from "@/src/features/annotation-queues/server";
export default withMiddlewares({
POST: createAuthedProjectAPIRoute({
name: "Create Annotation Queue Assignment",
diff --git a/web/src/pages/api/public/annotation-queues/[queueId]/index.ts b/web/src/pages/api/public/annotation-queues/[queueId]/index.ts
index 51c72db06a..2d164edd2a 100644
--- a/web/src/pages/api/public/annotation-queues/[queueId]/index.ts
+++ b/web/src/pages/api/public/annotation-queues/[queueId]/index.ts
@@ -4,7 +4,7 @@ import {
GetAnnotationQueueByIdQuery,
GetAnnotationQueueByIdResponse,
} from "@/src/features/public-api/types/annotation-queues";
-import { getAnnotationQueueForApi } from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
+import { getAnnotationQueueForApi } from "@/src/features/annotation-queues/server";
export default withMiddlewares({
GET: createAuthedProjectAPIRoute({
diff --git a/web/src/pages/api/public/annotation-queues/[queueId]/items/[itemId].ts b/web/src/pages/api/public/annotation-queues/[queueId]/items/[itemId].ts
index 16d35b2fa0..6a566158b0 100644
--- a/web/src/pages/api/public/annotation-queues/[queueId]/items/[itemId].ts
+++ b/web/src/pages/api/public/annotation-queues/[queueId]/items/[itemId].ts
@@ -12,8 +12,7 @@ import {
deleteAnnotationQueueItemForApi,
getAnnotationQueueItemForApi,
updateAnnotationQueueItemForApi,
-} from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
-
+} from "@/src/features/annotation-queues/server";
export default withMiddlewares({
GET: createAuthedProjectAPIRoute({
name: "Get annotation queue item by ID",
diff --git a/web/src/pages/api/public/annotation-queues/[queueId]/items/index.ts b/web/src/pages/api/public/annotation-queues/[queueId]/items/index.ts
index 872f2763eb..bd962ad918 100644
--- a/web/src/pages/api/public/annotation-queues/[queueId]/items/index.ts
+++ b/web/src/pages/api/public/annotation-queues/[queueId]/items/index.ts
@@ -9,8 +9,7 @@ import {
import {
createAnnotationQueueItemForApi,
listAnnotationQueueItemsForApi,
-} from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
-
+} from "@/src/features/annotation-queues/server";
export default withMiddlewares({
GET: createAuthedProjectAPIRoute({
name: "Get annotation queue items",
diff --git a/web/src/pages/api/public/annotation-queues/index.ts b/web/src/pages/api/public/annotation-queues/index.ts
index 93eebd0b36..58a06cbaf5 100644
--- a/web/src/pages/api/public/annotation-queues/index.ts
+++ b/web/src/pages/api/public/annotation-queues/index.ts
@@ -9,8 +9,7 @@ import {
import {
createAnnotationQueueForApi,
listAnnotationQueuesForApi,
-} from "@/src/features/annotation-queues/server/publicAnnotationQueueService";
-
+} from "@/src/features/annotation-queues/server";
export default withMiddlewares({
GET: createAuthedProjectAPIRoute({
name: "Get annotation queues",
diff --git a/web/src/pages/project/[projectId]/settings/billing.ts b/web/src/pages/project/[projectId]/settings/billing.ts
index f6a61a155b..baeb622b53 100644
--- a/web/src/pages/project/[projectId]/settings/billing.ts
+++ b/web/src/pages/project/[projectId]/settings/billing.ts
@@ -1,4 +1,4 @@
-import { useQueryProject } from "@/src/features/projects/hooks";
+import { useQueryProject } from "@/src/features/projects";
import { useRouter } from "next/router";
import { useEffect } from "react";
diff --git a/web/src/utils/trpcErrorToast.tsx b/web/src/utils/trpcErrorToast.tsx
index 49a5387d91..2f020545bf 100644
--- a/web/src/utils/trpcErrorToast.tsx
+++ b/web/src/utils/trpcErrorToast.tsx
@@ -1,5 +1,5 @@
import { TRPCClientError } from "@trpc/client";
-import { showErrorToast } from "@/src/features/notifications/showErrorToast";
+import { showErrorToast } from "@/src/features/notifications";
import { formatTrpcZodValidationDescription } from "@/src/utils/trpcValidationError";
// Catch network level errors, e.g. by proxy rate-limiting