Skip to content

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

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

Nikita Kabardindb1df33a42bf
diff --git a/web/src/__tests__/buildStepData.clienttest.ts b/web/src/__tests__/buildStepData.clienttest.ts
index ee65c053af..1fe3b09f1a 100644
--- a/web/src/__tests__/buildStepData.clienttest.ts
+++ b/web/src/__tests__/buildStepData.clienttest.ts
@@ -15,7 +15,7 @@ vi.mock("@langfuse/shared", () => ({
}));
import { buildStepData } from "@/src/features/trace-graph-view/buildStepData";
-import { type AgentGraphDataResponse } from "@/src/features/trace-graph-view/types";
+import { type AgentGraphDataResponse } from "@/src/features/trace-graph-view";
describe("buildStepData", () => {
const createMockObservation = (
diff --git a/web/src/__tests__/server/onboarding-router.servertest.ts b/web/src/__tests__/server/onboarding-router.servertest.ts
index 137c92b13a..f8a37b57e6 100644
--- a/web/src/__tests__/server/onboarding-router.servertest.ts
+++ b/web/src/__tests__/server/onboarding-router.servertest.ts
@@ -6,7 +6,7 @@ import { appRouter } from "@/src/server/api/root";
import { createInnerTRPCContext } from "@/src/server/api/trpc";
import { createProjectMembershipsOnSignup } from "@/src/features/auth/lib/createProjectMembershipsOnSignup";
import { V4_DEFAULT_ENABLED_FROM_AT } from "@/src/features/events/lib/v4Rollout";
-import { createProjectRoute } from "@/src/features/setup/setupRoutes";
+import { createProjectRoute } from "@/src/features/setup";
import { prisma, Role } from "@langfuse/shared/src/db";
const makeSession = ({
diff --git a/web/src/__tests__/server/prompts.v1.servertest.ts b/web/src/__tests__/server/prompts.v1.servertest.ts
index 36042c438f..d28fafa1ed 100644
--- a/web/src/__tests__/server/prompts.v1.servertest.ts
+++ b/web/src/__tests__/server/prompts.v1.servertest.ts
@@ -15,7 +15,7 @@ import {
createOrgProjectAndApiKey,
getObservationById,
} from "@langfuse/shared/src/server";
-import { createPromptForApi } from "@/src/features/prompts/server/prompt-api-service";
+import { createPromptForApi } from "@/src/features/prompts/server";
import handler from "@/src/pages/api/public/prompts";
describe("/api/public/prompts API Endpoint", () => {
diff --git a/web/src/__tests__/server/unit/feedback-service.servertest.ts b/web/src/__tests__/server/unit/feedback-service.servertest.ts
index 7fe2e7b3b5..473f3f69bb 100644
--- a/web/src/__tests__/server/unit/feedback-service.servertest.ts
+++ b/web/src/__tests__/server/unit/feedback-service.servertest.ts
@@ -39,7 +39,7 @@ vi.mock("@/src/features/public-api/server/RateLimitService", () => ({
import {
isProductFeedbackAvailable,
submitFeedback,
-} from "@/src/features/feedback/server/FeedbackService";
+} from "@/src/features/feedback/server";
import { feedbackFeature } from "@/src/features/mcp/server/feedback";
import { getMcpServerInstructions } from "@/src/features/mcp/server/mcpServer";
import { PostFeedbackBody } from "@/src/features/public-api/types/feedback";
diff --git a/web/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu.tsx b/web/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu.tsx
index 260beaacef..fe512d4dea 100644
--- a/web/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu.tsx
+++ b/web/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu.tsx
@@ -3,7 +3,7 @@ import { PlusIcon, Settings } from "lucide-react";
import { type Session } from "next-auth";
import { type ComponentProps, useMemo } from "react";
import { env } from "@/src/env.mjs";
-import { createOrganizationRoute } from "@/src/features/setup/setupRoutes";
+import { createOrganizationRoute } from "@/src/features/setup";
type Organization = NonNullable<Session["user"]>["organizations"][number];
diff --git a/web/src/components/ProjectDropdownMenu/ProjectDropdownMenu.tsx b/web/src/components/ProjectDropdownMenu/ProjectDropdownMenu.tsx
index baf94f2b9b..0913897bbf 100644
--- a/web/src/components/ProjectDropdownMenu/ProjectDropdownMenu.tsx
+++ b/web/src/components/ProjectDropdownMenu/ProjectDropdownMenu.tsx
@@ -1,5 +1,5 @@
import { DropdownMenu } from "@/src/components/design-system/DropdownMenu/DropdownMenu";
-import { createProjectRoute } from "@/src/features/setup/setupRoutes";
+import { createProjectRoute } from "@/src/features/setup";
import { PlusIcon, Settings } from "lucide-react";
import { type Session } from "next-auth";
import { type ComponentProps, useMemo } from "react";
diff --git a/web/src/components/layouts/app-layout/hooks/useFilteredNavigation.ts b/web/src/components/layouts/app-layout/hooks/useFilteredNavigation.ts
index 20ae863dd4..ad0c709f3b 100644
--- a/web/src/components/layouts/app-layout/hooks/useFilteredNavigation.ts
+++ b/web/src/components/layouts/app-layout/hooks/useFilteredNavigation.ts
@@ -7,7 +7,7 @@ import { useRouter } from "next/router";
import { useMemo } from "react";
import type { Session } from "next-auth";
import { useEntitlements } from "@/src/features/entitlements";
-import { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
+import { useUiCustomization } from "@/src/ee/features/ui-customization";
import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { useForceV3Experience } from "@/src/features/v4-migration/useForceV3Experience";
import {
diff --git a/web/src/components/layouts/app-layout/right-drawer/AppContentWithRightDrawer.tsx b/web/src/components/layouts/app-layout/right-drawer/AppContentWithRightDrawer.tsx
index d6f0f4f9eb..2c15bac2a4 100644
--- a/web/src/components/layouts/app-layout/right-drawer/AppContentWithRightDrawer.tsx
+++ b/web/src/components/layouts/app-layout/right-drawer/AppContentWithRightDrawer.tsx
@@ -1,5 +1,5 @@
/* eslint-disable no-nested-ternary */
-import { useSupportDrawer } from "@/src/features/support-chat/SupportDrawerProvider";
+import { useSupportDrawer } from "@/src/features/support-chat";
import { useV4MigrationPanel } from "@/src/features/v4-migration/V4MigrationPanelProvider";
import { type PropsWithChildren } from "react";
import { useMediaQuery } from "react-responsive";
diff --git a/web/src/components/layouts/app-layout/right-drawer/MobileRightDrawer.tsx b/web/src/components/layouts/app-layout/right-drawer/MobileRightDrawer.tsx
index 190d9e485b..57ad0a9676 100644
--- a/web/src/components/layouts/app-layout/right-drawer/MobileRightDrawer.tsx
+++ b/web/src/components/layouts/app-layout/right-drawer/MobileRightDrawer.tsx
@@ -6,7 +6,7 @@ import {
DrawerHeader,
DrawerTitle,
} from "@/src/components/ui/drawer";
-import { useSupportDrawer } from "@/src/features/support-chat/SupportDrawerProvider";
+import { useSupportDrawer } from "@/src/features/support-chat";
import { SupportDrawer } from "@/src/features/support-chat/SupportDrawer";
import { useV4MigrationPanel } from "@/src/features/v4-migration/V4MigrationPanelProvider";
import { V4MigrationPanel } from "@/src/features/v4-migration/V4MigrationPanel";
diff --git a/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx b/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx
index e45a111ad8..defef83ed1 100644
--- a/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx
+++ b/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx
@@ -42,7 +42,7 @@ import {
useV4UpgradeUiEnabled,
useV4UpgradeUiFlag,
} from "@/src/features/v4-migration/useV4UpgradeUiEnabled";
-import { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
+import { useUiCustomization } from "@/src/ee/features/ui-customization";
import { findCurrentInstance } from "@/src/ee/features/ui-customization/instanceLinks";
import { api } from "@/src/utils/api";
import { usePlan } from "@/src/features/entitlements";
diff --git a/web/src/components/nav/support-button.tsx b/web/src/components/nav/support-button.tsx
index e841660483..698b671194 100644
--- a/web/src/components/nav/support-button.tsx
+++ b/web/src/components/nav/support-button.tsx
@@ -1,6 +1,6 @@
import { LifeBuoy } from "lucide-react";
import { SidebarMenuButton, useSidebar } from "@/src/components/ui/sidebar";
-import { useSupportDrawer } from "@/src/features/support-chat/SupportDrawerProvider";
+import { useSupportDrawer } from "@/src/features/support-chat";
import { useV4MigrationPanel } from "@/src/features/v4-migration/V4MigrationPanelProvider";
import { useInAppAiAgent } from "@/src/features/in-app-agent";
diff --git a/web/src/components/nav/topbar-brand.tsx b/web/src/components/nav/topbar-brand.tsx
index e4b5961f2b..b650c986dd 100644
--- a/web/src/components/nav/topbar-brand.tsx
+++ b/web/src/components/nav/topbar-brand.tsx
@@ -3,7 +3,7 @@
import { cn } from "@/src/utils/tailwind";
import Link from "next/link";
import { env } from "@/src/env.mjs";
-import { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
+import { useUiCustomization } from "@/src/ee/features/ui-customization";
import { PlusIcon } from "lucide-react";
import { LangfuseIcon } from "@/src/components/design-system/LangfuseIcon/LangfuseIcon";
diff --git a/web/src/ee/features/billing/components/BillingActionButtons.tsx b/web/src/ee/features/billing/components/BillingActionButtons.tsx
index 25da2831da..253844d1bc 100644
--- a/web/src/ee/features/billing/components/BillingActionButtons.tsx
+++ b/web/src/ee/features/billing/components/BillingActionButtons.tsx
@@ -3,7 +3,7 @@ import { useMemo } from "react";
import { Button } from "@/src/components/ui/button";
import Link from "next/link";
-import { useSupportDrawer } from "@/src/features/support-chat/SupportDrawerProvider";
+import { useSupportDrawer } from "@/src/features/support-chat";
import { useV4MigrationPanel } from "@/src/features/v4-migration/V4MigrationPanelProvider";
import { StripeCustomerPortalButton } from "./StripeCustomerPortalButton";
import { BillingSwitchPlanDialog } from "./BillingSwitchPlanDialog";
diff --git a/web/src/ee/features/multi-tenant-sso/index.ts b/web/src/ee/features/multi-tenant-sso/index.ts
new file mode 100644
index 0000000000..2da8a66007
--- /dev/null
+++ b/web/src/ee/features/multi-tenant-sso/index.ts
@@ -0,0 +1,4 @@
+// The multi-tenant-sso feature's public client surface (RFC rule 8).
+// Named re-exports only — the provider schema SSO settings already
+// imported by file path. utils stay on server/index.ts.
+export { SsoProviderSchema } from "@/src/ee/features/multi-tenant-sso/types";
diff --git a/web/src/ee/features/multi-tenant-sso/server/index.ts b/web/src/ee/features/multi-tenant-sso/server/index.ts
new file mode 100644
index 0000000000..6277d19007
--- /dev/null
+++ b/web/src/ee/features/multi-tenant-sso/server/index.ts
@@ -0,0 +1,8 @@
+// The multi-tenant-sso feature's server surface (RFC rule 9, amended):
+// domain lookup helpers auth already imported by file path.
+export {
+ findMultiTenantSsoConfig,
+ getSsoAuthProviderIdForDomain,
+ isAnySsoConfigured,
+ loadSsoProviders,
+} from "@/src/ee/features/multi-tenant-sso/utils";
diff --git a/web/src/ee/features/sso-settings/components/SSOSettings.tsx b/web/src/ee/features/sso-settings/components/SSOSettings.tsx
index 8015a487a4..be0183a973 100644
--- a/web/src/ee/features/sso-settings/components/SSOSettings.tsx
+++ b/web/src/ee/features/sso-settings/components/SSOSettings.tsx
@@ -31,7 +31,7 @@ import Header from "@/src/components/layouts/header";
import { useHasEntitlement } from "@/src/features/entitlements";
import { useHasOrganizationAccess } from "@/src/features/rbac";
import { VerifiedDomainsSettings } from "@/src/ee/features/verified-domains/components/VerifiedDomainsSettings";
-import { SsoProviderSchema } from "@/src/ee/features/multi-tenant-sso/types";
+import { SsoProviderSchema } from "@/src/ee/features/multi-tenant-sso";
import { api } from "@/src/utils/api";
import { zodResolver } from "@hookform/resolvers/zod";
import { AlertCircle, Check, Copy, TrashIcon } from "lucide-react";
diff --git a/web/src/ee/features/ui-customization/index.ts b/web/src/ee/features/ui-customization/index.ts
new file mode 100644
index 0000000000..52b6bc3430
--- /dev/null
+++ b/web/src/ee/features/ui-customization/index.ts
@@ -0,0 +1,7 @@
+// The ui-customization feature's public client surface (RFC rule 8).
+// Named re-exports only — exactly what other features already imported.
+//
+// instanceLinks and productModuleSchema stay deep: layout and the
+// uiCustomization router are not features, and routing those files
+// through here would pull the React hook into tRPC.
+export { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
diff --git a/web/src/features/auth-credentials/server/signupApiHandler.ts b/web/src/features/auth-credentials/server/signupApiHandler.ts
index 0ddf6cdb10..cf4f176000 100644
--- a/web/src/features/auth-credentials/server/signupApiHandler.ts
+++ b/web/src/features/auth-credentials/server/signupApiHandler.ts
@@ -3,7 +3,7 @@ import { createUserEmailPassword } from "@/src/features/auth-credentials/lib/cre
import { ENTERPRISE_SSO_REQUIRED_MESSAGE } from "@/src/features/auth/constants";
import { getAdClickIdsFromRequest } from "@/src/features/auth/lib/signupAttribution";
import { signupSchema } from "@/src/features/auth/lib/signupSchema";
-import { getSsoAuthProviderIdForDomain } from "@/src/ee/features/multi-tenant-sso/utils";
+import { getSsoAuthProviderIdForDomain } from "@/src/ee/features/multi-tenant-sso/server";
import type { NextApiRequest, NextApiResponse } from "next";
import { logger } from "@langfuse/shared/src/server";
import { isEmailVerificationRequired } from "@/src/features/auth-credentials/lib/credentialsUtils";
diff --git a/web/src/features/auth/server/getSignInPageServerSideProps.ts b/web/src/features/auth/server/getSignInPageServerSideProps.ts
index ffd2c1f85d..a62c18bebd 100644
--- a/web/src/features/auth/server/getSignInPageServerSideProps.ts
+++ b/web/src/features/auth/server/getSignInPageServerSideProps.ts
@@ -1,7 +1,7 @@
/* eslint-disable no-nested-ternary */
import { type GetServerSideProps } from "next";
import { env } from "@/src/env.mjs";
-import { isAnySsoConfigured } from "@/src/ee/features/multi-tenant-sso/utils";
+import { isAnySsoConfigured } from "@/src/ee/features/multi-tenant-sso/server";
import { isEmailVerificationRequired } from "@/src/features/auth-credentials/lib/credentialsUtils";
import { type PageProps } from "@/src/features/auth/SignInPage";
diff --git a/web/src/features/automations/components/actions/SlackActionForm.tsx b/web/src/features/automations/components/actions/SlackActionForm.tsx
index 38e4e8692f..43fc892fb6 100644
--- a/web/src/features/automations/components/actions/SlackActionForm.tsx
+++ b/web/src/features/automations/components/actions/SlackActionForm.tsx
@@ -10,12 +10,12 @@ import {
import { type UseFormReturn } from "react-hook-form";
import { type ActionDomain } from "@langfuse/shared";
import { api } from "@/src/utils/api";
-import { SlackConnectionCard } from "@/src/features/slack/components/SlackConnectionCard";
import {
+ SlackConnectionCard,
ChannelSelector,
type SlackChannel,
-} from "@/src/features/slack/components/ChannelSelector";
-import { SlackTestMessageButton } from "@/src/features/slack/components/SlackTestMessageButton";
+ SlackTestMessageButton,
+} from "@/src/features/slack";
import { useState } from "react";
import { useHasProjectAccess } from "@/src/features/rbac";
diff --git a/web/src/features/batch-actions/index.ts b/web/src/features/batch-actions/index.ts
new file mode 100644
index 0000000000..75cbbdbb8b
--- /dev/null
+++ b/web/src/features/batch-actions/index.ts
@@ -0,0 +1,5 @@
+// The batch-actions feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported.
+export { AddObservationsToDatasetDialog } from "@/src/features/batch-actions/components/AddObservationsToDatasetDialog";
+export { BatchActionsSettingsPage } from "@/src/features/batch-actions/components/BatchActionsSettingsPage";
+export { RunEvaluationDialog } from "@/src/features/batch-actions/components/RunEvaluationDialog";
diff --git a/web/src/features/batch-actions/server/addToDatasetRouter.ts b/web/src/features/batch-actions/server/addToDatasetRouter.ts
index e0a8741775..c9bd99aa56 100644
--- a/web/src/features/batch-actions/server/addToDatasetRouter.ts
+++ b/web/src/features/batch-actions/server/addToDatasetRouter.ts
@@ -23,7 +23,7 @@ import {
} from "@langfuse/shared";
import { env } from "@/src/env.mjs";
import { CreateObservationAddToDatasetActionSchema } from "../validation";
-import { assertLegacyTracingIoSearchCanCreateBatchJob } from "@/src/features/traces/server/legacyIoSearch";
+import { assertLegacyTracingIoSearchCanCreateBatchJob } from "@/src/features/traces/server";
const MAX_BATCH_ADD_TO_DATASET_ITEMS = 1000;
diff --git a/web/src/features/batch-exports/server/batchExport.ts b/web/src/features/batch-exports/server/batchExport.ts
index fc276ac6b3..aec40c70ed 100644
--- a/web/src/features/batch-exports/server/batchExport.ts
+++ b/web/src/features/batch-exports/server/batchExport.ts
@@ -28,7 +28,7 @@ import {
} from "@langfuse/shared/src/server";
import { TRPCError } from "@trpc/server";
import { z } from "zod";
-import { assertLegacyTracingIoSearchCanCreateBatchJob } from "@/src/features/traces/server/legacyIoSearch";
+import { assertLegacyTracingIoSearchCanCreateBatchJob } from "@/src/features/traces/server";
// Fallback for legacy rows that predate the worker stamping expiresAt;
// matches the worker's BATCH_EXPORT_DOWNLOAD_LINK_EXPIRATION_HOURS default.
diff --git a/web/src/features/corrections/index.ts b/web/src/features/corrections/index.ts
new file mode 100644
index 0000000000..c406f88e32
--- /dev/null
+++ b/web/src/features/corrections/index.ts
@@ -0,0 +1,7 @@
+// The corrections feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported.
+export {
+ CorrectionCacheProvider,
+ useCorrectionCache,
+} from "@/src/features/corrections/contexts/CorrectionCacheContext";
+export { getMostRecentCorrection } from "@/src/features/corrections/utils/getMostRecentCorrection";
diff --git a/web/src/features/dashboard/DashboardDetailPage.tsx b/web/src/features/dashboard/DashboardDetailPage.tsx
index 80d7e9307b..a1f8f5cede 100644
--- a/web/src/features/dashboard/DashboardDetailPage.tsx
+++ b/web/src/features/dashboard/DashboardDetailPage.tsx
@@ -35,9 +35,15 @@ import { v4 as uuidv4 } from "uuid";
import { useDebounce } from "@/src/hooks/useDebounce";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import {
- DashboardGrid,
type DashboardPlacement,
-} from "@/src/features/widgets/components/DashboardGrid";
+ parsePastedWidget,
+ toWidgetCreateFields,
+ type PastedWidgetParseResult,
+ type WidgetExportSource,
+ pushDownForInsertion,
+ useClipboardWidgetProbe,
+} from "@/src/features/widgets";
+import { DashboardGrid } from "@/src/features/widgets/components/DashboardGrid";
import { CloneFirstDialogController } from "@/src/features/dashboard/components/CloneFirstDialogController";
import { InlineEditText } from "@/src/components/design-system/InlineEditText/InlineEditText";
import { PageHeaderControlsPortal } from "@/src/components/layouts/page-header-controls-slot";
@@ -67,12 +73,6 @@ import {
getDashboardSchedulerResetKey,
useDashboardQueryScheduler,
} from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
-import {
- parsePastedWidget,
- toWidgetCreateFields,
- type PastedWidgetParseResult,
- type WidgetExportSource,
-} from "@/src/features/widgets/utils/import-export-utils";
import {
isPasteablePlacementPayload,
parseDashboardImport,
@@ -80,9 +80,7 @@ import {
type ParsedDashboardImport,
} from "@/src/features/dashboard/utils/dashboard-import-export";
import { type PresetPlacement } from "@/src/features/widgets/components/PresetDashboardWidget";
-import { pushDownForInsertion } from "@/src/features/widgets/utils/grid-placement";
import { readTextFromClipboard } from "@/src/utils/clipboard";
-import { useClipboardWidgetProbe } from "@/src/features/widgets/hooks/useClipboardWidgetProbe";
import { extractTransferFiles } from "@/src/components/editor/fileDropPaste";
import { Layer } from "@/src/components/design-system/Layer/Layer";
import { useDashboardDefinitionDraft } from "@/src/features/dashboard/hooks/useDashboardDefinitionDraft";
diff --git a/web/src/features/dashboard/ProjectHomePage.tsx b/web/src/features/dashboard/ProjectHomePage.tsx
index 0f0b11cb30..0632f8274e 100644
--- a/web/src/features/dashboard/ProjectHomePage.tsx
+++ b/web/src/features/dashboard/ProjectHomePage.tsx
@@ -49,7 +49,7 @@ import { Button } from "@/src/components/ui/button";
import { DashboardGrid } from "@/src/features/widgets/components/DashboardGrid";
import { HomeDashboardSelect } from "@/src/features/dashboard/components/HomeDashboardSelect";
import { useQueryProjectOrOrganization } from "@/src/features/projects";
-import { setupTracingRoute } from "@/src/features/setup/setupRoutes";
+import { setupTracingRoute } from "@/src/features/setup";
// Controller: no widget query may fire before the session resolves the v3/v4
// read path — an unresolved session used to read as v3, fire a full wave of
diff --git a/web/src/features/dashboard/server/index.ts b/web/src/features/dashboard/server/index.ts
new file mode 100644
index 0000000000..9fac7a9f82
--- /dev/null
+++ b/web/src/features/dashboard/server/index.ts
@@ -0,0 +1,12 @@
+// The dashboard feature's server surface (RFC rule 9, amended): the
+// public dashboard services MCP tools already imported by file path.
+export {
+ addPublicDashboardPlacement,
+ createPublicDashboard,
+ deletePublicDashboard,
+ deletePublicDashboardPlacement,
+ getPublicDashboard,
+ listPublicDashboards,
+ updatePublicDashboard,
+ updatePublicDashboardPlacement,
+} from "@/src/features/dashboard/server/public-dashboard-service";
diff --git a/web/src/features/datasets/DatasetCompareChartsPage.tsx b/web/src/features/datasets/DatasetCompareChartsPage.tsx
index 7696cd365f..5c77774c8f 100644
--- a/web/src/features/datasets/DatasetCompareChartsPage.tsx
+++ b/web/src/features/datasets/DatasetCompareChartsPage.tsx
@@ -27,7 +27,7 @@ import {
compareViewChartDataToDataPoints,
getCompareViewChartUnit,
} from "@/src/features/dashboard";
-import { Chart } from "@/src/features/widgets/chart-library/Chart";
+import { Chart } from "@/src/features/widgets";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import Page from "@/src/components/layouts/page";
import { SubHeaderLabel } from "@/src/components/layouts/header";
diff --git a/web/src/features/evals/components/default-eval-model-setup.tsx b/web/src/features/evals/components/default-eval-model-setup.tsx
index 944f6c6aad..c623c7d485 100644
--- a/web/src/features/evals/components/default-eval-model-setup.tsx
+++ b/web/src/features/evals/components/default-eval-model-setup.tsx
@@ -2,7 +2,7 @@
import { useHasProjectAccess } from "@/src/features/rbac";
import { ModelParameters } from "@/src/components/ModelParameters";
import { CardContent, Card } from "@/src/components/ui/card";
-import { useModelParams } from "@/src/features/playground/page/hooks/useModelParams";
+import { useModelParams } from "@/src/features/playground";
import { Button } from "@/src/components/ui/button";
import { api } from "@/src/utils/api";
import { showSuccessToast } from "@/src/features/notifications";
diff --git a/web/src/features/evals/components/template-form.tsx b/web/src/features/evals/components/template-form.tsx
index 18130700b2..636f5ff744 100644
--- a/web/src/features/evals/components/template-form.tsx
+++ b/web/src/features/evals/components/template-form.tsx
@@ -36,10 +36,10 @@ import {
} from "@langfuse/shared";
import router from "next/router";
import { ModelParameters } from "@/src/components/ModelParameters";
-import { PromptVariableListPreview } from "@/src/features/prompts/components/PromptVariableListPreview";
+import { PromptVariableListPreview } from "@/src/features/prompts";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { getFinalModelParams } from "@/src/utils/getFinalModelParams";
-import { useModelParams } from "@/src/features/playground/page/hooks/useModelParams";
+import { useModelParams } from "@/src/features/playground";
import { showSuccessToast } from "@/src/features/notifications";
import {
getDefaultOutputDefinitionFormValues,
diff --git a/web/src/features/evals/v2/components/Evaluators/JudgeModelConfigurationDialog/JudgeModelConfigurationDialog.tsx b/web/src/features/evals/v2/components/Evaluators/JudgeModelConfigurationDialog/JudgeModelConfigurationDialog.tsx
index b15a621708..aec1522fe2 100644
--- a/web/src/features/evals/v2/components/Evaluators/JudgeModelConfigurationDialog/JudgeModelConfigurationDialog.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/JudgeModelConfigurationDialog/JudgeModelConfigurationDialog.tsx
@@ -8,7 +8,7 @@ import {
DialogHeader,
DialogTitle,
} from "@/src/components/ui/dialog";
-import { useModelParams } from "@/src/features/playground/page/hooks/useModelParams";
+import { useModelParams } from "@/src/features/playground";
import { getFinalModelParams } from "@/src/utils/getFinalModelParams";
import type { ProjectDefaultModelConfig } from "@/src/features/evals/v2/types/ProjectDefaultModelConfig";
diff --git a/web/src/features/events/components/EventsTable.tsx b/web/src/features/events/components/EventsTable.tsx
index 2d758a286b..9972d3c14b 100644
--- a/web/src/features/events/components/EventsTable.tsx
+++ b/web/src/features/events/components/EventsTable.tsx
@@ -107,7 +107,7 @@ import { BatchExportTableButton } from "@/src/components/BatchExportTableButton"
import { useHasProjectAccess } from "@/src/features/rbac";
import { BreakdownTooltip } from "@/src/features/traces";
import { InfoIcon, LightbulbIcon } from "lucide-react";
-import { ProvidedModelNameCell } from "@/src/features/models/components/ProvidedModelNameCell";
+import { ProvidedModelNameCell } from "@/src/features/models";
import { type RowSelectionState } from "@tanstack/react-table";
import { TablePeekViewObservationDetail } from "@/src/components/table/peek/peek-observation-detail";
import { usePeekNavigation } from "@/src/components/table/peek/hooks/usePeekNavigation";
@@ -142,7 +142,9 @@ import { getSafeRedirectPath } from "@/src/utils/redirect";
// useEventsViewMode,
// type EventsViewMode,
// } from "@/src/features/events/hooks/useEventsViewMode";
+
// import { EventsViewModeToggle } from "@/src/features/events/components/EventsViewModeToggle";
+
// import { useObservationCountCheck } from "@/src/features/events/hooks/useObservationCountCheck";
import {
REFRESH_INTERVALS,
@@ -150,8 +152,10 @@ import {
} from "@/src/components/table/utils/refresh-intervals";
import useSessionStorage from "@/src/components/useSessionStorage";
import { api } from "@/src/utils/api";
-import { RunEvaluationDialog } from "@/src/features/batch-actions/components/RunEvaluationDialog/index";
-import { AddObservationsToDatasetDialog } from "@/src/features/batch-actions/components/AddObservationsToDatasetDialog/index";
+import {
+ RunEvaluationDialog,
+ AddObservationsToDatasetDialog,
+} from "@/src/features/batch-actions";
import { useHasEntitlement } from "@/src/features/entitlements";
import { showSuccessToast } from "@/src/features/notifications";
import { MobileFullTextSearch } from "@/src/features/events/components/MobileFullTextSearch";
diff --git a/web/src/features/events/hooks/useAppRootDefault.ts b/web/src/features/events/hooks/useAppRootDefault.ts
index 20ca90b010..18ad375d91 100644
--- a/web/src/features/events/hooks/useAppRootDefault.ts
+++ b/web/src/features/events/hooks/useAppRootDefault.ts
@@ -19,9 +19,11 @@ import {
useBrowserStorageValue,
writeStorage,
} from "@/src/features/events/lib/appRootDefaultStorage";
-import { getSdkVersionCapability } from "@/src/features/sdk-version/lib/sdkVersionCapabilities";
-import { useProjectSdkVersionInfo } from "@/src/features/sdk-version/hooks/useProjectSdkVersionInfo";
-import { clearProjectSdkVersionInfo } from "@/src/features/sdk-version/lib/sdkVersionStorage";
+import {
+ getSdkVersionCapability,
+ useProjectSdkVersionInfo,
+ clearProjectSdkVersionInfo,
+} from "@/src/features/sdk-version";
export function useAppRootDefault(params: {
enabled: boolean;
diff --git a/web/src/features/events/lib/appRootDefault.clienttest.ts b/web/src/features/events/lib/appRootDefault.clienttest.ts
index 2077759be5..3914d8e2f0 100644
--- a/web/src/features/events/lib/appRootDefault.clienttest.ts
+++ b/web/src/features/events/lib/appRootDefault.clienttest.ts
@@ -16,7 +16,7 @@ import {
getSdkVersionCapability,
getSdkVersionCapabilityStatus,
toSdkVersionInfo,
-} from "@/src/features/sdk-version/lib/sdkVersionCapabilities";
+} from "@/src/features/sdk-version";
const levelFilter: FilterState[number] = {
column: "level",
diff --git a/web/src/features/events/server/eventsRouter.ts b/web/src/features/events/server/eventsRouter.ts
index 5f8c449cef..696b466447 100644
--- a/web/src/features/events/server/eventsRouter.ts
+++ b/web/src/features/events/server/eventsRouter.ts
@@ -45,7 +45,7 @@ import {
import {
AgentGraphDataSchema,
type AgentGraphDataResponse,
-} from "@/src/features/trace-graph-view/types";
+} from "@/src/features/trace-graph-view/server";
import type * as opentelemetry from "@opentelemetry/api";
const GetAllEventsInput = EventsTableOptions.safeExtend({
diff --git a/web/src/features/experiments/components/MultiStepExperimentForm.tsx b/web/src/features/experiments/components/MultiStepExperimentForm.tsx
index 8491a9d83a..bcb756c5e8 100644
--- a/web/src/features/experiments/components/MultiStepExperimentForm.tsx
+++ b/web/src/features/experiments/components/MultiStepExperimentForm.tsx
@@ -24,7 +24,7 @@ import Link from "next/link";
import { zodResolver } from "@hookform/resolvers/zod";
import { useForm, type UseFormReturn } from "react-hook-form";
import { api } from "@/src/utils/api";
-import { useModelParams } from "@/src/features/playground/page/hooks/useModelParams";
+import { useModelParams } from "@/src/features/playground";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useEvaluatorDefaults } from "@/src/features/experiments/hooks/useEvaluatorDefaults";
import { useExperimentEvaluatorData } from "@/src/features/experiments/hooks/useExperimentEvaluatorData";
diff --git a/web/src/features/experiments/components/steps/PromptModelStep.tsx b/web/src/features/experiments/components/steps/PromptModelStep.tsx
index 74f322cf55..5b2125c26b 100644
--- a/web/src/features/experiments/components/steps/PromptModelStep.tsx
+++ b/web/src/features/experiments/components/steps/PromptModelStep.tsx
@@ -28,7 +28,7 @@ import {
EyeIcon,
TriangleAlert,
} from "lucide-react";
-import { CreateOrEditLLMSchemaDialog } from "@/src/features/playground/page/components/CreateOrEditLLMSchemaDialog";
+import { CreateOrEditLLMSchemaDialog } from "@/src/features/playground";
import {
hasPromptToolStructuredOutputConflict,
PROMPT_TOOL_STRUCTURED_OUTPUT_CONFLICT_MESSAGE,
diff --git a/web/src/features/experiments/components/table/ExperimentItemsTable.tsx b/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
index ae56691bd4..73db0c1320 100644
--- a/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
+++ b/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
@@ -8,7 +8,7 @@ import {
} from "@/src/components/table/data-table-controls";
import { ResizableFilterLayout } from "@/src/components/table/resizable-filter-layout";
import { useEffect, useMemo, useState, useRef, useCallback } from "react";
-import { RunEvaluationDialog } from "@/src/features/batch-actions/components/RunEvaluationDialog";
+import { RunEvaluationDialog } from "@/src/features/batch-actions";
import { LightbulbIcon } from "lucide-react";
import { useHasProjectAccess } from "@/src/features/rbac";
import {
diff --git a/web/src/features/experiments/components/table/ExperimentsTable.tsx b/web/src/features/experiments/components/table/ExperimentsTable.tsx
index 3906db17e9..17fd52e1a5 100644
--- a/web/src/features/experiments/components/table/ExperimentsTable.tsx
+++ b/web/src/features/experiments/components/table/ExperimentsTable.tsx
@@ -71,7 +71,7 @@ import {
import { useExperimentsTableData } from "../../hooks/useExperimentsTableData";
import { type ExperimentsTableRow, type ExperimentsTableProps } from "./types";
import { useExperimentFilterOptions } from "../../hooks/useExperimentFilterOptions";
-import { RunEvaluationDialog } from "@/src/features/batch-actions/components/RunEvaluationDialog";
+import { RunEvaluationDialog } from "@/src/features/batch-actions";
import { useHasProjectAccess } from "@/src/features/rbac";
import { ExperimentMetricStrip } from "../ExperimentMetricStrip";
import {
diff --git a/web/src/features/experiments/server/index.ts b/web/src/features/experiments/server/index.ts
new file mode 100644
index 0000000000..f1060d5f6e
--- /dev/null
+++ b/web/src/features/experiments/server/index.ts
@@ -0,0 +1,6 @@
+// The experiments feature's server surface (RFC rule 9, amended): the
+// public-API experiment services MCP tools already imported by file path.
+export {
+ listExperimentItemsForPublicApi,
+ listExperimentsForPublicApi,
+} from "@/src/features/experiments/server/public";
diff --git a/web/src/features/feedback/server/feedbackHandler.ts b/web/src/features/feedback/server/feedbackHandler.ts
index ad967ccd45..8a967c6042 100644
--- a/web/src/features/feedback/server/feedbackHandler.ts
+++ b/web/src/features/feedback/server/feedbackHandler.ts
@@ -1,5 +1,5 @@
import { runFeedbackCorsMiddleware } from "@/src/features/feedback/server/corsMiddleware";
-import { sendToSlack } from "@/src/features/slack/server/slack-webhook";
+import { sendToSlack } from "@/src/features/slack/server";
import { type NextApiRequest, type NextApiResponse } from "next";
import { logger } from "@langfuse/shared/src/server";
diff --git a/web/src/features/feedback/server/index.ts b/web/src/features/feedback/server/index.ts
new file mode 100644
index 0000000000..a5bcc9d224
--- /dev/null
+++ b/web/src/features/feedback/server/index.ts
@@ -0,0 +1,6 @@
+// The feedback feature's server surface (RFC rule 9, amended): the
+// product-feedback helpers MCP already imported by file path.
+export {
+ isProductFeedbackAvailable,
+ submitFeedback,
+} from "@/src/features/feedback/server/FeedbackService";
diff --git a/web/src/features/filters/components/filter-builder.tsx b/web/src/features/filters/components/filter-builder.tsx
index 289df01641..0f1f44f02b 100644
--- a/web/src/features/filters/components/filter-builder.tsx
+++ b/web/src/features/filters/components/filter-builder.tsx
@@ -68,8 +68,10 @@ import {
InputCommandList,
} from "@/src/components/ui/input-command";
import { useQueryProject } from "@/src/features/projects";
-import { useLangfuseCloudRegion } from "@/src/features/organizations/hooks";
-import { openAIFeaturesSettings } from "@/src/features/organizations/components/AIFeaturesDisabledNotice";
+import {
+ useLangfuseCloudRegion,
+ openAIFeaturesSettings,
+} from "@/src/features/organizations";
/**
* Extended ColumnDefinition with optional alert for UI display.
diff --git a/web/src/features/mcp/server/dashboardWidgets/tools/dashboardCrud.ts b/web/src/features/mcp/server/dashboardWidgets/tools/dashboardCrud.ts
index fc6e9e29f1..ba57ed478b 100644
--- a/web/src/features/mcp/server/dashboardWidgets/tools/dashboardCrud.ts
+++ b/web/src/features/mcp/server/dashboardWidgets/tools/dashboardCrud.ts
@@ -35,7 +35,7 @@ import {
listPublicDashboards,
updatePublicDashboard,
updatePublicDashboardPlacement,
-} from "@/src/features/dashboard/server/public-dashboard-service";
+} from "@/src/features/dashboard/server";
const auditScope = (context: { orgId: string; apiKeyId: string }) => ({
orgId: context.orgId,
diff --git a/web/src/features/mcp/server/evals/rule-schema.ts b/web/src/features/mcp/server/evals/rule-schema.ts
index 6a3cd074ce..4b4ef80005 100644
--- a/web/src/features/mcp/server/evals/rule-schema.ts
+++ b/web/src/features/mcp/server/evals/rule-schema.ts
@@ -12,7 +12,7 @@ import {
ObservationPromptVariableMappingInput,
PromptVariableMappingRead,
PublicEvaluatorType,
-} from "@/src/features/public-api/types/evaluation/publicEvalsContract";
+} from "@/src/features/public-api/server";
import { McpAdvancedFilterBaseSchema } from "../../core/filter-schema";
const RuleFilterBaseSchema = McpAdvancedFilterBaseSchema.describe(
diff --git a/web/src/features/mcp/server/experiments/tools/listExperimentItems.ts b/web/src/features/mcp/server/experiments/tools/listExperimentItems.ts
index f532001386..8a5c12e8f9 100644
--- a/web/src/features/mcp/server/experiments/tools/listExperimentItems.ts
+++ b/web/src/features/mcp/server/experiments/tools/listExperimentItems.ts
@@ -1,4 +1,4 @@
-import { listExperimentItemsForPublicApi } from "@/src/features/experiments/server/public/service";
+import { listExperimentItemsForPublicApi } from "@/src/features/experiments/server";
import { GetExperimentItemsV1Response } from "@/src/features/public-api/server";
import { buildObservationUrl } from "@langfuse/shared/src/server";
import { defineTool } from "../../../core/define-tool";
diff --git a/web/src/features/mcp/server/experiments/tools/listExperiments.ts b/web/src/features/mcp/server/experiments/tools/listExperiments.ts
index b3246f24bb..45c1af9951 100644
--- a/web/src/features/mcp/server/experiments/tools/listExperiments.ts
+++ b/web/src/features/mcp/server/experiments/tools/listExperiments.ts
@@ -1,4 +1,4 @@
-import { listExperimentsForPublicApi } from "@/src/features/experiments/server/public/service";
+import { listExperimentsForPublicApi } from "@/src/features/experiments/server";
import { GetExperimentsV1Response } from "@/src/features/public-api/server";
import { buildExperimentUrl } from "@langfuse/shared/src/server";
import { defineTool } from "../../../core/define-tool";
diff --git a/web/src/features/mcp/server/feedback/index.ts b/web/src/features/mcp/server/feedback/index.ts
index d9835075d4..46d46c1379 100644
--- a/web/src/features/mcp/server/feedback/index.ts
+++ b/web/src/features/mcp/server/feedback/index.ts
@@ -1,4 +1,4 @@
-import { isProductFeedbackAvailable } from "@/src/features/feedback/server/FeedbackService";
+import { isProductFeedbackAvailable } from "@/src/features/feedback/server";
import type { McpFeatureModule } from "../registry";
import {
handleSubmitFeedback,
diff --git a/web/src/features/mcp/server/feedback/tools/submitFeedback.ts b/web/src/features/mcp/server/feedback/tools/submitFeedback.ts
index 186426a33a..ff6db5316e 100644
--- a/web/src/features/mcp/server/feedback/tools/submitFeedback.ts
+++ b/web/src/features/mcp/server/feedback/tools/submitFeedback.ts
@@ -1,4 +1,4 @@
-import { submitFeedback } from "@/src/features/feedback/server/FeedbackService";
+import { submitFeedback } from "@/src/features/feedback/server";
import { PostFeedbackBody } from "@/src/features/public-api/server";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/mcpServer.ts b/web/src/features/mcp/server/mcpServer.ts
index 82eca1004c..63e24b1788 100644
--- a/web/src/features/mcp/server/mcpServer.ts
+++ b/web/src/features/mcp/server/mcpServer.ts
@@ -17,7 +17,7 @@ import {
ListToolsRequestSchema,
CallToolRequestSchema,
} from "@modelcontextprotocol/sdk/types.js";
-import { isProductFeedbackAvailable } from "@/src/features/feedback/server/FeedbackService";
+import { isProductFeedbackAvailable } from "@/src/features/feedback/server";
import { shadowAuthorize } from "@/src/features/public-api/server";
import { formatErrorForUser } from "../core/error-formatting";
import type { ServerContext } from "../types";
diff --git a/web/src/features/mcp/server/models/tools/createModel.ts b/web/src/features/mcp/server/models/tools/createModel.ts
index 182e30cec8..5e289d6783 100644
--- a/web/src/features/mcp/server/models/tools/createModel.ts
+++ b/web/src/features/mcp/server/models/tools/createModel.ts
@@ -2,7 +2,7 @@ import {
PostModelsV1Body,
PostModelsV1Response,
} from "@/src/features/public-api/server";
-import { createModelForApi } from "@/src/features/models/server/publicApiModelService";
+import { createModelForApi } from "@/src/features/models/server";
import { defineTool } from "../../../core/define-tool";
import { buildModelUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/models/tools/deleteModel.ts b/web/src/features/mcp/server/models/tools/deleteModel.ts
index 4430824594..04ae56bc90 100644
--- a/web/src/features/mcp/server/models/tools/deleteModel.ts
+++ b/web/src/features/mcp/server/models/tools/deleteModel.ts
@@ -2,7 +2,7 @@ import {
DeleteModelV1Query,
DeleteModelV1Response,
} from "@/src/features/public-api/server";
-import { deleteModelForApi } from "@/src/features/models/server/publicApiModelService";
+import { deleteModelForApi } from "@/src/features/models/server";
import { defineTool } from "../../../core/define-tool";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/models/tools/getModel.ts b/web/src/features/mcp/server/models/tools/getModel.ts
index 2dfb78071e..13aab9f61b 100644
--- a/web/src/features/mcp/server/models/tools/getModel.ts
+++ b/web/src/features/mcp/server/models/tools/getModel.ts
@@ -2,7 +2,7 @@ import {
GetModelV1Query,
GetModelV1Response,
} from "@/src/features/public-api/server";
-import { getModelForApi } from "@/src/features/models/server/publicApiModelService";
+import { getModelForApi } from "@/src/features/models/server";
import { defineTool } from "../../../core/define-tool";
import { buildModelUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/models/tools/listModels.ts b/web/src/features/mcp/server/models/tools/listModels.ts
index 866d3fac5f..5276ae2fa3 100644
--- a/web/src/features/mcp/server/models/tools/listModels.ts
+++ b/web/src/features/mcp/server/models/tools/listModels.ts
@@ -2,7 +2,7 @@ import {
GetModelsV1Query,
GetModelsV1Response,
} from "@/src/features/public-api/server";
-import { listModelsForApi } from "@/src/features/models/server/publicApiModelService";
+import { listModelsForApi } from "@/src/features/models/server";
import { defineTool } from "../../../core/define-tool";
import { buildModelUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/prompts/tools/createChatPrompt.ts b/web/src/features/mcp/server/prompts/tools/createChatPrompt.ts
index 0ae214c58c..44ebba4811 100644
--- a/web/src/features/mcp/server/prompts/tools/createChatPrompt.ts
+++ b/web/src/features/mcp/server/prompts/tools/createChatPrompt.ts
@@ -13,7 +13,7 @@ import {
COMMIT_MESSAGE_MAX_LENGTH,
PROMPT_NAME_MAX_LENGTH,
} from "@langfuse/shared";
-import { createPromptForApi } from "@/src/features/prompts/server/prompt-api-service";
+import { createPromptForApi } from "@/src/features/prompts/server";
import {
buildPromptUrl,
PromptChatMessageSchema,
diff --git a/web/src/features/mcp/server/prompts/tools/createTextPrompt.ts b/web/src/features/mcp/server/prompts/tools/createTextPrompt.ts
index f09c9d1dfb..84f1adb2a0 100644
--- a/web/src/features/mcp/server/prompts/tools/createTextPrompt.ts
+++ b/web/src/features/mcp/server/prompts/tools/createTextPrompt.ts
@@ -13,7 +13,7 @@ import {
COMMIT_MESSAGE_MAX_LENGTH,
PROMPT_NAME_MAX_LENGTH,
} from "@langfuse/shared";
-import { createPromptForApi } from "@/src/features/prompts/server/prompt-api-service";
+import { createPromptForApi } from "@/src/features/prompts/server";
import { buildPromptUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
import { ParamCreatePromptLabels } from "../validation";
diff --git a/web/src/features/mcp/server/prompts/tools/listPrompts.ts b/web/src/features/mcp/server/prompts/tools/listPrompts.ts
index e7a0ef0c65..aa925f6e13 100644
--- a/web/src/features/mcp/server/prompts/tools/listPrompts.ts
+++ b/web/src/features/mcp/server/prompts/tools/listPrompts.ts
@@ -13,7 +13,7 @@ import {
ParamPromptTag,
} from "../validation";
import { ParamLimit, ParamPage } from "../../../core/validation";
-import { listPromptsForApi } from "@/src/features/prompts/server/prompt-api-service";
+import { listPromptsForApi } from "@/src/features/prompts/server";
import { buildPromptUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
import { paginationMeta } from "../../publicApi";
diff --git a/web/src/features/mcp/server/prompts/tools/promptReadToolFactory.ts b/web/src/features/mcp/server/prompts/tools/promptReadToolFactory.ts
index accf24128c..7fe41b5b18 100644
--- a/web/src/features/mcp/server/prompts/tools/promptReadToolFactory.ts
+++ b/web/src/features/mcp/server/prompts/tools/promptReadToolFactory.ts
@@ -1,8 +1,7 @@
import { z } from "zod";
import { LATEST_PROMPT_LABEL, type Prompt } from "@langfuse/shared";
-import { getPromptForApi } from "@/src/features/prompts/server/prompt-api-service";
-
+import { getPromptForApi } from "@/src/features/prompts/server";
import { defineTool } from "../../../core/define-tool";
import { buildPromptUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/mcp/server/prompts/tools/updatePromptLabels.ts b/web/src/features/mcp/server/prompts/tools/updatePromptLabels.ts
index a0739b282a..83030d197e 100644
--- a/web/src/features/mcp/server/prompts/tools/updatePromptLabels.ts
+++ b/web/src/features/mcp/server/prompts/tools/updatePromptLabels.ts
@@ -9,7 +9,7 @@
import { z } from "zod";
import { defineTool } from "../../../core/define-tool";
import { ParamPromptName, ParamNewLabels } from "../validation";
-import { updatePromptLabelsForApi } from "@/src/features/prompts/server/prompt-api-service";
+import { updatePromptLabelsForApi } from "@/src/features/prompts/server";
import { buildPromptUrl } from "@langfuse/shared/src/server";
import { runMcpTool } from "../../../core/run-mcp-tool";
diff --git a/web/src/features/models/index.ts b/web/src/features/models/index.ts
new file mode 100644
index 0000000000..031e9d7fa3
--- /dev/null
+++ b/web/src/features/models/index.ts
@@ -0,0 +1,5 @@
+// The models feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported.
+export { ModelsSettings } from "@/src/features/models/components/ModelSettings";
+export { ProvidedModelNameCell } from "@/src/features/models/components/ProvidedModelNameCell";
+export { UpsertModelFormDialog } from "@/src/features/models/components/UpsertModelFormDialog/UpsertModelFormDialog";
diff --git a/web/src/features/models/server/index.ts b/web/src/features/models/server/index.ts
new file mode 100644
index 0000000000..6b3d8bf33f
--- /dev/null
+++ b/web/src/features/models/server/index.ts
@@ -0,0 +1,9 @@
+// The models feature's server surface (RFC rule 9, amended): the
+// public-API model service MCP tools already imported by file path.
+export {
+ createModelForApi,
+ deleteModelForApi,
+ getModelForApi,
+ listModelsForApi,
+ upsertModelForApi,
+} from "@/src/features/models/server/publicApiModelService";
diff --git a/web/src/features/notifications/ErrorNotification.tsx b/web/src/features/notifications/ErrorNotification.tsx
index d6cd9d4607..4ab27e8927 100644
--- a/web/src/features/notifications/ErrorNotification.tsx
+++ b/web/src/features/notifications/ErrorNotification.tsx
@@ -1,6 +1,6 @@
import { Button } from "@/src/components/ui/button";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useSupportDrawer } from "@/src/features/support-chat/SupportDrawerProvider";
+import { useSupportDrawer } from "@/src/features/support-chat";
import { useV4MigrationPanel } from "@/src/features/v4-migration/V4MigrationPanelProvider";
import { AlertTriangle, X } from "lucide-react";
diff --git a/web/src/features/onboarding/server/onboardingService.ts b/web/src/features/onboarding/server/onboardingService.ts
index b7fcab5d39..29adccc875 100644
--- a/web/src/features/onboarding/server/onboardingService.ts
+++ b/web/src/features/onboarding/server/onboardingService.ts
@@ -15,7 +15,7 @@ import {
type OrganizationScope,
} from "@/src/features/rbac";
import { projectRoleAccessRights } from "@langfuse/shared";
-import { createProjectRoute } from "@/src/features/setup/setupRoutes";
+import { createProjectRoute } from "@/src/features/setup";
const DEFAULT_STARTER_PROJECT_NAME = "My Project";
const STARTER_ORGANIZATION_METADATA = {
diff --git a/web/src/features/organizations/components/ProjectOverview.tsx b/web/src/features/organizations/components/ProjectOverview.tsx
index 8e7f5562b4..1fc6264c06 100644
--- a/web/src/features/organizations/components/ProjectOverview.tsx
+++ b/web/src/features/organizations/components/ProjectOverview.tsx
@@ -28,7 +28,7 @@ import { useSession } from "next-auth/react";
import {
createOrganizationRoute,
createProjectRoute,
-} from "@/src/features/setup/setupRoutes";
+} from "@/src/features/setup";
import { isCloudPlan, planLabels } from "@langfuse/shared";
import ContainerPage from "@/src/components/layouts/container-page";
import { type Session } from "next-auth";
diff --git a/web/src/features/organizations/index.ts b/web/src/features/organizations/index.ts
index 52573e14bb..3a7e7d9b0c 100644
--- a/web/src/features/organizations/index.ts
+++ b/web/src/features/organizations/index.ts
@@ -13,9 +13,6 @@
// 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,
@@ -23,7 +20,10 @@ export {
type CloudRegion,
type CloudRegionName,
} from "@/src/features/organizations/cloudRegions";
-export { AIFeaturesDisabledNotice } from "@/src/features/organizations/components/AIFeaturesDisabledNotice";
+export {
+ AIFeaturesDisabledNotice,
+ openAIFeaturesSettings,
+} from "@/src/features/organizations/components/AIFeaturesDisabledNotice";
export {
useLangfuseCloudRegion,
useLangfuseV4WriteMode,
diff --git a/web/src/features/playground/index.ts b/web/src/features/playground/index.ts
new file mode 100644
index 0000000000..6dc20defed
--- /dev/null
+++ b/web/src/features/playground/index.ts
@@ -0,0 +1,6 @@
+// The playground feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported.
+export { CreateOrEditLLMSchemaDialog } from "@/src/features/playground/page/components/CreateOrEditLLMSchemaDialog";
+export { JumpToPlaygroundDropdownMenuController } from "@/src/features/playground/page/components/JumpToPlaygroundDropdownMenuController";
+export { useModelParams } from "@/src/features/playground/page/hooks/useModelParams";
+export { default as usePlaygroundCache } from "@/src/features/playground/page/hooks/usePlaygroundCache";
diff --git a/web/src/features/projects/ProjectSettingsPage.tsx b/web/src/features/projects/ProjectSettingsPage.tsx
index dacb0aa8df..d643fa39b0 100644
--- a/web/src/features/projects/ProjectSettingsPage.tsx
+++ b/web/src/features/projects/ProjectSettingsPage.tsx
@@ -24,20 +24,20 @@ import { useRouter } from "next/router";
import { SettingsDangerZone } from "@/src/components/SettingsDangerZone";
import { ActionButton } from "@/src/components/ActionButton";
import { BatchExportsSettingsPage } from "@/src/features/batch-exports/components/BatchExportsSettingsPage";
-import { BatchActionsSettingsPage } from "@/src/features/batch-actions/components/BatchActionsSettingsPage";
+import { BatchActionsSettingsPage } from "@/src/features/batch-actions";
import { AuditLogsSettingsPage } from "@/src/ee/features/audit-log-viewer/AuditLogsSettingsPage";
-import { ModelsSettings } from "@/src/features/models/components/ModelSettings";
+import { ModelsSettings } from "@/src/features/models";
import ConfigureRetention from "@/src/features/projects/components/ConfigureRetention";
import ContainerPage from "@/src/components/layouts/container-page";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
-import ProtectedLabelsSettings from "@/src/features/prompts/components/ProtectedLabelsSettings";
+import { ProtectedLabelsSettings } from "@/src/features/prompts";
import { SiSlack } from "react-icons/si";
import { ScoreConfigSettings } from "@/src/features/score-configs/components/ScoreConfigSettings";
import { env } from "@/src/env.mjs";
import { PersonalNotificationSettings } from "@/src/features/notifications/components/PersonalNotificationSettings";
import { ProjectNotificationChannels } from "@/src/features/notifications/components/ProjectNotificationChannels";
import useSessionStorage from "@/src/components/useSessionStorage";
-import { WebCalloutIntegrationCard } from "@/src/features/web-callouts/components/WebCalloutSettingsPage";
+import { WebCalloutIntegrationCard } from "@/src/features/web-callouts";
import { DeveloperToolsSettings } from "@/src/features/developer-tools/components/DeveloperToolsSettings";
import { useV4UpgradeUiFlag } from "@/src/features/v4-migration/useV4UpgradeUiEnabled";
import { api } from "@/src/utils/api";
diff --git a/web/src/features/projects/components/HostNameProject.tsx b/web/src/features/projects/components/HostNameProject.tsx
index 927399c883..b88cb46003 100644
--- a/web/src/features/projects/components/HostNameProject.tsx
+++ b/web/src/features/projects/components/HostNameProject.tsx
@@ -1,7 +1,7 @@
import { Card } from "@/src/components/ui/card";
import { CodeView } from "@/src/components/ui/CodeJsonViewer";
import Header from "@/src/components/layouts/header";
-import { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
+import { useUiCustomization } from "@/src/ee/features/ui-customization";
import { env } from "@/src/env.mjs";
export function HostNameProject() {
diff --git a/web/src/features/prompts/components/NewPromptForm/index.tsx b/web/src/features/prompts/components/NewPromptForm/index.tsx
index acbdeb5377..3d0c1e016b 100644
--- a/web/src/features/prompts/components/NewPromptForm/index.tsx
+++ b/web/src/features/prompts/components/NewPromptForm/index.tsx
@@ -41,7 +41,7 @@ import { PromptVariableListPreview } from "@/src/features/prompts/components/Pro
import { CodeMirrorEditor } from "@/src/components/editor/CodeMirrorEditor";
import { PromptLinkingEditor } from "@/src/components/editor/PromptLinkingEditor";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import usePlaygroundCache from "@/src/features/playground/page/hooks/usePlaygroundCache";
+import { usePlaygroundCache } from "@/src/features/playground";
import { useQueryParam } from "use-query-params";
import { usePromptNameValidation } from "@/src/features/prompts/hooks/usePromptNameValidation";
import { getPromptDetailHref } from "@/src/features/prompts/utils";
diff --git a/web/src/features/prompts/components/prompt-detail.tsx b/web/src/features/prompts/components/prompt-detail.tsx
index b021796ade..0ea6c1833a 100644
--- a/web/src/features/prompts/components/prompt-detail.tsx
+++ b/web/src/features/prompts/components/prompt-detail.tsx
@@ -30,7 +30,7 @@ import {
} from "@langfuse/shared";
import { getPromptTabs, PROMPT_TABS } from "@/src/features/navigation";
import { PromptHistoryNode } from "./prompt-history";
-import { JumpToPlaygroundDropdownMenuController } from "@/src/features/playground/page/components/JumpToPlaygroundDropdownMenuController";
+import { JumpToPlaygroundDropdownMenuController } from "@/src/features/playground";
import { ChatMlArraySchema } from "@/src/components/schemas/ChatMlSchema";
import { ObservationsTable as LegacyGenerations } from "@/src/features/tracing-tables";
import EventsTable from "@/src/features/events/components/EventsTable";
diff --git a/web/src/features/prompts/index.ts b/web/src/features/prompts/index.ts
new file mode 100644
index 0000000000..a46e840ffd
--- /dev/null
+++ b/web/src/features/prompts/index.ts
@@ -0,0 +1,4 @@
+// The prompts feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported.
+export { PromptVariableListPreview } from "@/src/features/prompts/components/PromptVariableListPreview";
+export { default as ProtectedLabelsSettings } from "@/src/features/prompts/components/ProtectedLabelsSettings";
diff --git a/web/src/features/prompts/server/index.ts b/web/src/features/prompts/server/index.ts
new file mode 100644
index 0000000000..e353bea1fa
--- /dev/null
+++ b/web/src/features/prompts/server/index.ts
@@ -0,0 +1,8 @@
+// The prompts feature's server surface (RFC rule 9, amended): the
+// public-API prompt service MCP tools already imported by file path.
+export {
+ createPromptForApi,
+ getPromptForApi,
+ listPromptsForApi,
+ updatePromptLabelsForApi,
+} from "@/src/features/prompts/server/prompt-api-service";
diff --git a/web/src/features/public-api/components/CreateLLMApiKeyDialog.tsx b/web/src/features/public-api/components/CreateLLMApiKeyDialog.tsx
index 5eec803557..696d6400a2 100644
--- a/web/src/features/public-api/components/CreateLLMApiKeyDialog.tsx
+++ b/web/src/features/public-api/components/CreateLLMApiKeyDialog.tsx
@@ -10,7 +10,7 @@ import {
} from "@/src/components/ui/dialog";
import { useHasProjectAccess } from "@/src/features/rbac";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
-import { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
+import { useUiCustomization } from "@/src/ee/features/ui-customization";
import { CreateLLMApiKeyForm } from "@/src/features/public-api/components/CreateLLMApiKeyForm";
export function CreateLLMApiKeyDialog({
diff --git a/web/src/features/public-api/components/CreateLLMApiKeyForm.tsx b/web/src/features/public-api/components/CreateLLMApiKeyForm.tsx
index 494c347db5..9fcaa75ffb 100644
--- a/web/src/features/public-api/components/CreateLLMApiKeyForm.tsx
+++ b/web/src/features/public-api/components/CreateLLMApiKeyForm.tsx
@@ -36,7 +36,7 @@ import { Switch } from "@/src/components/design-system/Switch/Switch";
import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
import { api, reportNonTrpcError, type RouterOutputs } from "@/src/utils/api";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { type useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
+import { type useUiCustomization } from "@/src/ee/features/ui-customization";
import { DialogFooter, DialogBody } from "@/src/components/ui/dialog";
import { env } from "@/src/env.mjs";
import {
diff --git a/web/src/features/public-api/components/UpdateLLMApiKeyDialog.tsx b/web/src/features/public-api/components/UpdateLLMApiKeyDialog.tsx
index a5280b4618..af725470c3 100644
--- a/web/src/features/public-api/components/UpdateLLMApiKeyDialog.tsx
+++ b/web/src/features/public-api/components/UpdateLLMApiKeyDialog.tsx
@@ -6,7 +6,7 @@ import {
DialogTitle,
} from "@/src/components/ui/dialog";
import { CreateLLMApiKeyForm } from "./CreateLLMApiKeyForm";
-import { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
+import { useUiCustomization } from "@/src/ee/features/ui-customization";
import { type RouterOutputs } from "@/src/utils/api";
type LlmApiKeyListItem = RouterOutputs["llmApiKey"]["all"]["data"][number];
diff --git a/web/src/features/public-api/hooks/useLangfuseEnvCode.ts b/web/src/features/public-api/hooks/useLangfuseEnvCode.ts
index edce86b69c..f2410c7860 100644
--- a/web/src/features/public-api/hooks/useLangfuseEnvCode.ts
+++ b/web/src/features/public-api/hooks/useLangfuseEnvCode.ts
@@ -1,4 +1,4 @@
-import { useUiCustomization } from "@/src/ee/features/ui-customization/useUiCustomization";
+import { useUiCustomization } from "@/src/ee/features/ui-customization";
import { env } from "@/src/env.mjs";
type LangfuseKeys = {
diff --git a/web/src/features/public-api/server/index.ts b/web/src/features/public-api/server/index.ts
index a7a25a4ea4..c63c5a8c7b 100644
--- a/web/src/features/public-api/server/index.ts
+++ b/web/src/features/public-api/server/index.ts
@@ -179,3 +179,8 @@ export {
writeProjectError,
writeScimError,
} from "./writeError";
+export {
+ ObservationPromptVariableMappingInput,
+ PromptVariableMappingRead,
+ PublicEvaluatorType,
+} from "../types/evaluation/publicEvalsContract";
diff --git a/web/src/features/score-analytics/index.ts b/web/src/features/score-analytics/index.ts
new file mode 100644
index 0000000000..7beadfd0c0
--- /dev/null
+++ b/web/src/features/score-analytics/index.ts
@@ -0,0 +1,10 @@
+// The score-analytics feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported.
+export type { ScoreOption } from "@/src/features/score-analytics/components/charts/ScoreCombobox";
+export { ScoreAnalyticsDashboard } from "@/src/features/score-analytics/components/ScoreAnalyticsDashboard";
+export { ScoreAnalyticsHeader } from "@/src/features/score-analytics/components/ScoreAnalyticsHeader";
+export {
+ ScoreAnalyticsProvider,
+ type DataType,
+} from "@/src/features/score-analytics/components/ScoreAnalyticsProvider";
+export { useAnalyticsUrlState } from "@/src/features/score-analytics/lib/analytics-url-state";
diff --git a/web/src/features/scores/ScoresAnalyticsPage.tsx b/web/src/features/scores/ScoresAnalyticsPage.tsx
index 48d8bf6b07..0feb770f1f 100644
--- a/web/src/features/scores/ScoresAnalyticsPage.tsx
+++ b/web/src/features/scores/ScoresAnalyticsPage.tsx
@@ -3,8 +3,14 @@ import { useRouter } from "next/router";
import { useMemo, useEffect, useRef } from "react";
import Page from "@/src/components/layouts/page";
import { getScoresTabs, SCORES_TABS } from "@/src/features/navigation";
-import { useAnalyticsUrlState } from "@/src/features/score-analytics/lib/analytics-url-state";
-import { type ScoreOption } from "@/src/features/score-analytics/components/charts/ScoreCombobox";
+import {
+ useAnalyticsUrlState,
+ type ScoreOption,
+ ScoreAnalyticsProvider,
+ type DataType,
+ ScoreAnalyticsHeader,
+ ScoreAnalyticsDashboard,
+} from "@/src/features/score-analytics";
import { useDashboardDateRange } from "@/src/hooks/useDashboardDateRange";
import {
toAbsoluteTimeRange,
@@ -12,12 +18,6 @@ import {
} from "@/src/utils/date-range-utils";
import { BarChart3 } from "lucide-react";
import { api } from "@/src/utils/api";
-import {
- ScoreAnalyticsProvider,
- type DataType,
-} from "@/src/features/score-analytics/components/ScoreAnalyticsProvider";
-import { ScoreAnalyticsHeader } from "@/src/features/score-analytics/components/ScoreAnalyticsHeader";
-import { ScoreAnalyticsDashboard } from "@/src/features/score-analytics/components/ScoreAnalyticsDashboard";
import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
/**
diff --git a/web/src/features/sdk-version/index.ts b/web/src/features/sdk-version/index.ts
new file mode 100644
index 0000000000..c7d3fb1750
--- /dev/null
+++ b/web/src/features/sdk-version/index.ts
@@ -0,0 +1,13 @@
+// The sdk-version feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported.
+//
+// Server callers of getSdkVersionCapabilityStatus use server/index.ts
+// so they do not load the React hook on this door.
+export { useProjectSdkVersionInfo } from "@/src/features/sdk-version/hooks/useProjectSdkVersionInfo";
+export {
+ getSdkVersionCapability,
+ getSdkVersionCapabilityStatus,
+ toSdkVersionInfo,
+ type SdkVersionInfo,
+} from "@/src/features/sdk-version/lib/sdkVersionCapabilities";
+export { clearProjectSdkVersionInfo } from "@/src/features/sdk-version/lib/sdkVersionStorage";
diff --git a/web/src/features/sdk-version/server/index.ts b/web/src/features/sdk-version/server/index.ts
new file mode 100644
index 0000000000..ca944b2322
--- /dev/null
+++ b/web/src/features/sdk-version/server/index.ts
@@ -0,0 +1,3 @@
+// The sdk-version feature's server surface (RFC rule 9, amended): the
+// capability helper server callers already imported by file path.
+export { getSdkVersionCapabilityStatus } from "@/src/features/sdk-version/lib/sdkVersionCapabilities";
diff --git a/web/src/features/sessions/LazySessionTraceEventsRow.tsx b/web/src/features/sessions/LazySessionTraceEventsRow.tsx
index 6cad911140..be0836c10f 100644
--- a/web/src/features/sessions/LazySessionTraceEventsRow.tsx
+++ b/web/src/features/sessions/LazySessionTraceEventsRow.tsx
@@ -8,7 +8,7 @@ import {
import { useSessionDetailStore } from "@/src/features/sessions/SessionDetailStoreProvider";
import { type RouterOutputs } from "@/src/utils/api";
import { type FilterState } from "@langfuse/shared";
-import { type IOPreviewContentMode } from "@/src/features/traces/components/IOPreview/IOPreview";
+import { type IOPreviewContentMode } from "@/src/features/traces";
type LazySessionTraceEventsRowProps = {
trace: RouterOutputs["sessions"]["tracesFromEvents"][number];
diff --git a/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx b/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx
index f979650e3c..b33ca43edb 100644
--- a/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx
+++ b/web/src/features/sessions/SessionConversationTimeline/ConnectedSessionConversationTimeline.tsx
@@ -10,7 +10,7 @@ import { type SessionObservation } from "@/src/features/sessions/SessionConversa
import { type EventSessionTrace } from "@/src/features/sessions/sessionDetailPageTypes";
import { AnnotateDrawerController } from "@/src/features/scores";
import { CommentDrawerController } from "@/src/features/comments";
-import { NewDatasetItemFromExistingObjectDialogController } from "@/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController";
+import { NewDatasetItemFromExistingObjectDialogController } from "@/src/features/datasets";
import { showErrorToast } from "@/src/features/notifications";
import { useHasProjectAccess } from "@/src/features/rbac";
import { api, sendAsPostOption, type RouterOutputs } from "@/src/utils/api";
diff --git a/web/src/features/sessions/SessionPages.tsx b/web/src/features/sessions/SessionPages.tsx
index c6b6366b64..f5ee6fc421 100644
--- a/web/src/features/sessions/SessionPages.tsx
+++ b/web/src/features/sessions/SessionPages.tsx
@@ -4,7 +4,7 @@ import { cn } from "@/src/utils/tailwind";
import { GroupedScoreBadges } from "@/src/components/grouped-score-badge";
import { ErrorPage } from "@/src/components/error-page";
import { PublishSessionSwitch } from "@/src/components/publish-object-switch";
-import { IOPreview } from "@/src/features/traces/components/IOPreview/IOPreview";
+import { IOPreview } from "@/src/features/traces";
import { JsonSkeleton } from "@/src/components/ui/CodeJsonViewer";
import { Badge } from "@/src/components/ui/badge";
import {
@@ -64,7 +64,7 @@ import {
import {
useWebCalloutAction,
WebCalloutButton,
-} from "@/src/features/web-callouts/components/WebCalloutMenuItem";
+} from "@/src/features/web-callouts";
import { TablePeekViewTraceDetail } from "@/src/components/table/peek/peek-trace-detail";
import { usePeekNavigation } from "@/src/components/table/peek/hooks/usePeekNavigation";
import { type WithStringifiedMetadata } from "@/src/utils/clientSideDomainTypes";
diff --git a/web/src/features/sessions/SessionTraceActionButtons.tsx b/web/src/features/sessions/SessionTraceActionButtons.tsx
index e10e77882f..80a4b8d916 100644
--- a/web/src/features/sessions/SessionTraceActionButtons.tsx
+++ b/web/src/features/sessions/SessionTraceActionButtons.tsx
@@ -6,9 +6,11 @@ import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-
import { Button } from "@/src/components/ui/button";
import { AnnotateDrawerController } from "@/src/features/scores";
import { CommentDrawerController } from "@/src/features/comments";
-import { ExistingDatasetItemsDropdownMenuController } from "@/src/features/datasets/components/ExistingDatasetItemsDropdownMenuController";
-import { NewDatasetItemFromExistingObjectDialogController } from "@/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController";
-import { useDatasetItemFromTraceOrObservation } from "@/src/features/datasets/hooks/useDatasetItemFromTraceOrObservation";
+import {
+ ExistingDatasetItemsDropdownMenuController,
+ NewDatasetItemFromExistingObjectDialogController,
+ useDatasetItemFromTraceOrObservation,
+} from "@/src/features/datasets";
import {
AnnotationQueueItemDropdownMenuController,
AnnotationQueueItemCountBadge,
diff --git a/web/src/features/setup/index.ts b/web/src/features/setup/index.ts
new file mode 100644
index 0000000000..e335ddd540
--- /dev/null
+++ b/web/src/features/setup/index.ts
@@ -0,0 +1,8 @@
+// The setup feature's public surface (RFC rule 8). Named re-exports
+// only — route helpers other features already imported by file path.
+// This module is React-free, so server callers use the same door.
+export {
+ createOrganizationRoute,
+ createProjectRoute,
+ setupTracingRoute,
+} from "@/src/features/setup/setupRoutes";
diff --git a/web/src/features/slack/index.ts b/web/src/features/slack/index.ts
new file mode 100644
index 0000000000..23bddf1aae
--- /dev/null
+++ b/web/src/features/slack/index.ts
@@ -0,0 +1,8 @@
+// The slack feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported.
+export {
+ ChannelSelector,
+ type SlackChannel,
+} from "@/src/features/slack/components/ChannelSelector";
+export { SlackConnectionCard } from "@/src/features/slack/components/SlackConnectionCard";
+export { SlackTestMessageButton } from "@/src/features/slack/components/SlackTestMessageButton";
diff --git a/web/src/features/slack/server/index.ts b/web/src/features/slack/server/index.ts
new file mode 100644
index 0000000000..3d9fd79b80
--- /dev/null
+++ b/web/src/features/slack/server/index.ts
@@ -0,0 +1,3 @@
+// The slack feature's server surface (RFC rule 9, amended): the webhook
+// helper other server features already imported by file path.
+export { sendToSlack } from "@/src/features/slack/server/slack-webhook";
diff --git a/web/src/features/support-chat/IntroSection.tsx b/web/src/features/support-chat/IntroSection.tsx
index b9286e7e3f..d10cf4b576 100644
--- a/web/src/features/support-chat/IntroSection.tsx
+++ b/web/src/features/support-chat/IntroSection.tsx
@@ -14,7 +14,7 @@ import { RainbowButton } from "@/src/components/magicui/rainbow-button";
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 { useUiCustomization } from "@/src/ee/features/ui-customization";
import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
diff --git a/web/src/features/support-chat/index.ts b/web/src/features/support-chat/index.ts
new file mode 100644
index 0000000000..5524ad4a74
--- /dev/null
+++ b/web/src/features/support-chat/index.ts
@@ -0,0 +1,6 @@
+// The support-chat feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported.
+export {
+ SupportDrawerProvider,
+ useSupportDrawer,
+} from "@/src/features/support-chat/SupportDrawerProvider";
diff --git a/web/src/features/table/server/createBatchActionJob.ts b/web/src/features/table/server/createBatchActionJob.ts
index 86824bb266..130a6eb0cd 100644
--- a/web/src/features/table/server/createBatchActionJob.ts
+++ b/web/src/features/table/server/createBatchActionJob.ts
@@ -15,7 +15,7 @@ import {
QueueJobs,
} from "@langfuse/shared/src/server";
import { TRPCError } from "@trpc/server";
-import { assertLegacyTracingIoSearchCanCreateBatchJob } from "@/src/features/traces/server/legacyIoSearch";
+import { assertLegacyTracingIoSearchCanCreateBatchJob } from "@/src/features/traces/server";
import { prisma } from "@langfuse/shared/src/db";
type CreateBatchActionJob = {
diff --git a/web/src/features/trace-graph-view/index.ts b/web/src/features/trace-graph-view/index.ts
new file mode 100644
index 0000000000..059c115676
--- /dev/null
+++ b/web/src/features/trace-graph-view/index.ts
@@ -0,0 +1,11 @@
+// The trace-graph-view feature's public client surface (RFC rule 8).
+// Named re-exports only — exactly what other features already imported.
+//
+// AgentGraphDataSchema stays on server/index.ts so eventsRouter does
+// not load TraceGraphView.
+export { TraceGraphView } from "@/src/features/trace-graph-view/components/TraceGraphView";
+export {
+ GRAPH_VIEW_MODES,
+ type AgentGraphDataResponse,
+ type GraphViewMode,
+} from "@/src/features/trace-graph-view/types";
diff --git a/web/src/features/trace-graph-view/server/index.ts b/web/src/features/trace-graph-view/server/index.ts
new file mode 100644
index 0000000000..810b207e43
--- /dev/null
+++ b/web/src/features/trace-graph-view/server/index.ts
@@ -0,0 +1,6 @@
+// The trace-graph-view feature's server surface (RFC rule 9, amended):
+// the graph payload schema tRPC routers already imported by file path.
+export {
+ AgentGraphDataSchema,
+ type AgentGraphDataResponse,
+} from "@/src/features/trace-graph-view/types";
diff --git a/web/src/features/traces/components/DetailHeaderActionsMenuController.tsx b/web/src/features/traces/components/DetailHeaderActionsMenuController.tsx
index afae743c94..3768c02f21 100644
--- a/web/src/features/traces/components/DetailHeaderActionsMenuController.tsx
+++ b/web/src/features/traces/components/DetailHeaderActionsMenuController.tsx
@@ -16,7 +16,7 @@ import { type ObservationType } from "@langfuse/shared";
import {
useWebCalloutAction,
WebCalloutMenuItem,
-} from "@/src/features/web-callouts/components/WebCalloutMenuItem";
+} from "@/src/features/web-callouts";
type IdItem = {
name: string;
diff --git a/web/src/features/traces/components/IOPreview/hooks/useCorrectionData.ts b/web/src/features/traces/components/IOPreview/hooks/useCorrectionData.ts
index 2c22db5a73..a79ac1415c 100644
--- a/web/src/features/traces/components/IOPreview/hooks/useCorrectionData.ts
+++ b/web/src/features/traces/components/IOPreview/hooks/useCorrectionData.ts
@@ -1,5 +1,5 @@
import { useMemo } from "react";
-import { useCorrectionCache } from "@/src/features/corrections/contexts/CorrectionCacheContext";
+import { useCorrectionCache } from "@/src/features/corrections";
import { type ScoreDomain } from "@langfuse/shared";
/**
diff --git a/web/src/features/traces/components/IOPreview/hooks/useCorrectionMutations.ts b/web/src/features/traces/components/IOPreview/hooks/useCorrectionMutations.ts
index a2b73d631b..fcee20ca97 100644
--- a/web/src/features/traces/components/IOPreview/hooks/useCorrectionMutations.ts
+++ b/web/src/features/traces/components/IOPreview/hooks/useCorrectionMutations.ts
@@ -1,6 +1,6 @@
import { useState, useCallback } from "react";
import { api } from "@/src/utils/api";
-import { useCorrectionCache } from "@/src/features/corrections/contexts/CorrectionCacheContext";
+import { useCorrectionCache } from "@/src/features/corrections";
import { type ScoreDomain } from "@langfuse/shared";
import { toast } from "sonner";
import { v4 } from "uuid";
diff --git a/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx b/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
index 6987b680dd..d3d3594906 100644
--- a/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
@@ -46,7 +46,7 @@ import {
} from "@/src/features/comments";
import { useRouter } from "next/router";
import { ScoresTable } from "@/src/features/scores";
-import { getMostRecentCorrection } from "@/src/features/corrections/utils/getMostRecentCorrection";
+import { getMostRecentCorrection } from "@/src/features/corrections";
import { useJsonExpansion } from "@/src/features/traces/contexts/JsonExpansionContext";
import { useMedia } from "@/src/features/traces/hooks/useMedia";
import {
diff --git a/web/src/features/traces/components/ObservationDetailView/components/ModelBadge.tsx b/web/src/features/traces/components/ObservationDetailView/components/ModelBadge.tsx
index 8f6d8d7ff2..cff272c530 100644
--- a/web/src/features/traces/components/ObservationDetailView/components/ModelBadge.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/components/ModelBadge.tsx
@@ -6,7 +6,7 @@
import { Badge } from "@/src/components/design-system/Badge/Badge";
import { ExternalLinkIcon, PlusCircle } from "lucide-react";
import Link from "next/link";
-import { UpsertModelFormDialog } from "@/src/features/models/components/UpsertModelFormDialog/UpsertModelFormDialog";
+import { UpsertModelFormDialog } from "@/src/features/models";
export function ModelBadge({
model,
diff --git a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
index 1e8d68e34d..e1ad1a71ee 100644
--- a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
@@ -33,7 +33,7 @@ import {
AnnotationQueueItemDropdownMenuController,
AnnotationQueueItemCountBadge,
} from "@/src/features/annotation-queues";
-import { JumpToPlaygroundDropdownMenuController } from "@/src/features/playground/page/components/JumpToPlaygroundDropdownMenuController";
+import { JumpToPlaygroundDropdownMenuController } from "@/src/features/playground";
import { PromptBadge } from "@/src/features/traces/components/PromptBadge";
import {
LatencyBadge,
diff --git a/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx b/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
index a2c62b4100..5336689f53 100644
--- a/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
+++ b/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
@@ -62,7 +62,7 @@ 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";
-import { getMostRecentCorrection } from "@/src/features/corrections/utils/getMostRecentCorrection";
+import { getMostRecentCorrection } from "@/src/features/corrections";
export interface TraceDetailViewProps {
trace: Omit<WithStringifiedMetadata<TraceDomain>, "input" | "output"> & {
diff --git a/web/src/features/traces/components/TraceGraphView/TraceGraphView.tsx b/web/src/features/traces/components/TraceGraphView/TraceGraphView.tsx
index aa1a12a3ce..0447e84e3d 100644
--- a/web/src/features/traces/components/TraceGraphView/TraceGraphView.tsx
+++ b/web/src/features/traces/components/TraceGraphView/TraceGraphView.tsx
@@ -7,8 +7,10 @@
*/
import { useCallback } from "react";
-import { TraceGraphView as TraceGraphViewComponent } from "@/src/features/trace-graph-view/components/TraceGraphView";
-import { type GraphViewMode } from "@/src/features/trace-graph-view/types";
+import {
+ TraceGraphView as TraceGraphViewComponent,
+ type GraphViewMode,
+} from "@/src/features/trace-graph-view";
import { useTraceGraphData } from "@/src/features/traces/contexts/TraceGraphDataContext";
import { useActiveObservationIds } from "@/src/features/traces/contexts/PlayheadContext";
import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
diff --git a/web/src/features/traces/contexts/TraceGraphDataContext.tsx b/web/src/features/traces/contexts/TraceGraphDataContext.tsx
index 362c4681a6..9963cb30b3 100644
--- a/web/src/features/traces/contexts/TraceGraphDataContext.tsx
+++ b/web/src/features/traces/contexts/TraceGraphDataContext.tsx
@@ -9,7 +9,7 @@
import { createContext, useContext, useMemo, type ReactNode } from "react";
import { api } from "@/src/utils/api";
-import { type AgentGraphDataResponse } from "@/src/features/trace-graph-view/types";
+import { type AgentGraphDataResponse } from "@/src/features/trace-graph-view";
import { useReadPath } from "@/src/features/events";
import {
MAX_NODES_FOR_GRAPH_UI,
diff --git a/web/src/features/traces/contexts/ViewPreferencesContext.tsx b/web/src/features/traces/contexts/ViewPreferencesContext.tsx
index 08ddaef2e1..647bfb61f3 100644
--- a/web/src/features/traces/contexts/ViewPreferencesContext.tsx
+++ b/web/src/features/traces/contexts/ViewPreferencesContext.tsx
@@ -18,7 +18,7 @@ import { useCollapseSystemPromptPreference } from "@/src/hooks/useCollapsibleSys
import {
GRAPH_VIEW_MODES,
type GraphViewMode,
-} from "@/src/features/trace-graph-view/types";
+} from "@/src/features/trace-graph-view";
import {
DEFAULT_JSON_VIEW_PREFERENCE,
JSON_VIEW_PREFERENCE_STORAGE_KEY,
diff --git a/web/src/features/traces/fns/graphAvailability.clienttest.ts b/web/src/features/traces/fns/graphAvailability.clienttest.ts
index 5f79c0fc0f..809a855a50 100644
--- a/web/src/features/traces/fns/graphAvailability.clienttest.ts
+++ b/web/src/features/traces/fns/graphAvailability.clienttest.ts
@@ -5,7 +5,7 @@ import {
MAX_NODES_FOR_GRAPH_UI,
resolveGraphAvailability,
} from "./graphAvailability";
-import { type AgentGraphDataResponse } from "@/src/features/trace-graph-view/types";
+import { type AgentGraphDataResponse } from "@/src/features/trace-graph-view";
const obs = (
over: Partial<AgentGraphDataResponse> = {},
diff --git a/web/src/features/traces/fns/graphAvailability.ts b/web/src/features/traces/fns/graphAvailability.ts
index a1e7cee413..7727afee67 100644
--- a/web/src/features/traces/fns/graphAvailability.ts
+++ b/web/src/features/traces/fns/graphAvailability.ts
@@ -1,6 +1,6 @@
/** Why the Graph view is or is not available for a trace. */
-import { type AgentGraphDataResponse } from "@/src/features/trace-graph-view/types";
+import { type AgentGraphDataResponse } from "@/src/features/trace-graph-view";
export const MAX_NODES_FOR_GRAPH_UI = 5000;
diff --git a/web/src/features/traces/server/index.ts b/web/src/features/traces/server/index.ts
new file mode 100644
index 0000000000..2ed9a0c204
--- /dev/null
+++ b/web/src/features/traces/server/index.ts
@@ -0,0 +1,6 @@
+// The traces feature's server surface (RFC rule 9, amended): the legacy
+// IO-search guard batch jobs already imported by file path.
+export {
+ assertLegacyTracingIoSearchCanCreateBatchJob,
+ sanitizeLegacyTracingSearch,
+} from "@/src/features/traces/server/legacyIoSearch";
diff --git a/web/src/features/tracing-tables/observations/ObservationsTable.tsx b/web/src/features/tracing-tables/observations/ObservationsTable.tsx
index 84daee41f1..ed7547ffb2 100644
--- a/web/src/features/tracing-tables/observations/ObservationsTable.tsx
+++ b/web/src/features/tracing-tables/observations/ObservationsTable.tsx
@@ -81,7 +81,7 @@ import {
calculateAggregatedUsage,
} from "@/src/features/traces";
import { InfoIcon } from "lucide-react";
-import { ProvidedModelNameCell } from "@/src/features/models/components/ProvidedModelNameCell";
+import { ProvidedModelNameCell } from "@/src/features/models";
import { createBadgeTableColumn } from "@/src/components/design-system/table/columns/createBadgeTableColumn";
import { createDateTableColumn } from "@/src/components/design-system/table/columns/createDateTableColumn";
import { createNumberTableColumn } from "@/src/components/design-system/table/columns/createNumberTableColumn";
@@ -115,7 +115,7 @@ import {
import { showSuccessToast } from "@/src/features/notifications";
import { type DataTablePeekViewProps } from "@/src/components/table/peek";
import { useScoreColumns, scoreFilters } from "@/src/features/scores";
-import { AddObservationsToDatasetDialog } from "@/src/features/batch-actions/components/AddObservationsToDatasetDialog/index";
+import { AddObservationsToDatasetDialog } from "@/src/features/batch-actions";
import useSessionStorage from "@/src/components/useSessionStorage";
import { getSafeRedirectPath } from "@/src/utils/redirect";
import {
diff --git a/web/src/features/v4-migration/V4MigrationContent.tsx b/web/src/features/v4-migration/V4MigrationContent.tsx
index da9f946634..c19e256daf 100644
--- a/web/src/features/v4-migration/V4MigrationContent.tsx
+++ b/web/src/features/v4-migration/V4MigrationContent.tsx
@@ -14,7 +14,7 @@ import {
import { env } from "@/src/env.mjs";
import { useIsInAppAgentLauncherVisible } from "@/src/features/in-app-agent";
import { useLangfuseCloudRegion } from "@/src/features/organizations";
-import { useSupportDrawer } from "@/src/features/support-chat/SupportDrawerProvider";
+import { useSupportDrawer } from "@/src/features/support-chat";
import { Button } from "@/src/components/ui/button";
import {
HoverCard,
diff --git a/web/src/features/v4-migration/hooks/useOpenV4MigrationPanel.ts b/web/src/features/v4-migration/hooks/useOpenV4MigrationPanel.ts
index ee043af161..11a312e0e0 100644
--- a/web/src/features/v4-migration/hooks/useOpenV4MigrationPanel.ts
+++ b/web/src/features/v4-migration/hooks/useOpenV4MigrationPanel.ts
@@ -1,5 +1,5 @@
import { useInAppAiAgent } from "@/src/features/in-app-agent";
-import { useSupportDrawer } from "@/src/features/support-chat/SupportDrawerProvider";
+import { useSupportDrawer } from "@/src/features/support-chat";
import {
useV4MigrationPanel,
type V4MigrationPanelOpenSource,
diff --git a/web/src/features/v4-migration/sdkVersionStatus.ts b/web/src/features/v4-migration/sdkVersionStatus.ts
index 0d3c1d018e..217773ea91 100644
--- a/web/src/features/v4-migration/sdkVersionStatus.ts
+++ b/web/src/features/v4-migration/sdkVersionStatus.ts
@@ -1,6 +1,6 @@
/* eslint-disable no-nested-ternary */
import { type RouterOutputs } from "@/src/utils/api";
-import { type SdkVersionInfo } from "@/src/features/sdk-version/lib/sdkVersionCapabilities";
+import { type SdkVersionInfo } from "@/src/features/sdk-version";
type V4MigrationSdkStatus =
| "checking"
diff --git a/web/src/features/v4/server/v4TransitionSdkUsage.ts b/web/src/features/v4/server/v4TransitionSdkUsage.ts
index 6c0f1d0ccb..c9945809dd 100644
--- a/web/src/features/v4/server/v4TransitionSdkUsage.ts
+++ b/web/src/features/v4/server/v4TransitionSdkUsage.ts
@@ -14,7 +14,7 @@ import {
queryClickhouse,
type IngestionSdkAttributionStatus,
} from "@langfuse/shared/src/server";
-import { getSdkVersionCapabilityStatus } from "@/src/features/sdk-version/lib/sdkVersionCapabilities";
+import { getSdkVersionCapabilityStatus } from "@/src/features/sdk-version/server";
import { getExperimentPostUsageByProject } from "@/src/features/v4/server/v4TransitionQueryLogUsage";
import {
getV4TransitionDetectionWindow,
diff --git a/web/src/features/web-callouts/index.ts b/web/src/features/web-callouts/index.ts
new file mode 100644
index 0000000000..3481f831ad
--- /dev/null
+++ b/web/src/features/web-callouts/index.ts
@@ -0,0 +1,8 @@
+// The web-callouts feature's public client surface (RFC rule 8). Named
+// re-exports only — exactly what other features already imported.
+export {
+ useWebCalloutAction,
+ WebCalloutButton,
+ WebCalloutMenuItem,
+} from "@/src/features/web-callouts/components/WebCalloutMenuItem";
+export { WebCalloutIntegrationCard } from "@/src/features/web-callouts/components/WebCalloutSettingsPage";
diff --git a/web/src/features/widgets/index.ts b/web/src/features/widgets/index.ts
index 479cecc884..5621defcc5 100644
--- a/web/src/features/widgets/index.ts
+++ b/web/src/features/widgets/index.ts
@@ -2,9 +2,9 @@
// only — the chart library, widget components and import/export helpers other
// features already imported by file path.
//
-// filters' multi-select and single-select and events' outlier-strip binning
-// stay on deep paths: routing them through this index would close runtime
-// cycles between widgets and those features.
+// filters' multi-select and single-select, events' outlier-strip binning,
+// and DashboardGrid stay on deep paths: routing them through this index
+// would close runtime cycles between widgets and those features.
export { Chart } from "@/src/features/widgets/chart-library/Chart";
export { ChartLoadingState } from "@/src/features/widgets/chart-library/ChartLoadingState";
export type {
@@ -16,6 +16,8 @@ export type {
export { parseChartTimestamp } from "@/src/features/widgets/chart-library/prepareTimeAxis";
export { formatMetric } from "@/src/features/widgets/chart-library/utils";
export type { DashboardPlacement } from "@/src/features/widgets/components/DashboardGrid";
+export { useClipboardWidgetProbe } from "@/src/features/widgets/hooks/useClipboardWidgetProbe";
+export { pushDownForInsertion } from "@/src/features/widgets/utils/grid-placement";
export { WidgetContent } from "@/src/features/widgets/components/InlineWidget";
export { WidgetPropertySelectItem } from "@/src/features/widgets/components/WidgetPropertySelectItem";
export type { WidgetDimensionConfig } from "@/src/features/widgets/hooks/useWidgetQuery";
@@ -27,8 +29,10 @@ export {
buildWidgetExport,
parseImportedWidgetJson,
parsePastedWidget,
+ toWidgetCreateFields,
} from "@/src/features/widgets/utils/import-export-utils";
export type {
+ PastedWidgetParseResult,
WidgetExportSource,
WidgetImport,
} from "@/src/features/widgets/utils/import-export-utils";
diff --git a/web/src/pages/_app.tsx b/web/src/pages/_app.tsx
index c5eeb58bae..251e0c99ed 100644
--- a/web/src/pages/_app.tsx
+++ b/web/src/pages/_app.tsx
@@ -88,13 +88,13 @@ 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";
-import { SupportDrawerProvider } from "@/src/features/support-chat/SupportDrawerProvider";
+import { SupportDrawerProvider } from "@/src/features/support-chat";
import { V4MigrationPanelProvider } from "@/src/features/v4-migration/V4MigrationPanelProvider";
import { installStaleChunkReloadListener } from "@/src/features/version-update/reloadOnStaleChunk";
import { InAppAiAgentProvider } from "@/src/features/in-app-agent";
import { useLangfuseCloudRegion } from "@/src/features/organizations";
import { ScoreCacheProvider } from "@/src/features/scores";
-import { CorrectionCacheProvider } from "@/src/features/corrections/contexts/CorrectionCacheContext";
+import { CorrectionCacheProvider } from "@/src/features/corrections";
import { LayerProvider } from "@/src/context/LayerContext/LayerContext";
import {
V4_BETA_ENABLED_POSTHOG_PROPERTY,
diff --git a/web/src/pages/api/auth/check-sso.ts b/web/src/pages/api/auth/check-sso.ts
index 9e71c12b8a..196606333e 100644
--- a/web/src/pages/api/auth/check-sso.ts
+++ b/web/src/pages/api/auth/check-sso.ts
@@ -4,7 +4,7 @@
* If no custom SSO provider is configured or EE is not available, this API will return a 404 response.
*/
-import { getSsoAuthProviderIdForDomain } from "@/src/ee/features/multi-tenant-sso/utils";
+import { getSsoAuthProviderIdForDomain } from "@/src/ee/features/multi-tenant-sso/server";
import type { NextApiRequest, NextApiResponse } from "next";
import { z } from "zod";
diff --git a/web/src/pages/api/public/feedback.ts b/web/src/pages/api/public/feedback.ts
index 33655253c5..644d38cd42 100644
--- a/web/src/pages/api/public/feedback.ts
+++ b/web/src/pages/api/public/feedback.ts
@@ -1,6 +1,6 @@
import { createAuthedProjectAPIRoute } from "@/src/features/public-api/server/createAuthedProjectAPIRoute";
import { withMiddlewares } from "@/src/features/public-api/server/withMiddlewares";
-import { submitFeedback } from "@/src/features/feedback/server/FeedbackService";
+import { submitFeedback } from "@/src/features/feedback/server";
import {
PostFeedbackBody,
PostFeedbackResponse,
diff --git a/web/src/pages/api/public/models/[modelId]/index.ts b/web/src/pages/api/public/models/[modelId]/index.ts
index e0a8faba90..7f35bfa66d 100644
--- a/web/src/pages/api/public/models/[modelId]/index.ts
+++ b/web/src/pages/api/public/models/[modelId]/index.ts
@@ -12,7 +12,7 @@ import {
deleteModelForApi,
getModelForApi,
upsertModelForApi,
-} from "@/src/features/models/server/publicApiModelService";
+} from "@/src/features/models/server";
export default withMiddlewares({
GET: createAuthedProjectAPIRoute({
diff --git a/web/src/pages/api/public/models/index.ts b/web/src/pages/api/public/models/index.ts
index b6900dbbc8..14c5bf3639 100644
--- a/web/src/pages/api/public/models/index.ts
+++ b/web/src/pages/api/public/models/index.ts
@@ -9,7 +9,7 @@ import {
import {
createModelForApi,
listModelsForApi,
-} from "@/src/features/models/server/publicApiModelService";
+} from "@/src/features/models/server";
export default withMiddlewares({
GET: createAuthedProjectAPIRoute({
diff --git a/web/src/pages/api/public/prompts.ts b/web/src/pages/api/public/prompts.ts
index 511f480cda..47598df81a 100644
--- a/web/src/pages/api/public/prompts.ts
+++ b/web/src/pages/api/public/prompts.ts
@@ -1,7 +1,7 @@
import { z } from "zod";
import { getPromptByName } from "@/src/features/prompts/server/actions/getPromptByName";
-import { createPromptForApi } from "@/src/features/prompts/server/prompt-api-service";
+import { createPromptForApi } from "@/src/features/prompts/server";
import {
createAuthedProjectAPIRoute,
withMiddlewares,
diff --git a/web/src/pages/api/public/unstable/dashboards/[dashboardId].ts b/web/src/pages/api/public/unstable/dashboards/[dashboardId].ts
index 22ce67209f..ce91faaa27 100644
--- a/web/src/pages/api/public/unstable/dashboards/[dashboardId].ts
+++ b/web/src/pages/api/public/unstable/dashboards/[dashboardId].ts
@@ -13,7 +13,7 @@ import {
deletePublicDashboard,
getPublicDashboard,
updatePublicDashboard,
-} from "@/src/features/dashboard/server/public-dashboard-service";
+} from "@/src/features/dashboard/server";
export default withUnstablePublicApiMiddlewares({
GET: createUnstablePublicApiRoute({
diff --git a/web/src/pages/api/public/unstable/dashboards/[dashboardId]/placements/[placementId].ts b/web/src/pages/api/public/unstable/dashboards/[dashboardId]/placements/[placementId].ts
index c075887b72..9945668b89 100644
--- a/web/src/pages/api/public/unstable/dashboards/[dashboardId]/placements/[placementId].ts
+++ b/web/src/pages/api/public/unstable/dashboards/[dashboardId]/placements/[placementId].ts
@@ -11,7 +11,7 @@ import {
import {
deletePublicDashboardPlacement,
updatePublicDashboardPlacement,
-} from "@/src/features/dashboard/server/public-dashboard-service";
+} from "@/src/features/dashboard/server";
export default withUnstablePublicApiMiddlewares({
PATCH: createUnstablePublicApiRoute({
diff --git a/web/src/pages/api/public/unstable/dashboards/[dashboardId]/placements/index.ts b/web/src/pages/api/public/unstable/dashboards/[dashboardId]/placements/index.ts
index 2189ce47a7..2851109303 100644
--- a/web/src/pages/api/public/unstable/dashboards/[dashboardId]/placements/index.ts
+++ b/web/src/pages/api/public/unstable/dashboards/[dashboardId]/placements/index.ts
@@ -7,7 +7,7 @@ import {
PostDashboardPlacementBody,
PostDashboardPlacementResponse,
} from "@/src/features/public-api/types/unstable-dashboards";
-import { addPublicDashboardPlacement } from "@/src/features/dashboard/server/public-dashboard-service";
+import { addPublicDashboardPlacement } from "@/src/features/dashboard/server";
export default withUnstablePublicApiMiddlewares({
POST: createUnstablePublicApiRoute({
diff --git a/web/src/pages/api/public/unstable/dashboards/index.ts b/web/src/pages/api/public/unstable/dashboards/index.ts
index da3b2e550f..7dbf345e20 100644
--- a/web/src/pages/api/public/unstable/dashboards/index.ts
+++ b/web/src/pages/api/public/unstable/dashboards/index.ts
@@ -11,7 +11,7 @@ import {
import {
createPublicDashboard,
listPublicDashboards,
-} from "@/src/features/dashboard/server/public-dashboard-service";
+} from "@/src/features/dashboard/server";
export default withUnstablePublicApiMiddlewares({
GET: createUnstablePublicApiRoute({
diff --git a/web/src/server/api/routers/generations/getAllQueries.ts b/web/src/server/api/routers/generations/getAllQueries.ts
index 296a1fb2a2..665cc1dfd0 100644
--- a/web/src/server/api/routers/generations/getAllQueries.ts
+++ b/web/src/server/api/routers/generations/getAllQueries.ts
@@ -11,7 +11,7 @@ import {
getObservationsTableCount,
applyCommentFilters,
} from "@langfuse/shared/src/server";
-import { sanitizeLegacyTracingSearch } from "@/src/features/traces/server/legacyIoSearch";
+import { sanitizeLegacyTracingSearch } from "@/src/features/traces/server";
const GetAllGenerationsInput = GenerationTableOptions.safeExtend({
...paginationZod,
diff --git a/web/src/server/api/routers/traces.ts b/web/src/server/api/routers/traces.ts
index e4477bb8de..7ae1e4becd 100644
--- a/web/src/server/api/routers/traces.ts
+++ b/web/src/server/api/routers/traces.ts
@@ -59,11 +59,11 @@ import {
import { TRPCError } from "@trpc/server";
import { createBatchActionJob } from "@/src/features/table/server";
import { throwIfNoEntitlement } from "@/src/features/entitlements/server/hasEntitlement";
-import { sanitizeLegacyTracingSearch } from "@/src/features/traces/server/legacyIoSearch";
+import { sanitizeLegacyTracingSearch } from "@/src/features/traces/server";
import {
type AgentGraphDataResponse,
AgentGraphDataSchema,
-} from "@/src/features/trace-graph-view/types";
+} from "@/src/features/trace-graph-view/server";
import { env } from "@/src/env.mjs";
import {
toDomainWithStringifiedMetadata,
diff --git a/web/src/server/auth.ts b/web/src/server/auth.ts
index 9e3b4c2fb4..849d1d4cda 100644
--- a/web/src/server/auth.ts
+++ b/web/src/server/auth.ts
@@ -54,7 +54,7 @@ import {
findMultiTenantSsoConfig,
getSsoAuthProviderIdForDomain,
loadSsoProviders,
-} from "@/src/ee/features/multi-tenant-sso/utils";
+} from "@/src/ee/features/multi-tenant-sso/server";
import {
ENTERPRISE_SSO_REQUIRED_MESSAGE,
MULTI_TENANT_SSO_DOMAIN_MISMATCH_MESSAGE,