Skip to content

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

refactor(web): Resolve some component-file-structure issues (#19270)

Ben Bachem4395d7d661ea
diff --git a/web/src/__tests__/auth-sign-in-page.clienttest.tsx b/web/src/__tests__/auth-sign-in-page.clienttest.tsx
index 3467bf4d57..b0dc61fe31 100644
--- a/web/src/__tests__/auth-sign-in-page.clienttest.tsx
+++ b/web/src/__tests__/auth-sign-in-page.clienttest.tsx
@@ -46,11 +46,11 @@ vi.mock("@/src/ee/features/multi-tenant-sso/utils", () => ({
isAnySsoConfigured: async () => false,
}));
-vi.mock("@/src/features/auth/components/AuthCloudRegionSwitch", () => ({
+vi.mock("@/src/features/auth/components/CloudRegionSwitch", () => ({
CloudRegionSwitch: () => null,
}));
-vi.mock("@/src/features/auth/components/AuthCloudPrivacyNotice", () => ({
+vi.mock("@/src/features/auth/components/CloudPrivacyNotice", () => ({
CloudPrivacyNotice: () => null,
}));
diff --git a/web/src/__tests__/detail-page-route-params.clienttest.tsx b/web/src/__tests__/detail-page-route-params.clienttest.tsx
index 195b05762c..f6657f6a4b 100644
--- a/web/src/__tests__/detail-page-route-params.clienttest.tsx
+++ b/web/src/__tests__/detail-page-route-params.clienttest.tsx
@@ -59,7 +59,7 @@ vi.mock("@/src/features/posthog-analytics/usePostHogClientCapture", () => ({
usePostHogClientCapture: () => vi.fn(),
}));
-vi.mock("@/src/components/layouts/page", () => ({
+vi.mock("@/src/components/layouts/Page", () => ({
default: ({ children }: { children: ReactNode }) => (
<div data-testid="page">{children}</div>
),
diff --git a/web/src/components/ChatMessages/ChatMessageComponent.tsx b/web/src/components/ChatMessages/ChatMessageComponent.tsx
index 990c7ee783..9c6e10f7d9 100644
--- a/web/src/components/ChatMessages/ChatMessageComponent.tsx
+++ b/web/src/components/ChatMessages/ChatMessageComponent.tsx
@@ -33,7 +33,7 @@ import {
SelectTrigger,
SelectValue,
} from "@/src/components/ui/select";
-import { useOptionalPlaygroundContext } from "@/src/features/playground/page/context";
+import { useOptionalPlaygroundContext } from "@/src/features/playground/page/context/PlaygroundProvider";
import {
useOptionalMessageSearchActions,
useOptionalMessageSearchPageId,
diff --git a/web/src/components/ChatMessages/index.tsx b/web/src/components/ChatMessages/ChatMessages.tsx
similarity index 98%
rename from web/src/components/ChatMessages/index.tsx
rename to web/src/components/ChatMessages/ChatMessages.tsx
index 6ab1e1c193..93d0906f83 100644
--- a/web/src/components/ChatMessages/index.tsx
+++ b/web/src/components/ChatMessages/ChatMessages.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/component-file-structure, @typescript-eslint/no-deprecated, @typescript-eslint/no-use-before-define -- Legacy UI usage retained during migration to design-system components. */
+/* eslint-disable @typescript-eslint/no-deprecated, @typescript-eslint/no-use-before-define -- Legacy UI usage retained during migration to design-system components. */
import { ChevronDownIcon, PlusCircleIcon } from "@langfuse/icons";
import { useCallback, useEffect, useRef } from "react";
@@ -44,7 +44,7 @@ import {
verticalListSortingStrategy,
} from "@dnd-kit/sortable";
import { isString } from "@/src/utils/types";
-import { useOptionalPlaygroundContext } from "@/src/features/playground/page/context";
+import { useOptionalPlaygroundContext } from "@/src/features/playground/page/context/PlaygroundProvider";
type ChatMessagesProps = MessagesContext;
export const ChatMessages: React.FC<ChatMessagesProps> = (props) => {
diff --git a/web/src/components/HeaderActionMenuRow.tsx b/web/src/components/HeaderActionMenuRow.tsx
index 1fcac1c5a3..3d7dcc77bc 100644
--- a/web/src/components/HeaderActionMenuRow.tsx
+++ b/web/src/components/HeaderActionMenuRow.tsx
@@ -1,7 +1,5 @@
-/* eslint-disable @repo/component-file-structure */
import * as React from "react";
-import { type DropdownMenuItemDefinition } from "@/src/components/design-system/DropdownMenu/DropdownMenu";
import { Button, type ButtonProps } from "@/src/components/ui/button";
import { cn } from "@/src/utils/tailwind";
@@ -43,42 +41,3 @@ export const HeaderActionMenuRow = React.forwardRef<
</Button>
);
});
-
-type MenuItem = Extract<DropdownMenuItemDefinition, { type: "item" }>;
-
-const isMenuItem = (item: DropdownMenuItemDefinition): item is MenuItem =>
- item.type === "item";
-
-/** Renders the clickable items of a dropdown definition as menu rows. */
-export function HeaderActionMenuRows({
- items,
-}: {
- items: DropdownMenuItemDefinition[];
-}) {
- return (
- <>
- {items.filter(isMenuItem).map((item) => {
- const Icon = item.icon;
- return (
- <HeaderActionMenuRow
- key={item.id}
- label={item.title}
- icon={
- Icon && (
- <Icon
- size="base"
- color={item.variant !== "destructive" ? "default" : "inherit"}
- />
- )
- }
- badge={item.badge}
- variant={item.variant}
- disabled={item.disabled !== undefined}
- disabledReason={item.disabled?.reason}
- onClick={item.onClick}
- />
- );
- })}
- </>
- );
-}
diff --git a/web/src/components/HeaderActionMenuRows.tsx b/web/src/components/HeaderActionMenuRows.tsx
new file mode 100644
index 0000000000..29e12b8f7e
--- /dev/null
+++ b/web/src/components/HeaderActionMenuRows.tsx
@@ -0,0 +1,41 @@
+import { type DropdownMenuItemDefinition } from "@/src/components/design-system/DropdownMenu/DropdownMenu";
+import { HeaderActionMenuRow } from "@/src/components/HeaderActionMenuRow";
+
+type MenuItem = Extract<DropdownMenuItemDefinition, { type: "item" }>;
+
+const isMenuItem = (item: DropdownMenuItemDefinition): item is MenuItem =>
+ item.type === "item";
+
+/** Renders the clickable items of a dropdown definition as menu rows. */
+export function HeaderActionMenuRows({
+ items,
+}: {
+ items: DropdownMenuItemDefinition[];
+}) {
+ return (
+ <>
+ {items.filter(isMenuItem).map((item) => {
+ const Icon = item.icon;
+ return (
+ <HeaderActionMenuRow
+ key={item.id}
+ label={item.title}
+ icon={
+ Icon && (
+ <Icon
+ size="base"
+ color={item.variant !== "destructive" ? "default" : "inherit"}
+ />
+ )
+ }
+ badge={item.badge}
+ variant={item.variant}
+ disabled={item.disabled !== undefined}
+ disabledReason={item.disabled?.reason}
+ onClick={item.onClick}
+ />
+ );
+ })}
+ </>
+ );
+}
diff --git a/web/src/components/level-colors.clienttest.ts b/web/src/components/ObservationLevelTag.clienttest.ts
similarity index 95%
rename from web/src/components/level-colors.clienttest.ts
rename to web/src/components/ObservationLevelTag.clienttest.ts
index c8fbaae7d0..04e31fe926 100644
--- a/web/src/components/level-colors.clienttest.ts
+++ b/web/src/components/ObservationLevelTag.clienttest.ts
@@ -1,6 +1,9 @@
// @vitest-environment node
-import { getLevelColors, LevelColors } from "@/src/components/level-colors";
+import {
+ getLevelColors,
+ LevelColors,
+} from "@/src/components/ObservationLevelTag";
describe("getLevelColors", () => {
it("returns the correct style for each known level", () => {
diff --git a/web/src/components/level-colors.tsx b/web/src/components/ObservationLevelTag.tsx
similarity index 98%
rename from web/src/components/level-colors.tsx
rename to web/src/components/ObservationLevelTag.tsx
index db8628e0cf..8c1f29b87f 100644
--- a/web/src/components/level-colors.tsx
+++ b/web/src/components/ObservationLevelTag.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import type React from "react";
import { type ObservationLevelType } from "@langfuse/shared";
import { cn } from "@/src/utils/tailwind";
diff --git a/web/src/components/publish-object-switch.tsx b/web/src/components/PublishSessionSwitch.tsx
similarity index 98%
rename from web/src/components/publish-object-switch.tsx
rename to web/src/components/PublishSessionSwitch.tsx
index dd829a6d12..a1f21062cb 100644
--- a/web/src/components/publish-object-switch.tsx
+++ b/web/src/components/PublishSessionSwitch.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/component-file-structure, @typescript-eslint/no-deprecated, @typescript-eslint/no-use-before-define -- Legacy UI usage retained during migration to design-system components. */
+/* eslint-disable @typescript-eslint/no-deprecated, @typescript-eslint/no-use-before-define -- Legacy UI usage retained during migration to design-system components. */
import { Button } from "@/src/components/ui/button";
import { Label } from "@/src/components/ui/label";
import {
diff --git a/web/src/components/layouts/page.tsx b/web/src/components/layouts/Page.tsx
similarity index 97%
rename from web/src/components/layouts/page.tsx
rename to web/src/components/layouts/Page.tsx
index 57b5db5992..16bdf26e0b 100644
--- a/web/src/components/layouts/page.tsx
+++ b/web/src/components/layouts/Page.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import PageHeader, {
type PageHeaderProps,
} from "@/src/components/layouts/page-header";
diff --git a/web/src/components/table/DataTable.stories.tsx b/web/src/components/table/DataTable.stories.tsx
index 14a3202182..410268068d 100644
--- a/web/src/components/table/DataTable.stories.tsx
+++ b/web/src/components/table/DataTable.stories.tsx
@@ -47,7 +47,10 @@ import {
LevelCountsDisplay,
type LevelCount,
} from "@/src/components/LevelCountsDisplay";
-import { formatAsLabel, LevelSymbols } from "@/src/components/level-colors";
+import {
+ formatAsLabel,
+ LevelSymbols,
+} from "@/src/components/ObservationLevelTag";
import { TagList } from "@/src/features/tag";
import { BreakdownTooltip } from "@/src/features/traces/components/BreakdownTooltip";
import { DropdownMenuItem } from "@/src/components/ui/dropdown-menu";
diff --git a/web/src/components/table/data-table-refresh-button.tsx b/web/src/components/table/DataTableRefreshButton.tsx
similarity index 98%
rename from web/src/components/table/data-table-refresh-button.tsx
rename to web/src/components/table/DataTableRefreshButton.tsx
index 35850809cf..c9dfde2906 100644
--- a/web/src/components/table/data-table-refresh-button.tsx
+++ b/web/src/components/table/DataTableRefreshButton.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { RefreshCw, ChevronDown } from "@langfuse/icons";
import { Button } from "@/src/components/ui/button";
import {
diff --git a/web/src/components/table/TableHeaderControls.tsx b/web/src/components/table/TableHeaderControls.tsx
index d5594b6426..a6b0ec14a3 100644
--- a/web/src/components/table/TableHeaderControls.tsx
+++ b/web/src/components/table/TableHeaderControls.tsx
@@ -1,5 +1,5 @@
import { TimeRangePicker } from "@/src/components/date-picker";
-import { DataTableRefreshButton } from "@/src/components/table/data-table-refresh-button";
+import { DataTableRefreshButton } from "@/src/components/table/DataTableRefreshButton";
import { type RefreshInterval } from "@/src/components/table/utils/refresh-intervals";
import { PageHeaderControlsPortal } from "@/src/components/layouts/page-header-controls-slot";
import {
diff --git a/web/src/components/table/data-table-toolbar.tsx b/web/src/components/table/data-table-toolbar.tsx
index fcf5c6c039..dd366a81ca 100644
--- a/web/src/components/table/data-table-toolbar.tsx
+++ b/web/src/components/table/data-table-toolbar.tsx
@@ -55,7 +55,7 @@ import {
DropdownMenuSubContent,
} from "@/src/components/ui/dropdown-menu";
import { MultiSelect as MultiSelectFilter } from "@/src/features/filters/components/MultiSelect";
-import { DataTableRefreshButton } from "@/src/components/table/data-table-refresh-button";
+import { DataTableRefreshButton } from "@/src/components/table/DataTableRefreshButton";
import { type RefreshInterval } from "@/src/components/table/utils/refresh-intervals";
import {
getSearchButtonLabel,
diff --git a/web/src/components/table/peek.tsx b/web/src/components/table/peek.tsx
index cb4cd66bf4..f579f62909 100644
--- a/web/src/components/table/peek.tsx
+++ b/web/src/components/table/peek.tsx
@@ -13,7 +13,7 @@ import { useRouter } from "next/router";
import { useIsHandheld } from "@/src/hooks/use-mobile";
import { getPathnameWithoutBasePath } from "@/src/utils/api";
import { urlSearchParamsToQuery } from "@/src/utils/navigation";
-import { PeekTableStateProvider } from "@/src/components/table/peek/contexts/PeekTableStateContext";
+import { PeekTableStateProvider } from "@/src/components/table/peek/contexts/PeekTableStateProvider";
import { PeekHeader } from "@/src/components/table/peek/PeekHeader";
import { usePeekPanelState } from "@/src/components/table/peek/usePeekPanelState";
import { shouldIgnoreOutsideInteraction } from "@/src/utils/outside-interaction";
diff --git a/web/src/components/table/peek/README.md b/web/src/components/table/peek/README.md
index d104a3577a..0907172b8f 100644
--- a/web/src/components/table/peek/README.md
+++ b/web/src/components/table/peek/README.md
@@ -134,7 +134,7 @@ The peek state architecture separates the persisting context provider from the r
#### PeekTableStateProvider
-**Location:** [`contexts/PeekTableStateContext.tsx`](./contexts/PeekTableStateContext.tsx)
+**Location:** [`contexts/PeekTableStateProvider.tsx`](./contexts/PeekTableStateProvider.tsx)
- Provides persistent state storage across peek item navigation
- Stores filters, sorting, pagination, and search state
@@ -386,7 +386,7 @@ const filters = useSidebarFilterState(config, options, queryFilterOptions);
## Related Files
-- Peek state context: [`contexts/PeekTableStateContext.tsx`](./contexts/PeekTableStateContext.tsx)
+- Peek state context: [`contexts/PeekTableStateProvider.tsx`](./contexts/PeekTableStateProvider.tsx)
- Pagination hook: [`web/src/hooks/usePaginationState.ts`](../../../hooks/usePaginationState.ts)
- Full text search hook: [`search-bar/hooks/useFullTextSearch.ts`](../../../features/search-bar/hooks/useFullTextSearch.ts)
- Filter state hook: [`web/src/features/filters/hooks/useSidebarFilterState.tsx`](../../../features/filters/hooks/useSidebarFilterState.tsx)
diff --git a/web/src/components/table/peek/peek-experiment-item-detail.tsx b/web/src/components/table/peek/TablePeekViewExperimentItemDetail.tsx
similarity index 97%
rename from web/src/components/table/peek/peek-experiment-item-detail.tsx
rename to web/src/components/table/peek/TablePeekViewExperimentItemDetail.tsx
index f0ce30f5f7..ba95087d35 100644
--- a/web/src/components/table/peek/peek-experiment-item-detail.tsx
+++ b/web/src/components/table/peek/TablePeekViewExperimentItemDetail.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { useRouter } from "next/router";
import { usePeekData } from "@/src/components/table/peek/hooks/usePeekData";
import { TraceDetailBody } from "@/src/features/traces";
diff --git a/web/src/components/table/peek/contexts/PeekTableStateContext.tsx b/web/src/components/table/peek/contexts/PeekTableStateProvider.tsx
similarity index 96%
rename from web/src/components/table/peek/contexts/PeekTableStateContext.tsx
rename to web/src/components/table/peek/contexts/PeekTableStateProvider.tsx
index e13dc37f2f..b0efd27f73 100644
--- a/web/src/components/table/peek/contexts/PeekTableStateContext.tsx
+++ b/web/src/components/table/peek/contexts/PeekTableStateProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import {
createContext,
useContext,
diff --git a/web/src/components/useShareMenuItems.ts b/web/src/components/useShareMenuItems.ts
index 32f57f84fd..9c5dc8f872 100644
--- a/web/src/components/useShareMenuItems.ts
+++ b/web/src/components/useShareMenuItems.ts
@@ -4,7 +4,7 @@ import { type DropdownMenuItemDefinition } from "@/src/components/design-system/
import {
getShareUrl,
usePublishObject,
-} from "@/src/components/publish-object-switch";
+} from "@/src/components/PublishSessionSwitch";
import { showSuccessToast } from "@/src/features/notifications";
import { copyTextToClipboard } from "@/src/utils/clipboard";
diff --git a/web/src/features/annotation-queues/components/AnnotationQueuesItem.clienttest.tsx b/web/src/features/annotation-queues/components/AnnotationQueuesItem.clienttest.tsx
index fdfc7824c6..361b70c6e2 100644
--- a/web/src/features/annotation-queues/components/AnnotationQueuesItem.clienttest.tsx
+++ b/web/src/features/annotation-queues/components/AnnotationQueuesItem.clienttest.tsx
@@ -54,7 +54,7 @@ vi.mock("@/src/features/rbac", () => ({ useHasProjectAccess: () => true }));
vi.mock("@/src/features/events", () => ({
useReadPath: () => ({ isV4: true }),
}));
-vi.mock("@/src/components/layouts/page", () => ({
+vi.mock("@/src/components/layouts/Page", () => ({
default: ({ children }: { children: ReactNode }) => children,
}));
vi.mock("@/src/components/ui/tooltip", () => ({
diff --git a/web/src/features/annotation-queues/components/AnnotationQueuesItem.tsx b/web/src/features/annotation-queues/components/AnnotationQueuesItem.tsx
index e362adc5fa..888b91ef96 100644
--- a/web/src/features/annotation-queues/components/AnnotationQueuesItem.tsx
+++ b/web/src/features/annotation-queues/components/AnnotationQueuesItem.tsx
@@ -2,7 +2,7 @@ import { SupportOrUpgradePage } from "@/src/ee/features/billing";
import { useHasProjectAccess } from "@/src/features/rbac";
import { AnnotationQueueItemPage } from "@/src/features/annotation-queues/components/AnnotationQueueItemPage";
import { api } from "@/src/utils/api";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
export const AnnotationQueuesItem = ({
annotationQueueId,
diff --git a/web/src/features/annotation-queues/pages/AnnotationQueues.tsx b/web/src/features/annotation-queues/pages/AnnotationQueues.tsx
index 708ad38a8b..25ddce2739 100644
--- a/web/src/features/annotation-queues/pages/AnnotationQueues.tsx
+++ b/web/src/features/annotation-queues/pages/AnnotationQueues.tsx
@@ -2,7 +2,7 @@ import { useRouter } from "next/router";
import { AnnotationQueuesTable } from "@/src/features/annotation-queues/components/AnnotationQueuesTable";
import { useHasProjectAccess } from "@/src/features/rbac";
import { SupportOrUpgradePage } from "@/src/ee/features/billing";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { AnnotationQueuesOnboarding } from "@/src/components/onboarding/AnnotationQueuesOnboarding";
import { api } from "@/src/utils/api";
import { CreateOrEditAnnotationQueueButton } from "@/src/features/annotation-queues/components/CreateOrEditAnnotationQueueButton";
diff --git a/web/src/features/annotation-queues/pages/QueueItems.tsx b/web/src/features/annotation-queues/pages/QueueItems.tsx
index 12826ef816..2d4b9d85ea 100644
--- a/web/src/features/annotation-queues/pages/QueueItems.tsx
+++ b/web/src/features/annotation-queues/pages/QueueItems.tsx
@@ -5,7 +5,7 @@ import { Button } from "@/src/components/design-system/Button/Button";
import { ClipboardPen, Lock } from "@langfuse/icons";
import { useHasProjectAccess } from "@/src/features/rbac";
import { SupportOrUpgradePage } from "@/src/ee/features/billing";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import {
SidePanel,
SidePanelContent,
diff --git a/web/src/features/auth-credentials/components/ResetPasswordButton.clienttest.tsx b/web/src/features/auth-credentials/components/RequestResetPasswordEmailButton.clienttest.tsx
similarity index 98%
rename from web/src/features/auth-credentials/components/ResetPasswordButton.clienttest.tsx
rename to web/src/features/auth-credentials/components/RequestResetPasswordEmailButton.clienttest.tsx
index 072f630c69..e7822ef2a1 100644
--- a/web/src/features/auth-credentials/components/ResetPasswordButton.clienttest.tsx
+++ b/web/src/features/auth-credentials/components/RequestResetPasswordEmailButton.clienttest.tsx
@@ -49,7 +49,7 @@ vi.mock("@/src/features/auth/components/TurnstileWidget", async () => {
};
});
-import { RequestResetPasswordEmailButton } from "@/src/features/auth-credentials/components/ResetPasswordButton";
+import { RequestResetPasswordEmailButton } from "@/src/features/auth-credentials/components/RequestResetPasswordEmailButton";
import {
TURNSTILE_ACTIONS,
TURNSTILE_FAILED_MESSAGE,
diff --git a/web/src/features/auth-credentials/components/ResetPasswordButton.tsx b/web/src/features/auth-credentials/components/RequestResetPasswordEmailButton.tsx
similarity index 98%
rename from web/src/features/auth-credentials/components/ResetPasswordButton.tsx
rename to web/src/features/auth-credentials/components/RequestResetPasswordEmailButton.tsx
index 0b792d0703..a947a7e542 100644
--- a/web/src/features/auth-credentials/components/ResetPasswordButton.tsx
+++ b/web/src/features/auth-credentials/components/RequestResetPasswordEmailButton.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/component-file-structure, @typescript-eslint/no-use-before-define */
+/* eslint-disable @typescript-eslint/no-use-before-define */
import { signIn, useSession } from "next-auth/react";
import { Button } from "@/src/components/ui/button";
import { useEffect, useRef, useState } from "react";
diff --git a/web/src/features/auth-credentials/components/ResetPasswordPage.clienttest.tsx b/web/src/features/auth-credentials/components/ResetPasswordPage.clienttest.tsx
index 5d182348d4..1ea81fad1a 100644
--- a/web/src/features/auth-credentials/components/ResetPasswordPage.clienttest.tsx
+++ b/web/src/features/auth-credentials/components/ResetPasswordPage.clienttest.tsx
@@ -72,7 +72,7 @@ vi.mock("@/src/env.mjs", async () => {
});
vi.mock(
- "@/src/features/auth-credentials/components/ResetPasswordButton",
+ "@/src/features/auth-credentials/components/RequestResetPasswordEmailButton",
() => ({
RequestResetPasswordEmailButton: ({
email,
diff --git a/web/src/features/auth-credentials/components/ResetPasswordPage.tsx b/web/src/features/auth-credentials/components/ResetPasswordPage.tsx
index b8495db63f..2751e541ca 100644
--- a/web/src/features/auth-credentials/components/ResetPasswordPage.tsx
+++ b/web/src/features/auth-credentials/components/ResetPasswordPage.tsx
@@ -19,7 +19,7 @@ import { signIn, useSession } from "next-auth/react";
import { ArrowLeft } from "@langfuse/icons";
import { api } from "@/src/utils/api";
import { useRouter } from "next/router";
-import { RequestResetPasswordEmailButton } from "@/src/features/auth-credentials/components/ResetPasswordButton";
+import { RequestResetPasswordEmailButton } from "@/src/features/auth-credentials/components/RequestResetPasswordEmailButton";
import { TRPCClientError } from "@trpc/client";
import Link from "next/link";
import { ErrorPage } from "@/src/components/error-page";
diff --git a/web/src/features/auth/SignInPage.tsx b/web/src/features/auth/SignInPage.tsx
index 57b41fd610..7d36e6ab29 100644
--- a/web/src/features/auth/SignInPage.tsx
+++ b/web/src/features/auth/SignInPage.tsx
@@ -30,8 +30,8 @@ import Link from "next/link";
import { useState, useEffect, useRef } from "react";
import { useForm } from "react-hook-form";
import * as z from "zod";
-import { CloudPrivacyNotice } from "@/src/features/auth/components/AuthCloudPrivacyNotice";
-import { CloudRegionSwitch } from "@/src/features/auth/components/AuthCloudRegionSwitch";
+import { CloudPrivacyNotice } from "@/src/features/auth/components/CloudPrivacyNotice";
+import { CloudRegionSwitch } from "@/src/features/auth/components/CloudRegionSwitch";
import { PasswordInput } from "@/src/components/design-system/PasswordInput/PasswordInput";
import { Code, Key } from "@langfuse/icons";
import { useRouter } from "next/router";
diff --git a/web/src/features/auth/SignUpPage.tsx b/web/src/features/auth/SignUpPage.tsx
index 6b0452c398..99bcadaa34 100644
--- a/web/src/features/auth/SignUpPage.tsx
+++ b/web/src/features/auth/SignUpPage.tsx
@@ -18,8 +18,8 @@ import * as z from "zod";
import { env } from "@/src/env.mjs";
import { useRef, useState } from "react";
import { LangfuseIcon } from "@/src/components/design-system/LangfuseIcon/LangfuseIcon";
-import { CloudPrivacyNotice } from "@/src/features/auth/components/AuthCloudPrivacyNotice";
-import { CloudRegionSwitch } from "@/src/features/auth/components/AuthCloudRegionSwitch";
+import { CloudPrivacyNotice } from "@/src/features/auth/components/CloudPrivacyNotice";
+import { CloudRegionSwitch } from "@/src/features/auth/components/CloudRegionSwitch";
import {
FALLBACK_AUTH_PROVIDERS,
SSOButtons,
diff --git a/web/src/features/auth/components/AuthCloudPrivacyNotice.tsx b/web/src/features/auth/components/CloudPrivacyNotice.tsx
similarity index 94%
rename from web/src/features/auth/components/AuthCloudPrivacyNotice.tsx
rename to web/src/features/auth/components/CloudPrivacyNotice.tsx
index 8121dcd724..c3fb047b4e 100644
--- a/web/src/features/auth/components/AuthCloudPrivacyNotice.tsx
+++ b/web/src/features/auth/components/CloudPrivacyNotice.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
export const CloudPrivacyNotice = ({ action }: { action: string }) => (
<div className="text-muted-foreground mx-auto mt-10 max-w-lg text-center text-xs">
By {action} you are agreeing to our{" "}
diff --git a/web/src/features/auth/components/AuthCloudRegionSwitch.tsx b/web/src/features/auth/components/CloudRegionSwitch.tsx
similarity index 96%
rename from web/src/features/auth/components/AuthCloudRegionSwitch.tsx
rename to web/src/features/auth/components/CloudRegionSwitch.tsx
index 8d94a9ecc5..b4076b30fd 100644
--- a/web/src/features/auth/components/AuthCloudRegionSwitch.tsx
+++ b/web/src/features/auth/components/CloudRegionSwitch.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { env } from "@/src/env.mjs";
import { CloudRegionPicker } from "@/src/features/auth/components/CloudRegionPicker";
import {
diff --git a/web/src/features/automations/components/AutomationsPage.tsx b/web/src/features/automations/components/AutomationsPage.tsx
index 98b8f08818..a13ddd4ca5 100644
--- a/web/src/features/automations/components/AutomationsPage.tsx
+++ b/web/src/features/automations/components/AutomationsPage.tsx
@@ -10,7 +10,7 @@ import { WebhookSecretRender } from "@/src/features/automations/components/Webho
import { Button } from "@/src/components/ui/button";
import { Plus } from "@langfuse/icons";
import { useEffect, useMemo, useState, useCallback } from "react";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { api, getPathnameWithoutBasePath } from "@/src/utils/api";
import { useQueryParams, StringParam, withDefault } from "use-query-params";
import {
diff --git a/web/src/features/background-migrations/components/BackgroundMigrationsTable.tsx b/web/src/features/background-migrations/components/BackgroundMigrationsTable.tsx
index 8110f4bffd..6b9f5ab82a 100644
--- a/web/src/features/background-migrations/components/BackgroundMigrationsTable.tsx
+++ b/web/src/features/background-migrations/components/BackgroundMigrationsTable.tsx
@@ -6,7 +6,7 @@ import { api } from "@/src/utils/api";
import { type BackgroundMigration } from "@langfuse/shared";
import { RetryBackgroundMigrationPopoverController } from "@/src/features/background-migrations/components/RetryBackgroundMigrationPopoverController";
import { createStatusTableColumn } from "@/src/components/design-system/table/columns/createStatusTableColumn";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { Button } from "@/src/components/ui/button";
import { RotateCcw } from "@langfuse/icons";
import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";
diff --git a/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/index.clienttest.tsx b/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/AddObservationsToDatasetDialog.clienttest.tsx
similarity index 98%
rename from web/src/features/batch-actions/components/AddObservationsToDatasetDialog/index.clienttest.tsx
rename to web/src/features/batch-actions/components/AddObservationsToDatasetDialog/AddObservationsToDatasetDialog.clienttest.tsx
index 4de4a8248e..e8d7a6a922 100644
--- a/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/index.clienttest.tsx
+++ b/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/AddObservationsToDatasetDialog.clienttest.tsx
@@ -2,7 +2,7 @@ import { fireEvent, render, screen, waitFor } from "@testing-library/react";
import { useState } from "react";
import { vi } from "vitest";
import { LayerProvider } from "@/src/context/LayerContext/LayerContext";
-import { AddObservationsToDatasetDialog } from "./index";
+import { AddObservationsToDatasetDialog } from "./AddObservationsToDatasetDialog";
const { submit, submitted, previewQuery } = vi.hoisted(() => ({
submit: vi.fn<() => Promise<{ id: string }>>(),
diff --git a/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/index.tsx b/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/AddObservationsToDatasetDialog.tsx
similarity index 97%
rename from web/src/features/batch-actions/components/AddObservationsToDatasetDialog/index.tsx
rename to web/src/features/batch-actions/components/AddObservationsToDatasetDialog/AddObservationsToDatasetDialog.tsx
index 115df62544..96e72bb8e5 100644
--- a/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/index.tsx
+++ b/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/AddObservationsToDatasetDialog.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/component-file-structure, @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
+/* eslint-disable @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
import { useRef, useState } from "react";
import { useStore } from "zustand";
import { parseJsonPrioritised, type BatchActionQuery } from "@langfuse/shared";
diff --git a/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/DatasetMappingEditor.tsx b/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/DatasetMappingEditor.tsx
index 3a1711bcc1..a56e7d2c29 100644
--- a/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/DatasetMappingEditor.tsx
+++ b/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/DatasetMappingEditor.tsx
@@ -5,10 +5,8 @@ import { Button } from "@/src/components/ui/button";
import { Combobox } from "@/src/components/ui/Combobox";
import { Skeleton } from "@/src/components/ui/skeleton";
import { DialogBody, DialogFooter } from "@/src/components/ui/dialog";
-import {
- DatasetItemEditorLayout,
- DatasetItemPreviewField,
-} from "@/src/features/datasets/components/DatasetItemEditorLayout";
+import { DatasetItemEditorLayout } from "@/src/features/datasets/components/DatasetItemEditorLayout";
+import { DatasetItemPreviewField } from "@/src/features/datasets/components/DatasetItemPreviewField";
import { MappingStep } from "./MappingStep";
import type { DatasetMappingStore } from "./datasetMappingStore";
import { prepareDatasetMapping } from "./prepareDatasetMapping";
diff --git a/web/src/features/batch-actions/index.ts b/web/src/features/batch-actions/index.ts
index 75cbbdbb8b..88cc080731 100644
--- a/web/src/features/batch-actions/index.ts
+++ b/web/src/features/batch-actions/index.ts
@@ -1,5 +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 { AddObservationsToDatasetDialog } from "@/src/features/batch-actions/components/AddObservationsToDatasetDialog/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/comments/CommentDrawerController.clienttest.tsx b/web/src/features/comments/CommentDrawerController.clienttest.tsx
index b975c46adb..75c447ef3e 100644
--- a/web/src/features/comments/CommentDrawerController.clienttest.tsx
+++ b/web/src/features/comments/CommentDrawerController.clienttest.tsx
@@ -12,7 +12,7 @@ import { LayerProvider } from "@/src/context/LayerContext/LayerContext";
import {
TraceReviewPanelProvider,
useTraceReviewPanel,
-} from "@/src/features/traces/contexts/TraceReviewPanelContext";
+} from "@/src/features/traces/contexts/TraceReviewPanelProvider";
import {
CommentDrawerController,
type CommentDrawerControllerProps,
diff --git a/web/src/features/comments/CommentDrawerController.tsx b/web/src/features/comments/CommentDrawerController.tsx
index dba4537e0c..a7fa017f17 100644
--- a/web/src/features/comments/CommentDrawerController.tsx
+++ b/web/src/features/comments/CommentDrawerController.tsx
@@ -6,7 +6,7 @@ import { api } from "@/src/utils/api";
import {
useTraceReviewPanelOptional,
useReviewPanelOpen,
-} from "@/src/features/traces/contexts/TraceReviewPanelContext";
+} from "@/src/features/traces/contexts/TraceReviewPanelProvider";
import {
createCommentOverlayStore,
type CommentTarget,
diff --git a/web/src/features/comments/CommentList.tsx b/web/src/features/comments/CommentList.tsx
index f008c5a4b1..2e6a2128fd 100644
--- a/web/src/features/comments/CommentList.tsx
+++ b/web/src/features/comments/CommentList.tsx
@@ -10,7 +10,7 @@ import { useSession } from "next-auth/react";
import { CommentComposer } from "./components/CommentComposer";
import { CommentConversation } from "./components/CommentConversation";
import { refreshCommentQueries } from "./actions/refreshCommentQueries";
-import { type SelectionData } from "./contexts/InlineCommentSelectionContext";
+import { type SelectionData } from "./contexts/InlineCommentSelectionProvider";
type CommentListProps = {
projectId: string;
diff --git a/web/src/features/comments/components/CommentComposer.tsx b/web/src/features/comments/components/CommentComposer.tsx
index 419843bb29..59d47fa3f8 100644
--- a/web/src/features/comments/components/CommentComposer.tsx
+++ b/web/src/features/comments/components/CommentComposer.tsx
@@ -23,7 +23,7 @@ import { CommentEditor, type CommentEditorHandle } from "./CommentEditor";
import { MentionAutocomplete } from "./MentionAutocomplete";
import { useMentionAutocomplete } from "../hooks/useMentionAutocomplete";
import { MENTION_USER_PREFIX } from "../lib/mentionParser";
-import { type SelectionData } from "../contexts/InlineCommentSelectionContext";
+import { type SelectionData } from "../contexts/InlineCommentSelectionProvider";
export function CommentComposer({
projectId,
diff --git a/web/src/features/comments/components/CommentOverlayHost.tsx b/web/src/features/comments/components/CommentOverlayHost.tsx
index e01ec2292e..e9e8c3b064 100644
--- a/web/src/features/comments/components/CommentOverlayHost.tsx
+++ b/web/src/features/comments/components/CommentOverlayHost.tsx
@@ -22,7 +22,7 @@ import { Button } from "@/src/components/ui/button";
import { api } from "@/src/utils/api";
import { CommentList } from "../CommentList";
import { CommentComposer } from "./CommentComposer";
-import { type SelectionData } from "../contexts/InlineCommentSelectionContext";
+import { type SelectionData } from "../contexts/InlineCommentSelectionProvider";
import {
type CommentOverlay,
type CommentOverlayStore,
diff --git a/web/src/features/comments/contexts/InlineCommentSelectionContext.tsx b/web/src/features/comments/contexts/InlineCommentSelectionProvider.tsx
similarity index 96%
rename from web/src/features/comments/contexts/InlineCommentSelectionContext.tsx
rename to web/src/features/comments/contexts/InlineCommentSelectionProvider.tsx
index a7234288a5..97ee5948f0 100644
--- a/web/src/features/comments/contexts/InlineCommentSelectionContext.tsx
+++ b/web/src/features/comments/contexts/InlineCommentSelectionProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import {
createContext,
useContext,
diff --git a/web/src/features/comments/hooks/useTextSelection.ts b/web/src/features/comments/hooks/useTextSelection.ts
index 41114b3826..fd8e77ffb3 100644
--- a/web/src/features/comments/hooks/useTextSelection.ts
+++ b/web/src/features/comments/hooks/useTextSelection.ts
@@ -1,5 +1,5 @@
import { useEffect, useCallback, useRef } from "react";
-import { useInlineCommentSelectionOptional } from "../contexts/InlineCommentSelectionContext";
+import { useInlineCommentSelectionOptional } from "../contexts/InlineCommentSelectionProvider";
import { containsNode } from "../lib/containsNode";
import { selectionToPath } from "../lib/selectionToPath";
diff --git a/web/src/features/comments/state/commentOverlayStore.ts b/web/src/features/comments/state/commentOverlayStore.ts
index b7154bd397..7946445819 100644
--- a/web/src/features/comments/state/commentOverlayStore.ts
+++ b/web/src/features/comments/state/commentOverlayStore.ts
@@ -1,6 +1,6 @@
import { createStore } from "zustand/vanilla";
import { type CommentObjectType } from "@langfuse/shared";
-import { type SelectionData } from "../contexts/InlineCommentSelectionContext";
+import { type SelectionData } from "../contexts/InlineCommentSelectionProvider";
export type CommentTarget = {
objectId: string;
diff --git a/web/src/features/dashboard/DashboardDetailPage.tsx b/web/src/features/dashboard/DashboardDetailPage.tsx
index c5083c6b98..c2cce12701 100644
--- a/web/src/features/dashboard/DashboardDetailPage.tsx
+++ b/web/src/features/dashboard/DashboardDetailPage.tsx
@@ -3,7 +3,7 @@ import { useRouter } from "next/router";
import { api } from "@/src/utils/api";
import { useReadPath, type ResolvedReadPath } from "@/src/features/events";
import { useDashboardFilterOptions } from "@/src/hooks/useDashboardFilterOptions";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
import { TimeRangePicker } from "@/src/components/date-picker";
import { PopoverFilterBuilder, MultiSelect } from "@/src/features/filters";
@@ -71,7 +71,7 @@ import {
getDashboardQuerySchedulerMaxConcurrent,
getDashboardSchedulerResetKey,
useDashboardQueryScheduler,
-} from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+} from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
import {
isPasteablePlacementPayload,
parseDashboardImport,
diff --git a/web/src/features/dashboard/DashboardsPage.tsx b/web/src/features/dashboard/DashboardsPage.tsx
index a60235dc69..aa51729e5f 100644
--- a/web/src/features/dashboard/DashboardsPage.tsx
+++ b/web/src/features/dashboard/DashboardsPage.tsx
@@ -1,5 +1,5 @@
import { useRouter } from "next/router";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { ConnectedDashboardTable } from "@/src/features/dashboard/components/DashboardTable/ConnectedDashboardTable";
import { ActionButton } from "@/src/components/ActionButton";
import { PlusIcon } from "@langfuse/icons";
diff --git a/web/src/features/dashboard/NewDashboardPage.tsx b/web/src/features/dashboard/NewDashboardPage.tsx
index f6dcb6a224..ead02f9c2b 100644
--- a/web/src/features/dashboard/NewDashboardPage.tsx
+++ b/web/src/features/dashboard/NewDashboardPage.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import { useRouter } from "next/router";
import { api } from "@/src/utils/api";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { Button } from "@/src/components/ui/button";
import { Input } from "@/src/components/ui/input";
import { Textarea } from "@/src/components/ui/textarea";
diff --git a/web/src/features/dashboard/ProjectHomePage.tsx b/web/src/features/dashboard/ProjectHomePage.tsx
index edc26b1052..dfc46b3ea8 100644
--- a/web/src/features/dashboard/ProjectHomePage.tsx
+++ b/web/src/features/dashboard/ProjectHomePage.tsx
@@ -26,7 +26,7 @@ import {
import { useDashboardDateRange } from "@/src/hooks/useDashboardDateRange";
import { useDebounce } from "@/src/hooks/useDebounce";
import { useEntitlementLimit } from "@/src/features/entitlements";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import {
convertSelectedEnvironmentsToFilter,
@@ -40,7 +40,7 @@ import {
DashboardQuerySchedulerProvider,
getDashboardQuerySchedulerMaxConcurrent,
useDashboardQueryScheduler,
-} from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+} from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
import Link from "next/link";
import { LockIcon, PencilIcon } from "@langfuse/icons";
import { showErrorToast } from "@/src/features/notifications";
diff --git a/web/src/features/dashboard/README.md b/web/src/features/dashboard/README.md
index 7dcb6b07c4..052672023d 100644
--- a/web/src/features/dashboard/README.md
+++ b/web/src/features/dashboard/README.md
@@ -24,7 +24,7 @@ as "preset" placements.
placements, plus dashboard-scoped dialogs/selectors. Cards receive a
**required** `metricsVersion` from the preset context — they never read the
session themselves.
-- `hooks/` — `useDashboardQueryScheduler.tsx`: the scheduler controller hook,
+- `hooks/` — `DashboardQuerySchedulerProvider.tsx`: the scheduler controller hook,
provider/context, executeQuery cache policy, and
`useScheduledDashboardExecuteQuery` (the one entry point widgets use to run
a dashboard query under the concurrency budget, over tRPC or SSE).
@@ -64,7 +64,7 @@ because `parseSSEBuffer` has non-dashboard consumers).
- Progress events re-render one widget's loading state at ClickHouse's
progress cadence; they must never enter the query cache or context values.
- The scheduler reset key must contain only query-affecting params — never the
- widget set (`useDashboardQueryScheduler.clienttest.ts` pins this).
+ widget set (`DashboardQuerySchedulerProvider.clienttest.ts` pins this).
## Reliability Invariants
diff --git a/web/src/features/dashboard/components/ChartScores.tsx b/web/src/features/dashboard/components/ChartScores.tsx
index 9e2929e6c0..76202b2326 100644
--- a/web/src/features/dashboard/components/ChartScores.tsx
+++ b/web/src/features/dashboard/components/ChartScores.tsx
@@ -18,7 +18,7 @@ import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard/lib/dashb
import { type DatabaseRow } from "@/src/server/api/services/sqlInterface";
import { Chart } from "@/src/features/widgets";
import { timeSeriesToDataPoints } from "@/src/features/dashboard/lib/chart-data-adapters";
-import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
// Static — hoisted so its reference is stable across re-renders (keeps the
// memoized <Chart> from reconciling on dashboard scheduler re-renders).
diff --git a/web/src/features/dashboard/components/LatencyChart.tsx b/web/src/features/dashboard/components/LatencyChart.tsx
index d2779b8aff..32f38689b1 100644
--- a/web/src/features/dashboard/components/LatencyChart.tsx
+++ b/web/src/features/dashboard/components/LatencyChart.tsx
@@ -6,7 +6,7 @@ import {
isEmptyTimeSeries,
} from "@/src/features/dashboard/components/hooks";
import { DashboardCard } from "@/src/features/dashboard/components/cards/DashboardCard";
-import { TabComponent } from "@/src/features/dashboard/components/TabsComponent";
+import { TabComponent } from "@/src/features/dashboard/components/TabComponent";
import {
type DashboardDateRangeAggregationOption,
dashboardDateRangeAggregationSettings,
@@ -15,12 +15,12 @@ import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
import {
ModelSelectorPopover,
useModelSelection,
-} from "@/src/features/dashboard/components/ModelSelector";
+} from "@/src/features/dashboard/components/ModelSelectorPopover";
import { type QueryType, type ViewVersion } from "@langfuse/shared/query";
import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
import type { DatabaseRow } from "@/src/server/api/services/sqlInterface";
import { DashboardLineTimeSeriesChart } from "@/src/features/dashboard/components/DashboardLineTimeSeriesChart";
-import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
import { useMemo } from "react";
export const GenerationLatencyChart = ({
diff --git a/web/src/features/dashboard/components/LatencyTables.tsx b/web/src/features/dashboard/components/LatencyTables.tsx
index 9087b481a8..7b8252beb1 100644
--- a/web/src/features/dashboard/components/LatencyTables.tsx
+++ b/web/src/features/dashboard/components/LatencyTables.tsx
@@ -14,7 +14,7 @@ import { cn } from "@/src/utils/tailwind";
import { Popup } from "@/src/components/layouts/doc-popup";
import { type QueryType, type ViewVersion } from "@langfuse/shared/query";
import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
-import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
export type LatencyTableKind = "traces" | "generations" | "observations";
diff --git a/web/src/features/dashboard/components/ModelCostTable.tsx b/web/src/features/dashboard/components/ModelCostTable.tsx
index 2d61ab4167..adc0e4dd0f 100644
--- a/web/src/features/dashboard/components/ModelCostTable.tsx
+++ b/web/src/features/dashboard/components/ModelCostTable.tsx
@@ -10,7 +10,7 @@ import { TotalMetric } from "./TotalMetric";
import { truncate } from "@/src/utils/string";
import { type QueryType, type ViewVersion } from "@langfuse/shared/query";
import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
-import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
import { cn } from "@/src/utils/tailwind";
export const ModelCostTable = ({
diff --git a/web/src/features/dashboard/components/ModelSelector.tsx b/web/src/features/dashboard/components/ModelSelectorPopover.tsx
similarity index 97%
rename from web/src/features/dashboard/components/ModelSelector.tsx
rename to web/src/features/dashboard/components/ModelSelectorPopover.tsx
index cc4edb2f5b..f61059f0b7 100644
--- a/web/src/features/dashboard/components/ModelSelector.tsx
+++ b/web/src/features/dashboard/components/ModelSelectorPopover.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { MultiSelectTagInput } from "@/src/components/design-system/MultiSelectTagInput/MultiSelectTagInput";
import { useAllModels } from "@/src/features/dashboard/components/hooks";
import { type FilterState } from "@langfuse/shared";
diff --git a/web/src/features/dashboard/components/ModelUsageChart.tsx b/web/src/features/dashboard/components/ModelUsageChart.tsx
index fb70c49a2a..7a9a5acd5b 100644
--- a/web/src/features/dashboard/components/ModelUsageChart.tsx
+++ b/web/src/features/dashboard/components/ModelUsageChart.tsx
@@ -6,7 +6,7 @@ import {
fillMissingValuesAndTransform,
isEmptyTimeSeries,
} from "@/src/features/dashboard/components/hooks";
-import { TabComponent } from "@/src/features/dashboard/components/TabsComponent";
+import { TabComponent } from "@/src/features/dashboard/components/TabComponent";
import { TotalMetric } from "@/src/features/dashboard/components/TotalMetric";
import { costFormatter, compactNumberFormatter } from "@/src/utils/numbers";
import { api } from "@/src/utils/api";
@@ -18,12 +18,12 @@ import { type FilterState, getGenerationLikeTypes } from "@langfuse/shared";
import {
ModelSelectorPopover,
useModelSelection,
-} from "@/src/features/dashboard/components/ModelSelector";
+} from "@/src/features/dashboard/components/ModelSelectorPopover";
import { type QueryType, type ViewVersion } from "@langfuse/shared/query";
import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
import { type DatabaseRow } from "@/src/server/api/services/sqlInterface";
import { DashboardLineTimeSeriesChart } from "@/src/features/dashboard/components/DashboardLineTimeSeriesChart";
-import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
import { useMemo } from "react";
export const ModelUsageChart = ({
diff --git a/web/src/features/dashboard/components/TabsComponent.tsx b/web/src/features/dashboard/components/TabComponent.tsx
similarity index 98%
rename from web/src/features/dashboard/components/TabsComponent.tsx
rename to web/src/features/dashboard/components/TabComponent.tsx
index 936bd773b6..1d4cd0fc17 100644
--- a/web/src/features/dashboard/components/TabsComponent.tsx
+++ b/web/src/features/dashboard/components/TabComponent.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { type ChangeEvent, type ReactNode, useState } from "react";
diff --git a/web/src/features/dashboard/components/TracesBarListChart.tsx b/web/src/features/dashboard/components/TracesBarListChart.tsx
index ad010dde90..15f661e186 100644
--- a/web/src/features/dashboard/components/TracesBarListChart.tsx
+++ b/web/src/features/dashboard/components/TracesBarListChart.tsx
@@ -8,7 +8,7 @@ import { type QueryType, type ViewVersion } from "@langfuse/shared/query";
import { formatMetric } from "@/src/features/widgets";
import { BarListChartArea } from "@/src/features/dashboard/components/cards/BarListChartArea";
import { traceViewQuery } from "@/src/features/dashboard/lib/dashboard-utils";
-import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
import { cn } from "@/src/utils/tailwind";
// Cap on bars fetched and rendered; the top list scrolls within the tile when
diff --git a/web/src/features/dashboard/components/TracesTimeSeriesChart.tsx b/web/src/features/dashboard/components/TracesTimeSeriesChart.tsx
index 0eafab876e..249fab0af1 100644
--- a/web/src/features/dashboard/components/TracesTimeSeriesChart.tsx
+++ b/web/src/features/dashboard/components/TracesTimeSeriesChart.tsx
@@ -9,11 +9,11 @@ import {
dashboardDateRangeAggregationSettings,
} from "@/src/utils/date-range-utils";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
-import { TabComponent } from "@/src/features/dashboard/components/TabsComponent";
+import { TabComponent } from "@/src/features/dashboard/components/TabComponent";
import { type QueryType, type ViewVersion } from "@langfuse/shared/query";
import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
import { DashboardLineTimeSeriesChart } from "@/src/features/dashboard/components/DashboardLineTimeSeriesChart";
-import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
import { useMemo } from "react";
export const TracesAndObservationsTimeSeriesChart = ({
diff --git a/web/src/features/dashboard/components/UserChart.tsx b/web/src/features/dashboard/components/UserChart.tsx
index 2055721c1d..55ccf148ce 100644
--- a/web/src/features/dashboard/components/UserChart.tsx
+++ b/web/src/features/dashboard/components/UserChart.tsx
@@ -2,14 +2,14 @@
import { type FilterState, getGenerationLikeTypes } from "@langfuse/shared";
import { DashboardCard } from "@/src/features/dashboard/components/cards/DashboardCard";
import { compactNumberFormatter, costFormatter } from "@/src/utils/numbers";
-import { TabComponent } from "@/src/features/dashboard/components/TabsComponent";
+import { TabComponent } from "@/src/features/dashboard/components/TabComponent";
import { TotalMetric } from "@/src/features/dashboard/components/TotalMetric";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
import { type QueryType, type ViewVersion } from "@langfuse/shared/query";
import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
import { BarListChartArea } from "@/src/features/dashboard/components/cards/BarListChartArea";
import { traceViewQuery } from "@/src/features/dashboard/lib/dashboard-utils";
-import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
import { cn } from "@/src/utils/tailwind";
// Cap on bars fetched and rendered; matches TracesBarListChart. The top list
diff --git a/web/src/features/dashboard/components/cards/DashboardTable.tsx b/web/src/features/dashboard/components/cards/DashboardTable.tsx
index 3ee25b4156..051925b137 100644
--- a/web/src/features/dashboard/components/cards/DashboardTable.tsx
+++ b/web/src/features/dashboard/components/cards/DashboardTable.tsx
@@ -1,5 +1,5 @@
/* eslint-disable no-nested-ternary */
-import { ExpandListButton } from "@/src/features/dashboard/components/cards/ChevronButton";
+import { ExpandListButton } from "@/src/features/dashboard/components/cards/ExpandListButton";
import { type ReactNode, useState } from "react";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
import { useFitRowCount } from "@/src/features/dashboard/hooks/useFitRowCount";
diff --git a/web/src/features/dashboard/components/cards/ChevronButton.tsx b/web/src/features/dashboard/components/cards/ExpandListButton.tsx
similarity index 93%
rename from web/src/features/dashboard/components/cards/ChevronButton.tsx
rename to web/src/features/dashboard/components/cards/ExpandListButton.tsx
index c881016df1..f967b12932 100644
--- a/web/src/features/dashboard/components/cards/ChevronButton.tsx
+++ b/web/src/features/dashboard/components/cards/ExpandListButton.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { DropdownIndicator } from "@/src/components/design-system/DropdownIndicator/DropdownIndicator";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/features/dashboard/components/hooks.ts b/web/src/features/dashboard/components/hooks.ts
index 16be7cb36f..7bd9aec902 100644
--- a/web/src/features/dashboard/components/hooks.ts
+++ b/web/src/features/dashboard/components/hooks.ts
@@ -9,7 +9,7 @@ export type TimeSeriesChartDataPoint = {
import { type DatabaseRow } from "@/src/server/api/services/sqlInterface";
import { type ViewVersion } from "@langfuse/shared/query";
import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
-import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
type UseAllModelsOptions = {
enabled?: boolean;
diff --git a/web/src/features/dashboard/components/score-analytics/CategoricalScoreChart.tsx b/web/src/features/dashboard/components/score-analytics/CategoricalScoreChart.tsx
index 214811829a..6a2e5c55df 100644
--- a/web/src/features/dashboard/components/score-analytics/CategoricalScoreChart.tsx
+++ b/web/src/features/dashboard/components/score-analytics/CategoricalScoreChart.tsx
@@ -16,7 +16,7 @@ import { Chart } from "@/src/features/widgets";
import { scoreChartDataToDataPoints } from "@/src/features/dashboard/lib/chart-data-adapters";
import { isEmptyChart } from "@/src/features/dashboard/lib/score-analytics-utils";
import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";
-import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
export function CategoricalScoreChart(props: {
projectId: string;
diff --git a/web/src/features/dashboard/components/score-analytics/NumericScoreTimeSeriesChart.tsx b/web/src/features/dashboard/components/score-analytics/NumericScoreTimeSeriesChart.tsx
index eca931450b..c460399d70 100644
--- a/web/src/features/dashboard/components/score-analytics/NumericScoreTimeSeriesChart.tsx
+++ b/web/src/features/dashboard/components/score-analytics/NumericScoreTimeSeriesChart.tsx
@@ -19,7 +19,7 @@ import { type QueryType, type ViewVersion } from "@langfuse/shared/query";
import { mapLegacyUiTableFilterToView } from "@/src/features/dashboard/lib/dashboardUiTableToViewMapping";
import { type DatabaseRow } from "@/src/server/api/services/sqlInterface";
import { DashboardLineTimeSeriesChart } from "@/src/features/dashboard/components/DashboardLineTimeSeriesChart";
-import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
export function NumericScoreTimeSeriesChart(props: {
projectId: string;
diff --git a/web/src/features/dashboard/hooks/useDashboardQueryScheduler.clienttest.ts b/web/src/features/dashboard/hooks/DashboardQuerySchedulerProvider.clienttest.ts
similarity index 98%
rename from web/src/features/dashboard/hooks/useDashboardQueryScheduler.clienttest.ts
rename to web/src/features/dashboard/hooks/DashboardQuerySchedulerProvider.clienttest.ts
index 3a0f3ff2c0..eeb3fbf44b 100644
--- a/web/src/features/dashboard/hooks/useDashboardQueryScheduler.clienttest.ts
+++ b/web/src/features/dashboard/hooks/DashboardQuerySchedulerProvider.clienttest.ts
@@ -11,7 +11,7 @@ import { act, renderHook } from "@testing-library/react";
import {
getDashboardSchedulerResetKey,
useDashboardQueryScheduler,
-} from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+} from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
import { type DashboardQuerySchedulerStore } from "@/src/features/dashboard/stores/dashboardQuerySchedulerStore";
describe("getDashboardSchedulerResetKey", () => {
diff --git a/web/src/features/dashboard/hooks/useDashboardQueryScheduler.tsx b/web/src/features/dashboard/hooks/DashboardQuerySchedulerProvider.tsx
similarity index 99%
rename from web/src/features/dashboard/hooks/useDashboardQueryScheduler.tsx
rename to web/src/features/dashboard/hooks/DashboardQuerySchedulerProvider.tsx
index f28b3c38c2..ca5ee5131f 100644
--- a/web/src/features/dashboard/hooks/useDashboardQueryScheduler.tsx
+++ b/web/src/features/dashboard/hooks/DashboardQuerySchedulerProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import {
type TimeRange,
toAbsoluteTimeRange,
diff --git a/web/src/features/datasets/DatasetCompareChartsPage.tsx b/web/src/features/datasets/DatasetCompareChartsPage.tsx
index 7b34ffee0f..c8a30531d6 100644
--- a/web/src/features/datasets/DatasetCompareChartsPage.tsx
+++ b/web/src/features/datasets/DatasetCompareChartsPage.tsx
@@ -29,7 +29,7 @@ import {
} from "@/src/features/dashboard";
import { Chart } from "@/src/features/widgets";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { SubHeaderLabel } from "@/src/components/layouts/header";
import {
SidePanel,
diff --git a/web/src/features/datasets/DatasetComparePage.tsx b/web/src/features/datasets/DatasetComparePage.tsx
index cb7c7472e8..fa2422efdd 100644
--- a/web/src/features/datasets/DatasetComparePage.tsx
+++ b/web/src/features/datasets/DatasetComparePage.tsx
@@ -17,7 +17,7 @@ import {
} from "@/src/features/experiments";
import { useHasProjectAccess } from "@/src/features/rbac";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import {
DATASET_RUN_COMPARE_TABS,
getDatasetRunCompareTabs,
@@ -26,7 +26,7 @@ import { useDatasetRunsCompare } from "@/src/features/datasets/hooks/useDatasetR
import {
ActiveCellProvider,
useActiveCell,
-} from "@/src/features/datasets/contexts/ActiveCellContext";
+} from "@/src/features/datasets/contexts/ActiveCellProvider";
import { SidePanel, SidePanelContent } from "@/src/components/ui/side-panel";
import { AnnotationPanel } from "@/src/features/datasets/components/AnnotationPanel";
import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
diff --git a/web/src/features/datasets/DatasetExperimentsPage.tsx b/web/src/features/datasets/DatasetExperimentsPage.tsx
index 87e79b5b11..173e5e519c 100644
--- a/web/src/features/datasets/DatasetExperimentsPage.tsx
+++ b/web/src/features/datasets/DatasetExperimentsPage.tsx
@@ -24,7 +24,7 @@ import { showSuccessToast } from "@/src/features/notifications";
import { DatasetAnalytics } from "@/src/features/datasets/components/DatasetAnalytics";
import { RESOURCE_METRICS } from "@/src/features/dashboard";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { getDatasetTabs, DATASET_TABS } from "@/src/features/navigation";
import { TemplateSelector } from "@/src/features/evals/components/TemplateSelector";
import {
diff --git a/web/src/features/datasets/DatasetItemsPage.tsx b/web/src/features/datasets/DatasetItemsPage.tsx
index aa01fbec6f..22c5c62bfd 100644
--- a/web/src/features/datasets/DatasetItemsPage.tsx
+++ b/web/src/features/datasets/DatasetItemsPage.tsx
@@ -7,7 +7,7 @@ import { NewDatasetItemButton } from "@/src/features/datasets/components/NewData
import { UploadDatasetCsvButton } from "@/src/features/datasets/components/UploadDatasetCsvButton";
import { Button } from "@/src/components/ui/button";
import { History, MoreVertical } from "@langfuse/icons";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { DatasetItemsOnboarding } from "@/src/components/onboarding/DatasetItemsOnboarding";
import { SidePanel, SidePanelContent } from "@/src/components/ui/side-panel";
import { DatasetVersionHistoryPanel } from "@/src/features/datasets/components/DatasetVersionHistoryPanel";
diff --git a/web/src/features/datasets/DatasetRunPage.tsx b/web/src/features/datasets/DatasetRunPage.tsx
index 12326be075..76931e322b 100644
--- a/web/src/features/datasets/DatasetRunPage.tsx
+++ b/web/src/features/datasets/DatasetRunPage.tsx
@@ -8,7 +8,7 @@ import { Columns3, MoreVertical, Trash } from "@langfuse/icons";
import Link from "next/link";
import { useRouter } from "next/router";
import { useEffect } from "react";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { DropdownMenu } from "@/src/components/design-system/DropdownMenu/DropdownMenu";
import {
SidePanel,
diff --git a/web/src/features/datasets/DatasetsPage.tsx b/web/src/features/datasets/DatasetsPage.tsx
index 2e7230c5b9..d76779e36d 100644
--- a/web/src/features/datasets/DatasetsPage.tsx
+++ b/web/src/features/datasets/DatasetsPage.tsx
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
import { useRouter } from "next/router";
import { DatasetsTable } from "@/src/features/datasets/components/DatasetsTable";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { ButtonWithIcon } from "@/src/components/ButtonWithIcon";
import { DialogTrigger } from "@/src/components/ui/dialog";
import { CreateDatasetDialogController } from "@/src/features/datasets/components/CreateDatasetDialogController";
diff --git a/web/src/features/datasets/README.md b/web/src/features/datasets/README.md
index 0527418d84..ab09e8c0d8 100644
--- a/web/src/features/datasets/README.md
+++ b/web/src/features/datasets/README.md
@@ -10,7 +10,7 @@ one `ActiveCellProvider` per project and dataset.
- tRPC owns dataset, run, item, and score query data. Router hooks own filters and
selected runs.
-- `contexts/ActiveCellContext.tsx` owns the active review target and its comment
+- `contexts/ActiveCellProvider.tsx` owns the active review target and its comment
draft guard in a per-view store. Its select and clear actions are the only
way to change review targets; both reject leaving an unfinished comment.
- `components/AnnotationPanel.tsx` owns the mounted review surface. Target identity
diff --git a/web/src/features/datasets/components/AnnotationPanel.clienttest.tsx b/web/src/features/datasets/components/AnnotationPanel.clienttest.tsx
index ce3991044d..784165f1b3 100644
--- a/web/src/features/datasets/components/AnnotationPanel.clienttest.tsx
+++ b/web/src/features/datasets/components/AnnotationPanel.clienttest.tsx
@@ -5,7 +5,7 @@ import { AnnotationPanel } from "./AnnotationPanel";
import {
ActiveCellProvider,
useActiveCell,
-} from "../contexts/ActiveCellContext";
+} from "../contexts/ActiveCellProvider";
vi.mock("sonner", () => ({ toast: { error: vi.fn() } }));
vi.mock("@/src/components/useSessionStorage", () => ({
diff --git a/web/src/features/datasets/components/AnnotationPanel.tsx b/web/src/features/datasets/components/AnnotationPanel.tsx
index 599a3fce1e..d9098537a0 100644
--- a/web/src/features/datasets/components/AnnotationPanel.tsx
+++ b/web/src/features/datasets/components/AnnotationPanel.tsx
@@ -8,7 +8,7 @@ import {
import { Skeleton } from "@/src/components/ui/skeleton";
import useSessionStorage from "@/src/components/useSessionStorage";
import { CommentsSection } from "@/src/features/annotation-queues";
-import { useActiveCell } from "@/src/features/datasets/contexts/ActiveCellContext";
+import { useActiveCell } from "@/src/features/datasets/contexts/ActiveCellProvider";
import {
AnnotationForm,
decomposeAggregateScoreKey,
diff --git a/web/src/features/datasets/components/DatasetAggregateTableCell.tsx b/web/src/features/datasets/components/DatasetAggregateTableCell.tsx
index 5ff79c2485..54376d0d1a 100644
--- a/web/src/features/datasets/components/DatasetAggregateTableCell.tsx
+++ b/web/src/features/datasets/components/DatasetAggregateTableCell.tsx
@@ -2,8 +2,8 @@
import { Badge } from "@/src/components/ui/badge";
import { Button } from "@/src/components/ui/button";
import { ConnectedIOTableCell } from "@/src/components/table/ConnectedIOTableCell";
-import { useActiveCell } from "@/src/features/datasets/contexts/ActiveCellContext";
-import { useDatasetCompareFields } from "@/src/features/datasets/contexts/DatasetCompareFieldsContext";
+import { useActiveCell } from "@/src/features/datasets/contexts/ActiveCellProvider";
+import { useDatasetCompareFields } from "@/src/features/datasets/contexts/DatasetCompareFieldsProvider";
import { api } from "@/src/utils/api";
import { formatIntervalSeconds } from "@/src/utils/dates";
import { cn } from "@/src/utils/tailwind";
diff --git a/web/src/features/datasets/components/DatasetCompareRunsTable.tsx b/web/src/features/datasets/components/DatasetCompareRunsTable.tsx
index 5d96b73a4a..6cf5f73b71 100644
--- a/web/src/features/datasets/components/DatasetCompareRunsTable.tsx
+++ b/web/src/features/datasets/components/DatasetCompareRunsTable.tsx
@@ -20,7 +20,7 @@ import { useDetailPageLists } from "@/src/features/navigate-detail-pages";
import {
DatasetCompareFieldsProvider,
useDatasetCompareFields,
-} from "@/src/features/datasets/contexts/DatasetCompareFieldsContext";
+} from "@/src/features/datasets/contexts/DatasetCompareFieldsProvider";
import { useColumnFilterState } from "@/src/features/filters";
import { type Prisma } from "@langfuse/shared";
import { type EnrichedDatasetRunItem } from "@langfuse/shared/src/server";
diff --git a/web/src/features/datasets/components/DatasetItemDetailPage.tsx b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
index 51688363b9..388319d1f7 100644
--- a/web/src/features/datasets/components/DatasetItemDetailPage.tsx
+++ b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
@@ -1,6 +1,6 @@
/* eslint-disable no-nested-ternary */
import { useHasProjectAccess } from "@/src/features/rbac";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { ActionButton } from "@/src/components/ActionButton";
import { Button } from "@/src/components/ui/button";
import { NewDatasetItemFromExistingObjectDialogController } from "@/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController";
diff --git a/web/src/features/datasets/components/DatasetItemEditorLayout.tsx b/web/src/features/datasets/components/DatasetItemEditorLayout.tsx
index 68251a5680..a1782ace24 100644
--- a/web/src/features/datasets/components/DatasetItemEditorLayout.tsx
+++ b/web/src/features/datasets/components/DatasetItemEditorLayout.tsx
@@ -1,6 +1,4 @@
-/* eslint-disable @repo/component-file-structure */
import { type ReactNode } from "react";
-import { JSONView } from "@/src/components/ui/CodeJsonViewer";
export function DatasetItemEditorLayout({
selector,
@@ -33,27 +31,3 @@ export function DatasetItemEditorLayout({
</div>
);
}
-
-export function DatasetItemPreviewField({
- label,
- value,
- feedback,
-}: {
- label: string;
- value: unknown;
- feedback: ReactNode;
-}) {
- return (
- <section className="ph-no-capture bg-background flex flex-col overflow-hidden rounded-md border">
- <h4 className="border-b px-3 py-2 text-xs font-bold">{label}</h4>
- <div className="max-h-64 overflow-auto">
- {value === undefined ? (
- <p className="text-muted-foreground p-3 text-xs">No value</p>
- ) : (
- <JSONView json={value} className="text-xs" />
- )}
- </div>
- {feedback}
- </section>
- );
-}
diff --git a/web/src/features/datasets/components/DatasetItemPreviewField.tsx b/web/src/features/datasets/components/DatasetItemPreviewField.tsx
new file mode 100644
index 0000000000..66a4424efb
--- /dev/null
+++ b/web/src/features/datasets/components/DatasetItemPreviewField.tsx
@@ -0,0 +1,26 @@
+import { type ReactNode } from "react";
+import { JSONView } from "@/src/components/ui/CodeJsonViewer";
+
+export function DatasetItemPreviewField({
+ label,
+ value,
+ feedback,
+}: {
+ label: string;
+ value: unknown;
+ feedback: ReactNode;
+}) {
+ return (
+ <section className="ph-no-capture bg-background flex flex-col overflow-hidden rounded-md border">
+ <h4 className="border-b px-3 py-2 text-xs font-bold">{label}</h4>
+ <div className="max-h-64 overflow-auto">
+ {value === undefined ? (
+ <p className="text-muted-foreground p-3 text-xs">No value</p>
+ ) : (
+ <JSONView json={value} className="text-xs" />
+ )}
+ </div>
+ {feedback}
+ </section>
+ );
+}
diff --git a/web/src/features/datasets/contexts/ActiveCellContext.tsx b/web/src/features/datasets/contexts/ActiveCellProvider.tsx
similarity index 98%
rename from web/src/features/datasets/contexts/ActiveCellContext.tsx
rename to web/src/features/datasets/contexts/ActiveCellProvider.tsx
index 7067cc8aab..909d493c4b 100644
--- a/web/src/features/datasets/contexts/ActiveCellContext.tsx
+++ b/web/src/features/datasets/contexts/ActiveCellProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { type ScoreAggregate } from "@langfuse/shared";
import { createContext, useContext, useState, type ReactNode } from "react";
import { useStore } from "zustand";
diff --git a/web/src/features/datasets/contexts/DatasetCompareFieldsContext.tsx b/web/src/features/datasets/contexts/DatasetCompareFieldsProvider.tsx
similarity index 97%
rename from web/src/features/datasets/contexts/DatasetCompareFieldsContext.tsx
rename to web/src/features/datasets/contexts/DatasetCompareFieldsProvider.tsx
index 3ae356f533..91de8bd7da 100644
--- a/web/src/features/datasets/contexts/DatasetCompareFieldsContext.tsx
+++ b/web/src/features/datasets/contexts/DatasetCompareFieldsProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { createContext, useContext, useState, type ReactNode } from "react";
// eslint-disable-next-line @typescript-eslint/no-unused-vars -- Used via typeof
diff --git a/web/src/features/evals/components/EvalTemplateDetail.tsx b/web/src/features/evals/components/EvalTemplateDetail.tsx
index 7719239062..88bee61344 100644
--- a/web/src/features/evals/components/EvalTemplateDetail.tsx
+++ b/web/src/features/evals/components/EvalTemplateDetail.tsx
@@ -6,7 +6,7 @@ import { api } from "@/src/utils/api";
import { type EvalTemplate } from "@langfuse/shared";
import { useRouter } from "next/router";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { Switch } from "@/src/components/design-system/Switch/Switch";
import { Command } from "@/src/components/ui/command";
import { Badge } from "@/src/components/ui/badge";
diff --git a/web/src/features/evals/components/EvaluatorDetail.tsx b/web/src/features/evals/components/EvaluatorDetail.tsx
index f48416b614..f95005de3d 100644
--- a/web/src/features/evals/components/EvaluatorDetail.tsx
+++ b/web/src/features/evals/components/EvaluatorDetail.tsx
@@ -4,7 +4,7 @@ import { useRouter } from "next/router";
import EvalLogTable from "@/src/features/evals/components/EvalLogTable";
import { StatusBadge } from "@/src/components/ui/StatusBadge/StatusBadge";
import { DetailPageNav } from "@/src/features/navigate-detail-pages";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { LevelCountsDisplay } from "@/src/components/LevelCountsDisplay";
import { generateJobExecutionCounts } from "@/src/features/evals/utils/job-execution-utils";
import { EvaluatorPausedCallout } from "@/src/features/evals/components/EvaluatorPausedCallout";
diff --git a/web/src/features/evals/components/InnerEvaluatorForm.tsx b/web/src/features/evals/components/InnerEvaluatorForm.tsx
index 695f9869e2..0c1f5aeb76 100644
--- a/web/src/features/evals/components/InnerEvaluatorForm.tsx
+++ b/web/src/features/evals/components/InnerEvaluatorForm.tsx
@@ -119,7 +119,7 @@ import {
import { CodeEvalTestRunCard } from "@/src/features/evals/components/CodeEvalTestRunCard";
import { getExperimentEvalPreviewFilters } from "@/src/features/evals/utils/experiment-eval-preview-utils";
import { cn } from "@/src/utils/tailwind";
-import { PeekTableStateProvider } from "@/src/components/table/peek/contexts/PeekTableStateContext";
+import { PeekTableStateProvider } from "@/src/components/table/peek/contexts/PeekTableStateProvider";
// Lazy load tables
const TracesTable = lazy(() => import("@/src/features/traces/TracesTable"));
diff --git a/web/src/features/evals/components/VariableMappingCard.tsx b/web/src/features/evals/components/VariableMappingCard.tsx
index 0a281d2f17..cdd5785771 100644
--- a/web/src/features/evals/components/VariableMappingCard.tsx
+++ b/web/src/features/evals/components/VariableMappingCard.tsx
@@ -23,7 +23,7 @@ import {
fieldHasJsonSelectorOption,
getJsonPathCompatibilityWarning,
} from "@/src/features/evals/utils/evaluator-form-utils";
-import { VariableMappingDescription } from "@/src/features/evals/components/eval-form-descriptions";
+import { VariableMappingDescription } from "@/src/features/evals/components/VariableMappingDescription";
import {
EvaluationPromptPreview,
getVariableColor,
diff --git a/web/src/features/evals/components/eval-form-descriptions.tsx b/web/src/features/evals/components/VariableMappingDescription.tsx
similarity index 89%
rename from web/src/features/evals/components/eval-form-descriptions.tsx
rename to web/src/features/evals/components/VariableMappingDescription.tsx
index b6aca92226..1aaf834b5d 100644
--- a/web/src/features/evals/components/eval-form-descriptions.tsx
+++ b/web/src/features/evals/components/VariableMappingDescription.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import DocPopup from "@/src/components/layouts/doc-popup";
import { Label } from "@/src/components/ui/label";
diff --git a/web/src/features/evals/pages/DefaultEvaluationModelPage.tsx b/web/src/features/evals/pages/DefaultEvaluationModelPage.tsx
index 565a07299a..0560b1b9e4 100644
--- a/web/src/features/evals/pages/DefaultEvaluationModelPage.tsx
+++ b/web/src/features/evals/pages/DefaultEvaluationModelPage.tsx
@@ -1,4 +1,4 @@
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { useRouter } from "next/router";
import { useHasProjectAccess } from "@/src/features/rbac";
import { SupportOrUpgradePage } from "@/src/ee/features/billing";
diff --git a/web/src/features/evals/pages/EvaluatorsPage.tsx b/web/src/features/evals/pages/EvaluatorsPage.tsx
index 736b918108..446ed84c0c 100644
--- a/web/src/features/evals/pages/EvaluatorsPage.tsx
+++ b/web/src/features/evals/pages/EvaluatorsPage.tsx
@@ -1,4 +1,4 @@
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { useRouter } from "next/router";
import { useHasProjectAccess } from "@/src/features/rbac";
import { Plus } from "@langfuse/icons";
diff --git a/web/src/features/evals/pages/NewEvaluatorPage.tsx b/web/src/features/evals/pages/NewEvaluatorPage.tsx
index ebab04bb7b..05b52811e9 100644
--- a/web/src/features/evals/pages/NewEvaluatorPage.tsx
+++ b/web/src/features/evals/pages/NewEvaluatorPage.tsx
@@ -1,4 +1,4 @@
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import {
BreadcrumbSeparator,
BreadcrumbPage,
diff --git a/web/src/features/evals/pages/NewTemplatesPage.tsx b/web/src/features/evals/pages/NewTemplatesPage.tsx
index 7ddddd82cb..05b5f11ded 100644
--- a/web/src/features/evals/pages/NewTemplatesPage.tsx
+++ b/web/src/features/evals/pages/NewTemplatesPage.tsx
@@ -1,4 +1,4 @@
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { EvalTemplateForm } from "@/src/features/evals/components/EvalTemplateForm";
import { useHasProjectAccess } from "@/src/features/rbac";
import { useRouter } from "next/router";
diff --git a/web/src/features/evals/pages/RemapEvaluatorPage.tsx b/web/src/features/evals/pages/RemapEvaluatorPage.tsx
index d8f9266f87..2c236b7bd0 100644
--- a/web/src/features/evals/pages/RemapEvaluatorPage.tsx
+++ b/web/src/features/evals/pages/RemapEvaluatorPage.tsx
@@ -1,7 +1,7 @@
/* eslint-disable no-nested-ternary */
import { useState, useMemo } from "react";
import { useRouter } from "next/router";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { api } from "@/src/utils/api";
import { InnerEvaluatorForm } from "@/src/features/evals/components/InnerEvaluatorForm";
import {
diff --git a/web/src/features/evals/pages/TemplatesPage.tsx b/web/src/features/evals/pages/TemplatesPage.tsx
index 3d0bda0e24..b7776dbab9 100644
--- a/web/src/features/evals/pages/TemplatesPage.tsx
+++ b/web/src/features/evals/pages/TemplatesPage.tsx
@@ -1,4 +1,4 @@
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { useRouter } from "next/router";
import { Button } from "@/src/components/ui/button";
import Link from "next/link";
diff --git a/web/src/features/evals/v2/components/EvaluatorTestPanel/components/SampleObservationSelectorContainer/SampleObservationSelectorContainer.tsx b/web/src/features/evals/v2/components/EvaluatorTestPanel/components/SampleObservationSelectorContainer/SampleObservationSelectorContainer.tsx
index d692c5a5d8..c504b28165 100644
--- a/web/src/features/evals/v2/components/EvaluatorTestPanel/components/SampleObservationSelectorContainer/SampleObservationSelectorContainer.tsx
+++ b/web/src/features/evals/v2/components/EvaluatorTestPanel/components/SampleObservationSelectorContainer/SampleObservationSelectorContainer.tsx
@@ -3,7 +3,7 @@ import type { FilterState } from "@langfuse/shared";
import useLocalStorage from "@/src/components/useLocalStorage";
import { EVALUATOR_FILTER_EXPERIENCE_STORAGE_KEY } from "@/src/features/evals/v2/constants/evaluatorFilterExperience";
-import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsContext";
+import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsProvider";
import type { EvaluatorFilterExperience } from "@/src/features/evals/v2/types/evaluatorFilterExperience";
import { EvaluatorSampleObservationSelector } from "@/src/features/evals/v2/components/Evaluators/Testing/components/EvaluatorSampleObservationSelector/EvaluatorSampleObservationSelector";
import type { EvaluatorSetupStore } from "@/src/features/evals/v2/store/evaluatorSetupStore/evaluatorSetupStore";
diff --git a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/DefinitionStepContainer/DefinitionStepContainer.tsx b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/DefinitionStepContainer/DefinitionStepContainer.tsx
index dc3125f13b..59a6226739 100644
--- a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/DefinitionStepContainer/DefinitionStepContainer.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/DefinitionStepContainer/DefinitionStepContainer.tsx
@@ -12,7 +12,7 @@ import { PromptEditor } from "@/src/features/evals/v2/components/Evaluators/Eval
import { ScoreOutputEditor } from "@/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/ScoreOutputEditor/ScoreOutputEditor";
import type { JudgeModel } from "@/src/features/evals/v2/judgeModel";
import type { EvaluatorSetupStore } from "@/src/features/evals/v2/store/evaluatorSetupStore/evaluatorSetupStore";
-import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsContext";
+import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsProvider";
import type { ProjectDefaultModelConfig } from "@/src/features/evals/v2/types/ProjectDefaultModelConfig";
import type { CodeEvalValidationResult } from "@/src/features/evals/utils/code-eval-template-validation";
diff --git a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/ModelSelector/ModelSelector.tsx b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/ModelSelector/ModelSelector.tsx
index 4ae1c84750..47b95450bf 100644
--- a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/ModelSelector/ModelSelector.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/ModelSelector/ModelSelector.tsx
@@ -15,7 +15,7 @@ import {
type JudgeModel,
} from "@/src/features/evals/v2/judgeModel";
import type { EvaluatorSetupStore } from "@/src/features/evals/v2/store/evaluatorSetupStore/evaluatorSetupStore";
-import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsContext";
+import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsProvider";
export function ModelSelector({
projectId,
diff --git a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/PromptEditor/PromptEditor.tsx b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/PromptEditor/PromptEditor.tsx
index d75fd6b06b..170a342798 100644
--- a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/PromptEditor/PromptEditor.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/PromptEditor/PromptEditor.tsx
@@ -58,7 +58,7 @@ import {
import { useEvaluatorSetupSample } from "@/src/features/evals/v2/hooks/useEvaluatorSetupSample";
import { useCopyToClipboard } from "@/src/hooks/useCopyToClipboard";
import type { EvaluatorSetupStore } from "@/src/features/evals/v2/store/evaluatorSetupStore/evaluatorSetupStore";
-import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsContext";
+import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsProvider";
import { cn } from "@/src/utils/tailwind";
import type { EvaluatorPromptMessage } from "@langfuse/shared";
diff --git a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/ScoreOutputEditor/ScoreOutputEditor.tsx b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/ScoreOutputEditor/ScoreOutputEditor.tsx
index e9d82053e7..b4fbc4db12 100644
--- a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/ScoreOutputEditor/ScoreOutputEditor.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/ScoreOutputEditor/ScoreOutputEditor.tsx
@@ -2,7 +2,7 @@ import { useStore } from "zustand";
import { ScoreOutputConfiguration } from "@/src/features/evals/v2/components/Evaluators/Judges/ScoreOutputConfiguration/ScoreOutputConfiguration";
import type { EvaluatorSetupStore } from "@/src/features/evals/v2/store/evaluatorSetupStore/evaluatorSetupStore";
-import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsContext";
+import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsProvider";
export function ScoreOutputEditor({ store }: { store: EvaluatorSetupStore }) {
const scoreOutput = useStore(store, (state) => state.scoreOutput);
diff --git a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/NameStep/components/NameStepContainer/NameStepContainer.tsx b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/NameStep/components/NameStepContainer/NameStepContainer.tsx
index ce8b4c7880..18b53e3574 100644
--- a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/NameStep/components/NameStepContainer/NameStepContainer.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/NameStep/components/NameStepContainer/NameStepContainer.tsx
@@ -6,7 +6,7 @@ import type { AIAssistedInput } from "@/src/components/ui/AIAssistedInput";
import { NameStep } from "@/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/NameStep/NameStep";
import { getEvaluatorNameStep } from "@/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/evaluatorSetupSteps";
import type { EvaluatorSetupStore } from "@/src/features/evals/v2/store/evaluatorSetupStore/evaluatorSetupStore";
-import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsContext";
+import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsProvider";
export function NameStepContainer({
store,
diff --git a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupLoadingPage/EvaluatorSetupLoadingPage.tsx b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupLoadingPage/EvaluatorSetupLoadingPage.tsx
index e83a90ac06..adc683835f 100644
--- a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupLoadingPage/EvaluatorSetupLoadingPage.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupLoadingPage/EvaluatorSetupLoadingPage.tsx
@@ -1,4 +1,4 @@
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { EvaluatorSetupLoadingState } from "./EvaluatorSetupLoadingState";
export function EvaluatorSetupLoadingPage({
diff --git a/web/src/features/evals/v2/components/VariableMapping/components/EditableVariableMapping/EditableVariableMapping.tsx b/web/src/features/evals/v2/components/VariableMapping/components/EditableVariableMapping/EditableVariableMapping.tsx
index 24b019a610..027415d184 100644
--- a/web/src/features/evals/v2/components/VariableMapping/components/EditableVariableMapping/EditableVariableMapping.tsx
+++ b/web/src/features/evals/v2/components/VariableMapping/components/EditableVariableMapping/EditableVariableMapping.tsx
@@ -33,7 +33,7 @@ import {
experimentTargetEvalVariableColumns,
} from "@langfuse/shared";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsContext";
+import { useEvalOnboardingAnalytics } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsProvider";
const TOOL_CALLS_COLUMN_ID = "toolCalls";
diff --git a/web/src/features/evals/v2/contexts/EvalOnboardingAnalyticsContext.tsx b/web/src/features/evals/v2/contexts/EvalOnboardingAnalyticsProvider.tsx
similarity index 94%
rename from web/src/features/evals/v2/contexts/EvalOnboardingAnalyticsContext.tsx
rename to web/src/features/evals/v2/contexts/EvalOnboardingAnalyticsProvider.tsx
index 181fc6b72c..c2297db547 100644
--- a/web/src/features/evals/v2/contexts/EvalOnboardingAnalyticsContext.tsx
+++ b/web/src/features/evals/v2/contexts/EvalOnboardingAnalyticsProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { createContext, useContext, type ReactNode } from "react";
import type { createEvalOnboardingAnalytics } from "@/src/features/evals/v2/fns/createEvalOnboardingAnalytics";
diff --git a/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx b/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
index 9bf7e48784..e279e05570 100644
--- a/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
+++ b/web/src/features/evals/v2/pages/EvaluatorSetupPage.tsx
@@ -14,7 +14,7 @@ import {
} from "@langfuse/shared";
import { useStore } from "zustand";
import { useShallow } from "zustand/react/shallow";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { usePeekNavigation } from "@/src/components/table/peek/hooks/usePeekNavigation";
import { TablePeekViewTraceDetail } from "@/src/components/table/peek/TablePeekViewTraceDetail";
import { Button } from "@/src/components/ui/button";
@@ -72,7 +72,7 @@ import {
} from "@/src/features/evals/v2/fns/evaluators/getEvaluatorCreationAnalyticsProperties";
import { getFilterAnalyticsProperties } from "@/src/features/evals/v2/fns/getFilterAnalyticsProperties";
import { createEvalOnboardingAnalytics } from "@/src/features/evals/v2/fns/createEvalOnboardingAnalytics";
-import { EvalOnboardingAnalyticsProvider } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsContext";
+import { EvalOnboardingAnalyticsProvider } from "@/src/features/evals/v2/contexts/EvalOnboardingAnalyticsProvider";
import { isJudgeModelAvailable } from "@/src/features/evals/v2/judgeModel";
import type { SampleObservation } from "@/src/features/evals/v2/components/Evaluators/Testing/components/SampleObservationSelectorBase/SampleObservationSelectorBase";
diff --git a/web/src/features/evals/v2/pages/EvaluatorsPage.tsx b/web/src/features/evals/v2/pages/EvaluatorsPage.tsx
index 3c6a2b7989..96b31c758e 100644
--- a/web/src/features/evals/v2/pages/EvaluatorsPage.tsx
+++ b/web/src/features/evals/v2/pages/EvaluatorsPage.tsx
@@ -11,7 +11,7 @@ import { useRouter } from "next/router";
import { type ComponentProps, useMemo, useRef, useState } from "react";
import { StringParam, useQueryParam, withDefault } from "use-query-params";
import { useStore } from "zustand";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { DataTable } from "@/src/components/table/data-table";
import {
customRowHeightMenu,
diff --git a/web/src/features/evals/v2/pages/RulesPage.tsx b/web/src/features/evals/v2/pages/RulesPage.tsx
index 60ed70f772..c8c995dd29 100644
--- a/web/src/features/evals/v2/pages/RulesPage.tsx
+++ b/web/src/features/evals/v2/pages/RulesPage.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import { Plus } from "@langfuse/icons";
import { useRouter } from "next/router";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { Button } from "@/src/components/ui/button";
import { SupportOrUpgradePage } from "@/src/ee/features/billing";
import { CreateRuleDialog } from "@/src/features/evals/v2/components/Rules/CreateRuleDialog/CreateRuleDialog";
diff --git a/web/src/features/events/EventsPage.tsx b/web/src/features/events/EventsPage.tsx
index a612a28760..2ce1d1d0c5 100644
--- a/web/src/features/events/EventsPage.tsx
+++ b/web/src/features/events/EventsPage.tsx
@@ -1,7 +1,7 @@
import React from "react";
import { useRouter } from "next/router";
import ObservationsEventsTable from "@/src/features/events/components/EventsTable";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { api } from "@/src/utils/api";
import { TracesOnboarding } from "@/src/components/onboarding/TracesOnboarding";
import { getTracingTabs, TRACING_TABS } from "@/src/features/navigation";
diff --git a/web/src/features/events/components/EventsTable.tsx b/web/src/features/events/components/EventsTable.tsx
index 335df65f79..985cb18313 100644
--- a/web/src/features/events/components/EventsTable.tsx
+++ b/web/src/features/events/components/EventsTable.tsx
@@ -69,7 +69,7 @@ import { createTextTableColumn } from "@/src/components/design-system/table/colu
import { type LangfuseColumnDef } from "@/src/components/table/types";
import { cn } from "@/src/utils/tailwind";
-import { ObservationLevelTag } from "@/src/components/level-colors";
+import { ObservationLevelTag } from "@/src/components/ObservationLevelTag";
import {
compactNumberFormatter,
numberFormatter,
@@ -98,10 +98,10 @@ import {
} from "@/src/utils/date-range-utils";
import { TableHeaderControls } from "@/src/components/table/TableHeaderControls";
import { TimeRangePicker } from "@/src/components/date-picker";
-import { DataTableRefreshButton } from "@/src/components/table/data-table-refresh-button";
+import { DataTableRefreshButton } from "@/src/components/table/DataTableRefreshButton";
import { MobileFiltersSheet } from "@/src/features/events/components/MobileFiltersSheet";
import { useIsMobile } from "@/src/hooks/use-mobile";
-import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateContext";
+import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateProvider";
import {
useColumnOrder,
useColumnVisibility,
diff --git a/web/src/features/events/config/filter-config.ts b/web/src/features/events/config/filter-config.ts
index da39c8173c..85ae548dbe 100644
--- a/web/src/features/events/config/filter-config.ts
+++ b/web/src/features/events/config/filter-config.ts
@@ -4,7 +4,7 @@ import {
type FilterConfig,
} from "@/src/features/filters/lib/filter-config";
import { renderFilterIcon } from "@/src/components/ItemBadge";
-import { renderLevelIcon } from "@/src/components/level-colors";
+import { renderLevelIcon } from "@/src/components/ObservationLevelTag";
// Helper function to get column name from eventsTableCols by ID
export const getEventsColumnName = (id: string): string => {
diff --git a/web/src/features/experiments/ExperimentResultsPage.tsx b/web/src/features/experiments/ExperimentResultsPage.tsx
index ee9f7b9a0e..8718b875a6 100644
--- a/web/src/features/experiments/ExperimentResultsPage.tsx
+++ b/web/src/features/experiments/ExperimentResultsPage.tsx
@@ -1,5 +1,5 @@
import { useRouter } from "next/router";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { api } from "@/src/utils/api";
import { ExperimentItemsTable } from "@/src/features/experiments/components/table";
import { ExperimentOverviewPanel } from "@/src/features/experiments/components/ExperimentOverviewPanel";
diff --git a/web/src/features/experiments/ExperimentsPage.tsx b/web/src/features/experiments/ExperimentsPage.tsx
index a5c112aa0c..0ed46ed73b 100644
--- a/web/src/features/experiments/ExperimentsPage.tsx
+++ b/web/src/features/experiments/ExperimentsPage.tsx
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { Button } from "@/src/components/ui/button";
import {
Dialog,
diff --git a/web/src/features/experiments/components/ExperimentOverviewField.tsx b/web/src/features/experiments/components/ExperimentOverviewField.tsx
index f4c52b6f42..9e9ed28dee 100644
--- a/web/src/features/experiments/components/ExperimentOverviewField.tsx
+++ b/web/src/features/experiments/components/ExperimentOverviewField.tsx
@@ -1,12 +1,5 @@
-/* eslint-disable @repo/component-file-structure */
import type { ReactNode } from "react";
-export const ExperimentOverviewSectionHeading = ({
- children,
-}: {
- children: ReactNode;
-}) => <h4 className="mb-2 text-sm font-bold">{children}</h4>;
-
export const ExperimentOverviewField = ({
label,
children,
diff --git a/web/src/features/experiments/components/ExperimentOverviewPanel.tsx b/web/src/features/experiments/components/ExperimentOverviewPanel.tsx
index 3a0c5499af..5de7e0f875 100644
--- a/web/src/features/experiments/components/ExperimentOverviewPanel.tsx
+++ b/web/src/features/experiments/components/ExperimentOverviewPanel.tsx
@@ -3,10 +3,8 @@ import { useState } from "react";
import { Button } from "@/src/components/ui/button";
import Link from "next/link";
import { ExperimentMetadataSection } from "./ExperimentMetadataSection";
-import {
- ExperimentOverviewField,
- ExperimentOverviewSectionHeading,
-} from "./ExperimentOverviewField";
+import { ExperimentOverviewField } from "./ExperimentOverviewField";
+import { ExperimentOverviewSectionHeading } from "./ExperimentOverviewSectionHeading";
const isSafeHttpUrl = (value: string | undefined) => {
if (!value) return false;
diff --git a/web/src/features/experiments/components/ExperimentOverviewSectionHeading.tsx b/web/src/features/experiments/components/ExperimentOverviewSectionHeading.tsx
new file mode 100644
index 0000000000..b14b92d0dc
--- /dev/null
+++ b/web/src/features/experiments/components/ExperimentOverviewSectionHeading.tsx
@@ -0,0 +1,7 @@
+import type { ReactNode } from "react";
+
+export const ExperimentOverviewSectionHeading = ({
+ children,
+}: {
+ children: ReactNode;
+}) => <h4 className="mb-2 text-sm font-bold">{children}</h4>;
diff --git a/web/src/features/experiments/components/table/ExperimentGridSummary.tsx b/web/src/features/experiments/components/table/ExperimentGridSummaryValues.tsx
similarity index 99%
rename from web/src/features/experiments/components/table/ExperimentGridSummary.tsx
rename to web/src/features/experiments/components/table/ExperimentGridSummaryValues.tsx
index 862b4d51d6..db013a74aa 100644
--- a/web/src/features/experiments/components/table/ExperimentGridSummary.tsx
+++ b/web/src/features/experiments/components/table/ExperimentGridSummaryValues.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { useMemo } from "react";
import { DropdownIndicator } from "@/src/components/design-system/DropdownIndicator/DropdownIndicator";
import { decomposeAggregateScoreKey } from "@/src/features/scores";
diff --git a/web/src/features/experiments/components/table/ExperimentGridView.tsx b/web/src/features/experiments/components/table/ExperimentGridView.tsx
index ad0126123f..4e05e2572e 100644
--- a/web/src/features/experiments/components/table/ExperimentGridView.tsx
+++ b/web/src/features/experiments/components/table/ExperimentGridView.tsx
@@ -1,6 +1,6 @@
/* eslint-disable react/no-unstable-nested-components */
import { ExperimentInputCell } from "./ExperimentInputCell";
-import { ExperimentGridSummaryValues } from "./ExperimentGridSummary";
+import { ExperimentGridSummaryValues } from "./ExperimentGridSummaryValues";
import { DataTable } from "@/src/components/table/data-table";
import { shouldIgnoreRowClickTarget } from "@/src/components/table/shouldIgnoreRowClickTarget";
import { type LangfuseColumnDef } from "@/src/components/table/types";
diff --git a/web/src/features/experiments/components/table/ExperimentItemsTable.tsx b/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
index 0be45bc880..26ee489146 100644
--- a/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
+++ b/web/src/features/experiments/components/table/ExperimentItemsTable.tsx
@@ -104,7 +104,7 @@ import {
DiffLabel,
} from "@/src/features/datasets";
import { describeRunComparison } from "@/src/features/experiments/fns/describeRunComparison";
-import { TablePeekViewExperimentItemDetail } from "@/src/components/table/peek/peek-experiment-item-detail";
+import { TablePeekViewExperimentItemDetail } from "@/src/components/table/peek/TablePeekViewExperimentItemDetail";
import { NotRecordedMetric } from "./NotRecordedMetric";
import {
summariseScoreColumn,
diff --git a/web/src/features/experiments/config/experiment-items-filter-config.ts b/web/src/features/experiments/config/experiment-items-filter-config.ts
index 5778ed5bd1..b1149a704d 100644
--- a/web/src/features/experiments/config/experiment-items-filter-config.ts
+++ b/web/src/features/experiments/config/experiment-items-filter-config.ts
@@ -1,5 +1,5 @@
import type { FilterConfig } from "@/src/features/filters";
-import { renderLevelIcon } from "@/src/components/level-colors";
+import { renderLevelIcon } from "@/src/components/ObservationLevelTag";
import type { ColumnDefinition, ObservationLevelType } from "@langfuse/shared";
/**
diff --git a/web/src/features/experiments/hooks/useExperimentItemsScoreCache.clienttest.tsx b/web/src/features/experiments/hooks/useExperimentItemsScoreCache.clienttest.tsx
index 1a92cf3d51..08da0ccc16 100644
--- a/web/src/features/experiments/hooks/useExperimentItemsScoreCache.clienttest.tsx
+++ b/web/src/features/experiments/hooks/useExperimentItemsScoreCache.clienttest.tsx
@@ -9,8 +9,8 @@ import {
ScoreCacheProvider,
useScoreCache,
type CachedScore,
-} from "@/src/features/scores/contexts/ScoreCacheContext";
-import { ExperimentGridSummaryValues } from "../components/table/ExperimentGridSummary";
+} from "@/src/features/scores/contexts/ScoreCacheProvider";
+import { ExperimentGridSummaryValues } from "../components/table/ExperimentGridSummaryValues";
import {
type ExperimentItemsTableRow,
type ExperimentItemData,
diff --git a/web/src/features/experiments/hooks/useExperimentItemsScoreCache.ts b/web/src/features/experiments/hooks/useExperimentItemsScoreCache.ts
index 2e53353207..2956902535 100644
--- a/web/src/features/experiments/hooks/useExperimentItemsScoreCache.ts
+++ b/web/src/features/experiments/hooks/useExperimentItemsScoreCache.ts
@@ -3,7 +3,7 @@ import { type ScoreAggregate } from "@langfuse/shared";
import {
useScoreCache,
type CachedScore,
-} from "@/src/features/scores/contexts/ScoreCacheContext";
+} from "@/src/features/scores/contexts/ScoreCacheProvider";
import { composeAggregateScoreKey } from "@/src/features/scores/lib/aggregateScores";
import { mergeAggregatesWithCache } from "@/src/features/scores/lib/mergeScoresWithCache";
import { type ExperimentItemsTableRow } from "../components/table/types";
diff --git a/web/src/features/filters/config/observations-config.ts b/web/src/features/filters/config/observations-config.ts
index 8ab936cf7c..8acc026012 100644
--- a/web/src/features/filters/config/observations-config.ts
+++ b/web/src/features/filters/config/observations-config.ts
@@ -5,7 +5,7 @@ import {
} from "@/src/features/filters/lib/filter-config";
import type { ColumnToBackendKeyMap } from "@/src/features/filters/lib/filter-transform";
import { renderFilterIcon } from "@/src/components/ItemBadge";
-import { renderLevelIcon } from "@/src/components/level-colors";
+import { renderLevelIcon } from "@/src/components/ObservationLevelTag";
export type ObservationsOmittableFilterColumn = "model" | "promptName";
diff --git a/web/src/features/filters/config/traces-config.ts b/web/src/features/filters/config/traces-config.ts
index 7661ae1e85..b85c7fad07 100644
--- a/web/src/features/filters/config/traces-config.ts
+++ b/web/src/features/filters/config/traces-config.ts
@@ -3,7 +3,7 @@ import {
omitFilterFacets,
type FilterConfig,
} from "@/src/features/filters/lib/filter-config";
-import { renderLevelIcon } from "@/src/components/level-colors";
+import { renderLevelIcon } from "@/src/components/ObservationLevelTag";
export type TraceOmittableFilterColumn = "userId" | "sessionId";
diff --git a/web/src/features/filters/hooks/useFilterState.ts b/web/src/features/filters/hooks/useFilterState.ts
index b4587eac66..78ce232a2c 100644
--- a/web/src/features/filters/hooks/useFilterState.ts
+++ b/web/src/features/filters/hooks/useFilterState.ts
@@ -28,7 +28,7 @@ import { evalConfigFilterColumns } from "@/src/server/api/definitions/evalConfig
import { evalExecutionsFilterCols } from "@/src/server/api/definitions/evalExecutionsTable";
import { experimentsTableCols } from "@/src/features/experiments/components/table/filter-config";
import { experimentItemsTableCols } from "@/src/features/experiments/config/experiment-items-filter-config";
-import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateContext";
+import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateProvider";
const DEBUG_QUERY_STATE = false;
diff --git a/web/src/features/filters/hooks/useSidebarFilterState.tsx b/web/src/features/filters/hooks/useSidebarFilterState.tsx
index 9502727b9a..aca3139b4b 100644
--- a/web/src/features/filters/hooks/useSidebarFilterState.tsx
+++ b/web/src/features/filters/hooks/useSidebarFilterState.tsx
@@ -61,7 +61,7 @@ import {
// Re-exported so existing consumers (tests, session view) keep their path.
export { resolveCheckboxOperator } from "../lib/sidebar-filter-actions";
-import type { PeekTableStateContextValue } from "@/src/components/table/peek/contexts/PeekTableStateContext";
+import type { PeekTableStateContextValue } from "@/src/components/table/peek/contexts/PeekTableStateProvider";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
/**
diff --git a/web/src/features/models/ModelDefinitionsTable/ConnectedModelDefinitionsTable.tsx b/web/src/features/models/ModelDefinitionsTable/ConnectedModelDefinitionsTable.tsx
index 4408106362..bc621c28c4 100644
--- a/web/src/features/models/ModelDefinitionsTable/ConnectedModelDefinitionsTable.tsx
+++ b/web/src/features/models/ModelDefinitionsTable/ConnectedModelDefinitionsTable.tsx
@@ -13,7 +13,7 @@ import {
UpsertModelFormDialogController,
UpsertModelFormDialogContent,
} from "@/src/features/models/components/UpsertModelFormDialog/UpsertModelFormDialogController";
-import { TestModelMatchDialogContent } from "@/src/features/models/components/test-match/TestModelMatchDialog";
+import { TestModelMatchDialogContent } from "@/src/features/models/components/test-match/TestModelMatchDialogContent";
import { usePriceUnitMultiplier } from "@/src/features/models/hooks/usePriceUnitMultiplier";
import { type GetModelResult } from "@/src/features/models/validation";
import { useHasProjectAccess } from "@/src/features/rbac";
diff --git a/web/src/features/models/ModelDetailPage.tsx b/web/src/features/models/ModelDetailPage.tsx
index 9b52f46ff9..6cb8803900 100644
--- a/web/src/features/models/ModelDetailPage.tsx
+++ b/web/src/features/models/ModelDetailPage.tsx
@@ -20,7 +20,7 @@ import { PriceUnitSelector } from "@/src/features/models/components/PriceUnitSel
import { useMemo, useState } from "react";
import { usePriceUnitMultiplier } from "@/src/features/models/hooks/usePriceUnitMultiplier";
import { ObservationsTable as Generations } from "@/src/features/tracing-tables";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { SquareArrowOutUpRight, Info as InfoIcon } from "@langfuse/icons";
import {
Select,
diff --git a/web/src/features/models/components/test-match/TestModelMatchDialog.tsx b/web/src/features/models/components/test-match/TestModelMatchDialog.tsx
index 1ae791ea2f..b5386f5aab 100644
--- a/web/src/features/models/components/test-match/TestModelMatchDialog.tsx
+++ b/web/src/features/models/components/test-match/TestModelMatchDialog.tsx
@@ -1,24 +1,6 @@
-/* eslint-disable @repo/component-file-structure, @typescript-eslint/no-deprecated, @typescript-eslint/no-use-before-define -- Legacy UI usage retained during migration to design-system components. */
-import { useState, useEffect } from "react";
-import Link from "next/link";
-import {
- Dialog,
- DialogContent,
- DialogHeader,
- DialogTitle,
- DialogDescription,
- DialogBody,
-} from "@/src/components/ui/dialog";
-import { Input } from "@/src/components/ui/input";
-import { Button } from "@/src/components/ui/button";
-import { api } from "@/src/utils/api";
-import { UsageDetailsEditor } from "./UsageDetailsEditor";
-import { StringMapEditor } from "./StringMapEditor";
-import { MatchedModelCard } from "./MatchedModelCard";
-import { MatchedTierCard } from "./MatchedTierCard";
-import { NoMatchDisplay } from "./NoMatchDisplay";
-import { CheckCircle, SquareArrowOutUpRight } from "@langfuse/icons";
-import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
+/* eslint-disable @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
+import { Dialog } from "@/src/components/ui/dialog";
+import { TestModelMatchDialogContent } from "./TestModelMatchDialogContent";
type TestModelMatchDialogProps = {
projectId: string;
@@ -28,9 +10,6 @@ type TestModelMatchDialogProps = {
export type { TestModelMatchDialogProps };
-const validStringMap = (entries: Array<[string, string]>) =>
- Object.fromEntries(entries.filter(([key]) => key.trim().length > 0));
-
export function TestModelMatchDialog({
projectId,
open,
@@ -46,199 +25,3 @@ export function TestModelMatchDialog({
</Dialog>
);
}
-
-export function TestModelMatchDialogContent({
- projectId,
- open,
- onClose,
-}: {
- projectId: string;
- open: boolean;
- onClose: () => void;
-}) {
- const [modelName, setModelName] = useState("");
- const [usageDetails, setUsageDetails] = useState<Record<string, number>>({});
- const [modelParameterEntries, setModelParameterEntries] = useState<
- Array<[string, string]>
- >([]);
- const [metadataEntries, setMetadataEntries] = useState<
- Array<[string, string]>
- >([]);
- const [hasSubmitted, setHasSubmitted] = useState(false);
- const modelParameters = validStringMap(modelParameterEntries);
- const metadata = validStringMap(metadataEntries);
-
- // Query for match result - only enabled after submit
- const { data, isLoading, error, refetch } = api.models.testMatch.useQuery(
- {
- projectId,
- modelName,
- usageDetails,
- modelParameters,
- metadata,
- },
- {
- enabled: false, // Manual trigger only
- },
- );
-
- // Handle form submission
- const handleSubmit = (e: React.SyntheticEvent) => {
- e.preventDefault();
- if (modelName.trim()) {
- setHasSubmitted(true);
- refetch();
- }
- };
-
- // Reset state when dialog closes
- useEffect(() => {
- if (!open) {
- setModelName("");
- setUsageDetails({});
- setModelParameterEntries([]);
- setMetadataEntries([]);
- setHasSubmitted(false);
- }
- }, [open]);
-
- return (
- <DialogContent size="lg" className="min-h-[62vh] overflow-y-auto">
- <form onSubmit={handleSubmit} className="flex flex-1 flex-col">
- <DialogHeader>
- <DialogTitle>Test Model Match</DialogTitle>
- <DialogDescription className="mt-1">
- Test which model and pricing tier your ingestion data would match
- against.
- </DialogDescription>
- </DialogHeader>
-
- <DialogBody className="grid grid-cols-[1fr_1px_1fr] gap-6">
- {/* Left Column: Input Form */}
- <div className="flex flex-col justify-between space-y-6">
- <div className="space-y-6">
- {/* Model Name Input */}
- <div className="space-y-2">
- <div className="text-sm font-bold">Model Name *</div>
- <div className="text-muted-foreground text-sm">
- The model name on your generations.
- </div>
- <Input
- placeholder="e.g. gpt-4-turbo"
- value={modelName}
- onChange={(e) => setModelName(e.target.value.trim())}
- autoFocus
- required
- />
- </div>
-
- {/* Usage Details Editor */}
- <UsageDetailsEditor
- usageDetails={usageDetails}
- onChange={setUsageDetails}
- />
-
- <StringMapEditor
- title="Model Parameters"
- description="Add top-level model parameters used by pricing tier conditions."
- entries={modelParameterEntries}
- onChange={setModelParameterEntries}
- />
-
- <StringMapEditor
- title="Metadata"
- description="Add top-level metadata used by pricing tier conditions."
- entries={metadataEntries}
- onChange={setMetadataEntries}
- />
- </div>
-
- {/* Buttons at bottom of left column */}
- <div className="flex gap-2 border-t pt-4">
- <Button
- type="button"
- variant="outline"
- onClick={onClose}
- className="flex-1"
- >
- Close
- </Button>
- <Button
- type="submit"
- disabled={!modelName.trim() || isLoading}
- className="flex-1"
- >
- Test Match
- </Button>
- </div>
- </div>
-
- {/* Vertical Divider */}
- <div className="bg-border" />
-
- {/* Right Column: Results Panel */}
- <div className="flex flex-col justify-between">
- <div className="space-y-4 overflow-y-auto pb-4">
- {hasSubmitted && (
- <>
- {isLoading && (
- <div className="bg-muted/30 text-muted-foreground flex min-h-[300px] items-center justify-center gap-2 rounded-lg border p-6">
- <Spinner size="md" />
- <span>Testing match...</span>
- </div>
- )}
-
- {error && (
- <div className="border-destructive/50 bg-destructive/5 text-destructive rounded-lg border p-4 text-sm">
- Error: {error.message}
- </div>
- )}
-
- {!isLoading &&
- !error &&
- data &&
- (data.matched ? (
- <>
- <div className="flex items-center gap-2 rounded-lg border border-green-200 bg-green-50 px-4 py-2.5 dark:border-green-900 dark:bg-green-950">
- <CheckCircle
- size="base"
- __rawClassName="text-green-600 dark:text-green-400"
- />
- <span className="text-sm font-bold text-green-900 dark:text-green-100">
- Match Found
- </span>
- </div>
- <MatchedModelCard model={data.model} />
- <MatchedTierCard tier={data.matchedTier} />
- </>
- ) : (
- <NoMatchDisplay modelName={modelName} />
- ))}
- </>
- )}
- </div>
-
- {/* View Model Details button at bottom */}
- {hasSubmitted && !isLoading && !error && data?.matched && (
- <div className="border-t pt-4">
- <Button variant="outline" asChild className="w-full">
- <Link
- href={`/project/${projectId}/settings/models/${data.model.id}?pricingTier=${data.matchedTier.id}`}
- target="_blank"
- >
- View Model Details
- <SquareArrowOutUpRight
- size="base"
- color="default"
- __rawClassName="ml-2"
- />
- </Link>
- </Button>
- </div>
- )}
- </div>
- </DialogBody>
- </form>
- </DialogContent>
- );
-}
diff --git a/web/src/features/models/components/test-match/TestModelMatchDialogContent.tsx b/web/src/features/models/components/test-match/TestModelMatchDialogContent.tsx
new file mode 100644
index 0000000000..4c5f5a9137
--- /dev/null
+++ b/web/src/features/models/components/test-match/TestModelMatchDialogContent.tsx
@@ -0,0 +1,219 @@
+/* eslint-disable @typescript-eslint/no-deprecated -- Legacy UI usage retained during migration to design-system components. */
+import { useState, useEffect } from "react";
+import Link from "next/link";
+import {
+ DialogContent,
+ DialogHeader,
+ DialogTitle,
+ DialogDescription,
+ DialogBody,
+} from "@/src/components/ui/dialog";
+import { Input } from "@/src/components/ui/input";
+import { Button } from "@/src/components/ui/button";
+import { api } from "@/src/utils/api";
+import { UsageDetailsEditor } from "./UsageDetailsEditor";
+import { StringMapEditor } from "./StringMapEditor";
+import { MatchedModelCard } from "./MatchedModelCard";
+import { MatchedTierCard } from "./MatchedTierCard";
+import { NoMatchDisplay } from "./NoMatchDisplay";
+import { CheckCircle, SquareArrowOutUpRight } from "@langfuse/icons";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
+
+const validStringMap = (entries: Array<[string, string]>) =>
+ Object.fromEntries(entries.filter(([key]) => key.trim().length > 0));
+
+export function TestModelMatchDialogContent({
+ projectId,
+ open,
+ onClose,
+}: {
+ projectId: string;
+ open: boolean;
+ onClose: () => void;
+}) {
+ const [modelName, setModelName] = useState("");
+ const [usageDetails, setUsageDetails] = useState<Record<string, number>>({});
+ const [modelParameterEntries, setModelParameterEntries] = useState<
+ Array<[string, string]>
+ >([]);
+ const [metadataEntries, setMetadataEntries] = useState<
+ Array<[string, string]>
+ >([]);
+ const [hasSubmitted, setHasSubmitted] = useState(false);
+ const modelParameters = validStringMap(modelParameterEntries);
+ const metadata = validStringMap(metadataEntries);
+
+ // Query for match result - only enabled after submit
+ const { data, isLoading, error, refetch } = api.models.testMatch.useQuery(
+ {
+ projectId,
+ modelName,
+ usageDetails,
+ modelParameters,
+ metadata,
+ },
+ {
+ enabled: false, // Manual trigger only
+ },
+ );
+
+ // Handle form submission
+ const handleSubmit = (e: React.SyntheticEvent) => {
+ e.preventDefault();
+ if (modelName.trim()) {
+ setHasSubmitted(true);
+ refetch();
+ }
+ };
+
+ // Reset state when dialog closes
+ useEffect(() => {
+ if (!open) {
+ setModelName("");
+ setUsageDetails({});
+ setModelParameterEntries([]);
+ setMetadataEntries([]);
+ setHasSubmitted(false);
+ }
+ }, [open]);
+
+ return (
+ <DialogContent size="lg" className="min-h-[62vh] overflow-y-auto">
+ <form onSubmit={handleSubmit} className="flex flex-1 flex-col">
+ <DialogHeader>
+ <DialogTitle>Test Model Match</DialogTitle>
+ <DialogDescription className="mt-1">
+ Test which model and pricing tier your ingestion data would match
+ against.
+ </DialogDescription>
+ </DialogHeader>
+
+ <DialogBody className="grid grid-cols-[1fr_1px_1fr] gap-6">
+ {/* Left Column: Input Form */}
+ <div className="flex flex-col justify-between space-y-6">
+ <div className="space-y-6">
+ {/* Model Name Input */}
+ <div className="space-y-2">
+ <div className="text-sm font-bold">Model Name *</div>
+ <div className="text-muted-foreground text-sm">
+ The model name on your generations.
+ </div>
+ <Input
+ placeholder="e.g. gpt-4-turbo"
+ value={modelName}
+ onChange={(e) => setModelName(e.target.value.trim())}
+ autoFocus
+ required
+ />
+ </div>
+
+ {/* Usage Details Editor */}
+ <UsageDetailsEditor
+ usageDetails={usageDetails}
+ onChange={setUsageDetails}
+ />
+
+ <StringMapEditor
+ title="Model Parameters"
+ description="Add top-level model parameters used by pricing tier conditions."
+ entries={modelParameterEntries}
+ onChange={setModelParameterEntries}
+ />
+
+ <StringMapEditor
+ title="Metadata"
+ description="Add top-level metadata used by pricing tier conditions."
+ entries={metadataEntries}
+ onChange={setMetadataEntries}
+ />
+ </div>
+
+ {/* Buttons at bottom of left column */}
+ <div className="flex gap-2 border-t pt-4">
+ <Button
+ type="button"
+ variant="outline"
+ onClick={onClose}
+ className="flex-1"
+ >
+ Close
+ </Button>
+ <Button
+ type="submit"
+ disabled={!modelName.trim() || isLoading}
+ className="flex-1"
+ >
+ Test Match
+ </Button>
+ </div>
+ </div>
+
+ {/* Vertical Divider */}
+ <div className="bg-border" />
+
+ {/* Right Column: Results Panel */}
+ <div className="flex flex-col justify-between">
+ <div className="space-y-4 overflow-y-auto pb-4">
+ {hasSubmitted && (
+ <>
+ {isLoading && (
+ <div className="bg-muted/30 text-muted-foreground flex min-h-[300px] items-center justify-center gap-2 rounded-lg border p-6">
+ <Spinner size="md" />
+ <span>Testing match...</span>
+ </div>
+ )}
+
+ {error && (
+ <div className="border-destructive/50 bg-destructive/5 text-destructive rounded-lg border p-4 text-sm">
+ Error: {error.message}
+ </div>
+ )}
+
+ {!isLoading &&
+ !error &&
+ data &&
+ (data.matched ? (
+ <>
+ <div className="flex items-center gap-2 rounded-lg border border-green-200 bg-green-50 px-4 py-2.5 dark:border-green-900 dark:bg-green-950">
+ <CheckCircle
+ size="base"
+ __rawClassName="text-green-600 dark:text-green-400"
+ />
+ <span className="text-sm font-bold text-green-900 dark:text-green-100">
+ Match Found
+ </span>
+ </div>
+ <MatchedModelCard model={data.model} />
+ <MatchedTierCard tier={data.matchedTier} />
+ </>
+ ) : (
+ <NoMatchDisplay modelName={modelName} />
+ ))}
+ </>
+ )}
+ </div>
+
+ {/* View Model Details button at bottom */}
+ {hasSubmitted && !isLoading && !error && data?.matched && (
+ <div className="border-t pt-4">
+ <Button variant="outline" asChild className="w-full">
+ <Link
+ href={`/project/${projectId}/settings/models/${data.model.id}?pricingTier=${data.matchedTier.id}`}
+ target="_blank"
+ >
+ View Model Details
+ <SquareArrowOutUpRight
+ size="base"
+ color="default"
+ __rawClassName="ml-2"
+ />
+ </Link>
+ </Button>
+ </div>
+ )}
+ </div>
+ </DialogBody>
+ </form>
+ </DialogContent>
+ );
+}
diff --git a/web/src/features/monitors/pages/EditMonitorPage.tsx b/web/src/features/monitors/pages/EditMonitorPage.tsx
index c143b1f4be..24c7c77c32 100644
--- a/web/src/features/monitors/pages/EditMonitorPage.tsx
+++ b/web/src/features/monitors/pages/EditMonitorPage.tsx
@@ -3,7 +3,7 @@ import { useRouter } from "next/router";
import { useState } from "react";
import { ErrorPage } from "@/src/components/error-page";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { DeleteMonitorButton } from "@/src/features/monitors/components/DeleteMonitorButton";
import { MonitorForm } from "@/src/features/monitors/components/MonitorForm";
import { MonitorPagePermissions } from "@/src/features/monitors/components/MonitorPagePermissions";
diff --git a/web/src/features/monitors/pages/ListMonitorsPage.tsx b/web/src/features/monitors/pages/ListMonitorsPage.tsx
index cb589c1a27..97fd068f4d 100644
--- a/web/src/features/monitors/pages/ListMonitorsPage.tsx
+++ b/web/src/features/monitors/pages/ListMonitorsPage.tsx
@@ -2,7 +2,7 @@
import { PlusIcon } from "@langfuse/icons";
import { ActionButton } from "@/src/components/ActionButton";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { DataTableControlsProvider } from "@/src/components/table/data-table-controls";
import { FilterToggleButton } from "@/src/components/table/FilterToggleButton";
import { AutomationButton } from "@/src/features/automations";
diff --git a/web/src/features/monitors/pages/NewMonitorPage.tsx b/web/src/features/monitors/pages/NewMonitorPage.tsx
index 57a20c2d4d..9809f38865 100644
--- a/web/src/features/monitors/pages/NewMonitorPage.tsx
+++ b/web/src/features/monitors/pages/NewMonitorPage.tsx
@@ -1,6 +1,6 @@
import { useRouter } from "next/router";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { Skeleton } from "@/src/components/ui/skeleton";
import { MonitorForm } from "@/src/features/monitors/components/MonitorForm";
import { MonitorPagePermissions } from "@/src/features/monitors/components/MonitorPagePermissions";
diff --git a/web/src/features/navigate-detail-pages/context.tsx b/web/src/features/navigate-detail-pages/DetailPageListsProvider.tsx
similarity index 97%
rename from web/src/features/navigate-detail-pages/context.tsx
rename to web/src/features/navigate-detail-pages/DetailPageListsProvider.tsx
index 5097d4a7d9..f3e8496c0e 100644
--- a/web/src/features/navigate-detail-pages/context.tsx
+++ b/web/src/features/navigate-detail-pages/DetailPageListsProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import React, {
type PropsWithChildren,
createContext,
diff --git a/web/src/features/navigate-detail-pages/DetailPageNav.tsx b/web/src/features/navigate-detail-pages/DetailPageNav.tsx
index a4fe0ac452..04a8c4ee24 100644
--- a/web/src/features/navigate-detail-pages/DetailPageNav.tsx
+++ b/web/src/features/navigate-detail-pages/DetailPageNav.tsx
@@ -5,7 +5,7 @@ import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
import {
type ListEntry,
useDetailPageLists,
-} from "@/src/features/navigate-detail-pages/context";
+} from "@/src/features/navigate-detail-pages/DetailPageListsProvider";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useReadPath } from "@/src/features/events";
import { cn } from "@/src/utils/tailwind";
diff --git a/web/src/features/navigate-detail-pages/index.ts b/web/src/features/navigate-detail-pages/index.ts
index 6ea1807422..22e4d383a0 100644
--- a/web/src/features/navigate-detail-pages/index.ts
+++ b/web/src/features/navigate-detail-pages/index.ts
@@ -9,5 +9,5 @@ export {
type ListEntry,
type ObservationDetailPageListEntry,
type TraceDetailPageListEntry,
-} from "@/src/features/navigate-detail-pages/context";
+} from "@/src/features/navigate-detail-pages/DetailPageListsProvider";
export { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
diff --git a/web/src/features/orderBy/hooks/useOrderByState.ts b/web/src/features/orderBy/hooks/useOrderByState.ts
index 86b627006f..ef229499ea 100644
--- a/web/src/features/orderBy/hooks/useOrderByState.ts
+++ b/web/src/features/orderBy/hooks/useOrderByState.ts
@@ -1,6 +1,6 @@
import { type OrderByState } from "@langfuse/shared";
import { ObjectParam, useQueryParam, withDefault } from "use-query-params";
-import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateContext";
+import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateProvider";
type OrderByQueryParamState =
| OrderByState
diff --git a/web/src/features/organizations/components/ProjectOverview.tsx b/web/src/features/organizations/components/OrganizationProjectOverview.tsx
similarity index 99%
rename from web/src/features/organizations/components/ProjectOverview.tsx
rename to web/src/features/organizations/components/OrganizationProjectOverview.tsx
index ef9fcbc599..41ee8b214a 100644
--- a/web/src/features/organizations/components/ProjectOverview.tsx
+++ b/web/src/features/organizations/components/OrganizationProjectOverview.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/component-file-structure, @typescript-eslint/no-use-before-define */
+/* eslint-disable @typescript-eslint/no-use-before-define */
import {
BookOpen,
LockIcon,
diff --git a/web/src/features/playground/page/index.tsx b/web/src/features/playground/page/PlaygroundPage.tsx
similarity index 98%
rename from web/src/features/playground/page/index.tsx
rename to web/src/features/playground/page/PlaygroundPage.tsx
index 4caea9f71d..ee6423fa45 100644
--- a/web/src/features/playground/page/index.tsx
+++ b/web/src/features/playground/page/PlaygroundPage.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import React, { useCallback } from "react";
import { Button } from "@/src/components/ui/button";
import { KeyboardShortcut } from "@/src/components/design-system/KeyboardShortcut/KeyboardShortcut";
@@ -8,7 +7,7 @@ import { useWindowCoordination } from "@/src/features/playground/page/hooks/useW
import { usePersistedWindowIds } from "@/src/features/playground/page/hooks/usePersistedWindowIds";
import useCommandEnter from "@/src/features/playground/page/hooks/useCommandEnter";
import { type MultiWindowState } from "@/src/features/playground/page/types";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import MultiWindowPlayground from "@/src/features/playground/page/components/MultiWindowPlayground";
import { NoModelConfiguredAlert } from "@/src/features/playground/page/components/NoModelConfiguredAlert";
import {
diff --git a/web/src/features/playground/page/components/ConfigurationDropdowns.tsx b/web/src/features/playground/page/components/ConfigurationDropdowns.tsx
index e530789400..7cbb5deb25 100644
--- a/web/src/features/playground/page/components/ConfigurationDropdowns.tsx
+++ b/web/src/features/playground/page/components/ConfigurationDropdowns.tsx
@@ -8,7 +8,7 @@ import {
PopoverContent,
PopoverTrigger,
} from "@/src/components/ui/popover";
-import { usePlaygroundContext } from "../context";
+import { usePlaygroundContext } from "../context/PlaygroundProvider";
import { usePlaygroundWindowSize } from "../hooks/usePlaygroundWindowSize";
import {
PlaygroundTools,
diff --git a/web/src/features/playground/page/components/GenerationOutput.clienttest.tsx b/web/src/features/playground/page/components/GenerationOutput.clienttest.tsx
index 3bcffc5d03..fd549a7f7e 100644
--- a/web/src/features/playground/page/components/GenerationOutput.clienttest.tsx
+++ b/web/src/features/playground/page/components/GenerationOutput.clienttest.tsx
@@ -2,7 +2,7 @@ import { render, screen } from "@testing-library/react";
import { GenerationOutput } from "./GenerationOutput";
-vi.mock("../context", () => ({
+vi.mock("../context/PlaygroundProvider", () => ({
usePlaygroundContext: () => ({
output: "customer-generated output",
outputReasoning: "",
diff --git a/web/src/features/playground/page/components/GenerationOutput.tsx b/web/src/features/playground/page/components/GenerationOutput.tsx
index 57bebcfdb0..87b73d7f80 100644
--- a/web/src/features/playground/page/components/GenerationOutput.tsx
+++ b/web/src/features/playground/page/components/GenerationOutput.tsx
@@ -1,6 +1,6 @@
import { useEffect, useRef, useState } from "react";
import { Button } from "@/src/components/ui/button";
-import { usePlaygroundContext } from "../context";
+import { usePlaygroundContext } from "../context/PlaygroundProvider";
import { ChatMessageRole, ChatMessageType } from "@langfuse/shared";
import { BracesIcon, Check, Copy, Plus } from "@langfuse/icons";
import { ToolCallCard } from "@/src/components/ChatMessages/ToolCallCard";
diff --git a/web/src/features/playground/page/components/MessagePlaceholderComponent.tsx b/web/src/features/playground/page/components/MessagePlaceholderComponent.tsx
index bddf82542b..cafb892c93 100644
--- a/web/src/features/playground/page/components/MessagePlaceholderComponent.tsx
+++ b/web/src/features/playground/page/components/MessagePlaceholderComponent.tsx
@@ -4,7 +4,7 @@ import { CodeMirrorEditor } from "@/src/components/editor";
import { useState, useCallback } from "react";
import { type ChatMessage } from "@langfuse/shared";
-import { usePlaygroundContext } from "../context";
+import { usePlaygroundContext } from "../context/PlaygroundProvider";
import { type PlaceholderMessageFillIn } from "../types";
import { useNamingConflicts } from "../hooks/useNamingConflicts";
diff --git a/web/src/features/playground/page/components/MessagePlaceholders.tsx b/web/src/features/playground/page/components/MessagePlaceholders.tsx
index a66fe88df9..85f90cc5d1 100644
--- a/web/src/features/playground/page/components/MessagePlaceholders.tsx
+++ b/web/src/features/playground/page/components/MessagePlaceholders.tsx
@@ -1,5 +1,5 @@
import { Separator } from "@/src/components/ui/separator";
-import { usePlaygroundContext } from "../context";
+import { usePlaygroundContext } from "../context/PlaygroundProvider";
import { MessagePlaceholderComponent } from "./MessagePlaceholderComponent";
export const MessagePlaceholders = () => {
diff --git a/web/src/features/playground/page/components/Messages.tsx b/web/src/features/playground/page/components/Messages.tsx
index 36d8b53054..1e3f43e8f8 100644
--- a/web/src/features/playground/page/components/Messages.tsx
+++ b/web/src/features/playground/page/components/Messages.tsx
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-use-before-define */
import { Button } from "@/src/components/ui/button";
-import { usePlaygroundContext } from "@/src/features/playground/page/context";
+import { usePlaygroundContext } from "@/src/features/playground/page/context/PlaygroundProvider";
import {
DropdownMenu,
DropdownMenuContent,
@@ -15,7 +15,7 @@ import { STREAMING_PREF_KEY } from "@/src/features/playground/page/storage/keys"
import { captureUnknownError } from "@/src/utils/captureUnknownError";
import { GenerationOutput } from "./GenerationOutput";
-import { ChatMessages } from "@/src/components/ChatMessages";
+import { ChatMessages } from "@/src/components/ChatMessages/ChatMessages";
import { type MessagesContext } from "@/src/components/ChatMessages/types";
import {
ResizableHandle,
diff --git a/web/src/features/playground/page/components/MultiWindowPlayground.tsx b/web/src/features/playground/page/components/MultiWindowPlayground.tsx
index 91ac3341e9..e5fd9d45be 100644
--- a/web/src/features/playground/page/components/MultiWindowPlayground.tsx
+++ b/web/src/features/playground/page/components/MultiWindowPlayground.tsx
@@ -1,6 +1,9 @@
/* eslint-disable @repo/no-null-render, @typescript-eslint/no-deprecated, @typescript-eslint/no-use-before-define -- Legacy UI usage retained during migration to design-system components. */
import React, { useMemo, useCallback, useRef, useEffect } from "react";
-import { PlaygroundProvider, usePlaygroundContext } from "../context";
+import {
+ PlaygroundProvider,
+ usePlaygroundContext,
+} from "../context/PlaygroundProvider";
import { SaveToPromptButton } from "./SaveToPromptButton";
import { SourcePromptHeading } from "./SourcePromptHeading";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/features/playground/page/components/PlaygroundTools/index.tsx b/web/src/features/playground/page/components/PlaygroundTools/index.tsx
index 8d69d3c420..bb536d482e 100644
--- a/web/src/features/playground/page/components/PlaygroundTools/index.tsx
+++ b/web/src/features/playground/page/components/PlaygroundTools/index.tsx
@@ -1,7 +1,7 @@
/* eslint-disable @repo/component-file-structure */
import React, { useCallback, useEffect } from "react";
-import { usePlaygroundContext } from "@/src/features/playground/page/context";
+import { usePlaygroundContext } from "@/src/features/playground/page/context/PlaygroundProvider";
import { Button } from "@/src/components/ui/button";
import { ScrollArea } from "@/src/components/ui/scroll-area";
import { PlusIcon, PencilIcon, MinusCircle, WrenchIcon } from "@langfuse/icons";
diff --git a/web/src/features/playground/page/components/PromptVariableComponent.tsx b/web/src/features/playground/page/components/PromptVariableComponent.tsx
index ec74c405cd..7614ccb07c 100644
--- a/web/src/features/playground/page/components/PromptVariableComponent.tsx
+++ b/web/src/features/playground/page/components/PromptVariableComponent.tsx
@@ -3,7 +3,7 @@ import { Button } from "@/src/components/ui/button";
import { type PromptVariable } from "@langfuse/shared";
import { CodeMirrorEditor } from "@/src/components/editor";
-import { usePlaygroundContext } from "../context";
+import { usePlaygroundContext } from "../context/PlaygroundProvider";
import { useNamingConflicts } from "../hooks/useNamingConflicts";
export const PromptVariableComponent: React.FC<{
diff --git a/web/src/features/playground/page/components/SaveToPromptButton.tsx b/web/src/features/playground/page/components/SaveToPromptButton.tsx
index 409726d89e..ff00093d25 100644
--- a/web/src/features/playground/page/components/SaveToPromptButton.tsx
+++ b/web/src/features/playground/page/components/SaveToPromptButton.tsx
@@ -23,7 +23,7 @@ import {
TooltipProvider,
TooltipTrigger,
} from "@/src/components/ui/tooltip";
-import { usePlaygroundContext } from "@/src/features/playground/page/context";
+import { usePlaygroundContext } from "@/src/features/playground/page/context/PlaygroundProvider";
import usePlaygroundCache from "@/src/features/playground/page/hooks/usePlaygroundCache";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
diff --git a/web/src/features/playground/page/components/StructuredOutputSchemaSection.tsx b/web/src/features/playground/page/components/StructuredOutputSchemaSection.tsx
index 9469d76243..f35bd5f255 100644
--- a/web/src/features/playground/page/components/StructuredOutputSchemaSection.tsx
+++ b/web/src/features/playground/page/components/StructuredOutputSchemaSection.tsx
@@ -1,7 +1,7 @@
/* eslint-disable @repo/component-file-structure */
import React, { useCallback, useEffect } from "react";
-import { usePlaygroundContext } from "@/src/features/playground/page/context";
+import { usePlaygroundContext } from "@/src/features/playground/page/context/PlaygroundProvider";
import { Button } from "@/src/components/ui/button";
import { ScrollArea } from "@/src/components/ui/scroll-area";
import { PlusIcon, PencilIcon, MinusCircle, BoxIcon } from "@langfuse/icons";
diff --git a/web/src/features/playground/page/components/Variables.tsx b/web/src/features/playground/page/components/Variables.tsx
index 6ba5039cc7..23b0fbc63a 100644
--- a/web/src/features/playground/page/components/Variables.tsx
+++ b/web/src/features/playground/page/components/Variables.tsx
@@ -1,5 +1,5 @@
import { Separator } from "@/src/components/ui/separator";
-import { usePlaygroundContext } from "../context";
+import { usePlaygroundContext } from "../context/PlaygroundProvider";
import { PromptVariableComponent } from "./PromptVariableComponent";
export const Variables = () => {
diff --git a/web/src/features/playground/page/context/index.tsx b/web/src/features/playground/page/context/PlaygroundProvider.tsx
similarity index 99%
rename from web/src/features/playground/page/context/index.tsx
rename to web/src/features/playground/page/context/PlaygroundProvider.tsx
index 9c71a45638..29737648cb 100644
--- a/web/src/features/playground/page/context/index.tsx
+++ b/web/src/features/playground/page/context/PlaygroundProvider.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/component-file-structure, @typescript-eslint/no-use-before-define */
+/* eslint-disable @typescript-eslint/no-use-before-define */
import { showErrorToast } from "@/src/features/notifications";
import React, {
createContext,
diff --git a/web/src/features/projects/ProjectSettingsPage.tsx b/web/src/features/projects/ProjectSettingsPage.tsx
index 19ed3ac80e..27deeabeb7 100644
--- a/web/src/features/projects/ProjectSettingsPage.tsx
+++ b/web/src/features/projects/ProjectSettingsPage.tsx
@@ -6,7 +6,7 @@ import { HostNameProject } from "@/src/features/projects/components/HostNameProj
import RenameProject from "@/src/features/projects/components/RenameProject";
import { Button } from "@/src/components/ui/button";
import Link from "next/link";
-import { LlmApiKeyList } from "@/src/features/public-api/components/LLMApiKeyList";
+import { LlmApiKeyList } from "@/src/features/public-api/components/LlmApiKeyList";
import { PagedSettingsContainer } from "@/src/components/PagedSettingsContainer";
import { useQueryProject } from "@/src/features/projects/hooks";
import { ConnectedMembershipInvitesSettingsTable } from "@/src/features/rbac/components/MembershipInvitesSettingsTable/ConnectedMembershipInvitesSettingsTable";
diff --git a/web/src/features/prompts/PromptMetricsPage.tsx b/web/src/features/prompts/PromptMetricsPage.tsx
index ab467df7f5..b9f83cf9ce 100644
--- a/web/src/features/prompts/PromptMetricsPage.tsx
+++ b/web/src/features/prompts/PromptMetricsPage.tsx
@@ -22,7 +22,7 @@ import {
} from "@/src/features/column-visibility";
import { Skeleton } from "@/src/components/ui/skeleton";
import { type ScoreAggregate } from "@langfuse/shared";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { DetailPageNav } from "@/src/features/navigate-detail-pages";
import { toPromptLabelListItems } from "@/src/features/prompts/utils";
import { LabelList } from "@/src/components/design-system/LabelList/LabelList";
diff --git a/web/src/features/prompts/PromptsPage.tsx b/web/src/features/prompts/PromptsPage.tsx
index de15e0a5bf..d56b038977 100644
--- a/web/src/features/prompts/PromptsPage.tsx
+++ b/web/src/features/prompts/PromptsPage.tsx
@@ -1,6 +1,6 @@
import { useRouter } from "next/router";
import { ActionButton } from "@/src/components/ActionButton";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { PromptTable } from "@/src/features/prompts/components/PromptTable";
import { useHasProjectAccess } from "@/src/features/rbac";
import { Download, UploadIcon, PlusIcon } from "@langfuse/icons";
diff --git a/web/src/features/prompts/components/NewPrompt.tsx b/web/src/features/prompts/components/NewPrompt.tsx
index 908762d985..50f913ae1e 100644
--- a/web/src/features/prompts/components/NewPrompt.tsx
+++ b/web/src/features/prompts/components/NewPrompt.tsx
@@ -1,8 +1,8 @@
import { StringParam, useQueryParam } from "use-query-params";
-import { NewPromptForm } from "@/src/features/prompts/components/NewPromptForm";
+import { NewPromptForm } from "@/src/features/prompts/components/NewPromptForm/NewPromptForm";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
import { api } from "@/src/utils/api";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
export const NewPrompt = () => {
const projectId = useProjectIdFromURL();
diff --git a/web/src/features/prompts/components/NewPromptForm/index.tsx b/web/src/features/prompts/components/NewPromptForm/NewPromptForm.tsx
similarity index 99%
rename from web/src/features/prompts/components/NewPromptForm/index.tsx
rename to web/src/features/prompts/components/NewPromptForm/NewPromptForm.tsx
index 4d0d1527f2..fe60876460 100644
--- a/web/src/features/prompts/components/NewPromptForm/index.tsx
+++ b/web/src/features/prompts/components/NewPromptForm/NewPromptForm.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/component-file-structure, @typescript-eslint/no-use-before-define */
+/* eslint-disable @typescript-eslint/no-use-before-define */
import capitalize from "lodash/capitalize";
import router from "next/router";
import { useState, useEffect, useMemo, useRef } from "react";
diff --git a/web/src/features/prompts/components/NewPromptForm/PromptChatMessages.tsx b/web/src/features/prompts/components/NewPromptForm/PromptChatMessages.tsx
index d1724be622..e68a37f097 100644
--- a/web/src/features/prompts/components/NewPromptForm/PromptChatMessages.tsx
+++ b/web/src/features/prompts/components/NewPromptForm/PromptChatMessages.tsx
@@ -4,7 +4,7 @@ import { v4 as uuidv4 } from "uuid";
import { PlusIcon } from "@langfuse/icons";
import { Button } from "@/src/components/ui/button";
-import { ChatMessages } from "@/src/components/ChatMessages";
+import { ChatMessages } from "@/src/components/ChatMessages/ChatMessages";
import { createEmptyMessage } from "@/src/components/ChatMessages/utils/createEmptyMessage";
import {
ChatMessageRole,
diff --git a/web/src/features/prompts/components/PromptDetail.tsx b/web/src/features/prompts/components/PromptDetail.tsx
index 4655c1b759..42e58755da 100644
--- a/web/src/features/prompts/components/PromptDetail.tsx
+++ b/web/src/features/prompts/components/PromptDetail.tsx
@@ -55,7 +55,7 @@ import { CreateExperimentsForm } from "@/src/features/experiments";
import { useMemo, useState } from "react";
import { showSuccessToast } from "@/src/features/notifications";
import { DuplicatePromptButton } from "@/src/features/prompts/components/DuplicatePromptButton";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import {
DropdownMenu,
DropdownMenuTrigger,
diff --git a/web/src/features/public-api/components/LLMApiKeyList.clienttest.tsx b/web/src/features/public-api/components/LlmApiKeyList.clienttest.tsx
similarity index 99%
rename from web/src/features/public-api/components/LLMApiKeyList.clienttest.tsx
rename to web/src/features/public-api/components/LlmApiKeyList.clienttest.tsx
index e9d7706b96..bbeb9956a8 100644
--- a/web/src/features/public-api/components/LLMApiKeyList.clienttest.tsx
+++ b/web/src/features/public-api/components/LlmApiKeyList.clienttest.tsx
@@ -4,7 +4,7 @@ import type { PropsWithChildren } from "react";
import { LayerProvider } from "@/src/context/LayerContext/LayerContext";
import { TooltipProvider } from "@/src/components/ui/tooltip";
import { api } from "@/src/utils/api";
-import { LlmApiKeyList } from "./LLMApiKeyList";
+import { LlmApiKeyList } from "./LlmApiKeyList";
const organizationQueryResult = vi.hoisted(() => ({
data: { data: [] },
diff --git a/web/src/features/public-api/components/LLMApiKeyList.tsx b/web/src/features/public-api/components/LlmApiKeyList.tsx
similarity index 98%
rename from web/src/features/public-api/components/LLMApiKeyList.tsx
rename to web/src/features/public-api/components/LlmApiKeyList.tsx
index cbd8703445..2681be199c 100644
--- a/web/src/features/public-api/components/LLMApiKeyList.tsx
+++ b/web/src/features/public-api/components/LlmApiKeyList.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { useMemo } from "react";
import { Building2, Plug } from "@langfuse/icons";
diff --git a/web/src/features/scores/ScoresAnalyticsPage.tsx b/web/src/features/scores/ScoresAnalyticsPage.tsx
index e2e86ebe0f..556ad7d23c 100644
--- a/web/src/features/scores/ScoresAnalyticsPage.tsx
+++ b/web/src/features/scores/ScoresAnalyticsPage.tsx
@@ -1,7 +1,7 @@
/* eslint-disable no-nested-ternary */
import { useRouter } from "next/router";
import { useMemo, useEffect, useRef } from "react";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { getScoresTabs, SCORES_TABS } from "@/src/features/navigation";
import {
useAnalyticsUrlState,
diff --git a/web/src/features/scores/ScoresPage.tsx b/web/src/features/scores/ScoresPage.tsx
index 579f4f5830..3f63089302 100644
--- a/web/src/features/scores/ScoresPage.tsx
+++ b/web/src/features/scores/ScoresPage.tsx
@@ -1,7 +1,7 @@
import { useRouter } from "next/router";
import ScoresTable from "@/src/features/scores/ScoresTable";
import { TablePeekViewTraceDetail } from "@/src/components/table/peek/TablePeekViewTraceDetail";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { api } from "@/src/utils/api";
import { ScoresOnboarding } from "@/src/components/onboarding/ScoresOnboarding";
import { getScoresTabs, SCORES_TABS } from "@/src/features/navigation";
diff --git a/web/src/features/scores/ScoresTable.tsx b/web/src/features/scores/ScoresTable.tsx
index 3222f599c9..0eeb948127 100644
--- a/web/src/features/scores/ScoresTable.tsx
+++ b/web/src/features/scores/ScoresTable.tsx
@@ -36,7 +36,7 @@ import {
sortOptionValues,
} from "@/src/features/filters";
-import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateContext";
+import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateProvider";
import { usePeekNavigation } from "@/src/components/table/peek/hooks/usePeekNavigation";
import {
getScoreFilterConfig,
diff --git a/web/src/features/scores/components/AnnotateDrawerController.tsx b/web/src/features/scores/components/AnnotateDrawerController.tsx
index ae87e42aba..585654b20d 100644
--- a/web/src/features/scores/components/AnnotateDrawerController.tsx
+++ b/web/src/features/scores/components/AnnotateDrawerController.tsx
@@ -17,7 +17,7 @@ import { AnnotationPanelContent } from "./AnnotationPanelContent";
import {
useTraceReviewPanelOptional,
useReviewPanelOpen,
-} from "@/src/features/traces/contexts/TraceReviewPanelContext";
+} from "@/src/features/traces/contexts/TraceReviewPanelProvider";
import { useIsMobile } from "@/src/hooks/use-mobile";
export type AnnotateDrawerControllerProps<Target extends ScoreTarget> = {
diff --git a/web/src/features/scores/components/DualAnnotationContent.clienttest.tsx b/web/src/features/scores/components/DualAnnotationContent.clienttest.tsx
index b34b919b53..3faf0fe481 100644
--- a/web/src/features/scores/components/DualAnnotationContent.clienttest.tsx
+++ b/web/src/features/scores/components/DualAnnotationContent.clienttest.tsx
@@ -22,7 +22,7 @@ import { LayerProvider } from "@/src/context/LayerContext/LayerContext";
import {
ScoreCacheProvider,
useScoreCache,
-} from "@/src/features/scores/contexts/ScoreCacheContext";
+} from "@/src/features/scores/contexts/ScoreCacheProvider";
import { DualAnnotationContent } from "./DualAnnotationContent";
import { AnnotationForm } from "./AnnotationForm";
import { cloneElement, createRef } from "react";
diff --git a/web/src/features/scores/contexts/ScoreCacheContext.tsx b/web/src/features/scores/contexts/ScoreCacheProvider.tsx
similarity index 99%
rename from web/src/features/scores/contexts/ScoreCacheContext.tsx
rename to web/src/features/scores/contexts/ScoreCacheProvider.tsx
index 752e570f00..f2e6daea67 100644
--- a/web/src/features/scores/contexts/ScoreCacheContext.tsx
+++ b/web/src/features/scores/contexts/ScoreCacheProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { type ScoreDomain } from "@langfuse/shared";
import {
createContext,
diff --git a/web/src/features/scores/hooks/useScoreMutations.ts b/web/src/features/scores/hooks/useScoreMutations.ts
index 3fd57040e7..5ec12b1251 100644
--- a/web/src/features/scores/hooks/useScoreMutations.ts
+++ b/web/src/features/scores/hooks/useScoreMutations.ts
@@ -3,7 +3,7 @@ import {
isSessionScore,
isTraceScore,
} from "@/src/features/scores/lib/helpers";
-import { useScoreCache } from "@/src/features/scores/contexts/ScoreCacheContext";
+import { useScoreCache } from "@/src/features/scores/contexts/ScoreCacheProvider";
import { showErrorToast } from "@/src/features/notifications";
import { classifyTrpcToastError } from "@/src/utils/trpcErrorClassification";
diff --git a/web/src/features/scores/index.ts b/web/src/features/scores/index.ts
index 153a8f30bf..7c5382ddfe 100644
--- a/web/src/features/scores/index.ts
+++ b/web/src/features/scores/index.ts
@@ -21,7 +21,7 @@ export { MultiSelectKeyValues } from "@/src/features/scores/components/MultiSele
export {
ScoreCacheProvider,
type CachedScore,
-} from "@/src/features/scores/contexts/ScoreCacheContext";
+} from "@/src/features/scores/contexts/ScoreCacheProvider";
export { useEmptyScoreConfigs } from "@/src/features/scores/hooks/useEmptyConfigs";
export {
createScoreColumns,
diff --git a/web/src/features/scores/lib/mergeScoreColumns.ts b/web/src/features/scores/lib/mergeScoreColumns.ts
index e287b53a9c..cec35efc99 100644
--- a/web/src/features/scores/lib/mergeScoreColumns.ts
+++ b/web/src/features/scores/lib/mergeScoreColumns.ts
@@ -1,4 +1,4 @@
-import { useScoreCache } from "@/src/features/scores/contexts/ScoreCacheContext";
+import { useScoreCache } from "@/src/features/scores/contexts/ScoreCacheProvider";
import { type ScoreColumn } from "@/src/features/scores/types";
/**
diff --git a/web/src/features/scores/lib/mergeScoresWithCache.ts b/web/src/features/scores/lib/mergeScoresWithCache.ts
index 499a9987f2..29e2713a97 100644
--- a/web/src/features/scores/lib/mergeScoresWithCache.ts
+++ b/web/src/features/scores/lib/mergeScoresWithCache.ts
@@ -1,5 +1,5 @@
import { type ScoreDomain, type ScoreAggregate } from "@langfuse/shared";
-import { type CachedScore } from "@/src/features/scores/contexts/ScoreCacheContext";
+import { type CachedScore } from "@/src/features/scores/contexts/ScoreCacheProvider";
import { type AnnotationScore } from "@/src/features/scores/types";
import {
composeAggregateScoreKey,
diff --git a/web/src/features/scores/lib/useMergedAggregates.ts b/web/src/features/scores/lib/useMergedAggregates.ts
index 6b528d47e2..d14a434493 100644
--- a/web/src/features/scores/lib/useMergedAggregates.ts
+++ b/web/src/features/scores/lib/useMergedAggregates.ts
@@ -1,6 +1,6 @@
import { useMemo } from "react";
import { type ScoreAggregate } from "@langfuse/shared";
-import { useScoreCache } from "@/src/features/scores/contexts/ScoreCacheContext";
+import { useScoreCache } from "@/src/features/scores/contexts/ScoreCacheProvider";
import { mergeAggregatesWithCache } from "@/src/features/scores/lib/mergeScoresWithCache";
/**
diff --git a/web/src/features/scores/lib/useMergedAnnotationScores.ts b/web/src/features/scores/lib/useMergedAnnotationScores.ts
index 7a7bfb59c1..5320eea7c5 100644
--- a/web/src/features/scores/lib/useMergedAnnotationScores.ts
+++ b/web/src/features/scores/lib/useMergedAnnotationScores.ts
@@ -3,7 +3,7 @@ import {
type ScoreTarget,
type AnnotationScore,
} from "@/src/features/scores/types";
-import { useScoreCache } from "@/src/features/scores/contexts/ScoreCacheContext";
+import { useScoreCache } from "@/src/features/scores/contexts/ScoreCacheProvider";
import { mergeAnnotationScoresWithCache } from "@/src/features/scores/lib/mergeScoresWithCache";
import { filterScoresByTarget } from "@/src/features/scores/lib/filterScoresByTarget";
diff --git a/web/src/features/scores/lib/useMergedScores.ts b/web/src/features/scores/lib/useMergedScores.ts
index f69da1bb60..788b4557bc 100644
--- a/web/src/features/scores/lib/useMergedScores.ts
+++ b/web/src/features/scores/lib/useMergedScores.ts
@@ -1,5 +1,5 @@
import { useMemo } from "react";
-import { useScoreCache } from "@/src/features/scores/contexts/ScoreCacheContext";
+import { useScoreCache } from "@/src/features/scores/contexts/ScoreCacheProvider";
import { type ScoreTarget } from "@/src/features/scores/types";
import { mergeScoresWithCache } from "@/src/features/scores/lib/mergeScoresWithCache";
import { filterScoresByTarget } from "@/src/features/scores/lib/filterScoresByTarget";
diff --git a/web/src/features/search-bar/hooks/useFullTextSearch.clienttest.tsx b/web/src/features/search-bar/hooks/useFullTextSearch.clienttest.tsx
index 98cdf29449..39de58631c 100644
--- a/web/src/features/search-bar/hooks/useFullTextSearch.clienttest.tsx
+++ b/web/src/features/search-bar/hooks/useFullTextSearch.clienttest.tsx
@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
import {
PeekTableStateProvider,
usePeekTableState,
-} from "@/src/components/table/peek/contexts/PeekTableStateContext";
+} from "@/src/components/table/peek/contexts/PeekTableStateProvider";
import { useFullTextSearch } from "./useFullTextSearch";
const h = vi.hoisted(() => ({
diff --git a/web/src/features/search-bar/hooks/useFullTextSearch.ts b/web/src/features/search-bar/hooks/useFullTextSearch.ts
index 51b87184a0..1c9e504228 100644
--- a/web/src/features/search-bar/hooks/useFullTextSearch.ts
+++ b/web/src/features/search-bar/hooks/useFullTextSearch.ts
@@ -5,7 +5,7 @@ import {
StringParam,
ArrayParam,
} from "use-query-params";
-import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateContext";
+import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateProvider";
import { hasFullTextSearchType } from "@/src/components/table/utils/searchUtils";
export const useFullTextSearch = ({
diff --git a/web/src/features/sessions/TraceRow.tsx b/web/src/features/sessions/LazyTraceRow.tsx
similarity index 99%
rename from web/src/features/sessions/TraceRow.tsx
rename to web/src/features/sessions/LazyTraceRow.tsx
index 1174339ded..bed69006b1 100644
--- a/web/src/features/sessions/TraceRow.tsx
+++ b/web/src/features/sessions/LazyTraceRow.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { SessionIO } from "@/src/features/sessions/SessionPages";
import { GroupedScoreBadges } from "@/src/components/GroupedScoreBadges";
import { JsonSkeleton } from "@/src/components/ui/CodeJsonViewer";
diff --git a/web/src/features/sessions/ModernSession.tsx b/web/src/features/sessions/ModernSession.tsx
index 2243aa90ec..9d8a51276c 100644
--- a/web/src/features/sessions/ModernSession.tsx
+++ b/web/src/features/sessions/ModernSession.tsx
@@ -5,7 +5,7 @@ import { ConnectedModernSessionBodyLegacy } from "@/src/features/sessions/Connec
import { ConnectedModernSessionBodyTimeline } from "@/src/features/sessions/components/ConnectedModernSessionBodyTimeline/ConnectedModernSessionBodyTimeline";
import { ModernSessionFilterControls } from "@/src/features/sessions/ModernSessionFilterControls";
import { ModernSessionHeader } from "@/src/features/sessions/ModernSessionHeader";
-import { SessionReviewLeading } from "@/src/features/sessions/sessionReviewLeading";
+import { SessionReviewLeading } from "@/src/features/sessions/SessionReviewLeadingProvider";
import { SessionMetadataJsonPathControl } from "@/src/features/sessions/SessionMetadataJsonPathControl";
import {
type EventSession,
diff --git a/web/src/features/sessions/ModernSessionHeaderActionsController.clienttest.tsx b/web/src/features/sessions/ModernSessionHeaderActionsController.clienttest.tsx
index 15f581947f..586f21ba07 100644
--- a/web/src/features/sessions/ModernSessionHeaderActionsController.clienttest.tsx
+++ b/web/src/features/sessions/ModernSessionHeaderActionsController.clienttest.tsx
@@ -93,7 +93,7 @@ vi.mock("@/src/components/HeaderActionButton", () => ({
),
}));
-vi.mock("@/src/components/publish-object-switch", () => ({
+vi.mock("@/src/components/PublishSessionSwitch", () => ({
getShareUrl: () => "https://example.com",
usePublishObject: () => ({
hasAccess: true,
diff --git a/web/src/features/sessions/ModernSessionHeaderActionsController.tsx b/web/src/features/sessions/ModernSessionHeaderActionsController.tsx
index 1e7f0c5456..fab15d61fd 100644
--- a/web/src/features/sessions/ModernSessionHeaderActionsController.tsx
+++ b/web/src/features/sessions/ModernSessionHeaderActionsController.tsx
@@ -3,7 +3,7 @@ import { useSession } from "next-auth/react";
import { useInternalFeaturesEnabled } from "@/src/features/feature-flags";
import { HeaderActionButton } from "@/src/components/HeaderActionButton";
-import { HeaderActionMenuRows } from "@/src/components/HeaderActionMenuRow";
+import { HeaderActionMenuRows } from "@/src/components/HeaderActionMenuRows";
import {
DropdownMenu,
type DropdownMenuItemDefinition,
diff --git a/web/src/features/sessions/SessionPages.tsx b/web/src/features/sessions/SessionPages.tsx
index 2b18eb75ad..53df1d9c24 100644
--- a/web/src/features/sessions/SessionPages.tsx
+++ b/web/src/features/sessions/SessionPages.tsx
@@ -6,8 +6,8 @@ import { GroupedScoreBadges } from "@/src/components/GroupedScoreBadges";
import { ErrorPage } from "@/src/components/error-page";
import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { Skeleton } from "@/src/components/ui/skeleton";
-import { SessionReviewLeading } from "@/src/features/sessions/sessionReviewLeading";
-import { PublishSessionSwitch } from "@/src/components/publish-object-switch";
+import { SessionReviewLeading } from "@/src/features/sessions/SessionReviewLeadingProvider";
+import { PublishSessionSwitch } from "@/src/components/PublishSessionSwitch";
import { IOPreview } from "@/src/features/traces";
import { JsonSkeleton } from "@/src/components/ui/CodeJsonViewer";
import { Badge } from "@/src/components/ui/badge";
@@ -51,7 +51,7 @@ import {
import { DropdownIndicator } from "@/src/components/design-system/DropdownIndicator/DropdownIndicator";
import { useCopyToClipboard } from "@/src/hooks/useCopyToClipboard";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import {
Popover,
PopoverContent,
@@ -77,7 +77,7 @@ import {
import { TablePeekViewTraceDetail } from "@/src/components/table/peek/TablePeekViewTraceDetail";
import { usePeekNavigation } from "@/src/components/table/peek/hooks/usePeekNavigation";
import { type WithStringifiedMetadata } from "@/src/utils/clientSideDomainTypes";
-import { LazyTraceRow } from "@/src/features/sessions/TraceRow";
+import { LazyTraceRow } from "@/src/features/sessions/LazyTraceRow";
import { useParsedTrace } from "@/src/hooks/useParsedTrace";
import useLocalStorage from "@/src/components/useLocalStorage";
import { Switch } from "@/src/components/design-system/Switch/Switch";
@@ -124,7 +124,7 @@ import { ConnectedSessionAddToDropdownMenuController } from "@/src/features/sess
import { useIsFeatureEnabled } from "@/src/features/feature-flags";
import { useIsMobile } from "@/src/hooks/use-mobile";
import { useStore } from "zustand";
-import { TraceReviewPanelProvider } from "@/src/features/traces/contexts/TraceReviewPanelContext";
+import { TraceReviewPanelProvider } from "@/src/features/traces/contexts/TraceReviewPanelProvider";
import { SessionReviewWorkspace } from "@/src/features/sessions/SessionReviewWorkspace";
import { useHistoryEntryRevisit } from "@/src/features/sessions/useHistoryEntryRevisit";
import {
diff --git a/web/src/features/sessions/sessionReviewLeading.tsx b/web/src/features/sessions/SessionReviewLeadingProvider.tsx
similarity index 93%
rename from web/src/features/sessions/sessionReviewLeading.tsx
rename to web/src/features/sessions/SessionReviewLeadingProvider.tsx
index 7b34138b17..e50e1cbdc7 100644
--- a/web/src/features/sessions/sessionReviewLeading.tsx
+++ b/web/src/features/sessions/SessionReviewLeadingProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { createContext, useContext, type ReactNode } from "react";
import { createPortal } from "react-dom";
diff --git a/web/src/features/sessions/SessionReviewWorkspace.clienttest.tsx b/web/src/features/sessions/SessionReviewWorkspace.clienttest.tsx
index bc1eadf952..10c4599fde 100644
--- a/web/src/features/sessions/SessionReviewWorkspace.clienttest.tsx
+++ b/web/src/features/sessions/SessionReviewWorkspace.clienttest.tsx
@@ -13,8 +13,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import {
TraceReviewPanelProvider,
useTraceReviewPanel,
-} from "@/src/features/traces/contexts/TraceReviewPanelContext";
-import { SessionReviewLeading } from "./sessionReviewLeading";
+} from "@/src/features/traces/contexts/TraceReviewPanelProvider";
+import { SessionReviewLeading } from "./SessionReviewLeadingProvider";
import { SessionReviewWorkspace } from "./SessionReviewWorkspace";
const { groupRef, router } = vi.hoisted(() => ({
diff --git a/web/src/features/sessions/SessionReviewWorkspace.tsx b/web/src/features/sessions/SessionReviewWorkspace.tsx
index c6351b8c71..88300d32e2 100644
--- a/web/src/features/sessions/SessionReviewWorkspace.tsx
+++ b/web/src/features/sessions/SessionReviewWorkspace.tsx
@@ -2,8 +2,8 @@ import { useLayoutEffect, useRef, useState, type ReactNode } from "react";
import { Group, Panel, Separator, useGroupRef } from "react-resizable-panels";
import { useStore } from "zustand";
import { SessionReviewPanel } from "@/src/features/traces/components/TraceReviewPanel";
-import { useTraceReviewPanel } from "@/src/features/traces/contexts/TraceReviewPanelContext";
-import { SessionReviewLeadingProvider } from "@/src/features/sessions/sessionReviewLeading";
+import { useTraceReviewPanel } from "@/src/features/traces/contexts/TraceReviewPanelProvider";
+import { SessionReviewLeadingProvider } from "@/src/features/sessions/SessionReviewLeadingProvider";
import { useElementSize } from "@/src/hooks/useElementSize";
import { cn } from "@/src/utils/tailwind";
diff --git a/web/src/features/sessions/SessionsPage.tsx b/web/src/features/sessions/SessionsPage.tsx
index 8f04beaec8..bf91b4d063 100644
--- a/web/src/features/sessions/SessionsPage.tsx
+++ b/web/src/features/sessions/SessionsPage.tsx
@@ -1,7 +1,7 @@
import React from "react";
import { useRouter } from "next/router";
import SessionsTable from "@/src/features/sessions/SessionsTable";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { SessionsOnboarding } from "@/src/components/onboarding/SessionsOnboarding";
import { api } from "@/src/utils/api";
import { useReadPath } from "@/src/features/events";
diff --git a/web/src/features/skills/components/SkillEditor.tsx b/web/src/features/skills/components/SkillEditor.tsx
index 240f7b05d5..7c073bdaaf 100644
--- a/web/src/features/skills/components/SkillEditor.tsx
+++ b/web/src/features/skills/components/SkillEditor.tsx
@@ -27,7 +27,7 @@ import { IconButton } from "@/src/components/design-system/IconButton/IconButton
import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
import { SkillLinkedTraces } from "@/src/features/skills/components/SkillLinkedTraces";
import { DropdownMenu } from "@/src/components/design-system/DropdownMenu/DropdownMenu";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { Button } from "@/src/components/ui/button";
import { Dialog } from "@/src/components/design-system/Dialog/Dialog";
import { DialogController } from "@/src/components/design-system/DialogController/DialogController";
diff --git a/web/src/features/skills/components/SkillEditorPage.tsx b/web/src/features/skills/components/SkillEditorPage.tsx
index 294f2907e3..cc38c3108d 100644
--- a/web/src/features/skills/components/SkillEditorPage.tsx
+++ b/web/src/features/skills/components/SkillEditorPage.tsx
@@ -2,7 +2,7 @@
import { type ComponentProps, useMemo, useState } from "react";
import { useRouter } from "next/router";
import { useStore } from "zustand";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { Skeleton } from "@/src/components/ui/skeleton";
import { showErrorToast } from "@/src/features/notifications";
import { SKILL_LATEST_LABEL } from "@langfuse/shared";
diff --git a/web/src/features/skills/components/SkillVersionComparison.tsx b/web/src/features/skills/components/SkillVersionComparisonController.tsx
similarity index 98%
rename from web/src/features/skills/components/SkillVersionComparison.tsx
rename to web/src/features/skills/components/SkillVersionComparisonController.tsx
index 4fac8f2929..813532ad89 100644
--- a/web/src/features/skills/components/SkillVersionComparison.tsx
+++ b/web/src/features/skills/components/SkillVersionComparisonController.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/component-file-structure, @typescript-eslint/no-use-before-define */
+/* eslint-disable @typescript-eslint/no-use-before-define */
import { type ReactNode, useState } from "react";
import { Button } from "@/src/components/design-system/Button/Button";
import { Dialog } from "@/src/components/design-system/Dialog/Dialog";
diff --git a/web/src/features/skills/components/SkillVersionHistory.tsx b/web/src/features/skills/components/SkillVersionHistory.tsx
index 8a00d2cf95..20f8581210 100644
--- a/web/src/features/skills/components/SkillVersionHistory.tsx
+++ b/web/src/features/skills/components/SkillVersionHistory.tsx
@@ -7,7 +7,7 @@ import { Timeline } from "@/src/components/design-system/Timeline/Timeline";
import { cn } from "@/src/utils/tailwind";
import { type SkillEditorStore } from "./skillEditorStore";
import { SkillLabelsSelect } from "./SkillMetadataSelect";
-import { SkillVersionComparisonController } from "./SkillVersionComparison";
+import { SkillVersionComparisonController } from "./SkillVersionComparisonController";
export function SkillVersionHistory(
props:
diff --git a/web/src/features/skills/components/SkillsPage.tsx b/web/src/features/skills/components/SkillsPage.tsx
index 43a7c48d48..c2dd2ba238 100644
--- a/web/src/features/skills/components/SkillsPage.tsx
+++ b/web/src/features/skills/components/SkillsPage.tsx
@@ -18,7 +18,7 @@ import {
useQueryParams,
withDefault,
} from "use-query-params";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { Button } from "@/src/components/ui/button";
import { Button as DesignSystemButton } from "@/src/components/design-system/Button/Button";
import { DropdownMenu } from "@/src/components/design-system/DropdownMenu/DropdownMenu";
diff --git a/web/src/features/topics/TopicsPage.clienttest.tsx b/web/src/features/topics/TopicsPage.clienttest.tsx
index 08754513c0..805f945d66 100644
--- a/web/src/features/topics/TopicsPage.clienttest.tsx
+++ b/web/src/features/topics/TopicsPage.clienttest.tsx
@@ -88,7 +88,7 @@ vi.mock("next/router", () => ({
push: state.push,
}),
}));
-vi.mock("@/src/components/layouts/page", () => ({
+vi.mock("@/src/components/layouts/Page", () => ({
default: ({
children,
headerProps,
diff --git a/web/src/features/topics/TopicsPage.tsx b/web/src/features/topics/TopicsPage.tsx
index 96e6d56004..8ac9a71686 100644
--- a/web/src/features/topics/TopicsPage.tsx
+++ b/web/src/features/topics/TopicsPage.tsx
@@ -6,7 +6,7 @@ import { usePeekNavigation } from "@/src/components/table/peek/hooks/usePeekNavi
import { TablePeekViewTraceDetail } from "@/src/components/table/peek/TablePeekViewTraceDetail";
import { useRouter } from "next/router";
import { TextLink } from "@/src/components/design-system/TextLink/TextLink";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { PageHeaderControlsPortal } from "@/src/components/layouts/page-header-controls-slot";
import { TimeRangePicker } from "@/src/components/date-picker";
import { useGlobalDateRange } from "@/src/features/global-time-range/useGlobalDateRange";
diff --git a/web/src/features/traces/TracePage.tsx b/web/src/features/traces/TracePage.tsx
index fc3100c162..6796015c76 100644
--- a/web/src/features/traces/TracePage.tsx
+++ b/web/src/features/traces/TracePage.tsx
@@ -3,7 +3,7 @@ import { useRouter } from "next/router";
import { ErrorPage } from "@/src/components/error-page";
import { TraceDetailActions } from "@/src/features/traces/components/TraceDetailActions";
import { useTraceDetailData } from "@/src/features/traces/hooks/useTraceDetailData";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { TraceDetailBody } from "@/src/features/traces/components/TraceDetailBody";
import { useSession } from "next-auth/react";
import { useIsAuthenticatedAndProjectMember } from "@/src/features/auth";
diff --git a/web/src/features/traces/TracesPage.tsx b/web/src/features/traces/TracesPage.tsx
index 1c90004b3b..5f0ec56c56 100644
--- a/web/src/features/traces/TracesPage.tsx
+++ b/web/src/features/traces/TracesPage.tsx
@@ -1,7 +1,7 @@
/* eslint-disable no-nested-ternary */
import { useRouter } from "next/router";
import TracesTable from "@/src/features/traces/TracesTable";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { api } from "@/src/utils/api";
import { TracesOnboarding } from "@/src/components/onboarding/TracesOnboarding";
import { getTracingTabs, TRACING_TABS } from "@/src/features/navigation";
diff --git a/web/src/features/traces/TracesTable.tsx b/web/src/features/traces/TracesTable.tsx
index 611327d138..2bdc109d78 100644
--- a/web/src/features/traces/TracesTable.tsx
+++ b/web/src/features/traces/TracesTable.tsx
@@ -38,7 +38,7 @@ import {
formatAsLabel,
LevelSymbols,
getObservationLevelStatus,
-} from "@/src/components/level-colors";
+} from "@/src/components/ObservationLevelTag";
import {
detailPageListKeys,
useDetailPageLists,
@@ -116,7 +116,7 @@ import {
type RefreshInterval,
} from "@/src/components/table/utils/refresh-intervals";
import { TableHeaderControls } from "@/src/components/table/TableHeaderControls";
-import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateContext";
+import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateProvider";
import { useScoreColumns, scoreFilters } from "@/src/features/scores";
import { AddTracesToAnnotationQueueDialogController } from "@/src/features/annotation-queues";
import { useHasProjectAccess } from "@/src/features/rbac";
diff --git a/web/src/features/traces/components/AdvancedJsonViewer/MultiSectionJsonViewer.tsx b/web/src/features/traces/components/AdvancedJsonViewer/MultiSectionJsonViewer.tsx
index 44c6d6e63f..1364046ede 100644
--- a/web/src/features/traces/components/AdvancedJsonViewer/MultiSectionJsonViewer.tsx
+++ b/web/src/features/traces/components/AdvancedJsonViewer/MultiSectionJsonViewer.tsx
@@ -24,7 +24,7 @@ import {
SimpleMultiSectionViewer,
type SimpleMultiSectionViewerHandle,
} from "./SimpleMultiSectionViewer";
-import { SectionContextProvider } from "./contexts/SectionContext";
+import { SectionContextProvider } from "./contexts/SectionContextProvider";
import { searchInTree, getMatchCountsPerNode } from "./utils/searchJson";
import { type MediaReturnType } from "@/src/features/media";
import { type CommentedPathsByField } from "./utils/commentRanges";
diff --git a/web/src/features/traces/components/AdvancedJsonViewer/contexts/SectionContext.tsx b/web/src/features/traces/components/AdvancedJsonViewer/contexts/SectionContextProvider.tsx
similarity index 96%
rename from web/src/features/traces/components/AdvancedJsonViewer/contexts/SectionContext.tsx
rename to web/src/features/traces/components/AdvancedJsonViewer/contexts/SectionContextProvider.tsx
index 7b60a945cb..03bd93f55d 100644
--- a/web/src/features/traces/components/AdvancedJsonViewer/contexts/SectionContext.tsx
+++ b/web/src/features/traces/components/AdvancedJsonViewer/contexts/SectionContextProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { createContext, useMemo } from "react";
import type { SectionContext } from "../types";
import type { TreeState } from "../utils/treeStructure";
diff --git a/web/src/features/traces/components/IOPreview/IOPreviewJSON.tsx b/web/src/features/traces/components/IOPreview/IOPreviewJSON.tsx
index dfaa08a095..7288fdc1b6 100644
--- a/web/src/features/traces/components/IOPreview/IOPreviewJSON.tsx
+++ b/web/src/features/traces/components/IOPreview/IOPreviewJSON.tsx
@@ -15,7 +15,7 @@ import {
InlineCommentSelectionProvider,
useInlineCommentSelectionOptional,
type SelectionData,
-} from "@/src/features/comments/contexts/InlineCommentSelectionContext";
+} from "@/src/features/comments/contexts/InlineCommentSelectionProvider";
import { CommentableJsonView } from "@/src/features/comments/components/CommentableJsonView";
import { InlineCommentBubble } from "@/src/features/comments/components/InlineCommentBubble";
import { type CommentedPathsByField } from "@/src/features/traces/components/AdvancedJsonViewer/utils/commentRanges";
diff --git a/web/src/features/traces/components/IOPreview/components/ChatMessage.tsx b/web/src/features/traces/components/IOPreview/components/ChatMessage.tsx
index c42ba11d1b..1d890f9eb3 100644
--- a/web/src/features/traces/components/IOPreview/components/ChatMessage.tsx
+++ b/web/src/features/traces/components/IOPreview/components/ChatMessage.tsx
@@ -20,7 +20,8 @@ import {
hasRedactedThinkingContent,
withoutUnsetFields,
} from "../../../fns/chatMessageUtils";
-import { ThinkingBlock, RedactedThinkingBlock } from "../../ThinkingBlock";
+import { ThinkingBlock } from "../../ThinkingBlock";
+import { RedactedThinkingBlock } from "../../RedactedThinkingBlock";
import { type IOPreviewContentMode } from "../IOPreview";
// View mode for pretty/json toggle
diff --git a/web/src/features/traces/components/LatencyBadge.tsx b/web/src/features/traces/components/LatencyBadge.tsx
new file mode 100644
index 0000000000..57e45279a7
--- /dev/null
+++ b/web/src/features/traces/components/LatencyBadge.tsx
@@ -0,0 +1,12 @@
+import { Badge } from "@/src/components/design-system/Badge/Badge";
+import { formatIntervalSeconds } from "@/src/utils/dates";
+
+export function LatencyBadge({ latencySeconds }: { latencySeconds: number }) {
+ return (
+ <Badge
+ font="mono"
+ color="ghost"
+ text={formatIntervalSeconds(latencySeconds)}
+ />
+ );
+}
diff --git a/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx b/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
index c6056a3d28..231b88dd1a 100644
--- a/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
@@ -36,22 +36,22 @@ import { getDetailTabs } from "../../fns/getDetailTabs";
import { resolveDetailTab } from "../../fns/resolveDetailTab";
import { ScoresTable } from "@/src/features/scores";
import { getMostRecentCorrection } from "@/src/features/corrections";
-import { useJsonExpansion } from "@/src/features/traces/contexts/JsonExpansionContext";
+import { useJsonExpansion } from "@/src/features/traces/contexts/JsonExpansionProvider";
import { useMedia } from "@/src/features/traces/hooks/useMedia";
import {
type DetailTab,
useSelection,
-} from "@/src/features/traces/contexts/SelectionContext";
+} from "@/src/features/traces/contexts/SelectionProvider";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useTraceAnalyticsDimensions } from "@/src/features/traces/hooks/useTraceAnalyticsDimensions";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
import {
jsonViewToggleTab,
normalizeJsonViewPreference,
} from "@/src/components/ui/jsonViewPreference";
// Contexts and hooks
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
import { useParsedObservation } from "@/src/features/traces/hooks/useParsedObservation";
import { api } from "@/src/utils/api";
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 45d1febabb..fd565db0f2 100644
--- a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
@@ -1,5 +1,5 @@
import { HeaderActionButton } from "@/src/components/HeaderActionButton";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
import { headerActionClassName } from "@/src/features/traces/components/headerActionClassName";
import { prepareTraceAnnotation } from "@/src/features/scores/lib/prepareTraceAnnotation";
/**
@@ -27,10 +27,8 @@ import { AnnotateDrawerController } from "@/src/features/scores";
import { ConnectedTraceObservationAddToDropdownMenuController } from "@/src/features/traces/components/ConnectedTraceObservationAddToDropdownMenuController";
import { Badge } from "@/src/components/design-system/Badge/Badge";
import { PromptBadge } from "@/src/features/traces/components/PromptBadge";
-import {
- LatencyBadge,
- TimeToFirstTokenBadge,
-} from "@/src/features/traces/components/ObservationMetadataBadgesSimple/ObservationMetadataBadgesSimple";
+import { LatencyBadge } from "@/src/features/traces/components/LatencyBadge";
+import { TimeToFirstTokenBadge } from "@/src/features/traces/components/TimeToFirstTokenBadge";
import { EvaluatorBadge } from "@/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/components/EvaluatorBadge/EvaluatorBadge";
import {
CostBadge,
@@ -49,7 +47,7 @@ import {
import { type AggregatedTraceMetrics } from "@/src/features/traces/fns/traceAggregation";
import type Decimal from "decimal.js";
import { ConnectedDetailHeaderActionsMenuController } from "@/src/features/traces/components/DetailHeaderActionsMenuController";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
import { useReadPath } from "@/src/features/events";
import { Button } from "@/src/components/ui/button";
import { ActionButtonCountBadge } from "@/src/components/ui/ActionButtonCountBadge";
diff --git a/web/src/features/traces/components/RedactedThinkingBlock.tsx b/web/src/features/traces/components/RedactedThinkingBlock.tsx
new file mode 100644
index 0000000000..f05e96dcaa
--- /dev/null
+++ b/web/src/features/traces/components/RedactedThinkingBlock.tsx
@@ -0,0 +1,43 @@
+import { useState } from "react";
+import { ChevronRight } from "@langfuse/icons";
+import { cn } from "@/src/utils/tailwind";
+
+export function RedactedThinkingBlock({
+ data,
+ defaultExpanded = false,
+}: {
+ data: string;
+ defaultExpanded?: boolean;
+}) {
+ const [expanded, setExpanded] = useState(defaultExpanded);
+
+ return (
+ <div className="my-2">
+ <button
+ type="button"
+ className="text-muted-foreground hover:text-foreground flex w-full cursor-pointer items-start gap-1 text-left"
+ onClick={() => setExpanded(!expanded)}
+ aria-expanded={expanded}
+ >
+ <ChevronRight
+ size="sm"
+ color="tertiary"
+ __rawClassName={cn(
+ "mt-0.5 translate-y-px transition-transform",
+ expanded && "rotate-90",
+ )}
+ />
+ <span className="text-xs font-bold">Thinking (redacted)</span>
+ {!expanded && (
+ <span className="text-xs italic">[Encrypted thinking data]</span>
+ )}
+ </button>
+
+ {expanded && (
+ <div className="ph-no-capture bg-muted/50 text-muted-foreground mt-1 ml-4 rounded p-2 font-mono text-xs break-all">
+ {data}
+ </div>
+ )}
+ </div>
+ );
+}
diff --git a/web/src/features/traces/components/SpanContent.tsx b/web/src/features/traces/components/SpanContent.tsx
index 9f4293c3dc..34637a88c6 100644
--- a/web/src/features/traces/components/SpanContent.tsx
+++ b/web/src/features/traces/components/SpanContent.tsx
@@ -30,8 +30,8 @@ import {
isEmphasizedShare,
type MetricEmphasisContext,
} from "@/src/features/traces/fns/metricEmphasis";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
import { selectNodeScores } from "@/src/features/traces/fns/nodeScores";
interface SpanContentProps {
diff --git a/web/src/features/traces/components/ThinkingBlock.tsx b/web/src/features/traces/components/ThinkingBlock.tsx
index 05334aa1fe..e2d1a3fb0e 100644
--- a/web/src/features/traces/components/ThinkingBlock.tsx
+++ b/web/src/features/traces/components/ThinkingBlock.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { useState } from "react";
import { ChevronRight } from "@langfuse/icons";
import { cn } from "@/src/utils/tailwind";
@@ -49,46 +48,3 @@ export function ThinkingBlock({
</div>
);
}
-
-interface RedactedThinkingBlockProps {
- data: string;
- defaultExpanded?: boolean;
-}
-
-// redactedThinkingBlock renders redacted thinking content if flagged by Anthropic
-export function RedactedThinkingBlock({
- data,
- defaultExpanded = false,
-}: RedactedThinkingBlockProps) {
- const [expanded, setExpanded] = useState(defaultExpanded);
-
- return (
- <div className="my-2">
- <button
- type="button"
- className="text-muted-foreground hover:text-foreground flex w-full cursor-pointer items-start gap-1 text-left"
- onClick={() => setExpanded(!expanded)}
- aria-expanded={expanded}
- >
- <ChevronRight
- size="sm"
- color="tertiary"
- __rawClassName={cn(
- "mt-0.5 translate-y-px transition-transform",
- expanded && "rotate-90",
- )}
- />
- <span className="text-xs font-bold">Thinking (redacted)</span>
- {!expanded && (
- <span className="text-xs italic">[Encrypted thinking data]</span>
- )}
- </button>
-
- {expanded && (
- <div className="ph-no-capture bg-muted/50 text-muted-foreground mt-1 ml-4 rounded p-2 font-mono text-xs break-all">
- {data}
- </div>
- )}
- </div>
- );
-}
diff --git a/web/src/features/traces/components/ObservationMetadataBadgesSimple/ObservationMetadataBadgesSimple.tsx b/web/src/features/traces/components/TimeToFirstTokenBadge.tsx
similarity index 59%
rename from web/src/features/traces/components/ObservationMetadataBadgesSimple/ObservationMetadataBadgesSimple.tsx
rename to web/src/features/traces/components/TimeToFirstTokenBadge.tsx
index 4519bf3c9a..bc526e5854 100644
--- a/web/src/features/traces/components/ObservationMetadataBadgesSimple/ObservationMetadataBadgesSimple.tsx
+++ b/web/src/features/traces/components/TimeToFirstTokenBadge.tsx
@@ -1,17 +1,6 @@
-/* eslint-disable @repo/component-file-structure */
import { Badge } from "@/src/components/design-system/Badge/Badge";
import { formatIntervalSeconds } from "@/src/utils/dates";
-export function LatencyBadge({ latencySeconds }: { latencySeconds: number }) {
- return (
- <Badge
- font="mono"
- color="ghost"
- text={formatIntervalSeconds(latencySeconds)}
- />
- );
-}
-
export function TimeToFirstTokenBadge({
timeToFirstToken,
}: {
diff --git a/web/src/features/traces/components/Trace.tsx b/web/src/features/traces/components/Trace.tsx
index 034b57d6eb..161bde25eb 100644
--- a/web/src/features/traces/components/Trace.tsx
+++ b/web/src/features/traces/components/Trace.tsx
@@ -6,19 +6,19 @@ import { type WithStringifiedMetadata } from "@/src/utils/clientSideDomainTypes"
import {
TraceDataProvider,
useTraceData,
-} from "@/src/features/traces/contexts/TraceDataContext";
-import { ViewPreferencesProvider } from "@/src/features/traces/contexts/ViewPreferencesContext";
+} from "@/src/features/traces/contexts/TraceDataProvider";
+import { ViewPreferencesProvider } from "@/src/features/traces/contexts/ViewPreferencesProvider";
import {
SelectionProvider,
useSelection,
-} from "@/src/features/traces/contexts/SelectionContext";
+} from "@/src/features/traces/contexts/SelectionProvider";
import { useSelectedObservation } from "@/src/features/traces/hooks/useSelectedObservation";
-import { SearchProvider } from "@/src/features/traces/contexts/SearchContext";
-import { JsonExpansionProvider } from "@/src/features/traces/contexts/JsonExpansionContext";
+import { SearchProvider } from "@/src/features/traces/contexts/SearchProvider";
+import { JsonExpansionProvider } from "@/src/features/traces/contexts/JsonExpansionProvider";
import {
TraceGraphDataProvider,
useTraceGraphData,
-} from "@/src/features/traces/contexts/TraceGraphDataContext";
+} from "@/src/features/traces/contexts/TraceGraphDataProvider";
import { TraceLayoutMobile } from "@/src/features/traces/components/TraceLayoutMobile";
import { TraceLayoutDesktop } from "@/src/features/traces/components/TraceLayoutDesktop";
import { TraceHeader } from "@/src/features/traces/components/TraceHeader";
@@ -34,7 +34,7 @@ import { TraceGraphView } from "@/src/features/traces/components/TraceGraphView/
import { useMemo, type ReactNode } from "react";
import { useRouter } from "next/router";
import { getCommentDrawerInitialStateFromUrl } from "@/src/features/comments/CommentDrawerController";
-import { TraceReviewPanelProvider } from "@/src/features/traces/contexts/TraceReviewPanelContext";
+import { TraceReviewPanelProvider } from "@/src/features/traces/contexts/TraceReviewPanelProvider";
import { TraceReviewPanel } from "./TraceReviewPanel";
import { useHasProjectAccess } from "@/src/features/rbac";
import { staleProps } from "@/src/features/traces/fns/staleProps";
diff --git a/web/src/features/traces/components/TraceDetailActions.tsx b/web/src/features/traces/components/TraceDetailActions.tsx
index 32f6f95073..10a6a5bdc2 100644
--- a/web/src/features/traces/components/TraceDetailActions.tsx
+++ b/web/src/features/traces/components/TraceDetailActions.tsx
@@ -8,10 +8,8 @@ import {
} from "@langfuse/icons";
import { HeaderActionButton } from "@/src/components/HeaderActionButton";
-import {
- HeaderActionMenuRow,
- HeaderActionMenuRows,
-} from "@/src/components/HeaderActionMenuRow";
+import { HeaderActionMenuRow } from "@/src/components/HeaderActionMenuRow";
+import { HeaderActionMenuRows } from "@/src/components/HeaderActionMenuRows";
import {
DropdownMenu,
type DropdownMenuItemDefinition,
diff --git a/web/src/features/traces/components/TraceDetailTabsBarList.tsx b/web/src/features/traces/components/TraceDetailTabsBarList.tsx
index 215b8cc13e..ad62d8435d 100644
--- a/web/src/features/traces/components/TraceDetailTabsBarList.tsx
+++ b/web/src/features/traces/components/TraceDetailTabsBarList.tsx
@@ -5,7 +5,7 @@ import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
import { Skeleton } from "@/src/components/ui/skeleton";
import { cn } from "@/src/utils/tailwind";
-import type { DetailTab } from "../contexts/SelectionContext";
+import type { DetailTab } from "../contexts/SelectionProvider";
const labels: Record<DetailTab, string> = {
preview: "Preview",
diff --git a/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx b/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
index 53eee2731d..a325574023 100644
--- a/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
+++ b/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
@@ -24,13 +24,13 @@ import { HoverCard } from "@/src/components/design-system/HoverCard/HoverCard";
// Preview tab components
import { IOPreview } from "@/src/features/traces/components/IOPreview/IOPreview";
import { IOPreviewJSON } from "@/src/features/traces/components/IOPreview/IOPreviewJSON";
-import { useJsonExpansion } from "@/src/features/traces/contexts/JsonExpansionContext";
+import { useJsonExpansion } from "@/src/features/traces/contexts/JsonExpansionProvider";
import { useMedia } from "@/src/features/traces/hooks/useMedia";
import { useParsedTrace } from "@/src/hooks/useParsedTrace";
// Contexts and hooks
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
import {
jsonViewToggleTab,
normalizeJsonViewPreference,
@@ -38,7 +38,7 @@ import {
import {
type DetailTab,
useSelection,
-} from "@/src/features/traces/contexts/SelectionContext";
+} from "@/src/features/traces/contexts/SelectionProvider";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useTraceAnalyticsDimensions } from "@/src/features/traces/hooks/useTraceAnalyticsDimensions";
import { useIsAuthenticatedAndProjectMember } from "@/src/features/auth";
diff --git a/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx b/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
index 567d3f5200..90cc57298b 100644
--- a/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
+++ b/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
@@ -38,7 +38,7 @@ import {
TargetTraceBadge,
} from "../../TraceMetadataBadges";
import { resolveEvalExecutionMetadata } from "@/src/features/traces/fns/resolveMetadata";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
import { CollapsibleBadgeRow } from "@/src/features/traces/components/CollapsibleBadgeRow";
import { useIsMobile } from "@/src/hooks/use-mobile";
import { Button } from "@/src/components/ui/button";
diff --git a/web/src/features/traces/components/TraceGraphView/TraceGraphView.tsx b/web/src/features/traces/components/TraceGraphView/TraceGraphView.tsx
index c7df675537..e05388a0ff 100644
--- a/web/src/features/traces/components/TraceGraphView/TraceGraphView.tsx
+++ b/web/src/features/traces/components/TraceGraphView/TraceGraphView.tsx
@@ -11,12 +11,12 @@ import {
TraceGraphView as TraceGraphViewComponent,
type GraphViewMode,
} from "@/src/features/trace-graph-view";
-import { useTraceGraphData } from "@/src/features/traces/contexts/TraceGraphDataContext";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
+import { useTraceGraphData } from "@/src/features/traces/contexts/TraceGraphDataProvider";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useTraceAnalyticsDimensions } from "@/src/features/traces/hooks/useTraceAnalyticsDimensions";
import { useTraceSearchMatches } from "@/src/features/traces/hooks/useTraceSearchMatches";
-import { useSelection } from "../../contexts/SelectionContext";
+import { useSelection } from "../../contexts/SelectionProvider";
export function TraceGraphView() {
const {
diff --git a/web/src/features/traces/components/TraceHeader.tsx b/web/src/features/traces/components/TraceHeader.tsx
index 3cf70e6643..cad929740e 100644
--- a/web/src/features/traces/components/TraceHeader.tsx
+++ b/web/src/features/traces/components/TraceHeader.tsx
@@ -13,15 +13,15 @@ import {
SessionBadge,
UserIdBadge,
} from "@/src/features/traces/components/TraceMetadataBadges";
-import { LatencyBadge } from "@/src/features/traces/components/ObservationMetadataBadgesSimple/ObservationMetadataBadgesSimple";
+import { LatencyBadge } from "@/src/features/traces/components/LatencyBadge";
import {
CostBadge,
UsageBadge,
hasBreakdown,
} from "@/src/features/traces/components/ObservationMetadataBadgesTooltip";
import { CollapsibleBadgeRow } from "@/src/features/traces/components/CollapsibleBadgeRow";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
import { aggregateTraceMetrics } from "@/src/features/traces/fns/traceAggregation";
import { cn } from "@/src/utils/tailwind";
diff --git a/web/src/features/traces/components/TraceLayoutDesktop.tsx b/web/src/features/traces/components/TraceLayoutDesktop.tsx
index 1778b7bcfe..fa6d264bab 100644
--- a/web/src/features/traces/components/TraceLayoutDesktop.tsx
+++ b/web/src/features/traces/components/TraceLayoutDesktop.tsx
@@ -22,11 +22,11 @@ import {
import { PanelRightOpen } from "@langfuse/icons";
import { Button } from "@/src/components/ui/button";
import { cn } from "@/src/utils/tailwind";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
-import { useSelection } from "@/src/features/traces/contexts/SelectionContext";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
+import { useSelection } from "@/src/features/traces/contexts/SelectionProvider";
import { TraceReviewLayout } from "./TraceReviewLayout";
import { resolveEffectiveWidthFraction } from "@/src/components/table/peek/store/peekPanelStore";
-import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateContext";
+import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateProvider";
const RESIZABLE_PANEL_HANDLE_ID = "trace-layout-handle";
const RESIZABLE_PANEL_NAVIGATION_ID = "trace-layout-panel-navigation";
diff --git a/web/src/features/traces/components/TraceLayoutMobile.tsx b/web/src/features/traces/components/TraceLayoutMobile.tsx
index f548ce6109..390570d71f 100644
--- a/web/src/features/traces/components/TraceLayoutMobile.tsx
+++ b/web/src/features/traces/components/TraceLayoutMobile.tsx
@@ -23,7 +23,7 @@
import { type ReactNode } from "react";
import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
-import { useSelection } from "../contexts/SelectionContext";
+import { useSelection } from "../contexts/SelectionProvider";
import { TraceTruncationNotice } from "./TraceTruncationNotice";
export type MobileTraceTab = "tree" | "timeline" | "graph" | "info";
diff --git a/web/src/features/traces/components/TraceLogView/TraceLogView.tsx b/web/src/features/traces/components/TraceLogView/TraceLogView.tsx
index e5bcb51b76..1f35df5c54 100644
--- a/web/src/features/traces/components/TraceLogView/TraceLogView.tsx
+++ b/web/src/features/traces/components/TraceLogView/TraceLogView.tsx
@@ -35,10 +35,10 @@ import { useState, useMemo, useCallback } from "react";
import { TRACE_VIEW_CONFIG } from "@/src/features/traces/constants/traceViewConfig";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useTraceAnalyticsDimensions } from "@/src/features/traces/hooks/useTraceAnalyticsDimensions";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
import { type JsonViewPreference } from "@/src/components/ui/jsonViewPreference";
-import { useJsonExpansion } from "@/src/features/traces/contexts/JsonExpansionContext";
+import { useJsonExpansion } from "@/src/features/traces/contexts/JsonExpansionProvider";
import { JSONTableView } from "@/src/features/traces/components/JSONTableView";
import { type FlatLogItem } from "./log-view-types";
import { LogViewToolbar } from "./LogViewToolbar";
diff --git a/web/src/features/traces/components/TraceMessagesView/TraceMessagesView.tsx b/web/src/features/traces/components/TraceMessagesView/TraceMessagesView.tsx
index 91dc7167c1..b8f131a24d 100644
--- a/web/src/features/traces/components/TraceMessagesView/TraceMessagesView.tsx
+++ b/web/src/features/traces/components/TraceMessagesView/TraceMessagesView.tsx
@@ -1,8 +1,8 @@
import { useState, type ComponentProps } from "react";
import { StringParam, useQueryParam } from "use-query-params";
import { ErrorBoundary } from "@sentry/nextjs";
-import { useSelection } from "@/src/features/traces/contexts/SelectionContext";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
+import { useSelection } from "@/src/features/traces/contexts/SelectionProvider";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
import { useTraceMessagesNavigation } from "./hooks/useTraceMessagesNavigation";
import { useTraceMessagesTranscript } from "./hooks/useTraceMessagesTranscript";
// TODO: Before TraceMessagesView leaves internal preview, rename the components
diff --git a/web/src/features/traces/components/TraceMessagesView/hooks/useTraceMessagesNavigation.ts b/web/src/features/traces/components/TraceMessagesView/hooks/useTraceMessagesNavigation.ts
index 529d1b273c..d0c0280059 100644
--- a/web/src/features/traces/components/TraceMessagesView/hooks/useTraceMessagesNavigation.ts
+++ b/web/src/features/traces/components/TraceMessagesView/hooks/useTraceMessagesNavigation.ts
@@ -1,8 +1,8 @@
import { useEffect } from "react";
import { useRouter } from "next/router";
import { api } from "@/src/utils/api";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
export function useTraceMessagesNavigation() {
const { trace, isPlaceholderData } = useTraceData();
diff --git a/web/src/features/traces/components/TracePanelDetail.clienttest.tsx b/web/src/features/traces/components/TracePanelDetail.clienttest.tsx
index 032cb894d7..14bfd77a6d 100644
--- a/web/src/features/traces/components/TracePanelDetail.clienttest.tsx
+++ b/web/src/features/traces/components/TracePanelDetail.clienttest.tsx
@@ -12,10 +12,10 @@ const { mockUseSelection, mockUseTraceData, mockByIdQuery } = vi.hoisted(
}),
);
-vi.mock("@/src/features/traces/contexts/SelectionContext", () => ({
+vi.mock("@/src/features/traces/contexts/SelectionProvider", () => ({
useSelection: () => mockUseSelection(),
}));
-vi.mock("@/src/features/traces/contexts/TraceDataContext", () => ({
+vi.mock("@/src/features/traces/contexts/TraceDataProvider", () => ({
useTraceData: () => mockUseTraceData(),
}));
vi.mock("@/src/utils/api", () => ({
diff --git a/web/src/features/traces/components/TracePanelDetail.tsx b/web/src/features/traces/components/TracePanelDetail.tsx
index 8ab235d4b6..3db816a034 100644
--- a/web/src/features/traces/components/TracePanelDetail.tsx
+++ b/web/src/features/traces/components/TracePanelDetail.tsx
@@ -17,8 +17,8 @@
* - Does NOT re-render when search changes (isolated)
*/
-import { useSelection } from "@/src/features/traces/contexts/SelectionContext";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
+import { useSelection } from "@/src/features/traces/contexts/SelectionProvider";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
import { useSelectedObservation } from "@/src/features/traces/hooks/useSelectedObservation";
import { SkeletonGroup } from "@/src/components/ui/skeleton";
import { TraceDetailView } from "./TraceDetailView/TraceDetailView";
diff --git a/web/src/features/traces/components/TracePanelNavigation.tsx b/web/src/features/traces/components/TracePanelNavigation.tsx
index ead5d3143f..b0627e527a 100644
--- a/web/src/features/traces/components/TracePanelNavigation.tsx
+++ b/web/src/features/traces/components/TracePanelNavigation.tsx
@@ -18,8 +18,8 @@
*/
import { StringParam, useQueryParam } from "use-query-params";
-import { useSearch } from "@/src/features/traces/contexts/SearchContext";
-import { useTraceGraphData } from "@/src/features/traces/contexts/TraceGraphDataContext";
+import { useSearch } from "@/src/features/traces/contexts/SearchProvider";
+import { useTraceGraphData } from "@/src/features/traces/contexts/TraceGraphDataProvider";
import { TraceTree } from "./TraceTree";
import { TraceSearchList } from "./TraceSearchList";
import { TraceTimelineCompact } from "./TraceTimelineDense/TraceTimelineCompact";
diff --git a/web/src/features/traces/components/TracePanelNavigationHeader/TracePanelNavigationHeader.tsx b/web/src/features/traces/components/TracePanelNavigationHeader/TracePanelNavigationHeader.tsx
index 48eb1205ed..1d36609a0c 100644
--- a/web/src/features/traces/components/TracePanelNavigationHeader/TracePanelNavigationHeader.tsx
+++ b/web/src/features/traces/components/TracePanelNavigationHeader/TracePanelNavigationHeader.tsx
@@ -11,10 +11,10 @@
* input so focus and the current query survive panel resizing.
*/
-import { useSearch } from "@/src/features/traces/contexts/SearchContext";
-import { useSelection } from "@/src/features/traces/contexts/SelectionContext";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
-import { useTraceGraphData } from "@/src/features/traces/contexts/TraceGraphDataContext";
+import { useSearch } from "@/src/features/traces/contexts/SearchProvider";
+import { useSelection } from "@/src/features/traces/contexts/SelectionProvider";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
+import { useTraceGraphData } from "@/src/features/traces/contexts/TraceGraphDataProvider";
import { type GraphUnavailableReason } from "@/src/features/traces/fns/graphAvailability";
import {
Tooltip,
diff --git a/web/src/features/traces/components/TracePanelNavigationLayoutDesktop/components/TracePanelNavigationHiddenNotice.tsx b/web/src/features/traces/components/TracePanelNavigationLayoutDesktop/components/TracePanelNavigationHiddenNotice.tsx
index 2f8f3c1366..5560ccd182 100644
--- a/web/src/features/traces/components/TracePanelNavigationLayoutDesktop/components/TracePanelNavigationHiddenNotice.tsx
+++ b/web/src/features/traces/components/TracePanelNavigationLayoutDesktop/components/TracePanelNavigationHiddenNotice.tsx
@@ -12,8 +12,8 @@
*/
import { ObservationLevel } from "@langfuse/shared";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
export function TracePanelNavigationHiddenNotice() {
const { hiddenObservationsCount } = useTraceData();
diff --git a/web/src/features/traces/components/TraceReviewPanel.clienttest.tsx b/web/src/features/traces/components/TraceReviewPanel.clienttest.tsx
index f639811417..563e71d3c5 100644
--- a/web/src/features/traces/components/TraceReviewPanel.clienttest.tsx
+++ b/web/src/features/traces/components/TraceReviewPanel.clienttest.tsx
@@ -17,13 +17,13 @@ vi.mock("next/router", () => ({
replace: state.replace,
}),
}));
-vi.mock("../contexts/TraceReviewPanelContext", () => ({
+vi.mock("../contexts/TraceReviewPanelProvider", () => ({
useTraceReviewPanel: () => store,
}));
-vi.mock("../contexts/SelectionContext", () => ({
+vi.mock("../contexts/SelectionProvider", () => ({
useSelection: () => ({ selectedNodeId: state.selectedNodeId }),
}));
-vi.mock("../contexts/TraceDataContext", () => ({
+vi.mock("../contexts/TraceDataProvider", () => ({
useTraceData: () => ({
trace: { id: "trace", projectId: "project", environment: "default" },
observations: [
diff --git a/web/src/features/traces/components/TraceReviewPanel.tsx b/web/src/features/traces/components/TraceReviewPanel.tsx
index 866f49f401..8f709e5069 100644
--- a/web/src/features/traces/components/TraceReviewPanel.tsx
+++ b/web/src/features/traces/components/TraceReviewPanel.tsx
@@ -3,8 +3,8 @@ import { type AnnotationPanelData } from "@/src/features/scores/types";
import { type CommentTarget } from "@/src/features/comments/state/commentOverlayStore";
import { getCommentDrawerInitialStateFromUrl } from "@/src/features/comments/CommentDrawerController";
import { useHasProjectAccess } from "@/src/features/rbac";
-import { useTraceData } from "../contexts/TraceDataContext";
-import { useSelection } from "../contexts/SelectionContext";
+import { useTraceData } from "../contexts/TraceDataProvider";
+import { useSelection } from "../contexts/SelectionProvider";
import { useReadPath } from "@/src/features/events";
import { prepareTraceAnnotation } from "@/src/features/scores/lib/prepareTraceAnnotation";
import { useStore } from "zustand";
@@ -15,7 +15,7 @@ import { Button } from "@/src/components/ui/button";
import { CommentList } from "@/src/features/comments/CommentList";
import { AnnotationPanelContent } from "@/src/features/scores/components/AnnotationPanelContent";
import { hasBlockingOverlay } from "@/src/features/scores/lib/keyboardShortcuts";
-import { useTraceReviewPanel } from "../contexts/TraceReviewPanelContext";
+import { useTraceReviewPanel } from "../contexts/TraceReviewPanelProvider";
import { type TraceReviewPanelStore } from "../state/traceReviewPanelStore";
import { traceNodeId } from "../fns/treeBuilding";
diff --git a/web/src/features/traces/components/TraceSearchList.tsx b/web/src/features/traces/components/TraceSearchList.tsx
index 5999518567..5b5cd9dc7a 100644
--- a/web/src/features/traces/components/TraceSearchList.tsx
+++ b/web/src/features/traces/components/TraceSearchList.tsx
@@ -7,9 +7,9 @@
*/
import { useMemo } from "react";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
-import { useSearch } from "@/src/features/traces/contexts/SearchContext";
-import { useSelection } from "@/src/features/traces/contexts/SelectionContext";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
+import { useSearch } from "@/src/features/traces/contexts/SearchProvider";
+import { useSelection } from "@/src/features/traces/contexts/SelectionProvider";
import { useHandlePrefetchObservation } from "@/src/features/traces/hooks/useHandlePrefetchObservation";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useTraceAnalyticsDimensions } from "@/src/features/traces/hooks/useTraceAnalyticsDimensions";
diff --git a/web/src/features/traces/components/TraceSearchListItem.tsx b/web/src/features/traces/components/TraceSearchListItem.tsx
index 6756faf4a9..8a8f3ecea4 100644
--- a/web/src/features/traces/components/TraceSearchListItem.tsx
+++ b/web/src/features/traces/components/TraceSearchListItem.tsx
@@ -10,7 +10,7 @@ import type { TraceSearchListItem as TraceSearchListItemData } from "@/src/featu
import { ItemTypeIcon } from "@/src/components/ItemBadge";
import { SpanContent } from "./SpanContent";
import { cn } from "@/src/utils/tailwind";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
import { formatIntervalSeconds } from "@/src/utils/dates";
interface TraceSearchListItemProps {
diff --git a/web/src/features/traces/components/TraceSettingsDropdown.tsx b/web/src/features/traces/components/TraceSettingsDropdown.tsx
index e8e3c43fdf..5f84005546 100644
--- a/web/src/features/traces/components/TraceSettingsDropdown.tsx
+++ b/web/src/features/traces/components/TraceSettingsDropdown.tsx
@@ -28,7 +28,7 @@ import {
} from "@/src/components/ui/dropdown-menu";
import { Switch } from "@/src/components/design-system/Switch/Switch";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
import { useTraceAnalyticsDimensions } from "@/src/features/traces/hooks/useTraceAnalyticsDimensions";
export function TraceSettingsDropdown() {
diff --git a/web/src/features/traces/components/TraceTimelineDense/TraceTimelineCompact.tsx b/web/src/features/traces/components/TraceTimelineDense/TraceTimelineCompact.tsx
index 747ee66d44..682b18e911 100644
--- a/web/src/features/traces/components/TraceTimelineDense/TraceTimelineCompact.tsx
+++ b/web/src/features/traces/components/TraceTimelineDense/TraceTimelineCompact.tsx
@@ -11,11 +11,11 @@
*/
import { useCallback, useState } from "react";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
import { type RowMetrics } from "./TimelineRowMetrics";
import { usdFormatter } from "@/src/utils/numbers";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
-import { useSelection } from "@/src/features/traces/contexts/SelectionContext";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
+import { useSelection } from "@/src/features/traces/contexts/SelectionProvider";
import { useTraceSearchMatches } from "@/src/features/traces/hooks/useTraceSearchMatches";
import { useHandlePrefetchObservation } from "@/src/features/traces/hooks/useHandlePrefetchObservation";
import { useSelectTraceNode } from "@/src/features/traces/hooks/useSelectTraceNode";
diff --git a/web/src/features/traces/components/TraceTree.tsx b/web/src/features/traces/components/TraceTree.tsx
index 800a043045..54408d3099 100644
--- a/web/src/features/traces/components/TraceTree.tsx
+++ b/web/src/features/traces/components/TraceTree.tsx
@@ -6,8 +6,8 @@ import {
type TreeNodeMetadata,
} from "./VirtualizedTreeNodeWrapper";
import { SpanContent } from "./SpanContent";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
-import { useSelection } from "@/src/features/traces/contexts/SelectionContext";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
+import { useSelection } from "@/src/features/traces/contexts/SelectionProvider";
import { useHandlePrefetchObservation } from "@/src/features/traces/hooks/useHandlePrefetchObservation";
import { useSelectTraceNode } from "@/src/features/traces/hooks/useSelectTraceNode";
import { type TreeNode } from "../types/treeNode";
diff --git a/web/src/features/traces/components/TraceTruncationNotice.clienttest.tsx b/web/src/features/traces/components/TraceTruncationNotice.clienttest.tsx
index 2097b0f4d6..43a023cc21 100644
--- a/web/src/features/traces/components/TraceTruncationNotice.clienttest.tsx
+++ b/web/src/features/traces/components/TraceTruncationNotice.clienttest.tsx
@@ -5,7 +5,7 @@ import { TraceTruncationNotice } from "@/src/features/traces/components/TraceTru
const { mockUseTraceData } = vi.hoisted(() => ({ mockUseTraceData: vi.fn() }));
-vi.mock("@/src/features/traces/contexts/TraceDataContext", () => ({
+vi.mock("@/src/features/traces/contexts/TraceDataProvider", () => ({
useTraceData: () => mockUseTraceData(),
}));
diff --git a/web/src/features/traces/components/TraceTruncationNotice.tsx b/web/src/features/traces/components/TraceTruncationNotice.tsx
index 30b6bc521a..41996b13f7 100644
--- a/web/src/features/traces/components/TraceTruncationNotice.tsx
+++ b/web/src/features/traces/components/TraceTruncationNotice.tsx
@@ -13,7 +13,7 @@
import { useState } from "react";
import { TriangleAlert, X } from "@langfuse/icons";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
export function TraceTruncationNotice() {
const {
diff --git a/web/src/features/traces/contexts/JsonExpansionContext.tsx b/web/src/features/traces/contexts/JsonExpansionProvider.tsx
similarity index 98%
rename from web/src/features/traces/contexts/JsonExpansionContext.tsx
rename to web/src/features/traces/contexts/JsonExpansionProvider.tsx
index 3c2d2b85f3..d39abcbe4a 100644
--- a/web/src/features/traces/contexts/JsonExpansionContext.tsx
+++ b/web/src/features/traces/contexts/JsonExpansionProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
/**
* JsonExpansionContext - Persists JSON expand/collapse state per view type
*
diff --git a/web/src/features/traces/contexts/SearchContext.tsx b/web/src/features/traces/contexts/SearchProvider.tsx
similarity index 97%
rename from web/src/features/traces/contexts/SearchContext.tsx
rename to web/src/features/traces/contexts/SearchProvider.tsx
index 55def95e0a..aea4883d1a 100644
--- a/web/src/features/traces/contexts/SearchContext.tsx
+++ b/web/src/features/traces/contexts/SearchProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
/**
* SearchContext - Isolated search state management
*
diff --git a/web/src/features/traces/contexts/SelectionContext.tsx b/web/src/features/traces/contexts/SelectionProvider.tsx
similarity index 98%
rename from web/src/features/traces/contexts/SelectionContext.tsx
rename to web/src/features/traces/contexts/SelectionProvider.tsx
index ff9e7fb6e3..6e74794861 100644
--- a/web/src/features/traces/contexts/SelectionContext.tsx
+++ b/web/src/features/traces/contexts/SelectionProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
/**
* SelectionContext - Manages UI navigation and interaction state.
*
@@ -32,7 +31,7 @@ import {
} from "react";
import { StringParam, useQueryParam } from "use-query-params";
import { useDebounce } from "@/src/hooks/useDebounce";
-import { useViewPreferences } from "./ViewPreferencesContext";
+import { useViewPreferences } from "./ViewPreferencesProvider";
import { type MobileTraceTab } from "../components/TraceLayoutMobile";
import {
isPrettyLikeJsonView,
diff --git a/web/src/features/traces/contexts/TraceDataContext.tsx b/web/src/features/traces/contexts/TraceDataProvider.tsx
similarity index 98%
rename from web/src/features/traces/contexts/TraceDataContext.tsx
rename to web/src/features/traces/contexts/TraceDataProvider.tsx
index ca4a3cf01c..0e5377bc01 100644
--- a/web/src/features/traces/contexts/TraceDataContext.tsx
+++ b/web/src/features/traces/contexts/TraceDataProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
/**
* TraceDataContext - Provides read-only trace data and derived structures.
*
@@ -29,7 +28,7 @@ import {
removeHiddenNodes,
} from "../fns/treeBuilding";
import { type TraceMetricEmphasis } from "@/src/features/traces/fns/metricEmphasis";
-import { useViewPreferences } from "./ViewPreferencesContext";
+import { useViewPreferences } from "./ViewPreferencesProvider";
import { useMergedScores } from "@/src/features/scores";
import { traceLevelScoreOwnerIds } from "@/src/features/traces/fns/nodeScores";
diff --git a/web/src/features/traces/contexts/TraceGraphDataContext.tsx b/web/src/features/traces/contexts/TraceGraphDataProvider.tsx
similarity index 98%
rename from web/src/features/traces/contexts/TraceGraphDataContext.tsx
rename to web/src/features/traces/contexts/TraceGraphDataProvider.tsx
index 0ed03b05bc..9963cb30b3 100644
--- a/web/src/features/traces/contexts/TraceGraphDataContext.tsx
+++ b/web/src/features/traces/contexts/TraceGraphDataProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
/**
* TraceGraphDataContext - Provides agent graph data for visualization.
*
diff --git a/web/src/features/traces/contexts/TraceReviewPanelContext.tsx b/web/src/features/traces/contexts/TraceReviewPanelProvider.tsx
similarity index 96%
rename from web/src/features/traces/contexts/TraceReviewPanelContext.tsx
rename to web/src/features/traces/contexts/TraceReviewPanelProvider.tsx
index c19fbec691..d7ae9b3c25 100644
--- a/web/src/features/traces/contexts/TraceReviewPanelContext.tsx
+++ b/web/src/features/traces/contexts/TraceReviewPanelProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { createContext, useContext, useState, type ReactNode } from "react";
import { type CommentTarget } from "@/src/features/comments/state/commentOverlayStore";
import {
diff --git a/web/src/features/traces/contexts/ViewPreferencesContext.tsx b/web/src/features/traces/contexts/ViewPreferencesProvider.tsx
similarity index 99%
rename from web/src/features/traces/contexts/ViewPreferencesContext.tsx
rename to web/src/features/traces/contexts/ViewPreferencesProvider.tsx
index 1844614ccf..315a31d41c 100644
--- a/web/src/features/traces/contexts/ViewPreferencesContext.tsx
+++ b/web/src/features/traces/contexts/ViewPreferencesProvider.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
/**
* ViewPreferencesContext - Manages user display preferences persisted to localStorage.
*
diff --git a/web/src/features/traces/hooks/useHandlePrefetchObservation.ts b/web/src/features/traces/hooks/useHandlePrefetchObservation.ts
index ff69a46ab4..1c081ea8ee 100644
--- a/web/src/features/traces/hooks/useHandlePrefetchObservation.ts
+++ b/web/src/features/traces/hooks/useHandlePrefetchObservation.ts
@@ -6,7 +6,7 @@
*/
import { useCallback } from "react";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
import { usePrefetchObservation } from "@/src/features/traces/hooks/usePrefetchObservation";
import { type TreeNode } from "../types/treeNode";
diff --git a/web/src/features/traces/hooks/useSelectTraceNode.ts b/web/src/features/traces/hooks/useSelectTraceNode.ts
index 9cde243c6f..22d4719ba4 100644
--- a/web/src/features/traces/hooks/useSelectTraceNode.ts
+++ b/web/src/features/traces/hooks/useSelectTraceNode.ts
@@ -1,5 +1,5 @@
import { useCallback } from "react";
-import { useSelection } from "@/src/features/traces/contexts/SelectionContext";
+import { useSelection } from "@/src/features/traces/contexts/SelectionProvider";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useTraceAnalyticsDimensions } from "@/src/features/traces/hooks/useTraceAnalyticsDimensions";
diff --git a/web/src/features/traces/hooks/useTraceAnalyticsDimensions.ts b/web/src/features/traces/hooks/useTraceAnalyticsDimensions.ts
index b2e014555e..d44d29737e 100644
--- a/web/src/features/traces/hooks/useTraceAnalyticsDimensions.ts
+++ b/web/src/features/traces/hooks/useTraceAnalyticsDimensions.ts
@@ -1,5 +1,5 @@
import { useMemo } from "react";
-import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesContext";
+import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferencesProvider";
import { useReadPath } from "@/src/features/events";
/**
diff --git a/web/src/features/traces/hooks/useTraceSearchMatches.ts b/web/src/features/traces/hooks/useTraceSearchMatches.ts
index 1f5477dbdf..8149ec0f75 100644
--- a/web/src/features/traces/hooks/useTraceSearchMatches.ts
+++ b/web/src/features/traces/hooks/useTraceSearchMatches.ts
@@ -13,8 +13,8 @@
*/
import { useMemo } from "react";
-import { useSearch } from "@/src/features/traces/contexts/SearchContext";
-import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
+import { useSearch } from "@/src/features/traces/contexts/SearchProvider";
+import { useTraceData } from "@/src/features/traces/contexts/TraceDataProvider";
import { matchesSearchQuery } from "@/src/features/traces/fns/matchesSearchQuery";
export type TraceSearchMatches = {
diff --git a/web/src/features/tracing-tables/observations/ObservationsPage.tsx b/web/src/features/tracing-tables/observations/ObservationsPage.tsx
index 4fd0d7c39a..6c319fd3ff 100644
--- a/web/src/features/tracing-tables/observations/ObservationsPage.tsx
+++ b/web/src/features/tracing-tables/observations/ObservationsPage.tsx
@@ -1,7 +1,7 @@
/* eslint-disable no-nested-ternary */
import { useRouter } from "next/router";
import { ObservationsTable } from "@/src/features/tracing-tables";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { api } from "@/src/utils/api";
import { TracesOnboarding } from "@/src/components/onboarding/TracesOnboarding";
import { getTracingTabs, TRACING_TABS } from "@/src/features/navigation";
diff --git a/web/src/features/tracing-tables/observations/ObservationsTable.tsx b/web/src/features/tracing-tables/observations/ObservationsTable.tsx
index 27ae8acaaf..baf8535561 100644
--- a/web/src/features/tracing-tables/observations/ObservationsTable.tsx
+++ b/web/src/features/tracing-tables/observations/ObservationsTable.tsx
@@ -57,7 +57,7 @@ import {
} from "@/src/features/column-visibility";
import { Skeleton } from "@/src/components/ui/skeleton";
import { type LangfuseColumnDef } from "@/src/components/table/types";
-import { ObservationLevelTag } from "@/src/components/level-colors";
+import { ObservationLevelTag } from "@/src/components/ObservationLevelTag";
import { numberFormatter, usdFormatter } from "@/src/utils/numbers";
import {
formatObservationCost,
@@ -73,7 +73,7 @@ import { EmptyValue } from "@/src/components/design-system/table/components/Empt
import { ConnectedIOTableCell } from "@/src/components/table/ConnectedIOTableCell";
import { useTableDateRange } from "@/src/hooks/useTableDateRange";
import { tablePlaceholderOptions } from "@/src/components/table/utils/tablePlaceholder";
-import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateContext";
+import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateProvider";
import {
toAbsoluteTimeRange,
type TableDateRange,
diff --git a/web/src/features/users/UserDetailPage.tsx b/web/src/features/users/UserDetailPage.tsx
index 8f8aa82ef3..58280342be 100644
--- a/web/src/features/users/UserDetailPage.tsx
+++ b/web/src/features/users/UserDetailPage.tsx
@@ -14,7 +14,7 @@ import { cn } from "@/src/utils/tailwind";
import { Badge } from "@/src/components/ui/badge";
import { ActionButton } from "@/src/components/ActionButton";
import { LayoutDashboard } from "@langfuse/icons";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { useReadPath } from "@/src/features/events";
import { ObservationsEventsTable } from "@/src/features/events/components";
diff --git a/web/src/features/users/UsersPage.tsx b/web/src/features/users/UsersPage.tsx
index d4f50b73f4..509abd29b0 100644
--- a/web/src/features/users/UsersPage.tsx
+++ b/web/src/features/users/UsersPage.tsx
@@ -1,5 +1,5 @@
import { useRouter } from "next/router";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { UsersOnboarding } from "@/src/components/onboarding/UsersOnboarding";
import { useReadPath } from "@/src/features/events";
import { api } from "@/src/utils/api";
diff --git a/web/src/features/widgets/EditWidgetPage.tsx b/web/src/features/widgets/EditWidgetPage.tsx
index 3c7ef7f199..67488478f1 100644
--- a/web/src/features/widgets/EditWidgetPage.tsx
+++ b/web/src/features/widgets/EditWidgetPage.tsx
@@ -1,5 +1,5 @@
import { useRouter } from "next/router";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { api } from "@/src/utils/api";
import { ConnectedWidgetForm } from "@/src/features/widgets/components/ConnectedWidgetForm";
import { type WidgetSavePayload } from "@/src/features/widgets/components/widgetFormSchema";
diff --git a/web/src/features/widgets/NewWidgetPage.tsx b/web/src/features/widgets/NewWidgetPage.tsx
index 6d8516d14d..d75bbb2787 100644
--- a/web/src/features/widgets/NewWidgetPage.tsx
+++ b/web/src/features/widgets/NewWidgetPage.tsx
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-use-before-define */
import { useRouter } from "next/router";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { api } from "@/src/utils/api";
import { ConnectedWidgetForm } from "@/src/features/widgets";
import { type WidgetSavePayload } from "@/src/features/widgets/components/widgetFormSchema";
diff --git a/web/src/features/widgets/WidgetsPage.tsx b/web/src/features/widgets/WidgetsPage.tsx
index 15a6a32bcb..6766aa52e9 100644
--- a/web/src/features/widgets/WidgetsPage.tsx
+++ b/web/src/features/widgets/WidgetsPage.tsx
@@ -1,6 +1,6 @@
import { useRouter } from "next/router";
import { useHasProjectAccess } from "@/src/features/rbac";
-import Page from "@/src/components/layouts/page";
+import Page from "@/src/components/layouts/Page";
import { ActionButton } from "@/src/components/ActionButton";
import { PlusIcon } from "@langfuse/icons";
import { ConnectedDashboardWidgetTable } from "@/src/features/widgets";
diff --git a/web/src/features/widgets/chart-library/AreaChartTimeSeries.tsx b/web/src/features/widgets/chart-library/AreaChartTimeSeries.tsx
index 354fe83d47..e8548f25f8 100644
--- a/web/src/features/widgets/chart-library/AreaChartTimeSeries.tsx
+++ b/web/src/features/widgets/chart-library/AreaChartTimeSeries.tsx
@@ -19,7 +19,7 @@ import {
seriesColor,
seriesFillColor,
SeriesOverflowNote,
-} from "@/src/features/widgets/chart-library/TimeSeriesLegend";
+} from "@/src/features/widgets/chart-library/SeriesOverflowNote";
import { getPlainTextFromReactNode } from "@/src/utils/react-node-plain-text";
export function AreaChartTimeSeries({
diff --git a/web/src/features/widgets/chart-library/LineChartTimeSeries.tsx b/web/src/features/widgets/chart-library/LineChartTimeSeries.tsx
index ae62b3b7ce..c308d51aea 100644
--- a/web/src/features/widgets/chart-library/LineChartTimeSeries.tsx
+++ b/web/src/features/widgets/chart-library/LineChartTimeSeries.tsx
@@ -24,7 +24,7 @@ import { prepareVisibleSeries } from "@/src/features/widgets/chart-library/prepa
import {
seriesColor,
SeriesOverflowNote,
-} from "@/src/features/widgets/chart-library/TimeSeriesLegend";
+} from "@/src/features/widgets/chart-library/SeriesOverflowNote";
import { getPlainTextFromReactNode } from "@/src/utils/react-node-plain-text";
const defaultConfig: NonNullable<ChartProps["config"]> = {
diff --git a/web/src/features/widgets/chart-library/TimeSeriesLegend.tsx b/web/src/features/widgets/chart-library/SeriesOverflowNote.tsx
similarity index 94%
rename from web/src/features/widgets/chart-library/TimeSeriesLegend.tsx
rename to web/src/features/widgets/chart-library/SeriesOverflowNote.tsx
index ae528d5d6f..0b9cbcf6df 100644
--- a/web/src/features/widgets/chart-library/TimeSeriesLegend.tsx
+++ b/web/src/features/widgets/chart-library/SeriesOverflowNote.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
/** The 8-slot chart line palette, cycled by series index. */
export const seriesColor = (index: number): string =>
`hsl(var(--chart-${(index % 8) + 1}))`;
diff --git a/web/src/features/widgets/chart-library/VerticalBarChartTimeSeries.tsx b/web/src/features/widgets/chart-library/VerticalBarChartTimeSeries.tsx
index 992ca9be14..d0f0e30de3 100644
--- a/web/src/features/widgets/chart-library/VerticalBarChartTimeSeries.tsx
+++ b/web/src/features/widgets/chart-library/VerticalBarChartTimeSeries.tsx
@@ -17,7 +17,7 @@ import { prepareVisibleSeries } from "@/src/features/widgets/chart-library/prepa
import {
seriesFillColor,
SeriesOverflowNote,
-} from "@/src/features/widgets/chart-library/TimeSeriesLegend";
+} from "@/src/features/widgets/chart-library/SeriesOverflowNote";
import { getPlainTextFromReactNode } from "@/src/utils/react-node-plain-text";
export function VerticalBarChartTimeSeries({
diff --git a/web/src/features/widgets/chart-library/prepareCategoryBars.ts b/web/src/features/widgets/chart-library/prepareCategoryBars.ts
index 1e24dc57d7..c5a97c7438 100644
--- a/web/src/features/widgets/chart-library/prepareCategoryBars.ts
+++ b/web/src/features/widgets/chart-library/prepareCategoryBars.ts
@@ -1,5 +1,5 @@
import { type DataPoint } from "@/src/features/widgets/chart-library/chart-props";
-import { seriesFillColor } from "@/src/features/widgets/chart-library/TimeSeriesLegend";
+import { seriesFillColor } from "@/src/features/widgets/chart-library/SeriesOverflowNote";
/**
* How many bars a colour can still IDENTIFY. The chart palette holds 8 slots and
diff --git a/web/src/features/widgets/components/DashboardWidget.tsx b/web/src/features/widgets/components/DashboardWidget.tsx
index 1c7983ab3b..b10dfe71cc 100644
--- a/web/src/features/widgets/components/DashboardWidget.tsx
+++ b/web/src/features/widgets/components/DashboardWidget.tsx
@@ -59,7 +59,7 @@ import {
getChartLoadingStateProps,
} from "@/src/features/widgets/chart-library/chartLoadingStateUtils";
import type { ResolvedReadPath } from "@/src/features/events";
-import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
import { CopyWidgetDialog } from "@/src/features/widgets/components/CopyWidgetDialog";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { Badge } from "@/src/components/ui/badge";
diff --git a/web/src/features/widgets/components/InlineWidget.tsx b/web/src/features/widgets/components/InlineWidget.tsx
index 9216d6810e..1752eec1de 100644
--- a/web/src/features/widgets/components/InlineWidget.tsx
+++ b/web/src/features/widgets/components/InlineWidget.tsx
@@ -8,7 +8,7 @@ import {
type ViewVersion,
getResultUnit,
} from "@langfuse/shared/query";
-import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/useDashboardQueryScheduler";
+import { useScheduledDashboardExecuteQuery } from "@/src/features/dashboard/hooks/DashboardQuerySchedulerProvider";
import { Chart } from "@/src/features/widgets/chart-library/Chart";
import { type LegendPosition } from "@/src/features/widgets/chart-library/chart-props";
import { ChartLoadingState } from "@/src/features/widgets/chart-library/ChartLoadingState";
diff --git a/web/src/features/widgets/components/WidgetTable/ConnectedWidgetTable.tsx b/web/src/features/widgets/components/WidgetTable/ConnectedDashboardWidgetTable.tsx
similarity index 98%
rename from web/src/features/widgets/components/WidgetTable/ConnectedWidgetTable.tsx
rename to web/src/features/widgets/components/WidgetTable/ConnectedDashboardWidgetTable.tsx
index c7ef671b06..f8ade7167e 100644
--- a/web/src/features/widgets/components/WidgetTable/ConnectedWidgetTable.tsx
+++ b/web/src/features/widgets/components/WidgetTable/ConnectedDashboardWidgetTable.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @repo/component-file-structure, @typescript-eslint/no-use-before-define */
+/* eslint-disable @typescript-eslint/no-use-before-define */
import { showErrorToast, showSuccessToast } from "@/src/features/notifications";
import { useCallback, useEffect, useMemo, useState } from "react";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
@@ -23,7 +23,10 @@ import { PaginationBar } from "@/src/components/design-system/PaginationBar/Pagi
import { type AsyncTableData } from "@/src/components/design-system/table/Table";
import { assertUnreachable } from "@/src/utils/types";
import { classifyTrpcToastError } from "@/src/utils/trpcErrorClassification";
-import { DashboardWidgetTable, type WidgetTableRow } from "./WidgetTable";
+import {
+ DashboardWidgetTable,
+ type WidgetTableRow,
+} from "./DashboardWidgetTable";
export function ConnectedDashboardWidgetTable() {
const projectId = useProjectIdFromURL();
diff --git a/web/src/features/widgets/components/WidgetTable/WidgetTable.stories.tsx b/web/src/features/widgets/components/WidgetTable/DashboardWidgetTable.stories.tsx
similarity index 98%
rename from web/src/features/widgets/components/WidgetTable/WidgetTable.stories.tsx
rename to web/src/features/widgets/components/WidgetTable/DashboardWidgetTable.stories.tsx
index 232d1075d4..f40eab74d1 100644
--- a/web/src/features/widgets/components/WidgetTable/WidgetTable.stories.tsx
+++ b/web/src/features/widgets/components/WidgetTable/DashboardWidgetTable.stories.tsx
@@ -1,7 +1,7 @@
import { fn } from "storybook/test";
import preview from "../../../../../.storybook/preview";
-import { DashboardWidgetTable } from "./WidgetTable";
+import { DashboardWidgetTable } from "./DashboardWidgetTable";
const onCopy = fn();
diff --git a/web/src/features/widgets/components/WidgetTable/WidgetTable.tsx b/web/src/features/widgets/components/WidgetTable/DashboardWidgetTable.tsx
similarity index 99%
rename from web/src/features/widgets/components/WidgetTable/WidgetTable.tsx
rename to web/src/features/widgets/components/WidgetTable/DashboardWidgetTable.tsx
index 107b2b1f51..bc9cf9b6ee 100644
--- a/web/src/features/widgets/components/WidgetTable/WidgetTable.tsx
+++ b/web/src/features/widgets/components/WidgetTable/DashboardWidgetTable.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import { useCallback, useMemo } from "react";
import { Copy, CopyPlus, FileJson, Trash } from "@langfuse/icons";
import startCase from "lodash/startCase";
diff --git a/web/src/features/widgets/index.ts b/web/src/features/widgets/index.ts
index ac6bd5f801..ff3fcc2f52 100644
--- a/web/src/features/widgets/index.ts
+++ b/web/src/features/widgets/index.ts
@@ -40,4 +40,4 @@ export type {
} from "@/src/features/widgets/utils/import-export-utils";
export { DashboardWidget } from "@/src/features/widgets/components/DashboardWidget";
export { ConnectedWidgetForm } from "@/src/features/widgets/components/ConnectedWidgetForm";
-export { ConnectedDashboardWidgetTable } from "@/src/features/widgets/components/WidgetTable/ConnectedWidgetTable";
+export { ConnectedDashboardWidgetTable } from "@/src/features/widgets/components/WidgetTable/ConnectedDashboardWidgetTable";
diff --git a/web/src/hooks/usePaginationState.ts b/web/src/hooks/usePaginationState.ts
index ea244b6ec6..7d5698d539 100644
--- a/web/src/hooks/usePaginationState.ts
+++ b/web/src/hooks/usePaginationState.ts
@@ -1,5 +1,5 @@
import { useQueryParams, withDefault, NumberParam } from "use-query-params";
-import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateContext";
+import { usePeekTableState } from "@/src/components/table/peek/contexts/PeekTableStateProvider";
import type { PaginationState, OnChangeFn } from "@tanstack/react-table";
// Overload for pageIndex/pageSize (returns TanStack types)
diff --git a/web/src/pages/_app.tsx b/web/src/pages/_app.tsx
index 6ab9071c2c..3313c684ab 100644
--- a/web/src/pages/_app.tsx
+++ b/web/src/pages/_app.tsx
@@ -18,7 +18,7 @@ import { CommandMenuProvider } from "@/src/features/command-k-menu/CommandMenuPr
import { api } from "@/src/utils/api";
-import { NextAdapterPagesWithReadyGuard } from "@/src/utils/nextAdapterPagesWithReadyGuard";
+import { NextAdapterPagesWithReadyGuard } from "@/src/utils/NextAdapterPagesWithReadyGuard";
import { QueryParamProvider } from "use-query-params";
import "@/src/styles/globals.css";
diff --git a/web/src/pages/index.tsx b/web/src/pages/index.tsx
index 02e5cadff8..10e69c71f5 100644
--- a/web/src/pages/index.tsx
+++ b/web/src/pages/index.tsx
@@ -1,4 +1,4 @@
-import { OrganizationProjectOverview } from "@/src/features/organizations/components/ProjectOverview";
+import { OrganizationProjectOverview } from "@/src/features/organizations/components/OrganizationProjectOverview";
export default function Home() {
return <OrganizationProjectOverview />;
diff --git a/web/src/pages/organization/[organizationId]/index.tsx b/web/src/pages/organization/[organizationId]/index.tsx
index 6474c77916..cf6cb506ad 100644
--- a/web/src/pages/organization/[organizationId]/index.tsx
+++ b/web/src/pages/organization/[organizationId]/index.tsx
@@ -1 +1 @@
-export { OrganizationProjectOverview as default } from "@/src/features/organizations/components/ProjectOverview";
+export { OrganizationProjectOverview as default } from "@/src/features/organizations/components/OrganizationProjectOverview";
diff --git a/web/src/pages/project/[projectId]/playground.tsx b/web/src/pages/project/[projectId]/playground.tsx
index 2711758e12..009699c0b1 100644
--- a/web/src/pages/project/[projectId]/playground.tsx
+++ b/web/src/pages/project/[projectId]/playground.tsx
@@ -1 +1 @@
-export { default as default } from "@/src/features/playground/page";
+export { default as default } from "@/src/features/playground/page/PlaygroundPage";
diff --git a/web/src/utils/nextAdapterPagesWithReadyGuard.clienttest.tsx b/web/src/utils/NextAdapterPagesWithReadyGuard.clienttest.tsx
similarity index 98%
rename from web/src/utils/nextAdapterPagesWithReadyGuard.clienttest.tsx
rename to web/src/utils/NextAdapterPagesWithReadyGuard.clienttest.tsx
index 9af75dc7aa..fee3624991 100644
--- a/web/src/utils/nextAdapterPagesWithReadyGuard.clienttest.tsx
+++ b/web/src/utils/NextAdapterPagesWithReadyGuard.clienttest.tsx
@@ -3,7 +3,7 @@ import { cleanup, render } from "@testing-library/react";
import { useRouter } from "next/router";
import type { QueryParamAdapter } from "use-query-params";
-import { NextAdapterPagesWithReadyGuard } from "@/src/utils/nextAdapterPagesWithReadyGuard";
+import { NextAdapterPagesWithReadyGuard } from "@/src/utils/NextAdapterPagesWithReadyGuard";
vi.mock("next/router", () => ({
useRouter: vi.fn(),
diff --git a/web/src/utils/nextAdapterPagesWithReadyGuard.tsx b/web/src/utils/NextAdapterPagesWithReadyGuard.tsx
similarity index 97%
rename from web/src/utils/nextAdapterPagesWithReadyGuard.tsx
rename to web/src/utils/NextAdapterPagesWithReadyGuard.tsx
index e27e6ce1fd..22c678fbbf 100644
--- a/web/src/utils/nextAdapterPagesWithReadyGuard.tsx
+++ b/web/src/utils/NextAdapterPagesWithReadyGuard.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @repo/component-file-structure */
import NextAdapterPages from "next-query-params/pages";
import { useRouter } from "next/router";
import type {