Skip to content

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

refactor(web): reroute remaining feature deep imports through index.ts (#17738)

Nikita Kabardinaa632ed77fce
diff --git a/web/src/__tests__/aggregateScores.clienttest.ts b/web/src/__tests__/aggregateScores.clienttest.ts
index 54aac168df..ca3dbb9366 100644
--- a/web/src/__tests__/aggregateScores.clienttest.ts
+++ b/web/src/__tests__/aggregateScores.clienttest.ts
@@ -1,9 +1,6 @@
// @vitest-environment node
-import {
- aggregateScores,
- type ScoreToAggregate,
-} from "@/src/features/scores/lib/aggregateScores";
+import { aggregateScores, type ScoreToAggregate } from "@/src/features/scores";
describe("aggregateScores", () => {
it("should return an empty object for an empty array", () => {
diff --git a/web/src/__tests__/mergeScoresWithCache.clienttest.ts b/web/src/__tests__/mergeScoresWithCache.clienttest.ts
index aa15498524..e8df7cff24 100644
--- a/web/src/__tests__/mergeScoresWithCache.clienttest.ts
+++ b/web/src/__tests__/mergeScoresWithCache.clienttest.ts
@@ -4,11 +4,11 @@ import {
mergeScoresWithCache,
mergeAggregatesWithCache,
mergeAnnotationScoresWithCache,
-} from "@/src/features/scores/lib/mergeScoresWithCache";
+ type CachedScore,
+ type AnnotationScore,
+} from "@/src/features/scores";
import { type ScoreDomain, type ScoreAggregate } from "@langfuse/shared";
import { type WithStringifiedMetadata } from "@/src/utils/clientSideDomainTypes";
-import { type CachedScore } from "@/src/features/scores/contexts/ScoreCacheContext";
-import { type AnnotationScore } from "@/src/features/scores/types";
describe("mergeScoresWithCache", () => {
it("should return server scores when cache is empty", () => {
diff --git a/web/src/__tests__/transformScores.clienttest.ts b/web/src/__tests__/transformScores.clienttest.ts
index a59d8f8327..1cc4e0d37c 100644
--- a/web/src/__tests__/transformScores.clienttest.ts
+++ b/web/src/__tests__/transformScores.clienttest.ts
@@ -1,6 +1,6 @@
// @vitest-environment node
-import { transformToAnnotationScores } from "@/src/features/scores/lib/transformScores";
+import { transformToAnnotationScores } from "@/src/features/scores";
import {
type ScoreDomain,
type ScoreAggregate,
diff --git a/web/src/components/ActionButton.tsx b/web/src/components/ActionButton.tsx
index 3e9308a370..e0b91306ed 100644
--- a/web/src/components/ActionButton.tsx
+++ b/web/src/components/ActionButton.tsx
@@ -9,7 +9,7 @@ import {
HoverCardPortal,
} from "@/src/components/ui/hover-card";
import Link from "next/link";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
export type ActionButtonProps = Pick<
ButtonProps,
diff --git a/web/src/components/EnvLabelBadge.tsx b/web/src/components/EnvLabelBadge.tsx
index 82cc24a46e..04c493e81e 100644
--- a/web/src/components/EnvLabelBadge.tsx
+++ b/web/src/components/EnvLabelBadge.tsx
@@ -1,7 +1,7 @@
import {
isRegionProduction,
type CloudRegionName,
-} from "@/src/features/organizations/cloudRegions";
+} from "@/src/features/organizations";
import { assertUnreachable } from "@/src/utils/types";
import { cva } from "class-variance-authority";
import { useMemo } from "react";
diff --git a/web/src/components/deleteButton.tsx b/web/src/components/deleteButton.tsx
index 3b3e426fce..adeffdbeb2 100644
--- a/web/src/components/deleteButton.tsx
+++ b/web/src/components/deleteButton.tsx
@@ -13,7 +13,7 @@ import { IconOnlyButton } from "@/src/components/IconOnlyButton";
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/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
import { useHasEntitlement } from "@/src/features/entitlements/hooks";
import { ConfirmationDialogController } from "@/src/components/design-system/ConfirmationDialogController/ConfirmationDialogController";
diff --git a/web/src/components/layouts/app-layout/hooks/useFilteredNavigation.ts b/web/src/components/layouts/app-layout/hooks/useFilteredNavigation.ts
index 30242d7df4..b5772bbc0e 100644
--- a/web/src/components/layouts/app-layout/hooks/useFilteredNavigation.ts
+++ b/web/src/components/layouts/app-layout/hooks/useFilteredNavigation.ts
@@ -8,7 +8,7 @@ import { useMemo } from "react";
import type { Session } from "next-auth";
import { useEntitlements } from "@/src/features/entitlements/hooks";
import { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useForceV3Experience } from "@/src/features/v4-migration/useForceV3Experience";
import {
ROUTES,
diff --git a/web/src/components/layouts/app-layout/hooks/useLayoutMetadata.ts b/web/src/components/layouts/app-layout/hooks/useLayoutMetadata.ts
index afebe51eb7..210c5a26b6 100644
--- a/web/src/components/layouts/app-layout/hooks/useLayoutMetadata.ts
+++ b/web/src/components/layouts/app-layout/hooks/useLayoutMetadata.ts
@@ -4,7 +4,7 @@
*/
import { useMemo } from "react";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { env } from "@/src/env.mjs";
import type { NavigationItem } from "@/src/components/layouts/utilities/routes";
diff --git a/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx b/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx
index 9fbdd74ac4..1d1e7f12cb 100644
--- a/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx
+++ b/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx
@@ -30,8 +30,8 @@ import { ThemeToggle } from "@/src/features/theming/ThemeToggle";
import {
getAvailableCloudRegionOptions,
getCloudRegionAuthUrl,
-} from "@/src/features/organizations/cloudRegions";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+ useLangfuseCloudRegion,
+} from "@/src/features/organizations";
import type { Session } from "next-auth";
import type { NavigationItem } from "@/src/components/layouts/utilities/routes";
import type { RouteGroup } from "@/src/components/layouts/routes";
@@ -48,7 +48,7 @@ import { api } from "@/src/utils/api";
import { usePlan } from "@/src/features/entitlements/hooks";
import { env } from "@/src/env.mjs";
import useLocalStorage from "@/src/components/useLocalStorage";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useSession } from "next-auth/react";
import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
import { useHasOrganizationAccess } from "@/src/features/rbac";
diff --git a/web/src/components/layouts/default-head/DefaultHead.tsx b/web/src/components/layouts/default-head/DefaultHead.tsx
index db02744c1c..11650f89fd 100644
--- a/web/src/components/layouts/default-head/DefaultHead.tsx
+++ b/web/src/components/layouts/default-head/DefaultHead.tsx
@@ -1,6 +1,6 @@
import Head from "next/head";
import { useRouter } from "next/router";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useLayoutMetadata } from "@/src/components/layouts/app-layout/hooks/useLayoutMetadata";
import { getPageMetadata } from "./getPageMetadata";
diff --git a/web/src/components/layouts/default-head/getPageMetadata.ts b/web/src/components/layouts/default-head/getPageMetadata.ts
index ab32ce9482..44324e891b 100644
--- a/web/src/components/layouts/default-head/getPageMetadata.ts
+++ b/web/src/components/layouts/default-head/getPageMetadata.ts
@@ -1,7 +1,7 @@
import {
type CloudRegionName,
isRegionProduction,
-} from "@/src/features/organizations/cloudRegions";
+} from "@/src/features/organizations";
/**
* Every region serves the same sign-in page, and the sign-in page is reached
diff --git a/web/src/components/layouts/doc-popup.tsx b/web/src/components/layouts/doc-popup.tsx
index 3f4d9f97fc..2693e004c0 100644
--- a/web/src/components/layouts/doc-popup.tsx
+++ b/web/src/components/layouts/doc-popup.tsx
@@ -6,7 +6,7 @@ import {
HoverCardTrigger,
HoverCardPortal,
} from "@/src/components/ui/hover-card";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { cn } from "@/src/utils/tailwind";
import { ExternalLink, Info } from "lucide-react";
diff --git a/web/src/components/layouts/routes.tsx b/web/src/components/layouts/routes.tsx
index d6fc53c272..43791d15ef 100644
--- a/web/src/components/layouts/routes.tsx
+++ b/web/src/components/layouts/routes.tsx
@@ -32,7 +32,7 @@ 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";
import { useCommandMenu } from "@/src/features/command-k-menu/CommandMenuProvider";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { CloudStatusMenu } from "@/src/features/cloud-status-notification/components/CloudStatusMenu";
import { type ProductModule } from "@/src/ee/features/ui-customization/productModuleSchema";
import { matchesPathname } from "@/src/components/layouts/app-layout/utils/pathClassification";
diff --git a/web/src/components/nav/book-a-call-button.tsx b/web/src/components/nav/book-a-call-button.tsx
index dafde5bf60..9a4790be0b 100644
--- a/web/src/components/nav/book-a-call-button.tsx
+++ b/web/src/components/nav/book-a-call-button.tsx
@@ -1,7 +1,7 @@
import { CalendarDays } from "lucide-react";
import { SidebarMenuButton } from "@/src/components/ui/sidebar";
import Link from "next/link";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
export const BookACallButton = () => {
const capture = usePostHogClientCapture();
diff --git a/web/src/components/onboarding/DatasetItemsOnboarding.tsx b/web/src/components/onboarding/DatasetItemsOnboarding.tsx
index eabfd8950c..e2dcd47f7c 100644
--- a/web/src/components/onboarding/DatasetItemsOnboarding.tsx
+++ b/web/src/components/onboarding/DatasetItemsOnboarding.tsx
@@ -12,7 +12,7 @@ import {
import { CsvUploadDialog } from "@/src/features/datasets/components/CsvUploadDialog";
import { NewDatasetItemForm } from "@/src/features/datasets/components/NewDatasetItemForm";
import { useHasProjectAccess } from "@/src/features/rbac";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { cn } from "@/src/utils/tailwind";
interface DatasetItemEntryPointRowProps {
diff --git a/web/src/components/publish-object-switch.tsx b/web/src/components/publish-object-switch.tsx
index fb9c0a3eee..6ec3036f9c 100644
--- a/web/src/components/publish-object-switch.tsx
+++ b/web/src/components/publish-object-switch.tsx
@@ -11,7 +11,7 @@ import {
TooltipTrigger,
} from "@/src/components/ui/tooltip";
import { useReadPath } from "@/src/features/events/hooks/useReadPath";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useHasProjectAccess } from "@/src/features/rbac";
import { env } from "@/src/env.mjs";
import { api } from "@/src/utils/api";
diff --git a/web/src/components/table/data-table-ai-filters.tsx b/web/src/components/table/data-table-ai-filters.tsx
index 7f5419784b..0f0f04774f 100644
--- a/web/src/components/table/data-table-ai-filters.tsx
+++ b/web/src/components/table/data-table-ai-filters.tsx
@@ -10,7 +10,7 @@ import {
import { Info } from "lucide-react";
import { useQueryProject } from "@/src/features/projects/hooks";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
-import { AIFeaturesDisabledNotice } from "@/src/features/organizations/components/AIFeaturesDisabledNotice";
+import { AIFeaturesDisabledNotice } from "@/src/features/organizations";
import { api, reportNonTrpcError } from "@/src/utils/api";
import { type FilterState } from "@langfuse/shared";
diff --git a/web/src/components/table/data-table-column-visibility-filter.tsx b/web/src/components/table/data-table-column-visibility-filter.tsx
index fae6ff371f..ca0094c740 100644
--- a/web/src/components/table/data-table-column-visibility-filter.tsx
+++ b/web/src/components/table/data-table-column-visibility-filter.tsx
@@ -13,7 +13,7 @@ import {
} from "@tanstack/react-table";
import { ChevronDown, ChevronRight, Menu } from "lucide-react";
import { type LangfuseColumnDef } from "@/src/components/table/types";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import DocPopup from "@/src/components/layouts/doc-popup";
import {
closestCenter,
diff --git a/web/src/components/table/data-table-controls.tsx b/web/src/components/table/data-table-controls.tsx
index 53dd06a304..421b625f81 100644
--- a/web/src/components/table/data-table-controls.tsx
+++ b/web/src/components/table/data-table-controls.tsx
@@ -68,7 +68,7 @@ import {
InputCommandItem,
InputCommandList,
} from "@/src/components/ui/input-command";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { Badge } from "@/src/components/ui/badge";
import { Checkbox } from "@/src/components/design-system/Checkbox/Checkbox";
import { Button } from "@/src/components/ui/button";
@@ -99,7 +99,7 @@ import {
PopoverTrigger,
} from "@/src/components/ui/popover";
import { DataTableAIFilters } from "@/src/components/table/data-table-ai-filters";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { type FilterState } from "@langfuse/shared";
interface ControlsContextType {
diff --git a/web/src/components/table/data-table-pagination.tsx b/web/src/components/table/data-table-pagination.tsx
index 8dae5fd16c..ca99477639 100644
--- a/web/src/components/table/data-table-pagination.tsx
+++ b/web/src/components/table/data-table-pagination.tsx
@@ -15,7 +15,7 @@ import {
SelectTrigger,
SelectValue,
} from "@/src/components/ui/select";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { Input } from "@/src/components/ui/input";
import {
diff --git a/web/src/components/table/data-table-row-height-switch.tsx b/web/src/components/table/data-table-row-height-switch.tsx
index 97dcd2665a..05e4add461 100644
--- a/web/src/components/table/data-table-row-height-switch.tsx
+++ b/web/src/components/table/data-table-row-height-switch.tsx
@@ -10,7 +10,7 @@ import {
DropdownMenuCheckboxItem,
} from "@/src/components/ui/dropdown-menu";
import useLocalStorage from "@/src/components/useLocalStorage";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { Rows3, Rows2, Rows4 } from "lucide-react";
const ROW_HEIGHT_OPTIONS = [
diff --git a/web/src/components/table/data-table-toolbar.tsx b/web/src/components/table/data-table-toolbar.tsx
index 851be721e6..0921dda7a3 100644
--- a/web/src/components/table/data-table-toolbar.tsx
+++ b/web/src/components/table/data-table-toolbar.tsx
@@ -25,7 +25,7 @@ import {
DataTableRowHeightSwitch,
type RowHeight,
} from "@/src/components/table/data-table-row-height-switch";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { TimeRangePicker } from "@/src/components/date-picker";
import {
type TimeRange,
diff --git a/web/src/components/table/data-table.tsx b/web/src/components/table/data-table.tsx
index e0f10bd7c9..c3422390c9 100644
--- a/web/src/components/table/data-table.tsx
+++ b/web/src/components/table/data-table.tsx
@@ -35,7 +35,7 @@ import {
TableHeader,
TableRow,
} from "@/src/components/ui/table";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { cn } from "@/src/utils/tailwind";
import {
type ColumnOrderState,
diff --git a/web/src/components/table/peek.tsx b/web/src/components/table/peek.tsx
index 28ae39ce58..a33b9fea30 100644
--- a/web/src/components/table/peek.tsx
+++ b/web/src/components/table/peek.tsx
@@ -5,7 +5,7 @@ import { Drawer, DrawerContent, DrawerTitle } from "@/src/components/ui/drawer";
import { Separator } from "@/src/components/ui/separator";
import { type LayerName } from "@/src/context/LayerContext/layers";
import { type LangfuseItemType } from "@/src/components/ItemBadge";
-import { type ListEntry } from "@/src/features/navigate-detail-pages/context";
+import { type ListEntry } from "@/src/features/navigate-detail-pages";
import { cn } from "@/src/utils/tailwind";
import { memo, useCallback, useEffect, useState } from "react";
import { useRouter } from "next/router";
@@ -16,7 +16,7 @@ import { PeekTableStateProvider } from "@/src/components/table/peek/contexts/Pee
import { PeekHeader } from "@/src/components/table/peek/PeekHeader";
import { usePeekPanelState } from "@/src/components/table/peek/usePeekPanelState";
import { shouldIgnoreOutsideInteraction } from "@/src/utils/outside-interaction";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
// Peek view-mode URL param (also cleared by usePeekNavigation on close). When
// `expanded`, the desktop peek widens to viewport − sidebar — shareable + back-able.
diff --git a/web/src/components/table/peek/PeekHeader.tsx b/web/src/components/table/peek/PeekHeader.tsx
index 4cf3bc9932..80faf12957 100644
--- a/web/src/components/table/peek/PeekHeader.tsx
+++ b/web/src/components/table/peek/PeekHeader.tsx
@@ -12,8 +12,10 @@ import {
TooltipTrigger,
} from "@/src/components/ui/tooltip";
import { ItemBadge, type LangfuseItemType } from "@/src/components/ItemBadge";
-import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
-import { type ListEntry } from "@/src/features/navigate-detail-pages/context";
+import {
+ DetailPageNav,
+ type ListEntry,
+} from "@/src/features/navigate-detail-pages";
import {
ExternalLink,
Maximize2,
diff --git a/web/src/components/table/peek/hooks/usePeekNavigation.ts b/web/src/components/table/peek/hooks/usePeekNavigation.ts
index ead041a3e5..63f3dff2e1 100644
--- a/web/src/components/table/peek/hooks/usePeekNavigation.ts
+++ b/web/src/components/table/peek/hooks/usePeekNavigation.ts
@@ -1,10 +1,10 @@
import { getPathnameWithoutBasePath } from "@/src/utils/api";
-import { type ListEntry } from "@/src/features/navigate-detail-pages/context";
+import { type ListEntry } from "@/src/features/navigate-detail-pages";
import { useRouter } from "next/router";
import { useCallback } from "react";
import { urlSearchParamsToQuery } from "@/src/utils/navigation";
import { resolvePeekTraceParams } from "@/src/components/table/peek/resolvePeekTraceParams";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
const PEEK_PARAM = "peek";
// View-mode param shared with the peek component (cleared whenever the peek closes).
diff --git a/web/src/components/table/resizable-filter-layout.tsx b/web/src/components/table/resizable-filter-layout.tsx
index 885afc8890..8664517756 100644
--- a/web/src/components/table/resizable-filter-layout.tsx
+++ b/web/src/components/table/resizable-filter-layout.tsx
@@ -3,7 +3,7 @@
import { type PropsWithChildren, Children } from "react";
import { ResizableSplitLayout } from "@/src/components/ui/resizable-split-layout";
import { Sheet, SheetContent, SheetTitle } from "@/src/components/ui/sheet";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useDataTableControls } from "./data-table-controls";
// Mirrors the trace peek's collapsed-panel rail (TraceLayoutDesktop): instead
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 3fbded0f61..a04a3b15e1 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
@@ -75,7 +75,7 @@ import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
import { copyTextToClipboard } from "@/src/utils/clipboard";
import { useUniqueNameValidation } from "@/src/hooks/useUniqueNameValidation";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useHasProjectAccess } from "@/src/features/rbac";
import { useDefaultViewMutations } from "../hooks/useDefaultViewMutations";
import { summarizeTableViewPreset } from "../lib/viewPreview";
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 e10cb8303b..33d32711e5 100644
--- a/web/src/components/table/table-view-presets/hooks/useTableViewManager.ts
+++ b/web/src/components/table/table-view-presets/hooks/useTableViewManager.ts
@@ -19,7 +19,7 @@ import { useKeyedSessionStorageState } from "@/src/features/filters/hooks/useKey
import { type LangfuseColumnDef } from "@/src/components/table/types";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import isEqual from "lodash/isEqual";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { validateOrderBy, validateFilters } from "../validation";
import { isSystemPresetId } from "../components/data-table-view-presets-drawer";
import type { FilterStateMigration } from "@/src/features/filters/lib/filter-config";
diff --git a/web/src/components/ui/LargeStringFallback.tsx b/web/src/components/ui/LargeStringFallback.tsx
index d503465ced..8d9c92b928 100644
--- a/web/src/components/ui/LargeStringFallback.tsx
+++ b/web/src/components/ui/LargeStringFallback.tsx
@@ -3,7 +3,7 @@ import { Download } from "lucide-react";
import { Button } from "@/src/components/ui/button";
import { compactNumberFormatter } from "@/src/utils/numbers";
import { LARGE_STRING_PREVIEW_CHARS } from "@/src/components/ui/largeStringGate";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { decodeUnicodeInJson } from "@/src/utils/decodeUnicodeInJson";
/**
diff --git a/web/src/ee/features/admin-api/server/organizations/index.ts b/web/src/ee/features/admin-api/server/organizations/index.ts
index 5ecb1c2ebf..68b8774b0c 100644
--- a/web/src/ee/features/admin-api/server/organizations/index.ts
+++ b/web/src/ee/features/admin-api/server/organizations/index.ts
@@ -1,6 +1,6 @@
import { prisma } from "@langfuse/shared/src/db";
import { logger } from "@langfuse/shared/src/server";
-import { organizationNameSchema } from "@/src/features/organizations/utils/organizationNameSchema";
+import { organizationNameSchema } from "@/src/features/organizations/server";
import { auditLog } from "@/src/features/audit-logs/server";
import { type NextApiRequest, type NextApiResponse } from "next";
import { z } from "zod";
diff --git a/web/src/ee/features/admin-api/server/organizations/organizationById.ts b/web/src/ee/features/admin-api/server/organizations/organizationById.ts
index 6ffa7c67cb..76246df771 100644
--- a/web/src/ee/features/admin-api/server/organizations/organizationById.ts
+++ b/web/src/ee/features/admin-api/server/organizations/organizationById.ts
@@ -4,7 +4,7 @@ import {
invalidateCachedOrgApiKeys,
logger,
} from "@langfuse/shared/src/server";
-import { organizationNameSchema } from "@/src/features/organizations/utils/organizationNameSchema";
+import { organizationNameSchema } from "@/src/features/organizations/server";
import { auditLog } from "@/src/features/audit-logs/server";
import { z } from "zod";
diff --git a/web/src/ee/features/billing/components/useBillingInformation.tsx b/web/src/ee/features/billing/components/useBillingInformation.tsx
index 24c2a94ec5..92ee15859a 100644
--- a/web/src/ee/features/billing/components/useBillingInformation.tsx
+++ b/web/src/ee/features/billing/components/useBillingInformation.tsx
@@ -1,6 +1,6 @@
import { useMemo } from "react";
-import { useQueryOrganization } from "@/src/features/organizations/hooks";
+import { useQueryOrganization } from "@/src/features/organizations";
import { formatLocalIsoDate } from "@/src/utils/dates";
import { type BillingProvider, type Plan, planLabels } from "@langfuse/shared";
import { stripeProducts } from "@/src/ee/features/billing/utils/stripeCatalogue";
diff --git a/web/src/ee/features/billing/utils/isCloudBilling.ts b/web/src/ee/features/billing/utils/isCloudBilling.ts
index 1264f0deb6..1052cb0331 100644
--- a/web/src/ee/features/billing/utils/isCloudBilling.ts
+++ b/web/src/ee/features/billing/utils/isCloudBilling.ts
@@ -1,5 +1,5 @@
import { env } from "@/src/env.mjs";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
/**
* Server-side check to determine if cloud billing is enabled.
diff --git a/web/src/features/annotation-queues/server/annotationQueueItemsRouter.ts b/web/src/features/annotation-queues/server/annotationQueueItemsRouter.ts
index 220122f93a..c7d5eccea2 100644
--- a/web/src/features/annotation-queues/server/annotationQueueItemsRouter.ts
+++ b/web/src/features/annotation-queues/server/annotationQueueItemsRouter.ts
@@ -1,6 +1,6 @@
import { auditLog } from "@/src/features/audit-logs/server";
import { throwIfNoProjectAccess } from "@/src/features/rbac";
-import { createBatchActionJob } from "@/src/features/table/server/createBatchActionJob";
+import { createBatchActionJob } from "@/src/features/table/server";
import {
createTRPCRouter,
protectedProjectProcedure,
diff --git a/web/src/features/auth-credentials/components/ResetPasswordPage.tsx b/web/src/features/auth-credentials/components/ResetPasswordPage.tsx
index 3b1ea8760f..c8d0338f85 100644
--- a/web/src/features/auth-credentials/components/ResetPasswordPage.tsx
+++ b/web/src/features/auth-credentials/components/ResetPasswordPage.tsx
@@ -25,7 +25,7 @@ import Link from "next/link";
import { ErrorPage } from "@/src/components/error-page";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { passwordSchema } from "@/src/features/auth";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { PASSWORD_SETUP_EMAIL_STORAGE_KEY } from "@/src/features/auth-credentials/lib/credentialsUtils";
const resetPasswordSchema = z
diff --git a/web/src/features/auth/SignInPage.tsx b/web/src/features/auth/SignInPage.tsx
index 2d2fc41327..2b3e8255fd 100644
--- a/web/src/features/auth/SignInPage.tsx
+++ b/web/src/features/auth/SignInPage.tsx
@@ -42,11 +42,11 @@ import {
isJsonParseSyntaxError,
} from "@/src/features/auth/lib/expectedAuthErrors";
import { captureUnknownError } from "@/src/utils/captureUnknownError";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import useLocalStorage from "@/src/components/useLocalStorage";
import { AuthProviderButton } from "@/src/features/auth/components/AuthProviderButton";
import { cn } from "@/src/utils/tailwind";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { getSafeRedirectPath } from "@/src/utils/redirect";
import { Spinner } from "@/src/components/layouts/spinner";
diff --git a/web/src/features/auth/SignUpPage.tsx b/web/src/features/auth/SignUpPage.tsx
index 8bf8b3c6fc..a7165bfc4d 100644
--- a/web/src/features/auth/SignUpPage.tsx
+++ b/web/src/features/auth/SignUpPage.tsx
@@ -26,12 +26,12 @@ import {
type PageProps,
} from "@/src/features/auth/SignInPage";
import { PasswordInput } from "@/src/components/design-system/PasswordInput/PasswordInput";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useRouter } from "next/router";
import { getSafeRedirectPath } from "@/src/utils/redirect";
import { reportError } from "@/src/utils/reportError";
import { isJsonParseSyntaxError } from "@/src/features/auth/lib/expectedAuthErrors";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import useLocalStorage from "@/src/components/useLocalStorage";
import { noUrlCheck, StringNoHTMLNonEmpty } from "@langfuse/shared";
import { PASSWORD_SETUP_EMAIL_STORAGE_KEY } from "@/src/features/auth-credentials/lib/credentialsUtils";
diff --git a/web/src/features/auth/components/AuthCloudRegionSwitch.tsx b/web/src/features/auth/components/AuthCloudRegionSwitch.tsx
index adf1c9b372..b4076b30fd 100644
--- a/web/src/features/auth/components/AuthCloudRegionSwitch.tsx
+++ b/web/src/features/auth/components/AuthCloudRegionSwitch.tsx
@@ -1,7 +1,9 @@
import { env } from "@/src/env.mjs";
import { CloudRegionPicker } from "@/src/features/auth/components/CloudRegionPicker";
-import { getAvailableCloudRegionOptions } from "@/src/features/organizations/cloudRegions";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import {
+ getAvailableCloudRegionOptions,
+ useLangfuseCloudRegion,
+} from "@/src/features/organizations";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
export function CloudRegionSwitch({
diff --git a/web/src/features/auth/components/CloudRegionPicker.stories.tsx b/web/src/features/auth/components/CloudRegionPicker.stories.tsx
index ffe9b209f6..84dbffdb2f 100644
--- a/web/src/features/auth/components/CloudRegionPicker.stories.tsx
+++ b/web/src/features/auth/components/CloudRegionPicker.stories.tsx
@@ -1,5 +1,5 @@
import preview from "../../../../.storybook/preview";
-import { getAvailableCloudRegionOptions } from "@/src/features/organizations/cloudRegions";
+import { getAvailableCloudRegionOptions } from "@/src/features/organizations";
import { useState } from "react";
import { CloudRegionPicker } from "./CloudRegionPicker";
diff --git a/web/src/features/auth/components/CloudRegionPicker.tsx b/web/src/features/auth/components/CloudRegionPicker.tsx
index 5144b3dd91..eeda611b16 100644
--- a/web/src/features/auth/components/CloudRegionPicker.tsx
+++ b/web/src/features/auth/components/CloudRegionPicker.tsx
@@ -14,7 +14,7 @@ import {
SelectItem,
SelectTrigger,
} from "@/src/components/ui/select";
-import type { CloudRegion } from "@/src/features/organizations/cloudRegions";
+import type { CloudRegion } from "@/src/features/organizations";
export function CloudRegionPicker({
regions,
diff --git a/web/src/features/auth/lib/createProjectMembershipsOnSignup.ts b/web/src/features/auth/lib/createProjectMembershipsOnSignup.ts
index c6ff16afc3..cfb708f2df 100644
--- a/web/src/features/auth/lib/createProjectMembershipsOnSignup.ts
+++ b/web/src/features/auth/lib/createProjectMembershipsOnSignup.ts
@@ -8,7 +8,7 @@ import {
} from "@/src/features/entitlements/server";
import { shouldAutoEnableV4 } from "@/src/features/events/lib/v4Rollout";
import { getSfdcService } from "@/src/ee/features/sfdc-sync/server";
-import { canCreateOrganizations } from "@/src/features/organizations/server/canCreateOrganizations";
+import { canCreateOrganizations } from "@/src/features/organizations/server";
import { provisionStarterOrganizationForNewUser } from "@/src/features/onboarding/server/onboardingService";
import { projectRoleAccessRights } from "@langfuse/shared";
import { type AdClickIds } from "@/src/features/auth/lib/signupAttribution";
diff --git a/web/src/features/automations/components/automationForm.tsx b/web/src/features/automations/components/automationForm.tsx
index 36017e9125..f20e435131 100644
--- a/web/src/features/automations/components/automationForm.tsx
+++ b/web/src/features/automations/components/automationForm.tsx
@@ -46,7 +46,7 @@ import {
} from "@langfuse/shared";
import { InlineFilterBuilder, MultiSelect } from "@/src/features/filters";
import { DeleteAutomationDialogController } from "./DeleteAutomationDialogController";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useHasProjectAccess } from "@/src/features/rbac";
import { ActionHandlerRegistry } from "./actions";
import { webhookSchema } from "./actions/WebhookActionForm";
diff --git a/web/src/features/blobstorage-integration/components/BlobStorageIntegrationContainer.tsx b/web/src/features/blobstorage-integration/components/BlobStorageIntegrationContainer.tsx
index e00b298861..c18ebb9d80 100644
--- a/web/src/features/blobstorage-integration/components/BlobStorageIntegrationContainer.tsx
+++ b/web/src/features/blobstorage-integration/components/BlobStorageIntegrationContainer.tsx
@@ -11,7 +11,7 @@ import {
} from "@langfuse/shared";
import { buildExportSourceContext } from "@/src/features/analytics-integrations/exportSource";
import { type BlobStorageIntegrationFormSchema } from "@/src/features/blobstorage-integration/types";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useQueryProject } from "@/src/features/projects/hooks";
import { buildBlobStorageFormValues } from "@/src/features/blobstorage-integration/components/formValues";
import { BlobStorageIntegrationForm } from "@/src/features/blobstorage-integration/components/BlobStorageIntegrationForm";
diff --git a/web/src/features/blobstorage-integration/components/StorageProviderFields.tsx b/web/src/features/blobstorage-integration/components/StorageProviderFields.tsx
index 0b33e30dd9..924c5d3d0e 100644
--- a/web/src/features/blobstorage-integration/components/StorageProviderFields.tsx
+++ b/web/src/features/blobstorage-integration/components/StorageProviderFields.tsx
@@ -13,7 +13,7 @@ import { PasswordInput } from "@/src/components/design-system/PasswordInput/Pass
import { SelectInput } from "@/src/components/design-system/SelectInput/SelectInput";
import { Switch } from "@/src/components/design-system/Switch/Switch";
import { BlobStorageIntegrationType } from "@langfuse/shared";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { type BlobStorageFormControl } from "@/src/features/blobstorage-integration/components/formValues";
// Provider selection plus the connection fields whose labels and visibility
diff --git a/web/src/features/command-k-menu/CommandMenu.tsx b/web/src/features/command-k-menu/CommandMenu.tsx
index e8d6c60af1..5e430a7659 100644
--- a/web/src/features/command-k-menu/CommandMenu.tsx
+++ b/web/src/features/command-k-menu/CommandMenu.tsx
@@ -16,7 +16,7 @@ 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";
+import { useOrganizationSettingsPages } from "@/src/features/organizations/OrganizationSettingsPage";
import { useAccountSettingsPages } from "@/src/features/account";
import { useQueryProjectOrOrganization } from "@/src/features/projects/hooks";
import { api } from "@/src/utils/api";
diff --git a/web/src/features/dashboard/DashboardDetailPage.tsx b/web/src/features/dashboard/DashboardDetailPage.tsx
index c1919faa49..99e522eb06 100644
--- a/web/src/features/dashboard/DashboardDetailPage.tsx
+++ b/web/src/features/dashboard/DashboardDetailPage.tsx
@@ -36,7 +36,7 @@ import {
import { useHasProjectAccess } from "@/src/features/rbac";
import { v4 as uuidv4 } from "uuid";
import { useDebounce } from "@/src/hooks/useDebounce";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import {
DashboardGrid,
type DashboardPlacement,
diff --git a/web/src/features/dashboard/ProjectHomePage.tsx b/web/src/features/dashboard/ProjectHomePage.tsx
index 42cee7b7ae..baec42639f 100644
--- a/web/src/features/dashboard/ProjectHomePage.tsx
+++ b/web/src/features/dashboard/ProjectHomePage.tsx
@@ -47,7 +47,7 @@ import Link from "next/link";
import { LockIcon, PencilIcon } from "lucide-react";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { useHasProjectAccess } from "@/src/features/rbac";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+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";
diff --git a/web/src/features/dashboard/components/DashboardTable/ConnectedDashboardTable.tsx b/web/src/features/dashboard/components/DashboardTable/ConnectedDashboardTable.tsx
index 0dfb770693..88fcc725d2 100644
--- a/web/src/features/dashboard/components/DashboardTable/ConnectedDashboardTable.tsx
+++ b/web/src/features/dashboard/components/DashboardTable/ConnectedDashboardTable.tsx
@@ -6,7 +6,7 @@ import { useOrderByState } from "@/src/features/orderBy/hooks/useOrderByState";
import { NumberParam, useQueryParams, withDefault } from "use-query-params";
import { api } from "@/src/utils/api";
import { safeExtract } from "@/src/utils/map-utils";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { EditDialogDashboardContent } from "@/src/features/dashboard/components/EditDialogDashboardContent";
import { CloneFirstDialogController } from "@/src/features/dashboard/components/CloneFirstDialogController";
diff --git a/web/src/features/datasets/DatasetCompareChartsPage.tsx b/web/src/features/datasets/DatasetCompareChartsPage.tsx
index aad3313066..d71d6f46b7 100644
--- a/web/src/features/datasets/DatasetCompareChartsPage.tsx
+++ b/web/src/features/datasets/DatasetCompareChartsPage.tsx
@@ -1,6 +1,10 @@
/* eslint-disable no-nested-ternary */
import { Button } from "@/src/components/ui/button";
-import { MultiSelectKeyValues } from "@/src/features/scores/components/multi-select-key-values";
+import {
+ MultiSelectKeyValues,
+ CompareViewAdapter,
+ getScoreDataTypeIcon,
+} from "@/src/features/scores";
import { FlaskConical, List } from "lucide-react";
import { useRouter } from "next/router";
import { useEffect, useState } from "react";
@@ -13,7 +17,6 @@ import {
import { CreateExperimentsForm } from "@/src/features/experiments/components/CreateExperimentsForm";
import { useHasProjectAccess } from "@/src/features/rbac";
import { DatasetAnalytics } from "@/src/features/datasets/components/DatasetAnalytics";
-import { CompareViewAdapter } from "@/src/features/scores/adapters";
import {
RESOURCE_METRICS,
isEmptyChart,
@@ -23,7 +26,7 @@ import {
getCompareViewChartUnit,
} from "@/src/features/dashboard/lib/chart-data-adapters";
import { Chart } from "@/src/features/widgets/chart-library/Chart";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import Page from "@/src/components/layouts/page";
import { SubHeaderLabel } from "@/src/components/layouts/header";
import {
@@ -33,7 +36,6 @@ import {
SidePanelTitle,
} from "@/src/components/ui/side-panel";
import useLocalStorage from "@/src/components/useLocalStorage";
-import { getScoreDataTypeIcon } from "@/src/features/scores/lib/scoreColumns";
import { useDatasetRunsCompare } from "@/src/features/datasets/hooks/useDatasetRunsCompare";
import { useDatasetRunCompareChartData } from "@/src/features/datasets/hooks/useDatasetRunCompareChartData";
import { Skeleton } from "@/src/components/ui/skeleton";
diff --git a/web/src/features/datasets/DatasetComparePage.tsx b/web/src/features/datasets/DatasetComparePage.tsx
index 720321d25c..26a47013e3 100644
--- a/web/src/features/datasets/DatasetComparePage.tsx
+++ b/web/src/features/datasets/DatasetComparePage.tsx
@@ -1,6 +1,6 @@
import { Button } from "@/src/components/ui/button";
import { DatasetCompareRunsTable } from "@/src/features/datasets/components/DatasetCompareRunsTable";
-import { MultiSelectKeyValues } from "@/src/features/scores/components/multi-select-key-values";
+import { MultiSelectKeyValues } from "@/src/features/scores";
import { FlaskConical, List } from "lucide-react";
import { useRouter } from "next/router";
import { useEffect, useState } from "react";
@@ -11,7 +11,7 @@ import {
} from "@/src/components/ui/dialog";
import { CreateExperimentsForm } from "@/src/features/experiments/components/CreateExperimentsForm";
import { useHasProjectAccess } from "@/src/features/rbac";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import Page from "@/src/components/layouts/page";
import {
DATASET_RUN_COMPARE_TABS,
diff --git a/web/src/features/datasets/DatasetExperimentsPage.tsx b/web/src/features/datasets/DatasetExperimentsPage.tsx
index 6646dfbfbb..44ef47d1e7 100644
--- a/web/src/features/datasets/DatasetExperimentsPage.tsx
+++ b/web/src/features/datasets/DatasetExperimentsPage.tsx
@@ -1,6 +1,6 @@
import { DatasetRunsTable } from "@/src/features/datasets/components/DatasetRunsTable";
import { api } from "@/src/utils/api";
-import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
+import { DetailPageNav } from "@/src/features/navigate-detail-pages";
import { useState, useCallback } from "react";
import { FlaskConical, MoreVertical } from "lucide-react";
import { useHasProjectAccess } from "@/src/features/rbac";
@@ -16,7 +16,7 @@ import { CreateExperimentsForm } from "@/src/features/experiments/components/Cre
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
import { DatasetAnalytics } from "@/src/features/datasets/components/DatasetAnalytics";
import { RESOURCE_METRICS } from "@/src/features/dashboard/lib/score-analytics-utils";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import Page from "@/src/components/layouts/page";
import {
getDatasetTabs,
diff --git a/web/src/features/datasets/DatasetItemsPage.tsx b/web/src/features/datasets/DatasetItemsPage.tsx
index 21f9c89bdb..63f8220327 100644
--- a/web/src/features/datasets/DatasetItemsPage.tsx
+++ b/web/src/features/datasets/DatasetItemsPage.tsx
@@ -4,7 +4,7 @@ import {
DATASET_TABS,
} from "@/src/features/navigation/utils/dataset-tabs";
import { DatasetItemsTable } from "@/src/features/datasets/components/DatasetItemsTable";
-import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
+import { DetailPageNav } from "@/src/features/navigate-detail-pages";
import { NewDatasetItemButton } from "@/src/features/datasets/components/NewDatasetItemButton";
import { UploadDatasetCsvButton } from "@/src/features/datasets/components/UploadDatasetCsvButton";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/features/datasets/DatasetRunPage.tsx b/web/src/features/datasets/DatasetRunPage.tsx
index 9b1b4bf04d..1265295d65 100644
--- a/web/src/features/datasets/DatasetRunPage.tsx
+++ b/web/src/features/datasets/DatasetRunPage.tsx
@@ -2,7 +2,7 @@ import { Button } from "@/src/components/ui/button";
import { JSONView } from "@/src/components/ui/CodeJsonViewer";
import { DatasetRunItemsByRunTable } from "@/src/features/datasets/components/DatasetRunItemsByRunTable";
import { DeleteDatasetRunDialogController } from "@/src/features/datasets/components/DeleteDatasetRunDialogController";
-import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
+import { DetailPageNav } from "@/src/features/navigate-detail-pages";
import { api } from "@/src/utils/api";
import { Columns3, MoreVertical, Trash } from "lucide-react";
import Link from "next/link";
diff --git a/web/src/features/datasets/components/DatasetCompareRunsTable.tsx b/web/src/features/datasets/components/DatasetCompareRunsTable.tsx
index 61636e8c1b..6ea8985ff8 100644
--- a/web/src/features/datasets/components/DatasetCompareRunsTable.tsx
+++ b/web/src/features/datasets/components/DatasetCompareRunsTable.tsx
@@ -13,7 +13,7 @@ import { usePaginationState } from "@/src/hooks/usePaginationState";
import { api } from "@/src/utils/api";
import { Checkbox } from "@/src/components/design-system/Checkbox/Checkbox";
import { useRowHeightLocalStorage } from "@/src/components/table/data-table-row-height-switch";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import {
DatasetCompareFieldsProvider,
useDatasetCompareFields,
diff --git a/web/src/features/datasets/components/DatasetItemDetailPage.tsx b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
index 7aa06ddaae..3b76930888 100644
--- a/web/src/features/datasets/components/DatasetItemDetailPage.tsx
+++ b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
@@ -4,7 +4,7 @@ import Page from "@/src/components/layouts/page";
import { ActionButton } from "@/src/components/ActionButton";
import { Button } from "@/src/components/ui/button";
import { NewDatasetItemFromExistingObjectDialogController } from "@/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController";
-import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
+import { DetailPageNav } from "@/src/features/navigate-detail-pages";
import { api } from "@/src/utils/api";
import { CopyIcon, ListTree, MoreVertical, Pencil, Trash2 } from "lucide-react";
import Link from "next/link";
diff --git a/web/src/features/datasets/components/DatasetItemsTable.tsx b/web/src/features/datasets/components/DatasetItemsTable.tsx
index 294413b5e7..13b76ccfa9 100644
--- a/web/src/features/datasets/components/DatasetItemsTable.tsx
+++ b/web/src/features/datasets/components/DatasetItemsTable.tsx
@@ -18,7 +18,7 @@ import {
BatchExportTableName,
} from "@langfuse/shared";
import { type LangfuseColumnDef } from "@/src/components/table/types";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { useEffect, useState } from "react";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
import {
diff --git a/web/src/features/datasets/components/DatasetRunItemsByItemTable.tsx b/web/src/features/datasets/components/DatasetRunItemsByItemTable.tsx
index 6b7347f115..1f0f62a38d 100644
--- a/web/src/features/datasets/components/DatasetRunItemsByItemTable.tsx
+++ b/web/src/features/datasets/components/DatasetRunItemsByItemTable.tsx
@@ -11,7 +11,7 @@ import {
useColumnVisibility,
} from "@/src/features/column-visibility";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { useEffect, useMemo } from "react";
import { useRowHeightLocalStorage } from "@/src/components/table/data-table-row-height-switch";
import { ListTree } from "lucide-react";
diff --git a/web/src/features/datasets/components/DatasetRunItemsByRunTable.tsx b/web/src/features/datasets/components/DatasetRunItemsByRunTable.tsx
index 9c1132eb35..eafa897a75 100644
--- a/web/src/features/datasets/components/DatasetRunItemsByRunTable.tsx
+++ b/web/src/features/datasets/components/DatasetRunItemsByRunTable.tsx
@@ -11,7 +11,7 @@ import {
useColumnVisibility,
} from "@/src/features/column-visibility";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { useEffect, useMemo } from "react";
import { useRowHeightLocalStorage } from "@/src/components/table/data-table-row-height-switch";
import { ListTree } from "lucide-react";
diff --git a/web/src/features/datasets/components/DatasetRunsTable.tsx b/web/src/features/datasets/components/DatasetRunsTable.tsx
index 70679fa87f..77034a8ae9 100644
--- a/web/src/features/datasets/components/DatasetRunsTable.tsx
+++ b/web/src/features/datasets/components/DatasetRunsTable.tsx
@@ -3,7 +3,7 @@ import { DataTable } from "@/src/components/table/data-table";
import { type LangfuseColumnDef } from "@/src/components/table/types";
import { createDropdownTableColumn } from "@/src/components/design-system/table/columns/createDropdownTableColumn";
import { createLinkTableColumn } from "@/src/components/design-system/table/columns/createLinkTableColumn";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { api } from "@/src/utils/api";
import { formatIntervalSeconds } from "@/src/utils/dates";
import { useQueryParams, withDefault, NumberParam } from "use-query-params";
diff --git a/web/src/features/datasets/components/DatasetsTable.tsx b/web/src/features/datasets/components/DatasetsTable.tsx
index 0bb792a688..9d24f1e25c 100644
--- a/web/src/features/datasets/components/DatasetsTable.tsx
+++ b/web/src/features/datasets/components/DatasetsTable.tsx
@@ -6,7 +6,7 @@ import { type LangfuseColumnDef } from "@/src/components/table/types";
import { DeleteDatasetDialogController } from "@/src/features/datasets/components/DeleteDatasetDialogController";
import { DatasetSchemaHoverCard } from "@/src/features/datasets/components/DatasetSchemaHoverCard";
import { UpdateDatasetDialogController } from "@/src/features/datasets/components/UpdateDatasetDialogController";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { api } from "@/src/utils/api";
import { withDefault, useQueryParam, StringParam } from "use-query-params";
import { type RouterOutput } from "@/src/utils/types";
@@ -42,9 +42,11 @@ import {
} from "@/src/features/datasets/store/datasetsTableStore";
import { useDatasetsTableSelectionSync } from "@/src/features/datasets/hooks/useDatasetsTableSelectionSync";
import { useStore } from "zustand";
-import { TableSelectionManager } from "@/src/features/table/components/TableSelectionManager";
-import { TableActionMenu } from "@/src/features/table/components/TableActionMenu";
-import { type TableAction } from "@/src/features/table/types";
+import {
+ TableSelectionManager,
+ TableActionMenu,
+ type TableAction,
+} from "@/src/features/table";
import { showSuccessToast } from "@/src/features/notifications";
import { Pen, Trash } from "lucide-react";
diff --git a/web/src/features/datasets/server/dataset-router.ts b/web/src/features/datasets/server/dataset-router.ts
index 5d7b81a4e1..c9351bf4ae 100644
--- a/web/src/features/datasets/server/dataset-router.ts
+++ b/web/src/features/datasets/server/dataset-router.ts
@@ -108,7 +108,7 @@ import {
RemoteExperimentHeadersSchema,
} from "@/src/features/datasets/server/remoteExperimentHelpers";
import { v4 } from "uuid";
-import { createBatchActionJob } from "@/src/features/table/server/createBatchActionJob";
+import { createBatchActionJob } from "@/src/features/table/server";
// Batch size kept small (100) as items may have large input/output/metadata JSON
const DUPLICATE_DATASET_ITEMS_BATCH_SIZE = 100;
diff --git a/web/src/features/evals/components/code-eval-test-run-card.tsx b/web/src/features/evals/components/code-eval-test-run-card.tsx
index 9c9aa91f11..2bc17f7c34 100644
--- a/web/src/features/evals/components/code-eval-test-run-card.tsx
+++ b/web/src/features/evals/components/code-eval-test-run-card.tsx
@@ -12,7 +12,7 @@ import {
} from "@/src/features/evals/hooks/usePreviewData";
import { useFirstEvalPreviewPointer } from "@/src/features/evals/hooks/useEvalPreviewNavigation";
import { useReadPath } from "@/src/features/events";
-import { detailPageListKeys } from "@/src/features/navigate-detail-pages/context";
+import { detailPageListKeys } from "@/src/features/navigate-detail-pages";
import { api, type RouterOutputs } from "@/src/utils/api";
import {
deepParseJson,
diff --git a/web/src/features/evals/components/eval-templates-table.tsx b/web/src/features/evals/components/eval-templates-table.tsx
index c1bac7bd8c..9f86d9d1dc 100644
--- a/web/src/features/evals/components/eval-templates-table.tsx
+++ b/web/src/features/evals/components/eval-templates-table.tsx
@@ -13,7 +13,7 @@ import { useEffect, useMemo, useState } from "react";
import { usePaginationState } from "@/src/hooks/usePaginationState";
import { TablePeekViewEvaluatorTemplateDetail } from "@/src/components/table/peek/peek-evaluator-template-detail";
import { usePeekNavigation } from "@/src/components/table/peek/hooks/usePeekNavigation";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { Button } from "@/src/components/ui/button";
import { useRouter } from "next/router";
import {
diff --git a/web/src/features/evals/components/evaluator-detail.tsx b/web/src/features/evals/components/evaluator-detail.tsx
index 355440300e..2cb163d4d0 100644
--- a/web/src/features/evals/components/evaluator-detail.tsx
+++ b/web/src/features/evals/components/evaluator-detail.tsx
@@ -3,7 +3,7 @@ import { api } from "@/src/utils/api";
import { useRouter } from "next/router";
import EvalLogTable from "@/src/features/evals/components/eval-log";
import { StatusBadge } from "@/src/components/ui/StatusBadge/StatusBadge";
-import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
+import { DetailPageNav } from "@/src/features/navigate-detail-pages";
import Page from "@/src/components/layouts/page";
import { LevelCountsDisplay } from "@/src/components/level-counts-display";
import { generateJobExecutionCounts } from "@/src/features/evals/utils/job-execution-utils";
diff --git a/web/src/features/evals/components/evaluator-table.tsx b/web/src/features/evals/components/evaluator-table.tsx
index 2be3b0f2c3..be6b715f55 100644
--- a/web/src/features/evals/components/evaluator-table.tsx
+++ b/web/src/features/evals/components/evaluator-table.tsx
@@ -11,7 +11,7 @@ import { ResizableFilterLayout } from "@/src/components/table/resizable-filter-l
import { type LangfuseColumnDef } from "@/src/components/table/types";
import { useColumnVisibility } from "@/src/features/column-visibility";
import { EvaluatorFilterCell } from "@/src/features/evals/components/EvaluatorFilterCell";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { TableSearchBar, toObservedOptions } from "@/src/features/search-bar";
import { LEGACY_EVALUATORS_FIELD_REGISTRY } from "@/src/features/evals/constants/tableSearchRegistry";
diff --git a/web/src/features/evals/components/variable-mapping-card.tsx b/web/src/features/evals/components/variable-mapping-card.tsx
index 38025e8b11..0efeb43253 100644
--- a/web/src/features/evals/components/variable-mapping-card.tsx
+++ b/web/src/features/evals/components/variable-mapping-card.tsx
@@ -47,7 +47,7 @@ import {
import { useFieldArray, type UseFormReturn } from "react-hook-form";
import { Input } from "@/src/components/ui/input";
import { Switch } from "@/src/components/design-system/Switch/Switch";
-import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
+import { DetailPageNav } from "@/src/features/navigate-detail-pages";
import { useEvalConfigMappingData } from "@/src/features/evals/hooks/useEvalConfigMappingData";
import { useEffect, useState } from "react";
import { Alert } from "@/src/components/design-system/Alert/Alert";
diff --git a/web/src/features/evals/hooks/useEvalCapabilities.ts b/web/src/features/evals/hooks/useEvalCapabilities.ts
index 7dfdbb6235..1eb9cc4093 100644
--- a/web/src/features/evals/hooks/useEvalCapabilities.ts
+++ b/web/src/features/evals/hooks/useEvalCapabilities.ts
@@ -1,6 +1,6 @@
import { useSession } from "next-auth/react";
import { api } from "@/src/utils/api";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useReadPath } from "@/src/features/events";
import { useIsCodeEvalEnabled } from "@/src/features/evals/hooks/useIsCodeEvalEnabled";
import { useForceV3Experience } from "@/src/features/v4-migration/useForceV3Experience";
diff --git a/web/src/features/evals/hooks/useEvalPreviewNavigation.ts b/web/src/features/evals/hooks/useEvalPreviewNavigation.ts
index bafc06fe7d..20ac567f50 100644
--- a/web/src/features/evals/hooks/useEvalPreviewNavigation.ts
+++ b/web/src/features/evals/hooks/useEvalPreviewNavigation.ts
@@ -5,7 +5,7 @@ import {
type ObservationDetailPageListEntry,
type TraceDetailPageListEntry,
useFirstDetailPageListEntry,
-} from "@/src/features/navigate-detail-pages/context";
+} from "@/src/features/navigate-detail-pages";
import { type NextRouter } from "next/router";
import {
EvalTargetObject,
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 e7eb16d4f2..309900c039 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
@@ -20,7 +20,7 @@ import type {
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/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useProject } from "@/src/features/projects/hooks";
import { prepareNameForSave } from "@/src/features/evals/v2/fns/prepareNameForSave";
import { getFilterAnalyticsProperties } from "@/src/features/evals/v2/fns/getFilterAnalyticsProperties";
diff --git a/web/src/features/evals/v2/components/Rules/RulesTable/RulesTable.tsx b/web/src/features/evals/v2/components/Rules/RulesTable/RulesTable.tsx
index 888ab73691..2acedaa198 100644
--- a/web/src/features/evals/v2/components/Rules/RulesTable/RulesTable.tsx
+++ b/web/src/features/evals/v2/components/Rules/RulesTable/RulesTable.tsx
@@ -33,7 +33,7 @@ import { RuleNameCell } from "@/src/features/evals/v2/components/Rules/RulesTabl
import { RulesTableToolbar } from "@/src/features/evals/v2/components/Rules/RulesTable/components/RulesTableToolbar/RulesTableToolbar";
import { usePaginationState } from "@/src/hooks/usePaginationState";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { TableSelectionManager } from "@/src/features/table/components/TableSelectionManager";
+import { TableSelectionManager } from "@/src/features/table";
import { RuleFilterPills } from "@/src/features/evals/v2/components/Rules/RuleFilterPills/RuleFilterPills";
import {
useColumnOrder,
diff --git a/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx b/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
index 16161b8c11..981cae5ae4 100644
--- a/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
+++ b/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
@@ -32,7 +32,7 @@ import type { NormalizedEvaluatorDefinition } from "../server/evaluators/evaluat
import { api } from "@/src/utils/api";
import { trpcErrorToast } from "@/src/utils/trpcErrorToast";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { detailPageListKeys } from "@/src/features/navigate-detail-pages/context";
+import { detailPageListKeys } from "@/src/features/navigate-detail-pages";
import { TableHeaderControls } from "@/src/components/table/table-header-controls";
import { useTableDateRange } from "@/src/hooks/useTableDateRange";
import { toAbsoluteTimeRange } from "@/src/utils/date-range-utils";
@@ -48,7 +48,7 @@ import { safeRandomUUID } from "@/src/utils/safe-random-uuid";
import { EvaluatorSavedDialogContainer } from "@/src/features/evals/v2/components/Evaluators/EvaluatorSavedDialogContainer/EvaluatorSavedDialogContainer";
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/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useProject } from "@/src/features/projects/hooks";
import { EvaluatorBlockedBanner } from "@/src/features/evals/v2/components/Evaluators/EvaluatorBlockedBanner/EvaluatorBlockedBanner";
import { useIsMobile } from "@/src/hooks/use-mobile";
diff --git a/web/src/features/evals/v2/pages/EvaluatorsPage.tsx b/web/src/features/evals/v2/pages/EvaluatorsPage.tsx
index 764247211c..0d5e5cf5ae 100644
--- a/web/src/features/evals/v2/pages/EvaluatorsPage.tsx
+++ b/web/src/features/evals/v2/pages/EvaluatorsPage.tsx
@@ -40,7 +40,7 @@ import {
} from "@/src/features/column-visibility";
import { useHasProjectAccess } from "@/src/features/rbac";
import { useEvaluatorAlerts } from "@/src/features/evals/v2/hooks/useEvaluatorAlerts";
-import { TableSelectionManager } from "@/src/features/table/components/TableSelectionManager";
+import { TableSelectionManager } from "@/src/features/table";
import { usePaginationState } from "@/src/hooks/usePaginationState";
import { useSidebarFilterState } from "@/src/features/filters";
import { TableSearchBar, toObservedOptions } from "@/src/features/search-bar";
diff --git a/web/src/features/events/components/EventsTable.tsx b/web/src/features/events/components/EventsTable.tsx
index fa1c5ed9b3..55b35dd3e7 100644
--- a/web/src/features/events/components/EventsTable.tsx
+++ b/web/src/features/events/components/EventsTable.tsx
@@ -114,16 +114,18 @@ import { usePeekNavigation } from "@/src/components/table/peek/hooks/usePeekNavi
import {
detailPageListKeys,
useDetailPageLists,
-} from "@/src/features/navigate-detail-pages/context";
+} from "@/src/features/navigate-detail-pages";
import { useTableViewManager } from "@/src/components/table/table-view-presets/hooks/useTableViewManager";
import {
demoteViewOnUserFilterEdit,
type ExplicitFilterStateChange,
} from "@/src/features/events/lib/demoteViewOnUserFilterEdit";
-import { TableSelectionManager } from "@/src/features/table/components/TableSelectionManager";
-import { useSelectAll } from "@/src/features/table/hooks/useSelectAll";
-import { TableActionMenu } from "@/src/features/table/components/TableActionMenu";
-import { type TableAction } from "@/src/features/table/types";
+import {
+ TableSelectionManager,
+ useSelectAll,
+ TableActionMenu,
+ type TableAction,
+} from "@/src/features/table";
import { type DataTablePeekViewProps } from "@/src/components/table/peek";
import { scoreFilters, useScoreColumns } from "@/src/features/scores";
import { useEventsTableData } from "@/src/features/events/hooks/useEventsTableData";
diff --git a/web/src/features/experiments/ExperimentResultsPage.tsx b/web/src/features/experiments/ExperimentResultsPage.tsx
index d6971dfe6f..053df98684 100644
--- a/web/src/features/experiments/ExperimentResultsPage.tsx
+++ b/web/src/features/experiments/ExperimentResultsPage.tsx
@@ -15,7 +15,7 @@ import { useExperimentAccess } from "@/src/features/experiments/hooks/useExperim
import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { ExperimentSelectionControls } from "@/src/features/experiments/components/ExperimentSelectionControls";
import { useIoRenderModeLocalStorage } from "@/src/components/table/data-table-io-render-mode-switch";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import {
diffModeChangedProps,
layoutChangedProps,
diff --git a/web/src/features/experiments/ExperimentsPage.tsx b/web/src/features/experiments/ExperimentsPage.tsx
index a51d6191f9..2091068f90 100644
--- a/web/src/features/experiments/ExperimentsPage.tsx
+++ b/web/src/features/experiments/ExperimentsPage.tsx
@@ -8,7 +8,7 @@ import {
import { CreateExperimentsForm } from "@/src/features/experiments/components/CreateExperimentsForm";
import { ExperimentsTable } from "@/src/features/experiments/components/table";
import { useExperimentAccess } from "@/src/features/experiments/hooks/useExperimentAccess";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useHasProjectAccess } from "@/src/features/rbac";
import { V4MigrationDelayBadge } from "@/src/features/v4-migration/V4MigrationDelayBadge";
import { api } from "@/src/utils/api";
diff --git a/web/src/features/experiments/components/ExperimentMetricStrip.tsx b/web/src/features/experiments/components/ExperimentMetricStrip.tsx
index 8cec310769..79cbded369 100644
--- a/web/src/features/experiments/components/ExperimentMetricStrip.tsx
+++ b/web/src/features/experiments/components/ExperimentMetricStrip.tsx
@@ -32,7 +32,7 @@ import {
metricStripTriggerClasses,
} from "@/src/components/metric-strip/MetricStripTrigger";
import { useExperimentStripMetric } from "@/src/features/experiments/hooks/useExperimentStripMetric";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { chartMetricChangedProps } from "@/src/features/experiments/lib/analytics";
/**
diff --git a/web/src/features/experiments/components/ExperimentSelectionControls.tsx b/web/src/features/experiments/components/ExperimentSelectionControls.tsx
index 29a1528540..42d2c8e2cf 100644
--- a/web/src/features/experiments/components/ExperimentSelectionControls.tsx
+++ b/web/src/features/experiments/components/ExperimentSelectionControls.tsx
@@ -3,7 +3,7 @@ import { useRouter } from "next/router";
import { type UrlUpdateType } from "use-query-params";
import { useExperimentComparisonAutoSelect } from "@/src/features/experiments/hooks/useExperimentComparisonAutoSelect";
import { useExperimentNames } from "@/src/features/experiments/hooks/useExperimentNames";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import {
comparisonChangedProps,
type ExperimentComparisonSource,
diff --git a/web/src/features/experiments/components/table/ExperimentItemsTable.tsx b/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
index c09c749a78..2d25a48fc2 100644
--- a/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
+++ b/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
@@ -11,8 +11,12 @@ import { useEffect, useMemo, useState, useRef, useCallback } from "react";
import { RunEvaluationDialog } from "@/src/features/batch-actions/components/RunEvaluationDialog";
import { LightbulbIcon } from "lucide-react";
import { useHasProjectAccess } from "@/src/features/rbac";
-import { TableActionMenu } from "@/src/features/table/components/TableActionMenu";
-import { type TableAction } from "@/src/features/table/types";
+import {
+ TableActionMenu,
+ type TableAction,
+ TableSelectionManager,
+ useSelectAll,
+} from "@/src/features/table";
import { usePaginationState } from "@/src/hooks/usePaginationState";
import { useSidebarFilterState } from "@/src/features/filters";
import {
@@ -55,7 +59,7 @@ import { createIdTableColumn } from "@/src/components/design-system/table/column
import { createIOTableColumn } from "@/src/components/design-system/table/columns/createIOTableColumn";
import { usePeekNavigation } from "@/src/components/table/peek/hooks/usePeekNavigation";
import { ExperimentGridView } from "./ExperimentGridView";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { useTableViewManager } from "@/src/components/table/table-view-presets/hooks/useTableViewManager";
import { useTableViewFilterChange } from "@/src/components/table/table-view-presets/hooks/useTableViewFilterChange";
import { TableSearchBar, toObservedOptions } from "@/src/features/search-bar";
@@ -65,8 +69,6 @@ import {
reconcileFilterTargets,
hasAmbiguousTargetChange,
} from "@/src/features/experiments/lib/reconcileFilterTargets";
-import { TableSelectionManager } from "@/src/features/table/components/TableSelectionManager";
-import { useSelectAll } from "@/src/features/table/hooks/useSelectAll";
import { useExperimentItemsTableData } from "../../hooks/useExperimentItemsTableData";
import {
type ExperimentItemsTableRow,
diff --git a/web/src/features/experiments/components/table/ExperimentsTable.tsx b/web/src/features/experiments/components/table/ExperimentsTable.tsx
index abdc257b11..5d9d145e7b 100644
--- a/web/src/features/experiments/components/table/ExperimentsTable.tsx
+++ b/web/src/features/experiments/components/table/ExperimentsTable.tsx
@@ -47,18 +47,20 @@ import { createDateTableColumn } from "@/src/components/design-system/table/colu
import { createNumberTableColumn } from "@/src/components/design-system/table/columns/createNumberTableColumn";
import { createIOTableColumn } from "@/src/components/design-system/table/columns/createIOTableColumn";
import Link from "next/link";
-import { TableActionMenu } from "@/src/features/table/components/TableActionMenu";
-import { type TableAction } from "@/src/features/table/types";
+import {
+ TableActionMenu,
+ type TableAction,
+ TableSelectionManager,
+} from "@/src/features/table";
import { Badge } from "@/src/components/ui/badge";
import { type VisibilityState } from "@tanstack/react-table";
import { useStore } from "zustand";
import { createIdTableColumn } from "@/src/components/design-system/table/columns/createIdTableColumn";
import { Skeleton } from "@/src/components/ui/skeleton";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { useTableViewManager } from "@/src/components/table/table-view-presets/hooks/useTableViewManager";
import { useTableViewFilterChange } from "@/src/components/table/table-view-presets/hooks/useTableViewFilterChange";
import { useRouter } from "next/router";
-import { TableSelectionManager } from "@/src/features/table/components/TableSelectionManager";
import {
collectPresentScoreKeys,
collectScoreNameCoverage,
diff --git a/web/src/features/experiments/hooks/useExperimentPeekNavigation.ts b/web/src/features/experiments/hooks/useExperimentPeekNavigation.ts
index 1c333fc16e..8b29e48fab 100644
--- a/web/src/features/experiments/hooks/useExperimentPeekNavigation.ts
+++ b/web/src/features/experiments/hooks/useExperimentPeekNavigation.ts
@@ -2,7 +2,7 @@ import { useCallback, useMemo } from "react";
import { useQueryParam, StringParam } from "use-query-params";
import { useRouter } from "next/router";
import { useExperimentResultsState } from "./useExperimentResultsState";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { getPathnameWithoutBasePath } from "@/src/utils/api";
type ExperimentTarget = {
diff --git a/web/src/features/in-app-agent/components/InAppAgentDisabledDialog.tsx b/web/src/features/in-app-agent/components/InAppAgentDisabledDialog.tsx
index 7728f260be..2c65c179ad 100644
--- a/web/src/features/in-app-agent/components/InAppAgentDisabledDialog.tsx
+++ b/web/src/features/in-app-agent/components/InAppAgentDisabledDialog.tsx
@@ -7,7 +7,7 @@ import {
DialogHeader,
DialogTitle,
} from "@/src/components/ui/dialog";
-import { AIFeaturesDisabledNotice } from "@/src/features/organizations/components/AIFeaturesDisabledNotice";
+import { AIFeaturesDisabledNotice } from "@/src/features/organizations";
export function InAppAgentDisabledDialog({
open,
diff --git a/web/src/features/mixpanel-integration/MixpanelIntegrationPage.tsx b/web/src/features/mixpanel-integration/MixpanelIntegrationPage.tsx
index b53aa99605..75e5ea9b33 100644
--- a/web/src/features/mixpanel-integration/MixpanelIntegrationPage.tsx
+++ b/web/src/features/mixpanel-integration/MixpanelIntegrationPage.tsx
@@ -21,7 +21,7 @@ import {
TooltipTrigger,
TooltipContent,
} from "@/src/components/ui/tooltip";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import {
mixpanelIntegrationFormSchema,
MIXPANEL_REGIONS,
@@ -41,7 +41,7 @@ import {
getExportSourceUnavailableMessage,
isExportSourceSelectable,
} from "@/src/features/analytics-integrations/exportSource";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useQueryProject } from "@/src/features/projects/hooks";
import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
diff --git a/web/src/features/monitors/components/MonitorPagePermissions.tsx b/web/src/features/monitors/components/MonitorPagePermissions.tsx
index 5742734222..5b650e3cf0 100644
--- a/web/src/features/monitors/components/MonitorPagePermissions.tsx
+++ b/web/src/features/monitors/components/MonitorPagePermissions.tsx
@@ -2,7 +2,7 @@ import { type ReactNode } from "react";
import { ErrorPage } from "@/src/components/error-page";
import { SupportOrUpgradePage } from "@/src/ee/features/billing/components/SupportOrUpgradePage";
-import { useLangfuseV4WriteMode } from "@/src/features/organizations/hooks";
+import { useLangfuseV4WriteMode } from "@/src/features/organizations";
import { useHasProjectAccess } from "@/src/features/rbac";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
diff --git a/web/src/features/navigate-detail-pages/index.ts b/web/src/features/navigate-detail-pages/index.ts
new file mode 100644
index 0000000000..6ea1807422
--- /dev/null
+++ b/web/src/features/navigate-detail-pages/index.ts
@@ -0,0 +1,13 @@
+// The navigate-detail-pages feature's public client surface (RFC rule 8).
+// Named re-exports only — exactly what other features already imported.
+export {
+ DetailPageListsProvider,
+ detailPageListKeys,
+ useDetailPageLists,
+ useFirstDetailPageListEntry,
+ type EventDetailPageListEntry,
+ type ListEntry,
+ type ObservationDetailPageListEntry,
+ type TraceDetailPageListEntry,
+} from "@/src/features/navigate-detail-pages/context";
+export { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
diff --git a/web/src/features/organizations/index.ts b/web/src/features/organizations/index.ts
index 34fb990cd1..52573e14bb 100644
--- a/web/src/features/organizations/index.ts
+++ b/web/src/features/organizations/index.ts
@@ -1,2 +1,31 @@
-export { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
-export { useOrganizationSettingsPages } from "@/src/features/organizations/OrganizationSettingsPage";
+// The organizations feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported from this
+// feature's client modules.
+//
+// `server/` is a separate door. organizationsRouter stays a direct import
+// from the tRPC root. canCreateOrganizations, organizationNameSchema, and
+// buildAdminOrgContext live on `server/index.ts` so this client barrel
+// never reaches auth/onboarding.
+//
+// ConnectedNewOrganizationForm, OrganizationProjectOverview, and
+// useOrganizationSettingsPages stay off this door. The barrel is already
+// imported by projects/hooks (useQueryOrganization); adding the settings
+// page would pull ai-gateway and search-bar into every useQueryProject
+// consumer, including filter-builder on the filters door that
+// ComposerTokens already imports.
+//
+// filter-builder keeps importing useLangfuseCloudRegion and
+// openAIFeaturesSettings by file path for the same reason.
+export {
+ getAvailableCloudRegionOptions,
+ getCloudRegionAuthUrl,
+ isRegionProduction,
+ type CloudRegion,
+ type CloudRegionName,
+} from "@/src/features/organizations/cloudRegions";
+export { AIFeaturesDisabledNotice } from "@/src/features/organizations/components/AIFeaturesDisabledNotice";
+export {
+ useLangfuseCloudRegion,
+ useLangfuseV4WriteMode,
+ useQueryOrganization,
+} from "@/src/features/organizations/hooks";
diff --git a/web/src/features/organizations/server/index.ts b/web/src/features/organizations/server/index.ts
new file mode 100644
index 0000000000..15694984af
--- /dev/null
+++ b/web/src/features/organizations/server/index.ts
@@ -0,0 +1,6 @@
+// The organizations feature's public server surface (RFC rules 8 and 10).
+// organizationsRouter stays a direct import from the tRPC root, which is
+// not a feature.
+export { buildAdminOrgContext } from "@/src/features/organizations/server/adminOrgContext";
+export { canCreateOrganizations } from "@/src/features/organizations/server/canCreateOrganizations";
+export { organizationNameSchema } from "@/src/features/organizations/utils/organizationNameSchema";
diff --git a/web/src/features/posthog-analytics/index.ts b/web/src/features/posthog-analytics/index.ts
index 77dcc6e0c2..28157ef98b 100644
--- a/web/src/features/posthog-analytics/index.ts
+++ b/web/src/features/posthog-analytics/index.ts
@@ -16,4 +16,8 @@ export {
V4_BETA_ENABLED_POSTHOG_PROPERTY,
} from "@/src/features/posthog-analytics/usePostHogClientCapture";
-export { isPostHogClientEnabled } from "@/src/features/posthog-analytics/productAnalyticsAvailability";
+export {
+ getPostHogClientConfig,
+ isPostHogClientEnabled,
+ isProductAnalyticsAvailable,
+} from "@/src/features/posthog-analytics/productAnalyticsAvailability";
diff --git a/web/src/features/posthog-integration/PostHogIntegrationPage.tsx b/web/src/features/posthog-integration/PostHogIntegrationPage.tsx
index 8ff90db8f9..d014d2b8e4 100644
--- a/web/src/features/posthog-integration/PostHogIntegrationPage.tsx
+++ b/web/src/features/posthog-integration/PostHogIntegrationPage.tsx
@@ -4,7 +4,7 @@ import Header from "@/src/components/layouts/header";
import ContainerPage from "@/src/components/layouts/container-page";
import { StatusBadge } from "@/src/components/ui/StatusBadge/StatusBadge";
import { Button } from "@/src/components/design-system/Button/Button";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { PostHogStatusSection } from "@/src/features/posthog-integration/components/PostHogStatusSection";
import {
PostHogIntegrationForm,
@@ -20,7 +20,7 @@ import {
buildExportSourceContext,
getExportSourceFormValue,
} from "@/src/features/analytics-integrations/exportSource";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useQueryProject } from "@/src/features/projects/hooks";
import { useHasProjectAccess } from "@/src/features/rbac";
import { api } from "@/src/utils/api";
diff --git a/web/src/features/projects/hooks.ts b/web/src/features/projects/hooks.ts
index 0f70535a0d..d4163a742f 100644
--- a/web/src/features/projects/hooks.ts
+++ b/web/src/features/projects/hooks.ts
@@ -1,4 +1,4 @@
-import { useQueryOrganization } from "@/src/features/organizations/hooks";
+import { useQueryOrganization } from "@/src/features/organizations";
import { api } from "@/src/utils/api";
import { useSession } from "next-auth/react";
import { useRouter } from "next/router";
diff --git a/web/src/features/projects/server/projectsRouter.ts b/web/src/features/projects/server/projectsRouter.ts
index 73b3db72f7..9bf64e43ff 100644
--- a/web/src/features/projects/server/projectsRouter.ts
+++ b/web/src/features/projects/server/projectsRouter.ts
@@ -23,7 +23,7 @@ import {
import { randomUUID } from "crypto";
import { LangfuseConflictError, StringNoHTMLNonEmpty } from "@langfuse/shared";
import type { PrismaClient } from "@langfuse/shared/src/db";
-import { buildAdminOrgContext } from "@/src/features/organizations/server/adminOrgContext";
+import { buildAdminOrgContext } from "@/src/features/organizations/server";
import { emitChbProjectEvent } from "@/src/ee/features/billing/server/chb/chbProjectEvents";
export const projectsRouter = createTRPCRouter({
diff --git a/web/src/features/prompts/PromptMetricsPage.tsx b/web/src/features/prompts/PromptMetricsPage.tsx
index 16adb9716a..281aab1782 100644
--- a/web/src/features/prompts/PromptMetricsPage.tsx
+++ b/web/src/features/prompts/PromptMetricsPage.tsx
@@ -18,17 +18,17 @@ import { Skeleton } from "@/src/components/ui/skeleton";
import { type ScoreAggregate } from "@langfuse/shared";
import useColumnOrder from "@/src/features/column-visibility/hooks/useColumnOrder";
import Page from "@/src/components/layouts/page";
-import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
+import { DetailPageNav } from "@/src/features/navigate-detail-pages";
import { TruncatedLabels } from "@/src/components/TruncatedLabels";
import {
getPromptTabs,
PROMPT_TABS,
} from "@/src/features/navigation/utils/prompt-tabs";
-import { useScoreColumns } from "@/src/features/scores/hooks/useScoreColumns";
import {
+ useScoreColumns,
scoreFilters,
addPrefixToScoreKeys,
-} from "@/src/features/scores/lib/scoreColumns";
+} from "@/src/features/scores";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
import { useTableDateRange } from "@/src/hooks/useTableDateRange";
import { toAbsoluteTimeRange } from "@/src/utils/date-range-utils";
diff --git a/web/src/features/prompts/PromptsPage.tsx b/web/src/features/prompts/PromptsPage.tsx
index be8e11f4e9..7e5b3c04c2 100644
--- a/web/src/features/prompts/PromptsPage.tsx
+++ b/web/src/features/prompts/PromptsPage.tsx
@@ -21,7 +21,7 @@ import {
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/src/components/ui/dropdown-menu";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { toast } from "sonner";
export default function PromptsPage() {
diff --git a/web/src/features/prompts/components/prompt-detail.tsx b/web/src/features/prompts/components/prompt-detail.tsx
index 1df739a4e9..e50f216d3d 100644
--- a/web/src/features/prompts/components/prompt-detail.tsx
+++ b/web/src/features/prompts/components/prompt-detail.tsx
@@ -18,7 +18,7 @@ import {
import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
import { Badge } from "@/src/components/ui/badge";
import { CodeView, JSONView } from "@/src/components/ui/CodeJsonViewer";
-import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
+import { DetailPageNav } from "@/src/features/navigate-detail-pages";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
import { api } from "@/src/utils/api";
import { getNumberFromMap } from "@/src/utils/map-utils";
diff --git a/web/src/features/prompts/components/prompts-table.tsx b/web/src/features/prompts/components/prompts-table.tsx
index 6591cff2bc..2a16c1c804 100644
--- a/web/src/features/prompts/components/prompts-table.tsx
+++ b/web/src/features/prompts/components/prompts-table.tsx
@@ -13,7 +13,7 @@ import { ResizableFilterLayout } from "@/src/components/table/resizable-filter-l
import { TextLink } from "@/src/components/design-system/TextLink/TextLink";
import { createFolderKeyTableColumn } from "@/src/components/design-system/table/columns/createFolderKeyTableColumn";
import { type LangfuseColumnDef } from "@/src/components/table/types";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { DeletePrompt } from "@/src/features/prompts/components/delete-prompt";
import { DeleteFolder } from "@/src/features/prompts/components/delete-folder";
import { DuplicateFolder } from "@/src/features/prompts/components/duplicate-folder";
diff --git a/web/src/features/public-api/components/CreateApiKeyButton.tsx b/web/src/features/public-api/components/CreateApiKeyButton.tsx
index 12b7aa8881..42ae0960b3 100644
--- a/web/src/features/public-api/components/CreateApiKeyButton.tsx
+++ b/web/src/features/public-api/components/CreateApiKeyButton.tsx
@@ -3,7 +3,7 @@ import { Dialog, DialogTrigger } from "@/src/components/ui/dialog";
import { api, reportNonTrpcError } from "@/src/utils/api";
import { useState } from "react";
import { PlusIcon } from "lucide-react";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useLangfuseBaseUrl } from "@/src/features/public-api/hooks/useLangfuseEnvCode";
import { ApiKeyCreateDialogContent } from "@/src/features/public-api/components/ApiKeyCreateDialogContent";
diff --git a/web/src/features/score-configs/ScoreConfigsTable.tsx b/web/src/features/score-configs/ScoreConfigsTable.tsx
index 335310ac8a..98e65ff965 100644
--- a/web/src/features/score-configs/ScoreConfigsTable.tsx
+++ b/web/src/features/score-configs/ScoreConfigsTable.tsx
@@ -17,7 +17,7 @@ import {
isBooleanDataType,
isCategoricalDataType,
isNumericDataType,
-} from "@/src/features/scores/lib/helpers";
+} from "@/src/features/scores";
import { Archive, Edit, MoreVertical, PlusIcon } from "lucide-react";
import { Button } from "@/src/components/ui/button";
import useColumnOrder from "@/src/features/column-visibility/hooks/useColumnOrder";
diff --git a/web/src/features/scores/ScoresTable.tsx b/web/src/features/scores/ScoresTable.tsx
index 29bd2cfe05..edfe400968 100644
--- a/web/src/features/scores/ScoresTable.tsx
+++ b/web/src/features/scores/ScoresTable.tsx
@@ -60,7 +60,12 @@ 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 { TableActionMenu } from "@/src/features/table/components/TableActionMenu";
+import {
+ TableActionMenu,
+ type TableAction,
+ useSelectAll,
+ TableSelectionManager,
+} from "@/src/features/table";
import React, {
type ReactNode,
useState,
@@ -68,12 +73,9 @@ import React, {
useCallback,
useMemo,
} from "react";
-import type { TableAction } from "@/src/features/table/types";
import type { RowSelectionState } from "@tanstack/react-table";
import { useHasEntitlement } from "@/src/features/entitlements/hooks";
import { useHasProjectAccess } from "@/src/features/rbac";
-import { useSelectAll } from "@/src/features/table/hooks/useSelectAll";
-import { TableSelectionManager } from "@/src/features/table/components/TableSelectionManager";
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";
diff --git a/web/src/features/scores/index.ts b/web/src/features/scores/index.ts
index 4e4661169f..561b705dd6 100644
--- a/web/src/features/scores/index.ts
+++ b/web/src/features/scores/index.ts
@@ -4,6 +4,15 @@
//
// score-configs/ScoreConfigDetails stays on the deep path: routing it through
// this index would close a runtime cycle (scores -> score-configs -> scores).
+//
+// Dual-use modules (aggregateScores, scoreColumns, helpers, scoresSearchRegistry)
+// stay a deep import for server callers. This door already carries React UI
+// (AnnotationForm, ScoresTable), and routing those files through here would
+// pull that UI into tRPC routers. Client importers of the same files come
+// through this door; server importers keep the file path.
+//
+// annotationFormHelpers stays deep: its only external importer is the
+// scoreConfigs tRPC router.
export {
CompareViewAdapter,
DashboardCategoricalScoreAdapter,
@@ -13,17 +22,23 @@ export { AnnotationForm } from "@/src/features/scores/components/AnnotationForm"
export { DualAnnotationContent } from "@/src/features/scores/components/DualAnnotationContent";
export { ScoreRow } from "@/src/features/scores/components/ScoreRow";
export { MultiSelectKeyValues } from "@/src/features/scores/components/multi-select-key-values";
+export {
+ ScoreCacheProvider,
+ type CachedScore,
+} from "@/src/features/scores/contexts/ScoreCacheContext";
export { useEmptyScoreConfigs } from "@/src/features/scores/hooks/useEmptyConfigs";
export {
createScoreColumns,
useScoreColumns,
} from "@/src/features/scores/hooks/useScoreColumns";
export {
+ aggregateScores,
collectScoreNameCoverage,
composeAggregateScoreKey,
decomposeAggregateScoreKey,
getScoreLabelFromKey,
normalizeScoreName,
+ type ScoreToAggregate,
} from "@/src/features/scores/lib/aggregateScores";
export {
isBooleanDataType,
@@ -39,6 +54,11 @@ export {
isTypingTarget,
} from "@/src/features/scores/lib/keyboardShortcuts";
export { useMergeScoreColumns } from "@/src/features/scores/lib/mergeScoreColumns";
+export {
+ mergeAggregatesWithCache,
+ mergeAnnotationScoresWithCache,
+ mergeScoresWithCache,
+} from "@/src/features/scores/lib/mergeScoresWithCache";
export {
addPrefixToScoreKeys,
collectPresentScoreKeys,
@@ -50,9 +70,11 @@ export {
splitScoreDataTypeIcon,
withPresentScoreKeys,
} from "@/src/features/scores/lib/scoreColumns";
+export { transformToAnnotationScores } from "@/src/features/scores/lib/transformScores";
export { useMergedAggregates } from "@/src/features/scores/lib/useMergedAggregates";
export { useMergedScores } from "@/src/features/scores/lib/useMergedScores";
export type {
+ AnnotationScore,
CategoryCounts,
ChartBin,
ScoreColumn,
diff --git a/web/src/features/sessions/ModernSessionFilterControls.tsx b/web/src/features/sessions/ModernSessionFilterControls.tsx
index e4faf2dd79..b2a7091988 100644
--- a/web/src/features/sessions/ModernSessionFilterControls.tsx
+++ b/web/src/features/sessions/ModernSessionFilterControls.tsx
@@ -27,7 +27,7 @@ import { useViewData } from "@/src/components/table/table-view-presets/hooks/use
import { useViewMutations } from "@/src/components/table/table-view-presets/hooks/useViewMutations";
import { Dialog } from "@/src/components/ui/dialog";
import { useHasProjectAccess } from "@/src/features/rbac";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
type ViewControllers = Pick<
ReturnType<typeof useTableViewManager>,
diff --git a/web/src/features/sessions/ModernSessionHeader.tsx b/web/src/features/sessions/ModernSessionHeader.tsx
index 4e59002384..d0b15a2131 100644
--- a/web/src/features/sessions/ModernSessionHeader.tsx
+++ b/web/src/features/sessions/ModernSessionHeader.tsx
@@ -38,7 +38,7 @@ import {
usdFormatter,
} from "@/src/utils/numbers";
import { cn } from "@/src/utils/tailwind";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
type ModernSessionHeaderProps = {
projectId: string;
diff --git a/web/src/features/sessions/ModernSessionHeaderActionsController.tsx b/web/src/features/sessions/ModernSessionHeaderActionsController.tsx
index 9d4afe52e3..c5d1bf80ed 100644
--- a/web/src/features/sessions/ModernSessionHeaderActionsController.tsx
+++ b/web/src/features/sessions/ModernSessionHeaderActionsController.tsx
@@ -12,7 +12,7 @@ import {
DropdownMenuSubContent,
DropdownMenuSubTrigger,
} from "@/src/components/ui/dropdown-menu";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useHasProjectAccess } from "@/src/features/rbac";
import { useCopyToClipboard } from "@/src/hooks/useCopyToClipboard";
import { api } from "@/src/utils/api";
diff --git a/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx b/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx
index f15ecb121c..9561233200 100644
--- a/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx
+++ b/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx
@@ -8,7 +8,7 @@ import {
} from "@/src/features/sessions/SessionConversationTimeline/SessionConversationTimeline";
import { type SessionObservation } from "@/src/features/sessions/SessionConversationTimeline/components/SessionConversationTimelineTrace/SessionConversationTimelineTrace";
import { type EventSessionTrace } from "@/src/features/sessions/sessionDetailPageTypes";
-import { AnnotateDrawerController } from "@/src/features/scores/components/AnnotateDrawerController";
+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";
diff --git a/web/src/features/sessions/SessionObservationIO.tsx b/web/src/features/sessions/SessionObservationIO.tsx
index d3c953dbcf..181a8723da 100644
--- a/web/src/features/sessions/SessionObservationIO.tsx
+++ b/web/src/features/sessions/SessionObservationIO.tsx
@@ -11,7 +11,7 @@ import {
import { api, type RouterOutputs } from "@/src/utils/api";
import { downloadJsonFile } from "@/src/features/sessions/actions/downloadSessionAsJson";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { compactNumberFormatter } from "@/src/utils/numbers";
import { decodeUnicodeEscapesOnly } from "@/src/utils/unicode";
import { parseJsonIfString } from "@langfuse/shared";
diff --git a/web/src/features/sessions/SessionPages.tsx b/web/src/features/sessions/SessionPages.tsx
index dc58a69f34..2a2df36444 100644
--- a/web/src/features/sessions/SessionPages.tsx
+++ b/web/src/features/sessions/SessionPages.tsx
@@ -7,8 +7,10 @@ import { PublishSessionSwitch } from "@/src/components/publish-object-switch";
import { IOPreview } from "@/src/features/traces/components/IOPreview/IOPreview";
import { JsonSkeleton } from "@/src/components/ui/CodeJsonViewer";
import { Badge } from "@/src/components/ui/badge";
-import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import {
+ DetailPageNav,
+ useDetailPageLists,
+} from "@/src/features/navigate-detail-pages";
import { api } from "@/src/utils/api";
import { usdFormatter } from "@/src/utils/numbers";
import { getNumberFromMap } from "@/src/utils/map-utils";
@@ -16,7 +18,7 @@ import Link from "next/link";
import { useRouter } from "next/router";
import React, { useEffect, useState, useCallback, useRef } from "react";
import { useVirtualizer } from "@tanstack/react-virtual";
-import { AnnotateDrawerController } from "@/src/features/scores/components/AnnotateDrawerController";
+import { AnnotateDrawerController } from "@/src/features/scores";
import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
import { Button } from "@/src/components/ui/button";
import {
@@ -39,7 +41,7 @@ import {
SquarePen,
} from "lucide-react";
import { useCopyToClipboard } from "@/src/hooks/useCopyToClipboard";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import Page from "@/src/components/layouts/page";
import {
Popover,
diff --git a/web/src/features/sessions/SessionTraceActionButtons.tsx b/web/src/features/sessions/SessionTraceActionButtons.tsx
index 2b0c6acdcb..5b1039ba11 100644
--- a/web/src/features/sessions/SessionTraceActionButtons.tsx
+++ b/web/src/features/sessions/SessionTraceActionButtons.tsx
@@ -4,7 +4,7 @@ import { api, type RouterOutputs } from "@/src/utils/api";
import { getNumberFromMap } from "@/src/utils/map-utils";
import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
import { Button } from "@/src/components/ui/button";
-import { AnnotateDrawerController } from "@/src/features/scores/components/AnnotateDrawerController";
+import { AnnotateDrawerController } from "@/src/features/scores";
import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
import { ExistingDatasetItemsDropdownMenuController } from "@/src/features/datasets/components/ExistingDatasetItemsDropdownMenuController";
import { NewDatasetItemFromExistingObjectDialogController } from "@/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController";
diff --git a/web/src/features/sessions/SessionsTable.tsx b/web/src/features/sessions/SessionsTable.tsx
index 2c517fc140..e862ca0bc1 100644
--- a/web/src/features/sessions/SessionsTable.tsx
+++ b/web/src/features/sessions/SessionsTable.tsx
@@ -39,7 +39,7 @@ import {
type ScoreAggregate,
} from "@langfuse/shared";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { useOrderByState } from "@/src/features/orderBy/hooks/useOrderByState";
import { api } from "@/src/utils/api";
import { formatIntervalSeconds } from "@/src/utils/dates";
@@ -59,19 +59,21 @@ import { cn } from "@/src/utils/tailwind";
import useColumnOrder from "@/src/features/column-visibility/hooks/useColumnOrder";
import { useTableViewManager } from "@/src/components/table/table-view-presets/hooks/useTableViewManager";
import { useTableViewFilterChange } from "@/src/components/table/table-view-presets/hooks/useTableViewFilterChange";
-import { useSelectAll } from "@/src/features/table/hooks/useSelectAll";
-import { type TableAction } from "@/src/features/table/types";
-import { TableActionMenu } from "@/src/features/table/components/TableActionMenu";
+import {
+ useSelectAll,
+ type TableAction,
+ TableActionMenu,
+ TableSelectionManager,
+} from "@/src/features/table";
import { type RowSelectionState } from "@tanstack/react-table";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { TableSelectionManager } from "@/src/features/table/components/TableSelectionManager";
-import { useScoreColumns } from "@/src/features/scores/hooks/useScoreColumns";
-import { scoreFilters } from "@/src/features/scores/lib/scoreColumns";
+import { useScoreColumns, scoreFilters } from "@/src/features/scores";
import { BatchExportTableButton } from "@/src/components/BatchExportTableButton";
import { toObservedOptions, TableSearchBar } from "@/src/features/search-bar";
import { useHasProjectAccess } from "@/src/features/rbac";
+
export type SessionTableRow = {
id: string;
createdAt: Date;
diff --git a/web/src/features/sessions/sessionDetailPageTypes.ts b/web/src/features/sessions/sessionDetailPageTypes.ts
index d03e6ff4c7..79060cb09c 100644
--- a/web/src/features/sessions/sessionDetailPageTypes.ts
+++ b/web/src/features/sessions/sessionDetailPageTypes.ts
@@ -1,4 +1,4 @@
-import { type ListEntry } from "@/src/features/navigate-detail-pages/context";
+import { type ListEntry } from "@/src/features/navigate-detail-pages";
import { type RouterOutputs } from "@/src/utils/api";
import { type SingleValueOption } from "@langfuse/shared";
diff --git a/web/src/features/support-chat/IntroSection.tsx b/web/src/features/support-chat/IntroSection.tsx
index 5c9d503868..b9286e7e3f 100644
--- a/web/src/features/support-chat/IntroSection.tsx
+++ b/web/src/features/support-chat/IntroSection.tsx
@@ -15,7 +15,7 @@ import { Separator } from "@/src/components/ui/separator";
import { usePlan } from "@/src/features/entitlements";
import { isCloudPlan } from "@langfuse/shared";
import { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
type SupportType = "in-app-support" | "custom" | "community";
diff --git a/web/src/features/table/index.ts b/web/src/features/table/index.ts
new file mode 100644
index 0000000000..926e62145d
--- /dev/null
+++ b/web/src/features/table/index.ts
@@ -0,0 +1,11 @@
+// The table feature's public client surface (RFC rule 8). Named re-exports
+// only — exactly what other features already imported from this feature's
+// client modules.
+//
+// `server/` is a separate door. tableRouter stays a direct import from the
+// tRPC root, which is not a feature. createBatchActionJob lives on
+// `server/index.ts` so this client barrel never reaches instrumentation.
+export { TableActionMenu } from "@/src/features/table/components/TableActionMenu";
+export { TableSelectionManager } from "@/src/features/table/components/TableSelectionManager";
+export { useSelectAll } from "@/src/features/table/hooks/useSelectAll";
+export type { TableAction } from "@/src/features/table/types";
diff --git a/web/src/features/table/server/index.ts b/web/src/features/table/server/index.ts
new file mode 100644
index 0000000000..a4a5a3111c
--- /dev/null
+++ b/web/src/features/table/server/index.ts
@@ -0,0 +1,3 @@
+// The table feature's public server surface (RFC rules 8 and 10).
+// tableRouter stays a direct import from the tRPC root, which is not a feature.
+export { createBatchActionJob } from "@/src/features/table/server/createBatchActionJob";
diff --git a/web/src/features/traces/TracePage.tsx b/web/src/features/traces/TracePage.tsx
index 8a205bb94a..1ae5162485 100644
--- a/web/src/features/traces/TracePage.tsx
+++ b/web/src/features/traces/TracePage.tsx
@@ -1,5 +1,5 @@
/* eslint-disable no-nested-ternary */
-import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
+import { DetailPageNav } from "@/src/features/navigate-detail-pages";
import { useRouter } from "next/router";
import { ErrorPage } from "@/src/components/error-page";
import { TraceDetailActions } from "@/src/features/traces/components/TraceDetailActions";
diff --git a/web/src/features/traces/TracesSetupPage.tsx b/web/src/features/traces/TracesSetupPage.tsx
index af25f7a661..304db929de 100644
--- a/web/src/features/traces/TracesSetupPage.tsx
+++ b/web/src/features/traces/TracesSetupPage.tsx
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from "react";
import { useRouter } from "next/router";
import { api, reportNonTrpcError } from "@/src/utils/api";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import ContainerPage from "@/src/components/layouts/container-page";
import { ActionButton } from "@/src/components/ActionButton";
import { SubHeader } from "@/src/components/layouts/header";
diff --git a/web/src/features/traces/TracesTable.tsx b/web/src/features/traces/TracesTable.tsx
index a15f2d63c9..37919eddce 100644
--- a/web/src/features/traces/TracesTable.tsx
+++ b/web/src/features/traces/TracesTable.tsx
@@ -38,7 +38,7 @@ import {
import {
detailPageListKeys,
useDetailPageLists,
-} from "@/src/features/navigate-detail-pages/context";
+} from "@/src/features/navigate-detail-pages";
import { useOrderByState } from "@/src/features/orderBy/hooks/useOrderByState";
import {
type FilterState,
@@ -70,11 +70,13 @@ 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 { TableActionMenu } from "@/src/features/table/components/TableActionMenu";
-import { useSelectAll } from "@/src/features/table/hooks/useSelectAll";
-import { TableSelectionManager } from "@/src/features/table/components/TableSelectionManager";
+import {
+ TableActionMenu,
+ useSelectAll,
+ TableSelectionManager,
+ type TableAction,
+} from "@/src/features/table";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { type TableAction } from "@/src/features/table/types";
import {
LevelCountsDisplay,
type LevelCount,
@@ -108,8 +110,7 @@ import {
} from "@/src/components/table/utils/refresh-intervals";
import { TableHeaderControls } from "@/src/components/table/table-header-controls";
import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateContext";
-import { useScoreColumns } from "@/src/features/scores/hooks/useScoreColumns";
-import { scoreFilters } from "@/src/features/scores/lib/scoreColumns";
+import { useScoreColumns, scoreFilters } from "@/src/features/scores";
import { AddTracesToAnnotationQueueDialogController } from "@/src/features/annotation-queues/components/AddTracesToAnnotationQueueDialogController";
import { useHasProjectAccess } from "@/src/features/rbac";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
diff --git a/web/src/features/traces/components/ObservationDetailView/AttributeRowActions.tsx b/web/src/features/traces/components/ObservationDetailView/AttributeRowActions.tsx
index f1490e0436..c2fe82e602 100644
--- a/web/src/features/traces/components/ObservationDetailView/AttributeRowActions.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/AttributeRowActions.tsx
@@ -16,7 +16,7 @@ import { copyTextToClipboard } from "@/src/utils/clipboard";
import { buildEventsTablePathForColumnFilter } from "@/src/features/events/lib/eventsTablePaths";
import { attributeColumnFilter } from "@/src/features/traces/fns/attributeColumnFilter";
import { attributeGrammar } from "@/src/features/traces/fns/attributeGrammar";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
export type AttributeTableAction = "copy" | "include_filter" | "exclude_filter";
diff --git a/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx b/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
index e88801115f..cfdba1ef57 100644
--- a/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
@@ -44,7 +44,7 @@ import {
getCommentDrawerInitialStateFromUrl,
} from "@/src/features/comments/CommentDrawerController";
import { useRouter } from "next/router";
-import ScoresTable from "@/src/features/scores/ScoresTable";
+import { ScoresTable } from "@/src/features/scores";
import { getMostRecentCorrection } from "@/src/features/corrections/utils/getMostRecentCorrection";
import { useJsonExpansion } from "@/src/features/traces/contexts/JsonExpansionContext";
import { useMedia } from "@/src/features/traces/hooks/useMedia";
@@ -52,7 +52,7 @@ import {
type DetailTab,
useSelection,
} from "@/src/features/traces/contexts/SelectionContext";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useTraceAnalyticsDimensions } from "@/src/features/traces/hooks/useTraceAnalyticsDimensions";
import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
import {
diff --git a/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx b/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
index 07eded787f..659269e2f7 100644
--- a/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
+++ b/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
@@ -50,7 +50,7 @@ import {
type DetailTab,
useSelection,
} from "@/src/features/traces/contexts/SelectionContext";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useTraceAnalyticsDimensions } from "@/src/features/traces/hooks/useTraceAnalyticsDimensions";
import { useIsAuthenticatedAndProjectMember } from "@/src/features/auth";
import { useCommentedPaths } from "@/src/features/comments/hooks/useCommentedPaths";
@@ -61,7 +61,7 @@ import { useSession } from "next-auth/react";
import { TraceDetailViewHeader } from "./components/TraceDetailViewHeader";
import { TraceLogView } from "../TraceLogView/TraceLogView";
import { TRACE_VIEW_CONFIG } from "@/src/features/traces/constants/traceViewConfig";
-import ScoresTable from "@/src/features/scores/ScoresTable";
+import { ScoresTable } from "@/src/features/scores";
import { getMostRecentCorrection } from "@/src/features/corrections/utils/getMostRecentCorrection";
export interface TraceDetailViewProps {
diff --git a/web/src/features/traces/components/TraceLogView/TraceLogView.tsx b/web/src/features/traces/components/TraceLogView/TraceLogView.tsx
index b82a9eaa5f..e5bcb51b76 100644
--- a/web/src/features/traces/components/TraceLogView/TraceLogView.tsx
+++ b/web/src/features/traces/components/TraceLogView/TraceLogView.tsx
@@ -33,7 +33,7 @@
import { useState, useMemo, useCallback } from "react";
import { TRACE_VIEW_CONFIG } from "@/src/features/traces/constants/traceViewConfig";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useTraceAnalyticsDimensions } from "@/src/features/traces/hooks/useTraceAnalyticsDimensions";
import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
diff --git a/web/src/features/tracing-tables/observations/ObservationsTable.tsx b/web/src/features/tracing-tables/observations/ObservationsTable.tsx
index 80786e9a56..aab5bd75cf 100644
--- a/web/src/features/tracing-tables/observations/ObservationsTable.tsx
+++ b/web/src/features/tracing-tables/observations/ObservationsTable.tsx
@@ -95,7 +95,7 @@ import { usePeekNavigation } from "@/src/components/table/peek/hooks/usePeekNavi
import {
detailPageListKeys,
useDetailPageLists,
-} from "@/src/features/navigate-detail-pages/context";
+} from "@/src/features/navigate-detail-pages";
import { useTableViewManager } from "@/src/components/table/table-view-presets/hooks/useTableViewManager";
import { useTableViewFilterChange } from "@/src/components/table/table-view-presets/hooks/useTableViewFilterChange";
import {
@@ -105,13 +105,14 @@ import {
} from "@/src/features/search-bar";
import { useRouter } from "next/router";
-import { TableSelectionManager } from "@/src/features/table/components/TableSelectionManager";
+import {
+ TableSelectionManager,
+ TableActionMenu,
+ type TableAction,
+} from "@/src/features/table";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import { TableActionMenu } from "@/src/features/table/components/TableActionMenu";
-import { type TableAction } from "@/src/features/table/types";
import { type DataTablePeekViewProps } from "@/src/components/table/peek";
-import { useScoreColumns } from "@/src/features/scores/hooks/useScoreColumns";
-import { scoreFilters } from "@/src/features/scores/lib/scoreColumns";
+import { useScoreColumns, scoreFilters } from "@/src/features/scores";
import { AddObservationsToDatasetDialog } from "@/src/features/batch-actions/components/AddObservationsToDatasetDialog/index";
import useSessionStorage from "@/src/components/useSessionStorage";
import { getSafeRedirectPath } from "@/src/utils/redirect";
diff --git a/web/src/features/tracing-tables/observations/useObservationsTableView.ts b/web/src/features/tracing-tables/observations/useObservationsTableView.ts
index 520bccf5d7..04b6b50673 100644
--- a/web/src/features/tracing-tables/observations/useObservationsTableView.ts
+++ b/web/src/features/tracing-tables/observations/useObservationsTableView.ts
@@ -1,5 +1,5 @@
import { useLayoutEffect, useState } from "react";
-import { useSelectAll } from "@/src/features/table/hooks/useSelectAll";
+import { useSelectAll } from "@/src/features/table";
import {
createObservationsTableStore,
type ObservationsTableStore,
diff --git a/web/src/features/users/UserDetailPage.tsx b/web/src/features/users/UserDetailPage.tsx
index 1fe217096d..cba76bcb76 100644
--- a/web/src/features/users/UserDetailPage.tsx
+++ b/web/src/features/users/UserDetailPage.tsx
@@ -10,7 +10,7 @@ import { ScoresTable } from "@/src/features/scores";
import { TablePeekViewTraceDetail } from "@/src/components/table/peek/peek-trace-detail";
import { compactNumberFormatter, usdFormatter } from "@/src/utils/numbers";
import { StringParam, useQueryParam, withDefault } from "use-query-params";
-import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
+import { DetailPageNav } from "@/src/features/navigate-detail-pages";
import { SessionsTable } from "@/src/features/sessions";
import { cn } from "@/src/utils/tailwind";
import { Badge } from "@/src/components/ui/badge";
diff --git a/web/src/features/users/UsersTable.tsx b/web/src/features/users/UsersTable.tsx
index 487bbd3a0b..c45765c428 100644
--- a/web/src/features/users/UsersTable.tsx
+++ b/web/src/features/users/UsersTable.tsx
@@ -31,7 +31,7 @@ import {
sortOptionValues,
} from "@/src/features/filters";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { useEventsFilterOptions } from "@/src/features/events/hooks/useEventsFilterOptions";
import { TableSearchBar, toObservedOptions } from "@/src/features/search-bar";
diff --git a/web/src/features/v4-migration/V4MigrationContent.tsx b/web/src/features/v4-migration/V4MigrationContent.tsx
index 5a211f7871..c989eacf05 100644
--- a/web/src/features/v4-migration/V4MigrationContent.tsx
+++ b/web/src/features/v4-migration/V4MigrationContent.tsx
@@ -13,7 +13,7 @@ import {
} from "lucide-react";
import { env } from "@/src/env.mjs";
import { useIsInAppAgentLauncherVisible } from "@/src/features/in-app-agent/components/InAppAiAgentProvider";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useSupportDrawer } from "@/src/features/support-chat/SupportDrawerProvider";
import { Button } from "@/src/components/ui/button";
import {
diff --git a/web/src/features/version-update/useVersionUpdatePrompt.ts b/web/src/features/version-update/useVersionUpdatePrompt.ts
index 1c4943165d..a6ab8f5ea8 100644
--- a/web/src/features/version-update/useVersionUpdatePrompt.ts
+++ b/web/src/features/version-update/useVersionUpdatePrompt.ts
@@ -1,5 +1,5 @@
import { useEffect } from "react";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useAppSettled } from "./useAppSettled";
import { useVersionUpdateAvailable } from "./useVersionUpdateAvailable";
import { versionUpdateStore } from "./versionUpdateStore";
diff --git a/web/src/features/widgets/EditWidgetPage.tsx b/web/src/features/widgets/EditWidgetPage.tsx
index 0e958ee482..48999bed27 100644
--- a/web/src/features/widgets/EditWidgetPage.tsx
+++ b/web/src/features/widgets/EditWidgetPage.tsx
@@ -7,7 +7,7 @@ import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
import { type metricAggregations, type views } from "@langfuse/shared/query";
import { type z } from "zod";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useReadPath } from "@/src/features/events/hooks/useReadPath";
export default function EditWidgetPage() {
diff --git a/web/src/features/widgets/NewWidgetPage.tsx b/web/src/features/widgets/NewWidgetPage.tsx
index 67b4f0aa19..0f32b0d2b1 100644
--- a/web/src/features/widgets/NewWidgetPage.tsx
+++ b/web/src/features/widgets/NewWidgetPage.tsx
@@ -12,7 +12,7 @@ import { useState } from "react";
import { useReadPath } from "@/src/features/events/hooks/useReadPath";
import { getDefaultView } from "@/src/features/widgets/utils";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import {
asSingleQueryParam,
RouteParamsPendingFallback,
diff --git a/web/src/features/widgets/components/WidgetTable/ConnectedWidgetTable.tsx b/web/src/features/widgets/components/WidgetTable/ConnectedWidgetTable.tsx
index c9213ba84a..39683a2d28 100644
--- a/web/src/features/widgets/components/WidgetTable/ConnectedWidgetTable.tsx
+++ b/web/src/features/widgets/components/WidgetTable/ConnectedWidgetTable.tsx
@@ -4,7 +4,7 @@ import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
import { useOrderByState } from "@/src/features/orderBy/hooks/useOrderByState";
import { NumberParam, useQueryParams, withDefault } from "use-query-params";
import { api } from "@/src/utils/api";
-import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import { useHasProjectAccess } from "@/src/features/rbac";
import {
buildWidgetExport,
diff --git a/web/src/hooks/useCollapsibleSystemPrompt.ts b/web/src/hooks/useCollapsibleSystemPrompt.ts
index c1b8e790b0..ee62f6eaaf 100644
--- a/web/src/hooks/useCollapsibleSystemPrompt.ts
+++ b/web/src/hooks/useCollapsibleSystemPrompt.ts
@@ -1,5 +1,5 @@
import { useMemo, useSyncExternalStore } from "react";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
const COLLAPSE_CHAR_THRESHOLD = 250;
const DEFAULT_PREVIEW_LINES = 4;
diff --git a/web/src/hooks/useEnvLabel.ts b/web/src/hooks/useEnvLabel.ts
index 6d2d968ee7..58f0345611 100644
--- a/web/src/hooks/useEnvLabel.ts
+++ b/web/src/hooks/useEnvLabel.ts
@@ -1,4 +1,4 @@
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useSession } from "next-auth/react";
import { useState } from "react";
diff --git a/web/src/pages/_app.tsx b/web/src/pages/_app.tsx
index 8dc1a3bff4..388557bfd0 100644
--- a/web/src/pages/_app.tsx
+++ b/web/src/pages/_app.tsx
@@ -84,7 +84,7 @@ if (typeof window !== "undefined") {
}
import { ResilientSessionProvider } from "@/src/features/auth/components/ResilientSessionProvider";
-import { DetailPageListsProvider } from "@/src/features/navigate-detail-pages/context";
+import { DetailPageListsProvider } from "@/src/features/navigate-detail-pages";
import { env } from "@/src/env.mjs";
import { ThemeProvider } from "@/src/features/theming/ThemeProvider";
import { MarkdownRenderCharacterLimitProvider } from "@/src/hooks/useMarkdownRenderCharacterLimit";
@@ -92,16 +92,16 @@ import { SupportDrawerProvider } from "@/src/features/support-chat/SupportDrawer
import { V4MigrationPanelProvider } from "@/src/features/v4-migration/V4MigrationPanelProvider";
import { installStaleChunkReloadListener } from "@/src/features/version-update/reloadOnStaleChunk";
import { InAppAiAgentProvider } from "@/src/features/in-app-agent/components/InAppAiAgentProvider";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
-import { ScoreCacheProvider } from "@/src/features/scores/contexts/ScoreCacheContext";
+import { useLangfuseCloudRegion } from "@/src/features/organizations";
+import { ScoreCacheProvider } from "@/src/features/scores";
import { CorrectionCacheProvider } from "@/src/features/corrections/contexts/CorrectionCacheContext";
import { LayerProvider } from "@/src/context/LayerContext/LayerContext";
-import { V4_BETA_ENABLED_POSTHOG_PROPERTY } from "@/src/features/posthog-analytics/usePostHogClientCapture";
import {
+ V4_BETA_ENABLED_POSTHOG_PROPERTY,
getPostHogClientConfig,
isPostHogClientEnabled,
isProductAnalyticsAvailable,
-} from "@/src/features/posthog-analytics/productAnalyticsAvailability";
+} from "@/src/features/posthog-analytics";
// Session replay is a Langfuse Cloud feature, so self-hosted never records.
// The product-analytics gate makes this redundant in HIPAA (PostHog is not
diff --git a/web/src/server/api/routers/scores.ts b/web/src/server/api/routers/scores.ts
index d329f6faba..192ad1eec7 100644
--- a/web/src/server/api/routers/scores.ts
+++ b/web/src/server/api/routers/scores.ts
@@ -63,7 +63,7 @@ import {
} from "@langfuse/shared/src/server";
import { v4 } from "uuid";
import { throwIfNoEntitlement } from "@/src/features/entitlements/server/hasEntitlement";
-import { createBatchActionJob } from "@/src/features/table/server/createBatchActionJob";
+import { createBatchActionJob } from "@/src/features/table/server";
import { TRPCError } from "@trpc/server";
import { randomUUID } from "crypto";
import {
diff --git a/web/src/server/api/routers/traces.ts b/web/src/server/api/routers/traces.ts
index 65c89dc866..e4477bb8de 100644
--- a/web/src/server/api/routers/traces.ts
+++ b/web/src/server/api/routers/traces.ts
@@ -57,7 +57,7 @@ import {
LISTABLE_SCORE_TYPES,
} from "@langfuse/shared";
import { TRPCError } from "@trpc/server";
-import { createBatchActionJob } from "@/src/features/table/server/createBatchActionJob";
+import { createBatchActionJob } from "@/src/features/table/server";
import { throwIfNoEntitlement } from "@/src/features/entitlements/server/hasEntitlement";
import { sanitizeLegacyTracingSearch } from "@/src/features/traces/server/legacyIoSearch";
import {
diff --git a/web/src/server/auth.ts b/web/src/server/auth.ts
index 34d1bb0427..807f375ba2 100644
--- a/web/src/server/auth.ts
+++ b/web/src/server/auth.ts
@@ -82,7 +82,7 @@ import {
canToggleV4,
isV4UpgradeUiAvailable,
} from "@/src/features/events/lib/v4Rollout";
-import { canCreateOrganizations } from "@/src/features/organizations/server/canCreateOrganizations";
+import { canCreateOrganizations } from "@/src/features/organizations/server";
const staticProviders: Provider[] = [
CredentialsProvider({