🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
feat(sessions): Enable redesigned session view by default (#18690)
Ben Bachem0d366d55437d
diff --git a/web/src/__tests__/server/organization-feature-flags.servertest.ts b/web/src/__tests__/server/organization-feature-flags.servertest.tsindex 44b0c03272..7f51ce67f0 100644--- a/web/src/__tests__/server/organization-feature-flags.servertest.ts+++ b/web/src/__tests__/server/organization-feature-flags.servertest.ts@@ -14,7 +14,7 @@ describe("organization feature preview defaults", () => {const { actor, caller, org } = await prepare();await prisma.user.update({where: { id: actor.id },- data: { featureFlags: ["modernSession"] },+ data: { featureFlags: ["sessionViewV2"] },});const member = await createUser();await prisma.organizationMembership.create({@@ -23,7 +23,7 @@ describe("organization feature preview defaults", () => {await caller.organizations.setFeatureFlagOrgDefault({orgId: org.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,});@@ -42,8 +42,8 @@ describe("organization feature preview defaults", () => {}),]);- expect(updatedOrg.featureFlagOrgDefaults).toEqual(["modernSession"]);- expect(updatedActor.featureFlags).toEqual(["modernSession"]);+ expect(updatedOrg.featureFlagOrgDefaults).toEqual(["sessionViewV2"]);+ expect(updatedActor.featureFlags).toEqual(["sessionViewV2"]);expect(updatedMember.featureFlags).toEqual([]);const auditEntry = await prisma.auditLog.findFirstOrThrow({where: {@@ -58,7 +58,7 @@ describe("organization feature preview defaults", () => {featureFlagOrgDefaults: [],});expect(JSON.parse(auditEntry.after!)).toEqual({- featureFlagOrgDefaults: ["modernSession"],+ featureFlagOrgDefaults: ["sessionViewV2"],});});@@ -66,12 +66,12 @@ describe("organization feature preview defaults", () => {const { actor, caller, org } = await prepare();await prisma.user.update({where: { id: actor.id },- data: { featureFlags: ["modernSession", "sessionTimeline"] },+ data: { featureFlags: ["sessionViewV2", "sessionViewV2Timeline"] },});await caller.organizations.setFeatureFlagOrgDefault({orgId: org.id,- flag: "sessionTimeline",+ flag: "sessionViewV2Timeline",enabled: true,});@@ -81,7 +81,7 @@ describe("organization feature preview defaults", () => {select: { featureFlagOrgDefaults: true },}),).resolves.toEqual({- featureFlagOrgDefaults: ["sessionTimeline", "modernSession"],+ featureFlagOrgDefaults: ["sessionViewV2Timeline", "sessionViewV2"],});});@@ -89,12 +89,12 @@ describe("organization feature preview defaults", () => {const admin = await prepare("cloud:core", Role.ADMIN);await prisma.user.update({where: { id: admin.actor.id },- data: { featureFlags: ["modernSession"] },+ data: { featureFlags: ["sessionViewV2"] },});await expect(admin.caller.organizations.setFeatureFlagOrgDefault({orgId: admin.org.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,}),).resolves.toMatchObject({ enabled: true });@@ -103,7 +103,7 @@ describe("organization feature preview defaults", () => {await expect(member.caller.organizations.setFeatureFlagOrgDefault({orgId: member.org.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,}),).rejects.toMatchObject({ code: "FORBIDDEN" });@@ -127,7 +127,7 @@ describe("organization feature preview defaults", () => {await expect(caller.organizations.setFeatureFlagOrgDefault({orgId: org.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,}),).rejects.toMatchObject({ code: "PRECONDITION_FAILED" });@@ -143,9 +143,19 @@ describe("organization feature preview defaults", () => {enabled: true,}),).resolves.toMatchObject({- defaults: ["externalMediaStorage"],+ defaults: [+ "externalMediaStorage",+ "sessionViewV2",+ "sessionViewV2Timeline",+ ],enabled: true,});+ await expect(+ prisma.organization.findUniqueOrThrow({+ where: { id: org.id },+ select: { featureFlagOrgDefaults: true },+ }),+ ).resolves.toEqual({ featureFlagOrgDefaults: ["externalMediaStorage"] });});it("rejects internal flags at the input boundary", async () => {@@ -165,7 +175,7 @@ describe("organization feature preview defaults", () => {await Promise.all([prisma.user.update({where: { id: actor.id },- data: { featureFlags: ["modernSession"] },+ data: { featureFlags: ["sessionViewV2"] },}),prisma.organization.update({where: { id: org.id },@@ -176,7 +186,7 @@ describe("organization feature preview defaults", () => {for (const enabled of [true, true]) {await caller.organizations.setFeatureFlagOrgDefault({orgId: org.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled,});}@@ -186,13 +196,13 @@ describe("organization feature preview defaults", () => {select: { featureFlagOrgDefaults: true },}),).resolves.toEqual({- featureFlagOrgDefaults: ["futurePreview", "modernSession"],+ featureFlagOrgDefaults: ["futurePreview", "sessionViewV2"],});for (const enabled of [false, false]) {await caller.organizations.setFeatureFlagOrgDefault({orgId: org.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled,});}@@ -202,7 +212,29 @@ describe("organization feature preview defaults", () => {select: { featureFlagOrgDefaults: true },}),).resolves.toEqual({- featureFlagOrgDefaults: ["futurePreview"],+ featureFlagOrgDefaults: [+ "futurePreview",+ getFeaturePreviewOptOutFlag("sessionViewV2"),+ getFeaturePreviewOptOutFlag("sessionViewV2Timeline"),+ ],+ });+ await expect(+ caller.organizations.getFeatureFlagOrgDefaults({ orgId: org.id }),+ ).resolves.toMatchObject({ defaults: [] });++ await prisma.user.update({+ where: { id: actor.id },+ data: { featureFlags: ["sessionViewV2", "sessionViewV2Timeline"] },+ });+ await caller.organizations.setFeatureFlagOrgDefault({+ orgId: org.id,+ flag: "sessionViewV2Timeline",+ enabled: true,+ });+ await expect(+ caller.organizations.getFeatureFlagOrgDefaults({ orgId: org.id }),+ ).resolves.toMatchObject({+ defaults: ["sessionViewV2", "sessionViewV2Timeline"],});});@@ -211,13 +243,13 @@ describe("organization feature preview defaults", () => {await prisma.organization.update({where: { id: org.id },data: {- featureFlagOrgDefaults: ["modernSession", "futurePreview"],+ featureFlagOrgDefaults: ["sessionViewV2", "futurePreview"],},});const member = await createUser({featureFlags: ["templateFlag",- getFeaturePreviewOptOutFlag("modernSession"),+ getFeaturePreviewOptOutFlag("sessionViewV2"),],});@@ -236,7 +268,7 @@ describe("organization feature preview defaults", () => {]);expect(updated.featureFlags).toEqual(["templateFlag",- getFeaturePreviewOptOutFlag("modernSession"),+ getFeaturePreviewOptOutFlag("sessionViewV2"),]);expect(members.memberships.find((membership) => membership.userId === member.id)@@ -248,8 +280,8 @@ describe("organization feature preview defaults", () => {// here. Asserting that two REGISTERED defaults resolve differently needs// a second preview; add that half back with the next one.externalMediaStorage: false,- modernSession: false,- sessionTimeline: false,+ sessionViewV2: false,+ sessionViewV2Timeline: false,});});@@ -263,7 +295,7 @@ describe("organization feature preview defaults", () => {await expect(caller.organizations.setFeatureFlagOrgDefault({orgId: org.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,}),).rejects.toMatchObject({ code: "FORBIDDEN" });@@ -292,7 +324,7 @@ describe("organization member feature preview overrides", () => {await caller.members.setUserFeaturePreviewEnabled({orgId: org.id,userId: target.id,- flag: "sessionTimeline",+ flag: "sessionViewV2Timeline",enabled: true,});@@ -302,13 +334,13 @@ describe("organization member feature preview overrides", () => {select: { featureFlags: true },}),).resolves.toEqual({- featureFlags: ["sessionTimeline", "modernSession"],+ featureFlags: ["sessionViewV2Timeline", "sessionViewV2"],});});it("persists an administrator's disable as a global user opt-out", async () => {const { caller, org } = await prepare();- const target = await createUser({ featureFlags: ["modernSession"] });+ const target = await createUser({ featureFlags: ["sessionViewV2"] });await prisma.organizationMembership.create({data: { orgId: org.id, userId: target.id, role: Role.MEMBER },});@@ -316,7 +348,7 @@ describe("organization member feature preview overrides", () => {await caller.members.setUserFeaturePreviewEnabled({orgId: org.id,userId: target.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled: false,});@@ -327,8 +359,8 @@ describe("organization member feature preview overrides", () => {}),).resolves.toEqual({featureFlags: [- getFeaturePreviewOptOutFlag("modernSession"),- getFeaturePreviewOptOutFlag("sessionTimeline"),+ getFeaturePreviewOptOutFlag("sessionViewV2"),+ getFeaturePreviewOptOutFlag("sessionViewV2Timeline"),],});});@@ -337,7 +369,7 @@ describe("organization member feature preview overrides", () => {const { caller, org } = await prepare();await prisma.organization.update({where: { id: org.id },- data: { featureFlagOrgDefaults: ["modernSession"] },+ data: { featureFlagOrgDefaults: ["sessionViewV2"] },});const target = await createUser();const membership = await prisma.organizationMembership.create({@@ -347,7 +379,7 @@ describe("organization member feature preview overrides", () => {await caller.members.setUserFeaturePreviewEnabled({orgId: org.id,userId: target.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled: false,});@@ -361,12 +393,12 @@ describe("organization member feature preview overrides", () => {orderBy: { createdAt: "desc" },});expect(JSON.parse(auditEntry.before!)).toEqual({- flag: "modernSession",+ flag: "sessionViewV2",override: "inherit",scope: "global",});expect(JSON.parse(auditEntry.after!)).toEqual({- flag: "modernSession",+ flag: "sessionViewV2",override: "disabled",scope: "global",});@@ -386,7 +418,7 @@ describe("organization member feature preview overrides", () => {await caller.members.setUserFeaturePreviewEnabled({orgId: org.id,userId: target.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,});@@ -400,12 +432,12 @@ describe("organization member feature preview overrides", () => {orderBy: { createdAt: "desc" },});expect(JSON.parse(auditEntry.before!)).toEqual({- flag: "modernSession",+ flag: "sessionViewV2",override: "inherit",scope: "global",});expect(JSON.parse(auditEntry.after!)).toEqual({- flag: "modernSession",+ flag: "sessionViewV2",override: "enabled",scope: "global",});@@ -436,7 +468,7 @@ describe("organization member feature preview overrides", () => {caller.members.setUserFeaturePreviewEnabled({orgId: org.id,userId: target.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,}),).rejects.toMatchObject({ code: "FORBIDDEN" });@@ -448,12 +480,12 @@ describe("organization member feature preview overrides", () => {caller.members.setUserFeaturePreviewEnabled({orgId: org.id,userId: target.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,}),).resolves.toMatchObject({userId: target.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,});});@@ -477,7 +509,7 @@ describe("organization member feature preview overrides", () => {caller.members.setUserFeaturePreviewEnabled({orgId: org.id,userId: target.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,}),).resolves.toMatchObject({ enabled: true });@@ -490,7 +522,7 @@ describe("organization member feature preview overrides", () => {it("does not expose raw or foreign-organization feature flag data", async () => {const { caller, org } = await prepare();const target = await createUser({- featureFlags: ["templateFlag", "modernSession"],+ featureFlags: ["templateFlag", "sessionViewV2"],});await prisma.organizationMembership.create({data: { orgId: org.id, userId: target.id, role: Role.MEMBER },@@ -509,8 +541,8 @@ describe("organization member feature preview overrides", () => {// hidden, which is what this guards.expect(row?.featurePreviews).toEqual({externalMediaStorage: false,- modernSession: true,- sessionTimeline: false,+ sessionViewV2: true,+ sessionViewV2Timeline: false,});expect(row?.user).not.toHaveProperty("featureFlags");expect(row).not.toHaveProperty("organizationIds");@@ -524,7 +556,7 @@ describe("organization member feature preview overrides", () => {caller.members.setUserFeaturePreviewEnabled({orgId: org.id,userId: target.id,- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,}),).rejects.toMatchObject({ code: "FORBIDDEN" });diff --git a/web/src/__tests__/server/unit/events-transcript-access.servertest.ts b/web/src/__tests__/server/unit/events-transcript-access.servertest.tsindex 5aa34a9cca..e0de281131 100644--- a/web/src/__tests__/server/unit/events-transcript-access.servertest.ts+++ b/web/src/__tests__/server/unit/events-transcript-access.servertest.ts@@ -54,21 +54,21 @@ describe("events.transcriptByTraceId preview access", () => {it.each([{name: "user preview",- flags: ["modernSession", "sessionTimeline"],+ flags: ["sessionViewV2", "sessionViewV2Timeline"],defaults: [],allowed: true,},- { name: "disabled preview", flags: [], defaults: [], allowed: false },+ { name: "default preview", flags: [], defaults: [], allowed: true },{name: "organization default",flags: [],- defaults: ["modernSession", "sessionTimeline"],+ defaults: ["sessionViewV2", "sessionViewV2Timeline"],allowed: true,},{name: "user opt-out",- flags: [getFeaturePreviewOptOutFlag("sessionTimeline")],- defaults: ["modernSession", "sessionTimeline"],+ flags: [getFeaturePreviewOptOutFlag("sessionViewV2Timeline")],+ defaults: ["sessionViewV2", "sessionViewV2Timeline"],allowed: false,},])("respects $name", async ({ flags, defaults, allowed }) => {diff --git a/web/src/__tests__/server/userAccount.servertest.ts b/web/src/__tests__/server/userAccount.servertest.tsindex e817b6386c..67a3cf4e6b 100644--- a/web/src/__tests__/server/userAccount.servertest.ts+++ b/web/src/__tests__/server/userAccount.servertest.ts@@ -70,13 +70,13 @@ describe("userAccountRouter.setFeaturePreviewEnabled", () => {});const result = await caller.userAccount.setFeaturePreviewEnabled({- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,});expect(result).toEqual({success: true,- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,});@@ -84,14 +84,14 @@ describe("userAccountRouter.setFeaturePreviewEnabled", () => {where: { id: userId },select: { featureFlags: true },});- expect(user.featureFlags).toEqual(["templateFlag", "modernSession"]);+ expect(user.featureFlags).toEqual(["templateFlag", "sessionViewV2"]);});it("allows users to enable the session timeline preview", async () => {const { caller, userId } = await createCaller();await caller.userAccount.setFeaturePreviewEnabled({- flag: "sessionTimeline",+ flag: "sessionViewV2Timeline",enabled: true,});@@ -101,24 +101,24 @@ describe("userAccountRouter.setFeaturePreviewEnabled", () => {});expect(user.featureFlags).toEqual(["templateFlag",- "sessionTimeline",- "modernSession",+ "sessionViewV2Timeline",+ "sessionViewV2",]);});it("persists a global opt-out when disabling a preview", async () => {const { caller, userId } = await createCaller({- featureFlags: ["templateFlag", "modernSession"],+ featureFlags: ["templateFlag", "sessionViewV2"],});const result = await caller.userAccount.setFeaturePreviewEnabled({- flag: "modernSession",+ flag: "sessionViewV2",enabled: false,});expect(result).toEqual({success: true,- flag: "modernSession",+ flag: "sessionViewV2",enabled: false,});@@ -128,8 +128,8 @@ describe("userAccountRouter.setFeaturePreviewEnabled", () => {});expect(user.featureFlags).toEqual(["templateFlag",- getFeaturePreviewOptOutFlag("modernSession"),- getFeaturePreviewOptOutFlag("sessionTimeline"),+ getFeaturePreviewOptOutFlag("sessionViewV2"),+ getFeaturePreviewOptOutFlag("sessionViewV2Timeline"),]);});@@ -139,7 +139,7 @@ describe("userAccountRouter.setFeaturePreviewEnabled", () => {await expect(caller.userAccount.setFeaturePreviewEnabled({- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,}),).rejects.toMatchObject({ code: "PRECONDITION_FAILED" });@@ -161,7 +161,7 @@ describe("userAccountRouter.setViewMode", () => {it("persists only the external override and preserves other preferences", async () => {const { caller, userId } = await createCaller({admin: true,- featureFlags: ["modernSession"],+ featureFlags: ["sessionViewV2"],});await caller.userAccount.setViewMode({ mode: "EXTERNAL" });await caller.userAccount.setViewMode({ mode: "EXTERNAL" });@@ -169,14 +169,14 @@ describe("userAccountRouter.setViewMode", () => {(await prisma.user.findUniqueOrThrow({ where: { id: userId } })).featureFlags,).toEqual([- "modernSession",+ "sessionViewV2",getFeaturePreviewOptOutFlag(INTERNAL_FEATURE_FLAG),]);await caller.userAccount.setViewMode({ mode: "INTERNAL" });expect((await prisma.user.findUniqueOrThrow({ where: { id: userId } })).featureFlags,- ).toEqual(["modernSession"]);+ ).toEqual(["sessionViewV2"]);});it("does not allow ordinary users to select internal mode", async () => {@@ -313,8 +313,8 @@ async function createCaller({],featureFlags: testFeatureFlags({langfuseTopics: featureFlags.includes("langfuseTopics"),- modernSession: featureFlags.includes("modernSession"),- sessionTimeline: featureFlags.includes("sessionTimeline"),+ sessionViewV2: featureFlags.includes("sessionViewV2"),+ sessionViewV2Timeline: featureFlags.includes("sessionViewV2Timeline"),searchBar: featureFlags.includes("searchBar"),templateFlag: featureFlags.includes("templateFlag"),}),diff --git a/web/src/features/events/server/eventsRouter.ts b/web/src/features/events/server/eventsRouter.tsindex 1892d7a025..f6e3fcbcab 100644--- a/web/src/features/events/server/eventsRouter.ts+++ b/web/src/features/events/server/eventsRouter.ts@@ -452,7 +452,7 @@ export const eventsRouter = createTRPCRouter({const isSessionTimelineEnabled =getContextualFeatureFlags(ctx.session?.user, {projectId: input.projectId,- })?.sessionTimeline === true;+ })?.sessionViewV2Timeline === true;if (!isSessionTimelineEnabled &&!hasInternalAccess({diff --git a/web/src/features/feature-flags/available-flags.ts b/web/src/features/feature-flags/available-flags.tsindex 0b994133e0..10b7805300 100644--- a/web/src/features/feature-flags/available-flags.ts+++ b/web/src/features/feature-flags/available-flags.ts@@ -5,12 +5,17 @@ export const organizationOnlyFeaturePreviewFlags = [] as const;export const userFeaturePreviewFlags = [- "modernSession",- "sessionTimeline",+ "sessionViewV2",+ "sessionViewV2Timeline",] as const;export type UserFeaturePreviewFlag = (typeof userFeaturePreviewFlags)[number];+export const defaultOnFeaturePreviewFlags = [+ "sessionViewV2",+ "sessionViewV2Timeline",+] as const;+export const featurePreviewFlags = [...organizationOnlyFeaturePreviewFlags,...userFeaturePreviewFlags,@@ -72,8 +77,8 @@ export const filterFeaturePreviewFlags = (export const featurePreviewLabels = {externalMediaStorage: "External Media Storage",- modernSession: "Compact Session View",- sessionTimeline: "Session Timeline",+ sessionViewV2: "Redesigned Session View",+ sessionViewV2Timeline: "Session Timeline",langfuseTopics: "Langfuse Topics",} satisfies Record<FeaturePreviewFlag | PersonalFeaturePreviewFlag, string>;@@ -88,7 +93,7 @@ export const isFeaturePreviewAvailable = (if (flag === "externalMediaStorage") {return true;}- if (flag === "modernSession" || flag === "sessionTimeline") {+ if (flag === "sessionViewV2" || flag === "sessionViewV2Timeline") {return context.v4BetaEnabled;}diff --git a/web/src/features/feature-flags/components/OrganizationFeaturePreviewsSettings.clienttest.tsx b/web/src/features/feature-flags/components/OrganizationFeaturePreviewsSettings.clienttest.tsxindex 2169189382..2c9b0c2c5f 100644--- a/web/src/features/feature-flags/components/OrganizationFeaturePreviewsSettings.clienttest.tsx+++ b/web/src/features/feature-flags/components/OrganizationFeaturePreviewsSettings.clienttest.tsx@@ -3,6 +3,8 @@ import type { ButtonHTMLAttributes, ReactNode } from "react";import { OrganizationFeaturePreviewsSettings } from "./OrganizationFeaturePreviewsSettings";import { featurePreviewFlags } from "../available-flags";+import { getFeaturePreviewOptOutFlag } from "../utils";+import { getOrganizationFeaturePreviewDefaults } from "../fns/getOrganizationFeaturePreviewDefaults";const mocks = vi.hoisted(() => ({capture: vi.fn(),@@ -20,14 +22,14 @@ const mocks = vi.hoisted(() => ({| undefined,experimentalFeaturesEnabled: false,userFeatureFlags: {- modernSession: false,+ sessionViewV2: false,} as Record<string, boolean>,/*** Which previews are already organization defaults. Per-test, because a test* that needs a preview which is NOT yet a default cannot rely on the registry* happening to hold one — both surviving previews are defaults by fixture.*/- orgDefaults: ["modernSession"] as string[],+ orgDefaults: ["sessionViewV2"] as string[],updateSession: vi.fn().mockResolvedValue(undefined),}));@@ -123,7 +125,10 @@ vi.mock("@/src/utils/api", () => ({organizations: {getFeatureFlagOrgDefaults: {useQuery: () => ({- data: { defaults: mocks.orgDefaults, memberCount: 3 },+ data: {+ defaults: getOrganizationFeaturePreviewDefaults(mocks.orgDefaults),+ memberCount: 3,+ },isError: false,isPending: false,}),@@ -143,27 +148,19 @@ describe("OrganizationFeaturePreviewsSettings", () => {vi.clearAllMocks();mocks.experimentalFeaturesEnabled = false;mocks.userFeatureFlags = {- modernSession: false,+ sessionViewV2: false,};- mocks.orgDefaults = ["modernSession"];+ mocks.orgDefaults = ["sessionViewV2"];mocks.mutate.mockImplementation((variables) => {mocks.mutationOptions?.onSuccess?.({}, variables);});});- it("explains the deployment-wide experimental feature override", () => {+ it("keeps deployment-wide experimental previews enabled and locked", () => {mocks.experimentalFeaturesEnabled = true;render(<OrganizationFeaturePreviewsSettings orgId="org-1" />);- expect(- screen.getByText(/experimental features enabled deployment-wide/i),- ).toBeInTheDocument();- expect(- screen.getByText(- "Every preview on this page is enabled by the env variable LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES=true. Per-user opt-outs do not disable these previews.",- ),- ).toBeInTheDocument();const switches = screen.getAllByRole("checkbox", {name: /organization default/i,});@@ -181,18 +178,37 @@ describe("OrganizationFeaturePreviewsSettings", () => {});});+ it("shows session defaults as enabled and lets an admin disable them", () => {+ mocks.orgDefaults = [];+ render(<OrganizationFeaturePreviewsSettings orgId="org-1" />);+ const sessionSwitch = screen.getByRole("checkbox", {+ name: "Toggle Redesigned Session View organization default",+ });+ expect(sessionSwitch).toBeChecked();+ expect(sessionSwitch).toBeEnabled();+ expect(+ screen.getByRole("checkbox", {+ name: "Toggle Session Timeline organization default",+ }),+ ).toBeChecked();+ fireEvent.click(sessionSwitch);+ fireEvent.click(screen.getByRole("button", { name: "Confirm" }));+ expect(mocks.mutate).toHaveBeenCalledWith({+ orgId: "org-1",+ flag: "sessionViewV2",+ enabled: false,+ });+ });+it("requires an admin to enable a preview personally before enabling the organization default", () => {// Not a default yet: an admin can always turn one OFF, so the lock only// shows on a row they would be turning ON.- mocks.orgDefaults = [];+ mocks.orgDefaults = [getFeaturePreviewOptOutFlag("sessionViewV2")];render(<OrganizationFeaturePreviewsSettings orgId="org-1" />);- // The contrast half — a row the admin HAS enabled personally stays live —- // needs a second registered preview, and there is one between one preview- // reaching GA and the next landing. Add it back with the next preview.expect(screen.getByRole("checkbox", {- name: "Toggle Compact Session View organization default",+ name: "Toggle Redesigned Session View organization default",}),).toBeDisabled();expect(@@ -200,48 +216,35 @@ describe("OrganizationFeaturePreviewsSettings", () => {name: "Toggle External Media Storage organization default",}),).toBeEnabled();- const personalEnablementRequirements = screen.getAllByText(- /enable this preview in your personal feature preview settings/i,- );- personalEnablementRequirements.forEach((requirement) =>- expect(requirement).toHaveClass("text-destructive"),- );});it("confirms an organization default change and captures metadata once", async () => {- mocks.userFeatureFlags.modernSession = true;- mocks.orgDefaults = [];+ mocks.userFeatureFlags.sessionViewV2 = true;+ mocks.orgDefaults = [getFeaturePreviewOptOutFlag("sessionViewV2")];render(<OrganizationFeaturePreviewsSettings orgId="org-1" />);- expect(- screen.getByText(/new members inherit these defaults automatically/i),- ).toBeInTheDocument();fireEvent.click(screen.getByRole("checkbox", {- name: "Toggle Compact Session View organization default",+ name: "Toggle Redesigned Session View organization default",}),);- expect(screen.getByText("Already enabled for you")).toBeInTheDocument();- expect(- screen.getByText(/personal Feature Preview settings.*tested/i),- ).toBeInTheDocument();fireEvent.click(screen.getByRole("button", { name: "Confirm" }));expect(mocks.mutate).toHaveBeenCalledWith({orgId: "org-1",- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,});await waitFor(() => expect(mocks.capture).toHaveBeenCalledTimes(1));expect(mocks.capture).toHaveBeenCalledWith("organization_settings:feature_flag_default_toggled",- { feature: "modernSession", isEnabled: true },+ { feature: "sessionViewV2", isEnabled: true },);});it("does not capture analytics when a default change fails", () => {- mocks.userFeatureFlags.modernSession = true;- mocks.orgDefaults = [];+ mocks.userFeatureFlags.sessionViewV2 = true;+ mocks.orgDefaults = [getFeaturePreviewOptOutFlag("sessionViewV2")];mocks.mutate.mockImplementation(() => {mocks.mutationOptions?.onError?.(new Error("denied"));});@@ -249,7 +252,7 @@ describe("OrganizationFeaturePreviewsSettings", () => {fireEvent.click(screen.getByRole("checkbox", {- name: "Toggle Compact Session View organization default",+ name: "Toggle Redesigned Session View organization default",}),);fireEvent.click(screen.getByRole("button", { name: "Confirm" }));diff --git a/web/src/features/feature-flags/components/OrganizationFeaturePreviewsSettings.tsx b/web/src/features/feature-flags/components/OrganizationFeaturePreviewsSettings.tsxindex 9d0f41360c..19affe586a 100644--- a/web/src/features/feature-flags/components/OrganizationFeaturePreviewsSettings.tsx+++ b/web/src/features/feature-flags/components/OrganizationFeaturePreviewsSettings.tsx@@ -19,6 +19,7 @@ import { Card } from "@/src/components/ui/card";import {featurePreviewFlags,featurePreviewLabels,+ defaultOnFeaturePreviewFlags,isOrganizationOnlyFeaturePreviewFlag,type FeaturePreviewFlag,} from "@/src/features/feature-flags/available-flags";@@ -128,6 +129,14 @@ export function OrganizationFeaturePreviewsSettings({><div className="flex min-w-0 flex-col gap-1"><h3 className="font-bold">{featurePreviewLabels[flag]}</h3>+ {defaultOnFeaturePreviewFlags.some(+ (defaultFlag) => defaultFlag === flag,+ ) ? (+ <p className="text-muted-foreground text-xs">+ Enabled by default on the events-backed view. Turn off to+ disable it for this organization.+ </p>+ ) : null}{requiresPersonalEnablement ? (<p className="text-destructive text-xs">Enable this preview in your personal Feature Previewdiff --git a/web/src/features/feature-flags/components/UserFeaturePreviewsPopover.clienttest.tsx b/web/src/features/feature-flags/components/UserFeaturePreviewsPopover.clienttest.tsxindex b756ef84bc..8cc8b1eff9 100644--- a/web/src/features/feature-flags/components/UserFeaturePreviewsPopover.clienttest.tsx+++ b/web/src/features/feature-flags/components/UserFeaturePreviewsPopover.clienttest.tsx@@ -1,4 +1,10 @@-import { fireEvent, render, screen, waitFor } from "@testing-library/react";+import {+ act,+ fireEvent,+ render,+ screen,+ waitFor,+} from "@testing-library/react";import type { ComponentProps, ReactNode } from "react";import type { HoverCard } from "@/src/components/design-system/HoverCard/HoverCard";@@ -7,8 +13,10 @@ import { userFeaturePreviewFlags } from "../available-flags";const mocks = vi.hoisted(() => ({capture: vi.fn(),+ showErrorToast: vi.fn(),invalidate: vi.fn().mockResolvedValue(undefined),mutate: vi.fn(),+ organizationDefaults: ["sessionViewV2", "sessionViewV2Timeline"] as string[],mutationOptions: undefined as| {onSuccess?: (@@ -33,7 +41,7 @@ vi.mock("@/src/features/posthog-analytics/usePostHogClientCapture", () => ({}));vi.mock("@/src/features/notifications/showErrorToast", () => ({- showErrorToast: vi.fn(),+ showErrorToast: mocks.showErrorToast,}));vi.mock("@/src/features/notifications/showSuccessToast", () => ({@@ -63,14 +71,17 @@ vi.mock("@/src/components/design-system/Switch/Switch", () => ({disabled,onCheckedChange,"aria-label": ariaLabel,+ "aria-describedby": ariaDescribedBy,}: {checked: boolean;disabled: boolean;onCheckedChange: (checked: boolean) => void;"aria-label": string;+ "aria-describedby"?: string;}) => (<inputaria-label={ariaLabel}+ aria-describedby={ariaDescribedBy}type="checkbox"checked={checked}disabled={disabled}@@ -92,6 +103,15 @@ vi.mock("@/src/utils/api", () => ({},},},+ organizations: {+ getFeatureFlagOrgDefaults: {+ useQuery: () => ({+ data: { defaults: mocks.organizationDefaults },+ isPending: false,+ isError: false,+ }),+ },+ },},}));@@ -114,30 +134,50 @@ const renderControl = (describe("UserFeaturePreviewsControl", () => {beforeEach(() => {vi.clearAllMocks();+ mocks.organizationDefaults = ["sessionViewV2", "sessionViewV2Timeline"];mocks.mutate.mockImplementation((variables) => {mocks.mutationOptions?.onSuccess?.({}, variables);});});+ it("blocks user changes when the organization disables a preview", () => {+ mocks.organizationDefaults = ["sessionViewV2"];+ renderControl({+ orgId: "org-1",+ userId: "user-1",+ featurePreviews: {+ externalMediaStorage: false,+ sessionViewV2: true,+ sessionViewV2Timeline: false,+ },+ management: { allowed: true },+ });+ const timelineSwitch = screen.getByRole("checkbox", {+ name: "Toggle Session Timeline for user",+ });+ expect(timelineSwitch).toBeDisabled();+ expect(timelineSwitch).toHaveAccessibleDescription();+ expect(+ screen.getByRole("checkbox", {+ name: "Toggle Redesigned Session View for user",+ }),+ ).toBeEnabled();+ });+it("explains why a multi-organization user cannot be changed", () => {renderControl({orgId: "org-1",userId: "user-1",featurePreviews: {externalMediaStorage: false,- modernSession: false,- sessionTimeline: false,+ sessionViewV2: false,+ sessionViewV2Timeline: false,},management: {allowed: false,},});- expect(- screen.getByText(- "You can only change this user's feature flags if you are an administrator in every organization they belong to.",- ),- ).toBeInTheDocument();expect(screen.getByRole("button", {// Derived: the counter's denominator is the number of user previews,@@ -145,6 +185,7 @@ describe("UserFeaturePreviewsControl", () => {name: new RegExp(`0/${userFeaturePreviewFlags.length} enabled`, "i"),}),).toBeDisabled();+ expect(screen.getByRole("button")).toHaveAccessibleDescription();});it("updates an eligible user and captures metadata once after success", async () => {@@ -153,8 +194,8 @@ describe("UserFeaturePreviewsControl", () => {userId: "user-1",featurePreviews: {externalMediaStorage: false,- modernSession: false,- sessionTimeline: false,+ sessionViewV2: false,+ sessionViewV2Timeline: false,},management: { allowed: true },});@@ -166,7 +207,7 @@ describe("UserFeaturePreviewsControl", () => {).not.toBeInTheDocument();fireEvent.click(screen.getByRole("checkbox", {- name: "Toggle Compact Session View for user",+ name: "Toggle Redesigned Session View for user",}),);@@ -174,7 +215,7 @@ describe("UserFeaturePreviewsControl", () => {{orgId: "org-1",userId: "user-1",- flag: "modernSession",+ flag: "sessionViewV2",enabled: true,},expect.objectContaining({ onSettled: expect.any(Function) }),@@ -184,36 +225,45 @@ describe("UserFeaturePreviewsControl", () => {});expect(mocks.capture).toHaveBeenCalledWith("organization_settings:user_feature_flag_toggled",- { feature: "modernSession", isEnabled: true },+ { feature: "sessionViewV2", isEnabled: true },);});it("keeps pending state isolated to the selected feature", () => {- mocks.mutate.mockImplementation(() => undefined);+ let settle: (() => void) | undefined;+ mocks.mutate.mockImplementation(+ (_variables, options: { onSettled: () => void }) => {+ settle = options.onSettled;+ },+ );renderControl({orgId: "org-1",userId: "user-1",featurePreviews: {externalMediaStorage: false,- modernSession: false,- sessionTimeline: false,+ sessionViewV2: false,+ sessionViewV2Timeline: false,},management: { allowed: true },});const sessions = screen.getByRole("checkbox", {- name: "Toggle Compact Session View for user",+ name: "Toggle Redesigned Session View for user",});fireEvent.click(sessions);- // Its own row only. The counterpart assertion — that every OTHER row stays- // interactive — needs a second registered preview, which the registry does- // not have between one preview reaching GA and the next one landing. Add it- // back with the next preview; `isToggling` is per-flag, not per-list.expect(sessions).toBeDisabled();+ expect(+ screen.getByRole("checkbox", {+ name: "Toggle Session Timeline for user",+ }),+ ).toBeEnabled();+ expect(settle).toBeDefined();+ act(() => settle?.());+ expect(sessions).toBeEnabled();});- it("refetches without capturing analytics when the mutation fails", async () => {+ it("notifies on failure, unlocks the control, and allows retry", async () => {mocks.mutate.mockImplementation((_variables, options) => {mocks.mutationOptions?.onError?.(new Error("denied"));options.onSettled();@@ -223,19 +273,26 @@ describe("UserFeaturePreviewsControl", () => {userId: "user-1",featurePreviews: {externalMediaStorage: false,- modernSession: false,- sessionTimeline: false,+ sessionViewV2: false,+ sessionViewV2Timeline: false,},management: { allowed: true },});fireEvent.click(screen.getByRole("checkbox", {- name: "Toggle Compact Session View for user",+ name: "Toggle Redesigned Session View for user",}),);await waitFor(() => expect(mocks.invalidate).toHaveBeenCalledOnce());+ await waitFor(() => expect(mocks.showErrorToast).toHaveBeenCalledOnce());expect(mocks.capture).not.toHaveBeenCalled();+ const sessionSwitch = screen.getByRole("checkbox", {+ name: "Toggle Redesigned Session View for user",+ });+ expect(sessionSwitch).toBeEnabled();+ fireEvent.click(sessionSwitch);+ expect(mocks.mutate).toHaveBeenCalledTimes(2);});});diff --git a/web/src/features/feature-flags/components/UserFeaturePreviewsPopover.tsx b/web/src/features/feature-flags/components/UserFeaturePreviewsPopover.tsxindex 5d3c160783..9a153c30f2 100644--- a/web/src/features/feature-flags/components/UserFeaturePreviewsPopover.tsx+++ b/web/src/features/feature-flags/components/UserFeaturePreviewsPopover.tsx@@ -1,5 +1,5 @@import { showErrorToast, showSuccessToast } from "@/src/features/notifications";-import { useState, type ReactNode } from "react";+import { useId, useState, type ReactNode } from "react";import { useSession } from "next-auth/react";import { Switch } from "@/src/components/design-system/Switch/Switch";@@ -8,6 +8,7 @@ import { HoverCard } from "@/src/components/design-system/HoverCard/HoverCard";import { PopoverContent } from "@/src/components/ui/popover";import {featurePreviewLabels,+ defaultOnFeaturePreviewFlags,userFeaturePreviewFlags,type FeaturePreviewFlag,} from "@/src/features/feature-flags/available-flags";@@ -37,11 +38,17 @@ export function UserFeaturePreviewsControl({}) => ReactNode;}) {const session = useSession();+ const descriptionId = useId();const [pendingFlags, setPendingFlags] = useState<Set<FeaturePreviewFlag>>(new Set(),);const capture = usePostHogClientCapture();const utils = api.useUtils();+ const organizationDefaults =+ api.organizations.getFeatureFlagOrgDefaults.useQuery(+ { orgId },+ { enabled: management.allowed },+ );const updatePreview = api.members.setUserFeaturePreviewEnabled.useMutation({onSuccess: async (_result, variables) => {capture("organization_settings:user_feature_flag_toggled", {@@ -82,7 +89,7 @@ export function UserFeaturePreviewsControl({placement="left"content={<div className="w-64 p-3">- <p className="text-xs">+ <p id={descriptionId} className="text-xs">You can only change this user's feature flags if you are anadministrator in every organization they belong to.</p>@@ -95,7 +102,12 @@ export function UserFeaturePreviewsControl({tabIndex={0}{...getTriggerProps()}>- <Button variant="outline" size="sm" disabled>+ <Button+ variant="outline"+ size="sm"+ disabled+ aria-describedby={descriptionId}+ >{enabledCount}/{totalCount} enabled</Button></span>@@ -116,37 +128,69 @@ export function UserFeaturePreviewsControl({Changes apply to this user in every organization.</p></div>- {userFeaturePreviewFlags.map((flag) => (- <div key={flag} className="flex items-center justify-between gap-4">- <span className="text-sm">{featurePreviewLabels[flag]}</span>- <Switch- size="sm"- aria-label={`Toggle ${featurePreviewLabels[flag]} for user`}- checked={featurePreviews[flag]}- disabled={pendingFlags.has(flag)}- onCheckedChange={(enabled) => {- setPendingFlags((current) => new Set(current).add(flag));- updatePreview.mutate(- {- orgId,- userId,- flag,- enabled,- },- {- onSettled: () => {- setPendingFlags((current) => {- const next = new Set(current);- next.delete(flag);- return next;- });+ {userFeaturePreviewFlags.map((flag) => {+ const disabledByOrganization =+ defaultOnFeaturePreviewFlags.some(+ (defaultFlag) => defaultFlag === flag,+ ) &&+ organizationDefaults.data !== undefined &&+ !organizationDefaults.data.defaults.includes(flag);+ return (+ <div+ key={flag}+ className="flex items-center justify-between gap-4"+ >+ <div className="flex flex-col gap-1">+ <span className="text-sm">{featurePreviewLabels[flag]}</span>+ {disabledByOrganization ? (+ <p+ id={`${descriptionId}-${flag}`}+ className="text-muted-foreground text-xs"+ >+ Disabled for this organization. Enable the organization+ default before changing this user's preference.+ </p>+ ) : null}+ </div>+ <Switch+ size="sm"+ aria-label={`Toggle ${featurePreviewLabels[flag]} for user`}+ aria-describedby={+ disabledByOrganization+ ? `${descriptionId}-${flag}`+ : undefined+ }+ checked={featurePreviews[flag]}+ disabled={+ pendingFlags.has(flag) ||+ disabledByOrganization ||+ organizationDefaults.isPending ||+ organizationDefaults.isError+ }+ onCheckedChange={(enabled) => {+ setPendingFlags((current) => new Set(current).add(flag));+ updatePreview.mutate(+ {+ orgId,+ userId,+ flag,+ enabled,+ },+ {+ onSettled: () => {+ setPendingFlags((current) => {+ const next = new Set(current);+ next.delete(flag);+ return next;+ });+ },},- },- );- }}- />- </div>- ))}+ );+ }}+ />+ </div>+ );+ })}</div></PopoverContent>),diff --git a/web/src/features/feature-flags/fns/getOrganizationFeaturePreviewDefaults.ts b/web/src/features/feature-flags/fns/getOrganizationFeaturePreviewDefaults.tsnew file mode 100644index 0000000000..5a01ddd665--- /dev/null+++ b/web/src/features/feature-flags/fns/getOrganizationFeaturePreviewDefaults.ts@@ -0,0 +1,26 @@+import {+ defaultOnFeaturePreviewFlags,+ featurePreviewFlags,+} from "../available-flags";+import { getFeaturePreviewOptOutFlag } from "../utils";++export const getOrganizationFeaturePreviewDefaults = (+ storedDefaults: string[],+) =>+ featurePreviewFlags.filter((flag) => {+ if (flag === "externalMediaStorage") return storedDefaults.includes(flag);+ if (storedDefaults.includes(getFeaturePreviewOptOutFlag(flag)))+ return false;+ if (+ defaultOnFeaturePreviewFlags.some((defaultFlag) => defaultFlag === flag)+ ) {+ if (+ flag === "sessionViewV2Timeline" &&+ storedDefaults.includes(getFeaturePreviewOptOutFlag("sessionViewV2"))+ ) {+ return false;+ }+ return true;+ }+ return storedDefaults.includes(flag);+ });diff --git a/web/src/features/feature-flags/server/index.ts b/web/src/features/feature-flags/server/index.tsindex 3f049756ca..f0a37444d0 100644--- a/web/src/features/feature-flags/server/index.ts+++ b/web/src/features/feature-flags/server/index.ts@@ -6,7 +6,6 @@ export {isAdminOnlyFeaturePreviewFlag,isOrganizationOnlyFeaturePreviewFlag,INTERNAL_FEATURE_FLAG,- filterFeaturePreviewFlags,} from "@/src/features/feature-flags/available-flags";export {EMPTY_ORGANIZATION_FEATURE_PREVIEW_STATES,@@ -21,6 +20,7 @@ export {getFeaturePreviewOptOutFlag,hasInternalAccess,} from "@/src/features/feature-flags/utils";+export { getOrganizationFeaturePreviewDefaults } from "../fns/getOrganizationFeaturePreviewDefaults";export {parseFlags,parseFlagsWithOrganizationDefaults,diff --git a/web/src/features/feature-flags/server/organizationFeatureFlags.ts b/web/src/features/feature-flags/server/organizationFeatureFlags.tsindex f22116345e..fa067103be 100644--- a/web/src/features/feature-flags/server/organizationFeatureFlags.ts+++ b/web/src/features/feature-flags/server/organizationFeatureFlags.ts@@ -6,7 +6,7 @@ import {} from "@langfuse/shared";import {- filterFeaturePreviewFlags,+ defaultOnFeaturePreviewFlags,featurePreviewFlags,type FeaturePreviewFlag,type UserFeaturePreviewFlag,@@ -189,11 +189,11 @@ async function setUserFeaturePreviewInTransaction({if (!user) throw new LangfuseNotFoundError("User not found");const affectedFlags: UserFeatureFlag[] = [flag];- if (flag === "sessionTimeline" && enabled) {- affectedFlags.push("modernSession");+ if (flag === "sessionViewV2Timeline" && enabled) {+ affectedFlags.push("sessionViewV2");}- if (flag === "modernSession" && !enabled) {- affectedFlags.push("sessionTimeline");+ if (flag === "sessionViewV2" && !enabled) {+ affectedFlags.push("sessionViewV2Timeline");}const nextFeatureFlags = user.featureFlags.filter((currentFlag) =>@@ -312,8 +312,8 @@ export async function setOrganizationFeatureFlagDefault({flag: FeaturePreviewFlag;enabled: boolean;}): Promise<{- before: FeaturePreviewFlag[];- after: FeaturePreviewFlag[];+ before: string[];+ after: string[];}> {return withSerializableRetry(prisma, async (tx) => {const organization = await tx.organization.findUnique({@@ -324,22 +324,40 @@ export async function setOrganizationFeatureFlagDefault({throw new LangfuseNotFoundError("Organization not found");}- const before = filterFeaturePreviewFlags(- organization.featureFlagOrgDefaults,+ const storedPreviewFlags = [+ ...featurePreviewFlags,+ ...defaultOnFeaturePreviewFlags.map(getFeaturePreviewOptOutFlag),+ ];+ const before = organization.featureFlagOrgDefaults.filter((flag) =>+ storedPreviewFlags.includes(flag),);const affectedFlags: FeaturePreviewFlag[] = [flag];- if (flag === "sessionTimeline" && enabled) {- affectedFlags.push("modernSession");+ if (flag === "sessionViewV2Timeline" && enabled) {+ affectedFlags.push("sessionViewV2");}- if (flag === "modernSession" && !enabled) {- affectedFlags.push("sessionTimeline");+ if (flag === "sessionViewV2" && !enabled) {+ affectedFlags.push("sessionViewV2Timeline");}const nextStoredDefaults = organization.featureFlagOrgDefaults.filter((currentFlag) =>- !affectedFlags.some((affectedFlag) => currentFlag === affectedFlag),+ !affectedFlags.some(+ (affectedFlag) =>+ currentFlag === affectedFlag ||+ (affectedFlag !== "externalMediaStorage" &&+ currentFlag === getFeaturePreviewOptOutFlag(affectedFlag)),+ ),);if (enabled) nextStoredDefaults.push(...affectedFlags);- const after = filterFeaturePreviewFlags(nextStoredDefaults);+ else {+ nextStoredDefaults.push(+ ...defaultOnFeaturePreviewFlags+ .filter((flag) => affectedFlags.includes(flag))+ .map(getFeaturePreviewOptOutFlag),+ );+ }+ const after = nextStoredDefaults.filter((flag) =>+ storedPreviewFlags.includes(flag),+ );await tx.organization.update({where: { id: orgId },diff --git a/web/src/features/feature-flags/types.ts b/web/src/features/feature-flags/types.tsindex 91105cd3a7..c57d815528 100644--- a/web/src/features/feature-flags/types.ts+++ b/web/src/features/feature-flags/types.ts@@ -8,16 +8,16 @@ export type Flags = {[key in Exclude<Flag,| "externalMediaStorage"- | "modernSession"+ | "sessionViewV2"| "aiGateway"- | "sessionTimeline"+ | "sessionViewV2Timeline"| typeof INTERNAL_FEATURE_FLAG>]: boolean;} & {// Optional while older sessions and test fixtures roll across new flags.externalMediaStorage?: boolean;- modernSession?: boolean;+ sessionViewV2?: boolean;aiGateway?: boolean;- sessionTimeline?: boolean;+ sessionViewV2Timeline?: boolean;[INTERNAL_FEATURE_FLAG]?: boolean;};diff --git a/web/src/features/feature-flags/utils.clienttest.ts b/web/src/features/feature-flags/utils.clienttest.tsindex 7701c0b2c5..46816c3db3 100644--- a/web/src/features/feature-flags/utils.clienttest.ts+++ b/web/src/features/feature-flags/utils.clienttest.ts@@ -8,8 +8,42 @@ import {parseFlags,parseFlagsWithOrganizationDefaults,} from "./utils";+import { getOrganizationFeaturePreviewDefaults } from "./fns/getOrganizationFeaturePreviewDefaults";describe("parseFlags", () => {+ it.each([+ { flag: "sessionViewV2" as const, expectedView: false },+ { flag: "sessionViewV2Timeline" as const, expectedView: true },+ ])(+ "honors an organization opt-out for $flag over personal opt-ins",+ ({ flag, expectedView }) => {+ const flags = parseFlagsWithOrganizationDefaults(+ ["sessionViewV2", "sessionViewV2Timeline"],+ [getFeaturePreviewOptOutFlag(flag)],+ { email: "[email protected]", v4BetaEnabled: true },+ );+ expect(flags.sessionViewV2).toBe(expectedView);+ expect(flags.sessionViewV2Timeline).toBe(false);+ },+ );++ it("shows session organization defaults as on unless explicitly disabled", () => {+ expect(getOrganizationFeaturePreviewDefaults([])).toEqual([+ "sessionViewV2",+ "sessionViewV2Timeline",+ ]);+ expect(+ getOrganizationFeaturePreviewDefaults([+ getFeaturePreviewOptOutFlag("sessionViewV2Timeline"),+ ]),+ ).toEqual(["sessionViewV2"]);+ expect(+ getOrganizationFeaturePreviewDefaults([+ getFeaturePreviewOptOutFlag("sessionViewV2"),+ ]),+ ).toEqual([]);+ });+it("requires personal Topics opt-in and ignores team and organization defaults", () => {const context = {email: "[email protected]",@@ -28,7 +62,7 @@ describe("parseFlags", () => {v4BetaEnabled: true,});- expect(flags.modernSession).toBe(true);+ expect(flags.sessionViewV2).toBe(true);});it("enables feature previews by default for ClickHouse team members", () => {@@ -37,16 +71,53 @@ describe("parseFlags", () => {v4BetaEnabled: true,});- expect(flags.modernSession).toBe(true);+ expect(flags.sessionViewV2).toBe(true);});- it("does not enable feature previews by default for other users", () => {+ it("enables both session previews by default for every user", () => {const flags = parseFlags([], {email: "[email protected]",v4BetaEnabled: true,});- expect(flags.modernSession).toBe(false);+ expect(flags.sessionViewV2).toBe(true);+ expect(flags.sessionViewV2Timeline).toBe(true);+ });++ it("ignores legacy session preferences and organization defaults", () => {+ const flags = parseFlagsWithOrganizationDefaults(+ [+ "modernSession",+ "sessionTimeline",+ "feature-preview:modernSession:disabled",+ "feature-preview:sessionTimeline:disabled",+ ],+ ["modernSession", "sessionTimeline"],+ { email: "[email protected]", v4BetaEnabled: true },+ );++ expect(flags.sessionViewV2).toBe(true);+ expect(flags.sessionViewV2Timeline).toBe(true);+ });++ it("does not default session previews on without the events-backed view", () => {+ const flags = parseFlags([], {+ email: "[email protected]",+ v4BetaEnabled: false,+ });++ expect(flags.sessionViewV2).toBe(false);+ expect(flags.sessionViewV2Timeline).toBe(false);+ });++ it("honors a timeline opt-out without disabling the redesigned view", () => {+ const flags = parseFlags(+ [getFeaturePreviewOptOutFlag("sessionViewV2Timeline")],+ { email: "[email protected]", v4BetaEnabled: true },+ );++ expect(flags.sessionViewV2).toBe(true);+ expect(flags.sessionViewV2Timeline).toBe(false);});it("enables the gateway flag only for allowlisted organizations", () => {@@ -73,15 +144,15 @@ describe("parseFlags", () => {it("honors a Langfuse team member's explicit opt-out", () => {const flags = parseFlags(- [getFeaturePreviewOptOutFlag("modernSession"), "templateFlag"],+ [getFeaturePreviewOptOutFlag("sessionViewV2"), "templateFlag"],{email: "[email protected]",v4BetaEnabled: true,},);- expect(flags.modernSession).toBe(false);- expect(flags.sessionTimeline).toBe(false);+ expect(flags.sessionViewV2).toBe(false);+ expect(flags.sessionViewV2Timeline).toBe(false);// Scoped to its own flag: the opt-out is a STRING match, so a matcher that// is too loose would take neighbouring flags down with it. A non-preview// flag stands in for that here, which keeps the guard alive no matter how@@ -91,38 +162,41 @@ describe("parseFlags", () => {it("honors an explicit opt-out for every user", () => {const flags = parseFlags(- ["modernSession", getFeaturePreviewOptOutFlag("modernSession")],+ ["sessionViewV2", getFeaturePreviewOptOutFlag("sessionViewV2")],{email: "[email protected]",v4BetaEnabled: true,},);- expect(flags.modernSession).toBe(false);+ expect(flags.sessionViewV2).toBe(false);});- it("does not enable Session Timeline without Compact Session", () => {- const flags = parseFlags(["sessionTimeline"], {- email: "[email protected]",- v4BetaEnabled: true,- });+ it("does not enable Session Timeline when Redesigned Session View is disabled", () => {+ const flags = parseFlags(+ ["sessionViewV2Timeline", getFeaturePreviewOptOutFlag("sessionViewV2")],+ {+ email: "[email protected]",+ v4BetaEnabled: true,+ },+ );- expect(flags.sessionTimeline).toBe(false);+ expect(flags.sessionViewV2Timeline).toBe(false);});it("applies organization defaults without overriding a global opt-out", () => {- const enabled = parseFlagsWithOrganizationDefaults([], ["modernSession"], {+ const enabled = parseFlagsWithOrganizationDefaults([], ["sessionViewV2"], {email: "[email protected]",v4BetaEnabled: true,});const optedOut = parseFlagsWithOrganizationDefaults(- [getFeaturePreviewOptOutFlag("modernSession")],- ["modernSession"],+ [getFeaturePreviewOptOutFlag("sessionViewV2")],+ ["sessionViewV2"],{ email: "[email protected]", v4BetaEnabled: true },);- expect(enabled.modernSession).toBe(true);- expect(optedOut.modernSession).toBe(false);+ expect(enabled.sessionViewV2).toBe(true);+ expect(optedOut.sessionViewV2).toBe(false);});it("enables organization-only previews exclusively through organization defaults", () => {@@ -140,21 +214,28 @@ describe("parseFlags", () => {expect(organizationEnabled.externalMediaStorage).toBe(true);});- it("does not apply a Session Timeline organization default without Compact Session", () => {- const flags = parseFlagsWithOrganizationDefaults([], ["sessionTimeline"], {- email: "[email protected]",- v4BetaEnabled: true,- });+ it("does not apply a Session Timeline organization default when Redesigned Session View is disabled", () => {+ const flags = parseFlagsWithOrganizationDefaults(+ [getFeaturePreviewOptOutFlag("sessionViewV2")],+ ["sessionViewV2Timeline"],+ {+ email: "[email protected]",+ v4BetaEnabled: true,+ },+ );- expect(flags.sessionTimeline).toBe(false);+ expect(flags.sessionViewV2Timeline).toBe(false);});it("selects flags from only the active project organization", () => {- const personalFlags = parseFlags([], {- email: "[email protected]",- v4BetaEnabled: true,- });- const enabledInFirstOrg = { ...personalFlags, modernSession: true };+ const personalFlags = parseFlags(+ [getFeaturePreviewOptOutFlag("sessionViewV2")],+ {+ email: "[email protected]",+ v4BetaEnabled: true,+ },+ );+ const enabledInFirstOrg = { ...personalFlags, sessionViewV2: true };const user = {featureFlags: personalFlags,organizations: [@@ -173,15 +254,15 @@ describe("parseFlags", () => {expect(getContextualFeatureFlags(user, { projectId: "project-a" })- ?.modernSession,+ ?.sessionViewV2,).toBe(true);expect(getContextualFeatureFlags(user, { projectId: "project-b" })- ?.modernSession,+ ?.sessionViewV2,).toBe(false);expect(getContextualFeatureFlags(user, { organizationId: "org-a" })- ?.modernSession,+ ?.sessionViewV2,).toBe(true);});});diff --git a/web/src/features/feature-flags/utils.ts b/web/src/features/feature-flags/utils.tsindex 249fa42f0d..b6bc8c229d 100644--- a/web/src/features/feature-flags/utils.ts+++ b/web/src/features/feature-flags/utils.ts@@ -1,6 +1,7 @@/* eslint-disable no-nested-ternary */import {availableFlags,+ defaultOnFeaturePreviewFlags,featurePreviewFlags,filterFeaturePreviewFlags,isRestrictedFlag,@@ -77,6 +78,17 @@ export const parseFlags = (return;}+ if (+ defaultOnFeaturePreviewFlags.some(+ (defaultFlag) => defaultFlag === flag,+ ) &&+ isFeaturePreviewFlag(flag) &&+ isFeaturePreviewAvailable(flag, context)+ ) {+ parsedFlags[flag] = true;+ return;+ }+if (enableFeaturePreviewsByDefault &&isFeaturePreviewFlag(flag) &&@@ -89,8 +101,8 @@ export const parseFlags = (parsedFlags[flag] = dbFlags.includes(flag);});- if (!parsedFlags.modernSession) {- parsedFlags.sessionTimeline = false;+ if (!parsedFlags.sessionViewV2) {+ parsedFlags.sessionViewV2Timeline = false;}return parsedFlags;@@ -107,7 +119,13 @@ export const parseFlagsWithOrganizationDefaults = (const featurePreviewDefaults =filterFeaturePreviewFlags(organizationDefaults);- const flags = parseFlags(dbFlags.concat(featurePreviewDefaults), context);+ const organizationOptOuts = defaultOnFeaturePreviewFlags+ .map(getFeaturePreviewOptOutFlag)+ .filter((flag) => organizationDefaults.includes(flag));+ const flags = parseFlags(+ dbFlags.concat(featurePreviewDefaults, organizationOptOuts),+ context,+ );for (const flag of featurePreviewFlags) {if (isOrganizationOnlyFeaturePreviewFlag(flag)) {flags[flag] = featurePreviewDefaults.includes(flag);diff --git a/web/src/features/feature-previews/components/ControlledFeaturePreviewModal.tsx b/web/src/features/feature-previews/components/ControlledFeaturePreviewModal.tsxindex e2b90d1ca2..d68ef81f96 100644--- a/web/src/features/feature-previews/components/ControlledFeaturePreviewModal.tsx+++ b/web/src/features/feature-previews/components/ControlledFeaturePreviewModal.tsx@@ -52,7 +52,7 @@ export function ControlledFeaturePreviewModal({setFeaturePreviewEnabled.mutate({ flag, enabled });const isModernSessionEnabled =- authSession.data?.user?.featureFlags.modernSession === true ||+ authSession.data?.user?.featureFlags.sessionViewV2 === true ||authSession.data?.environment.enableExperimentalFeatures === true;const state: Partial<Record<PreviewFlag, PreviewState>> = {@@ -65,35 +65,35 @@ export function ControlledFeaturePreviewModal({},}: {}),- modernSession: {+ sessionViewV2: {enabled: isModernSessionEnabled,disabled:!isV4 ||authSession.data?.environment.enableExperimentalFeatures === true,warningReason: !isV4- ? `Compact Session View is only available on the events-backed session view. Turn on ${V4_PREVIEW_LABEL} to enable it.`+ ? `Redesigned Session View is only available on the events-backed session view. Turn on ${V4_PREVIEW_LABEL} to enable it.`: authSession.data?.environment.enableExperimentalFeatures === true? "This preview is enabled by LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES, so a per-user opt-out does not disable it.": undefined,- onToggle: onToggle("modernSession"),+ onToggle: onToggle("sessionViewV2"),isToggling: setFeaturePreviewEnabled.isPending,},- sessionTimeline: {+ sessionViewV2Timeline: {enabled:- authSession.data?.user?.featureFlags.sessionTimeline === true ||+ authSession.data?.user?.featureFlags.sessionViewV2Timeline === true ||authSession.data?.environment.enableExperimentalFeatures === true,disabled:!isV4 ||!isModernSessionEnabled ||authSession.data?.environment.enableExperimentalFeatures === true,warningReason: !isV4- ? `Compact Session View is only available on the events-backed session view. Turn on ${V4_PREVIEW_LABEL} to enable it.`+ ? `Redesigned Session View is only available on the events-backed session view. Turn on ${V4_PREVIEW_LABEL} to enable it.`: !isModernSessionEnabled- ? "Enable Compact Session View before enabling the Session Timeline."+ ? "Enable Redesigned Session View before enabling the Session Timeline.": authSession.data?.environment.enableExperimentalFeatures === true? "This preview is enabled by LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES, so a per-user opt-out does not disable it.": undefined,- onToggle: onToggle("sessionTimeline"),+ onToggle: onToggle("sessionViewV2Timeline"),isToggling: setFeaturePreviewEnabled.isPending,},};diff --git a/web/src/features/feature-previews/components/FeaturePreviewModal.clienttest.tsx b/web/src/features/feature-previews/components/FeaturePreviewModal.clienttest.tsxindex 14abad1a7c..715a227897 100644--- a/web/src/features/feature-previews/components/FeaturePreviewModal.clienttest.tsx+++ b/web/src/features/feature-previews/components/FeaturePreviewModal.clienttest.tsx@@ -8,7 +8,7 @@ vi.mock("next/image", () => ({}));describe("FeaturePreviewModal", () => {- it("renders the session timeline toggle inside Compact Session View", () => {+ it("renders the session timeline toggle inside Redesigned Session View", () => {const onTimelineToggle = vi.fn();render(@@ -16,8 +16,8 @@ describe("FeaturePreviewModal", () => {openonOpenChange={vi.fn()}state={{- modernSession: { enabled: true, onToggle: vi.fn() },- sessionTimeline: {+ sessionViewV2: { enabled: true, onToggle: vi.fn() },+ sessionViewV2Timeline: {enabled: false,onToggle: onTimelineToggle,},@@ -28,6 +28,10 @@ describe("FeaturePreviewModal", () => {const timelineToggle = screen.getByRole("switch", {name: "Toggle Session Timeline",});+ expect(screen.getByRole("link", { name: "Give feedback" })).toHaveAttribute(+ "href",+ "https://github.com/orgs/langfuse/discussions/18687",+ );fireEvent.click(timelineToggle);expect(onTimelineToggle).toHaveBeenCalledWith(true);diff --git a/web/src/features/feature-previews/components/FeaturePreviewModal.stories.tsx b/web/src/features/feature-previews/components/FeaturePreviewModal.stories.tsxindex c82bf3a272..6d6ab92d4b 100644--- a/web/src/features/feature-previews/components/FeaturePreviewModal.stories.tsx+++ b/web/src/features/feature-previews/components/FeaturePreviewModal.stories.tsx@@ -56,8 +56,8 @@ const meta = preview.meta({open: true,onOpenChange: fn(),state: {- modernSession: { enabled: false, onToggle: fn(), isToggling: false },- sessionTimeline: { enabled: false, disabled: true, onToggle: fn() },+ sessionViewV2: { enabled: false, onToggle: fn(), isToggling: false },+ sessionViewV2Timeline: { enabled: false, disabled: true, onToggle: fn() },},},render: StatefulFeaturePreviewModal,@@ -68,7 +68,7 @@ export const Default = meta.story({});export const Warning = meta.story({args: {state: {- modernSession: {+ sessionViewV2: {enabled: false,warningReason:"This preview is enabled globally, so a per-user opt-out does not disable it.",@@ -81,7 +81,7 @@ export const Warning = meta.story({export const Loading = meta.story({args: {state: {- modernSession: { enabled: false, onToggle: fn(), isToggling: true },+ sessionViewV2: { enabled: false, onToggle: fn(), isToggling: true },},},});diff --git a/web/src/features/feature-previews/components/FeaturePreviewModal.tsx b/web/src/features/feature-previews/components/FeaturePreviewModal.tsxindex 158a53acb7..808c683d80 100644--- a/web/src/features/feature-previews/components/FeaturePreviewModal.tsx+++ b/web/src/features/feature-previews/components/FeaturePreviewModal.tsx@@ -62,16 +62,16 @@ const PREVIEW_REGISTRY: PreviewRegistryItem[] = [feedbackUrl: "https://github.com/orgs/langfuse/discussions",},{- flag: "modernSession",+ flag: "sessionViewV2",description:"Navigate every trace in a session from one continuous conversation feed, with tools and structured data available on demand.",details:- "Compact Session View replaces separate trace cards with a compact minimap and a virtualized feed. Jump between traces, keep the active trace in view, or temporarily show inline tool calls and system prompts.",- feedbackUrl: "https://github.com/orgs/langfuse/discussions",+ "Redesigned Session View replaces separate trace cards with a compact minimap and a virtualized feed. Jump between traces, keep the active trace in view, or temporarily show inline tool calls and system prompts.",+ feedbackUrl: "https://github.com/orgs/langfuse/discussions/18687",illustration: {light: modernSessionLightIllustration,dark: modernSessionDarkIllustration,- alt: "Compact Session View showing a trace minimap beside a continuous session conversation feed.",+ alt: "Redesigned Session View with a continuous session conversation feed.",},},];@@ -193,30 +193,31 @@ export function FeaturePreviewModal({</div></div>- {selected.flag === "modernSession" && state.sessionTimeline ? (+ {selected.flag === "sessionViewV2" &&+ state.sessionViewV2Timeline ? (<div className="border-border mt-5 flex items-start justify-between gap-6 border-t pt-5"><div><h3 className="text-foreground text-sm font-bold">- {featurePreviewLabels.sessionTimeline}+ {featurePreviewLabels.sessionViewV2Timeline}</h3><p className="text-muted-foreground mt-1 max-w-2xl text-sm">Use the redesigned timeline to navigate session eventsin chronological order.</p>- {state.sessionTimeline.warningReason ? (+ {state.sessionViewV2Timeline.warningReason ? (<p className="mt-2 text-xs text-yellow-800 dark:text-yellow-200">- {state.sessionTimeline.warningReason}+ {state.sessionViewV2Timeline.warningReason}</p>) : null}</div><Switch- checked={state.sessionTimeline.enabled}+ checked={state.sessionViewV2Timeline.enabled}disabled={- state.sessionTimeline.disabled === true ||- state.sessionTimeline.isToggling === true+ state.sessionViewV2Timeline.disabled === true ||+ state.sessionViewV2Timeline.isToggling === true}- onCheckedChange={state.sessionTimeline.onToggle}- aria-label={`Toggle ${featurePreviewLabels.sessionTimeline}`}+ onCheckedChange={state.sessionViewV2Timeline.onToggle}+ aria-label={`Toggle ${featurePreviewLabels.sessionViewV2Timeline}`}/></div>) : null}diff --git a/web/src/features/organizations/server/organizationRouter.ts b/web/src/features/organizations/server/organizationRouter.tsindex 495f85a26b..d1ca410a9d 100644--- a/web/src/features/organizations/server/organizationRouter.ts+++ b/web/src/features/organizations/server/organizationRouter.ts@@ -26,7 +26,7 @@ import { buildAdminOrgContext } from "@/src/features/organizations/server/adminOimport { getSfdcService } from "@/src/ee/features/sfdc-sync/server";import {featurePreviewFlags,- filterFeaturePreviewFlags,+ getOrganizationFeaturePreviewDefaults,isOrganizationOnlyFeaturePreviewFlag,setOrganizationFeatureFlagDefault,parseFlags,@@ -97,7 +97,7 @@ export const organizationsRouter = createTRPCRouter({}return {- defaults: filterFeaturePreviewFlags(+ defaults: getOrganizationFeaturePreviewDefaults(organization.featureFlagOrgDefaults,),memberCount: organization._count.organizationMemberships,@@ -174,7 +174,7 @@ export const organizationsRouter = createTRPCRouter({});return {- defaults: result.after,+ defaults: getOrganizationFeaturePreviewDefaults(result.after),flag: input.flag,enabled: input.enabled,};diff --git a/web/src/features/sessions/SessionPages.tsx b/web/src/features/sessions/SessionPages.tsxindex e28aa42ca2..0eba79020b 100644--- a/web/src/features/sessions/SessionPages.tsx+++ b/web/src/features/sessions/SessionPages.tsx@@ -1003,14 +1003,17 @@ export const SessionEventsPage: React.FC<{sessionId: string;projectId: string;}> = ({ sessionId, projectId }) => {- const isModernSessionEnabled = useIsFeatureEnabled("modernSession", {- enableForAdmins: false,- projectId,- });- const isSessionTimelineEnabled = useIsFeatureEnabled("sessionTimeline", {+ const isModernSessionEnabled = useIsFeatureEnabled("sessionViewV2", {enableForAdmins: false,projectId,});+ const isSessionTimelineEnabled = useIsFeatureEnabled(+ "sessionViewV2Timeline",+ {+ enableForAdmins: false,+ projectId,+ },+ );const session = api.sessions.byIdWithScoresFromEvents.useQuery({sessionId,@@ -1159,14 +1162,17 @@ const LoadedSessionEventsPage: React.FC<{const { setDetailPageList, detailPagelists } = useDetailPageLists();const userSession = useSession();const capture = usePostHogClientCapture();- const isModernSessionEnabled = useIsFeatureEnabled("modernSession", {- enableForAdmins: false,- projectId,- });- const isSessionTimelineEnabled = useIsFeatureEnabled("sessionTimeline", {+ const isModernSessionEnabled = useIsFeatureEnabled("sessionViewV2", {enableForAdmins: false,projectId,});+ const isSessionTimelineEnabled = useIsFeatureEnabled(+ "sessionViewV2Timeline",+ {+ enableForAdmins: false,+ projectId,+ },+ );const isMobile = useIsMobile();const openAnnotateRef = useRef<(payload: SessionAnnotatePayload) => void>(() => {},