PostHog · dmarticus · Jan 16, 2025 · Jan 14, 2025 · Jan 14, 2025 · Jan 15, 2025
diff --git a/frontend/__snapshots__/replay-player-failure--recent-recordings-404--light.png b/frontend/__snapshots__/replay-player-failure--recent-recordings-404--light.png
diff --git a/frontend/__snapshots__/replay-player-success--recent-recordings--dark.png b/frontend/__snapshots__/replay-player-success--recent-recordings--dark.png
diff --git a/frontend/__snapshots__/replay-player-success--recent-recordings--light.png b/frontend/__snapshots__/replay-player-success--recent-recordings--light.png
diff --git a/frontend/__snapshots__/replay-player-success--second-recording-in-list--dark.png b/frontend/__snapshots__/replay-player-success--second-recording-in-list--dark.png
diff --git a/frontend/__snapshots__/replay-player-success--second-recording-in-list--light.png b/frontend/__snapshots__/replay-player-success--second-recording-in-list--light.png
diff --git a/.../__snapshots__/scenes-other-org-member-invites--current-user-is-admin--dark.png b/.../__snapshots__/scenes-other-org-member-invites--current-user-is-admin--dark.png
diff --git a/...__snapshots__/scenes-other-org-member-invites--current-user-is-admin--light.png b/...__snapshots__/scenes-other-org-member-invites--current-user-is-admin--light.png
diff --git a/...__snapshots__/scenes-other-org-member-invites--current-user-is-member--dark.png b/...__snapshots__/scenes-other-org-member-invites--current-user-is-member--dark.png
diff --git a/..._snapshots__/scenes-other-org-member-invites--current-user-is-member--light.png b/..._snapshots__/scenes-other-org-member-invites--current-user-is-member--light.png
diff --git a/.../__snapshots__/scenes-other-org-member-invites--current-user-is-owner--dark.png b/.../__snapshots__/scenes-other-org-member-invites--current-user-is-owner--dark.png
diff --git a/...__snapshots__/scenes-other-org-member-invites--current-user-is-owner--light.png b/...__snapshots__/scenes-other-org-member-invites--current-user-is-owner--light.png
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-organization--dark.png b/frontend/__snapshots__/scenes-other-settings--settings-organization--dark.png
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-organization--light.png b/frontend/__snapshots__/scenes-other-settings--settings-organization--light.png
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-project--dark.png b/frontend/__snapshots__/scenes-other-settings--settings-project--dark.png
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-project--light.png b/frontend/__snapshots__/scenes-other-settings--settings-project--light.png
diff --git a/...pshots__/scenes-other-settings--settings-project-with-replay-features--dark.png b/...pshots__/scenes-other-settings--settings-project-with-replay-features--dark.png
diff --git a/...shots__/scenes-other-settings--settings-project-with-replay-features--light.png b/...shots__/scenes-other-settings--settings-project-with-replay-features--light.png
diff --git a/...apshots__/scenes-other-settings--settings-session-timeout-all-options--dark.png b/...apshots__/scenes-other-settings--settings-session-timeout-all-options--dark.png
diff --git a/...pshots__/scenes-other-settings--settings-session-timeout-all-options--light.png b/...pshots__/scenes-other-settings--settings-session-timeout-all-options--light.png
diff --git a/...shots__/scenes-other-settings--settings-session-timeout-password-only--dark.png b/...shots__/scenes-other-settings--settings-session-timeout-password-only--dark.png
diff --git a/...hots__/scenes-other-settings--settings-session-timeout-password-only--light.png b/...hots__/scenes-other-settings--settings-session-timeout-password-only--light.png
diff --git a/..._/scenes-other-settings--settings-session-timeout-sso-enforced-github--dark.png b/..._/scenes-other-settings--settings-session-timeout-sso-enforced-github--dark.png
diff --git a/.../scenes-other-settings--settings-session-timeout-sso-enforced-github--light.png b/.../scenes-other-settings--settings-session-timeout-sso-enforced-github--light.png
diff --git a/..._/scenes-other-settings--settings-session-timeout-sso-enforced-google--dark.png b/..._/scenes-other-settings--settings-session-timeout-sso-enforced-google--dark.png
diff --git a/.../scenes-other-settings--settings-session-timeout-sso-enforced-google--light.png b/.../scenes-other-settings--settings-session-timeout-sso-enforced-google--light.png
diff --git a/...s__/scenes-other-settings--settings-session-timeout-sso-enforced-saml--dark.png b/...s__/scenes-other-settings--settings-session-timeout-sso-enforced-saml--dark.png
diff --git a/...__/scenes-other-settings--settings-session-timeout-sso-enforced-saml--light.png b/...__/scenes-other-settings--settings-session-timeout-sso-enforced-saml--light.png
diff --git a/..._snapshots__/scenes-other-settings--settings-session-timeout-sso-only--dark.png b/..._snapshots__/scenes-other-settings--settings-session-timeout-sso-only--dark.png
diff --git a/...snapshots__/scenes-other-settings--settings-session-timeout-sso-only--light.png b/...snapshots__/scenes-other-settings--settings-session-timeout-sso-only--light.png
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-user--dark.png b/frontend/__snapshots__/scenes-other-settings--settings-user--dark.png
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-user--light.png b/frontend/__snapshots__/scenes-other-settings--settings-user--light.png
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-web-vitals--dark.png b/frontend/__snapshots__/scenes-other-settings--settings-web-vitals--dark.png
diff --git a/frontend/__snapshots__/scenes-other-settings--settings-web-vitals--light.png b/frontend/__snapshots__/scenes-other-settings--settings-web-vitals--light.png
diff --git a/frontend/src/lib/api.mock.ts b/frontend/src/lib/api.mock.ts
@@ -94,6 +94,7 @@ export const MOCK_DEFAULT_TEAM: TeamType = {
     live_events_token: '123',
     capture_dead_clicks: false,
     human_friendly_comparison_periods: false,
+    flags_persistence_default: false,
 }
 
 export const MOCK_DEFAULT_PROJECT: ProjectType = {

diff --git a/frontend/src/scenes/feature-flags/FeatureFlagSettings.tsx b/frontend/src/scenes/feature-flags/FeatureFlagSettings.tsx
@@ -0,0 +1,55 @@
+import { LemonDialog, LemonSwitch, Link } from '@posthog/lemon-ui'
+import { useActions, useValues } from 'kea'
+import { teamLogic } from 'scenes/teamLogic'
+
+export type FeatureFlagSettingsProps = {
+    inModal?: boolean
+}
+
+export function FeatureFlagSettings({ inModal = false }: FeatureFlagSettingsProps): JSX.Element {
+    const { updateCurrentTeam } = useActions(teamLogic)
+    const { currentTeam } = useValues(teamLogic)
+
+    return (
+        <div className="space-y-4">
+            <div className="space-y-2">
+                <LemonSwitch
+                    data-attr="default-flag-persistence-switch"
+                     => {
+                        updateCurrentTeam({
+                            flags_persistence_default: checked,
+                        })
+                    }}
+                    label="Enable flag persistence by default"
+                    bordered={!inModal}
+                    fullWidth={inModal}
+                    labelClassName={inModal ? 'text-base font-semibold' : ''}
+                    checked={!!currentTeam?.flags_persistence_default}
+                />
+
+                <p>
+                    When enabled, all new feature flags will have persistence enabled by default. This ensures
+                    consistent user experiences across authentication steps. Learn more in our{' '}
+                    <Link
+                        to="https://posthog.com/docs/feature-flags/creating-feature-flags#persisting-feature-flags-across-authentication-steps"
+                        target="_blank"
+                    >
+                        documentation
+                    </Link>
+                    .
+                </p>
+            </div>
+        </div>
+    )
+}
+
+export function openFeatureFlagSettingsDialog(): void {
+    LemonDialog.open({
+        title: 'Feature flag settings',
+        content: <FeatureFlagSettings inModal />,
+        width: 600,
+        primaryButton: {
+            children: 'Done',
+        },
+    })
+}
diff --git a/frontend/src/scenes/feature-flags/featureFlagLogic.ts b/frontend/src/scenes/feature-flags/featureFlagLogic.ts
@@ -233,7 +233,7 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
     connect((props: FeatureFlagLogicProps) => ({
         values: [
             teamLogic,
-            ['currentTeamId'],
+            ['currentTeam', 'currentTeamId'],
             projectLogic,
             ['currentProjectId'],
             groupsModel,
@@ -291,7 +291,10 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
     }),
     forms(({ actions, values }) => ({
         featureFlag: {
-            defaults: { ...NEW_FLAG },
+            defaults: {
+                ...NEW_FLAG,
+                ensure_experience_continuity: values.currentTeam?.flags_persistence_default || false,
+            },
             errors: ({ key, filters }) => {
                 return {
                     key: validateFeatureFlagKey(key),
@@ -538,7 +541,10 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
                         throw e
                     }
                 }
-                return NEW_FLAG
+                return {
+                    ...NEW_FLAG,
+                    ensure_experience_continuity: values.currentTeam?.flags_persistence_default ?? false,
+                }
             },
             saveFeatureFlag: async (updatedFlag: Partial<FeatureFlagType>) => {
                 const { created_at, id, ...flag } = updatedFlag

diff --git a/frontend/src/scenes/settings/SettingsMap.tsx b/frontend/src/scenes/settings/SettingsMap.tsx
@@ -18,6 +18,7 @@ import {
 import { CorrelationConfig } from './environment/CorrelationConfig'
 import { DataAttributes } from './environment/DataAttributes'
 import { DataColorThemes } from './environment/DataColorThemes'
+import { FeatureFlagSettings } from './environment/FeatureFlagSettings'
 import { GroupAnalyticsConfig } from './environment/GroupAnalyticsConfig'
 import { HeatmapsSettings } from './environment/HeatmapsSettings'
 import { HumanFriendlyComparisonPeriodsSetting } from './environment/HumanFriendlyComparisonPeriodsSetting'
@@ -299,6 +300,18 @@ export const SETTINGS_MAP: SettingSection[] = [
             },
         ],
     },
+    {
+        level: 'environment',
+        id: 'environment-feature-flags',
+        title: 'Feature flags',
+        settings: [
+            {
+                id: 'feature-flags-interface',
+                title: 'Feature flags',
+                component: <FeatureFlagSettings />,
+            },
+        ],
+    },
     {
         level: 'environment',
         id: 'environment-error-tracking',

diff --git a/frontend/src/scenes/settings/environment/FeatureFlagSettings.tsx b/frontend/src/scenes/settings/environment/FeatureFlagSettings.tsx
@@ -0,0 +1,16 @@
+import { Link } from '@posthog/lemon-ui'
+import { FeatureFlagSettings as BasicFeatureFlagSettings } from 'scenes/feature-flags/FeatureFlagSettings'
+import { urls } from 'scenes/urls'
+
+export function FeatureFlagSettings(): JSX.Element {
+    return (
+        <>
+            <p>
+                Configure default behavior for feature flags. Flags can be managed on the{' '}
+                <Link to={urls.featureFlags()}>feature flags page</Link>.
+            </p>
+
+            <BasicFeatureFlagSettings />
+        </>
+    )
+}
diff --git a/...nes/settings/organization/VerifiedDomains/__snapshots__/verifiedDomainsLogic.test.ts.snap b/...nes/settings/organization/VerifiedDomains/__snapshots__/verifiedDomainsLogic.test.ts.snap
@@ -73,6 +73,7 @@ exports[`verifiedDomainsLogic values has proper defaults 1`] = `
           "data-attr",
         ],
         "effective_membership_level": 8,
+        "flags_persistence_default": false,
         "has_group_types": true,
         "heatmaps_opt_in": true,
         "human_friendly_comparison_periods": false,

diff --git a/frontend/src/scenes/settings/types.ts b/frontend/src/scenes/settings/types.ts
@@ -22,6 +22,7 @@ export type SettingSectionId =
     | 'environment-web-analytics'
     | 'environment-replay'
     | 'environment-surveys'
+    | 'environment-feature-flags'
     | 'environment-error-tracking'
     | 'environment-toolbar'
     | 'environment-integrations'
@@ -72,6 +73,7 @@ export type SettingId =
     | 'replay-authorized-domains'
     | 'replay-ingestion'
     | 'surveys-interface'
+    | 'feature-flags-interface'
     | 'error-tracking-user-groups'
     | 'authorized-toolbar-urls'
     | 'integration-webhooks'

diff --git a/frontend/src/scenes/teamActivityDescriber.tsx b/frontend/src/scenes/teamActivityDescriber.tsx
@@ -389,6 +389,7 @@ const teamActionsMapping: Record<
     slack_incoming_webhook: () => null,
     timezone: () => null,
     surveys_opt_in: () => null,
+    flags_persistence_default: () => null,
     week_start_day: () => null,
     default_modifiers: () => null,
     has_completed_onboarding_for: () => null,

diff --git a/frontend/src/types.ts b/frontend/src/types.ts
@@ -569,6 +569,7 @@ export interface TeamType extends TeamBasicType {
     default_modifiers?: HogQLQueryModifiers
     product_intents?: ProductIntentType[]
     default_data_theme?: number
+    flags_persistence_default: boolean
 }
 
 export interface ProductIntentType {

diff --git a/posthog/api/decide.py b/posthog/api/decide.py
@@ -144,6 +144,7 @@ def get_base_config(token: str, team: Team, request: HttpRequest, skip_db: bool
 
     response["surveys"] = True if team.surveys_opt_in else False
     response["heatmaps"] = True if team.heatmaps_opt_in else False
+    response["flagsPersistenceDefault"] = True if team.flags_persistence_default else False
     response["defaultIdentifiedOnly"] = True  # Support old SDK versions with setting that is now the default
 
     site_apps = []

diff --git a/posthog/api/project.py b/posthog/api/project.py
@@ -123,6 +123,7 @@ class Meta:
             "surveys_opt_in",  # Compat with TeamSerializer
             "heatmaps_opt_in",  # Compat with TeamSerializer
             "product_intents",  # Compat with TeamSerializer
+            "flags_persistence_default",  # Compat with TeamSerializer
         )
         read_only_fields = (
             "id",
@@ -184,6 +185,7 @@ class Meta:
             "has_completed_onboarding_for",
             "surveys_opt_in",
             "heatmaps_opt_in",
+            "flags_persistence_default",
         }
 
     def get_effective_membership_level(self, project: Project) -> Optional[OrganizationMembership.Level]:

diff --git a/posthog/api/team.py b/posthog/api/team.py
@@ -141,6 +141,7 @@ class Meta:
             "surveys_opt_in",
             "heatmaps_opt_in",
             "capture_dead_clicks",
+            "flags_persistence_default",
         ]
         read_only_fields = fields
 
@@ -211,6 +212,7 @@ class Meta:
             "has_completed_onboarding_for",
             "surveys_opt_in",
             "heatmaps_opt_in",
+            "flags_persistence_default",
             "live_events_token",
             "product_intents",
             "capture_dead_clicks",

diff --git a/posthog/api/test/__snapshots__/test_action.ambr b/posthog/api/test/__snapshots__/test_action.ambr
@@ -69,6 +69,7 @@
          "posthog_team"."capture_dead_clicks",
          "posthog_team"."surveys_opt_in",
          "posthog_team"."heatmaps_opt_in",
+         "posthog_team"."flags_persistence_default",
          "posthog_team"."session_recording_version",
          "posthog_team"."signup_token",
          "posthog_team"."is_demo",
@@ -377,6 +378,7 @@
          "posthog_team"."capture_dead_clicks",
          "posthog_team"."surveys_opt_in",
          "posthog_team"."heatmaps_opt_in",
+         "posthog_team"."flags_persistence_default",
          "posthog_team"."session_recording_version",
          "posthog_team"."signup_token",
          "posthog_team"."is_demo",
@@ -894,6 +896,7 @@
          "posthog_team"."capture_dead_clicks",
          "posthog_team"."surveys_opt_in",
          "posthog_team"."heatmaps_opt_in",
+         "posthog_team"."flags_persistence_default",
          "posthog_team"."session_recording_version",
          "posthog_team"."signup_token",
          "posthog_team"."is_demo",

diff --git a/posthog/api/test/__snapshots__/test_annotation.ambr b/posthog/api/test/__snapshots__/test_annotation.ambr
@@ -69,6 +69,7 @@
          "posthog_team"."capture_dead_clicks",
          "posthog_team"."surveys_opt_in",
          "posthog_team"."heatmaps_opt_in",
+         "posthog_team"."flags_persistence_default",
          "posthog_team"."session_recording_version",
          "posthog_team"."signup_token",
          "posthog_team"."is_demo",
@@ -372,6 +373,7 @@
          "posthog_team"."capture_dead_clicks",
          "posthog_team"."surveys_opt_in",
          "posthog_team"."heatmaps_opt_in",
+         "posthog_team"."flags_persistence_default",
          "posthog_team"."session_recording_version",
          "posthog_team"."signup_token",
          "posthog_team"."is_demo",
@@ -821,6 +823,7 @@
          "posthog_team"."capture_dead_clicks",
          "posthog_team"."surveys_opt_in",
          "posthog_team"."heatmaps_opt_in",
+         "posthog_team"."flags_persistence_default",
          "posthog_team"."session_recording_version",
          "posthog_team"."signup_token",
          "posthog_team"."is_demo",