trunk-merge/pr-87346/2c072ef9-b7fa-4ff7-877e-f48418c7cc6b-bisection

frontend/src/scenes/organizationLogic.tsx

@@ -29,6 +29,7 @@ export type OrganizationUpdatePayload = Partial<
         | 'members_can_create_projects'
         | 'members_can_use_personal_api_keys'
         | 'members_can_see_org_members'
+        | 'read_only_mcp_access'
         | 'is_ai_data_processing_approved'
         | 'is_ai_training_opted_in'
         | 'default_experiment_stats_method'

frontend/src/scenes/settings/SettingsMap.tsx

@@ -36,6 +36,7 @@ import { PreAggregatedTablesSetting } from 'scenes/settings/environment/PreAggre
 import { ReplayTriggers } from 'scenes/settings/environment/ReplayTriggers'
 import { SessionsTableVersion } from 'scenes/settings/environment/SessionsTableVersion'
 import { SessionsV2JoinModeSettings } from 'scenes/settings/environment/SessionsV2JoinModeSettings'
+import { OrganizationMCPAccess } from 'scenes/settings/organization/OrganizationMCPAccess'
 import { urls } from 'scenes/urls'
 
 import {
@@ -1908,6 +1909,13 @@ export const SETTINGS_MAP: SettingSection[] = [
                 component: <OrganizationSecuritySettings />,
                 keywords: ['compliance', 'sharing', 'public'],
             },
+            {
+                id: 'organization-mcp-access',
+                title: 'MCP access',
+                description: 'Control what the PostHog MCP can do in this organization.',
+                component: <OrganizationMCPAccess />,
+                keywords: ['mcp', 'ai', 'agent', 'read-only', 'model context protocol'],
+            },
             {
                 id: 'organization-personal-api-keys',
                 title: 'Personal API key access',

frontend/src/scenes/settings/organization/OrganizationMCPAccess.tsx

@@ -0,0 +1,44 @@
+import { useActions, useValues } from 'kea'
+
+import { IconInfo } from '@posthog/icons'
+import { LemonSwitch } from '@posthog/lemon-ui'
+
+import { PayGateMini } from 'lib/components/PayGateMini/PayGateMini'
+import { useRestrictedArea } from 'lib/components/RestrictedArea'
+import { OrganizationMembershipLevel } from 'lib/constants'
+import { Tooltip } from 'lib/lemon-ui/Tooltip'
+import { organizationLogic } from 'scenes/organizationLogic'
+
+import { AvailableFeature } from '~/types'
+
+export function OrganizationMCPAccess(): JSX.Element {
+    const { currentOrganization, currentOrganizationLoading } = useValues(organizationLogic)
+    const { updateOrganization } = useActions(organizationLogic)
+
+    const adminRestrictionReason = useRestrictedArea({
+        minimumAccessLevel: OrganizationMembershipLevel.Admin,
+    })
+
+    return (
+        <PayGateMini feature={AvailableFeature.ORGANIZATION_SECURITY_SETTINGS}>
+            <LemonSwitch
+                label={
+                    <span>
+                        Restrict MCP access to read-only{' '}
+                        <Tooltip title="When enabled, anyone connecting to this organization through the PostHog MCP can read data but can't change it. This applies to every member, including admins. Each member's permissions still apply separately via access control. Using PostHog in the app or calling the API directly is not affected.">
+                            <IconInfo className="mr-1" />
+                        </Tooltip>
+                    </span>
+                }
+                bordered
+                data-attr="org-mcp-access-read-only-toggle"
+                checked={!!currentOrganization?.read_only_mcp_access}
+                onChange={(read_only_mcp_access) => {
+                    updateOrganization({ read_only_mcp_access })
+                }}
+                disabled={currentOrganizationLoading}
+                disabledReason={adminRestrictionReason}
+            />
+        </PayGateMini>
+    )
+}

frontend/src/scenes/settings/organization/VerifiedDomains/verifiedDomainImpactLogic.ts

@@ -53,6 +53,7 @@ export interface verifiedDomainImpactLogicActions {
                 | 'members_can_see_org_members'
                 | 'members_can_use_personal_api_keys'
                 | 'name'
+                | 'read_only_mcp_access'
             >
         >
     ) => Partial<
@@ -72,6 +73,7 @@ export interface verifiedDomainImpactLogicActions {
             | 'members_can_see_org_members'
             | 'members_can_use_personal_api_keys'
             | 'name'
+            | 'read_only_mcp_access'
         >
     > // organizationLogic
     closeEnforcementPrompt: () => {

frontend/src/scenes/settings/types.ts

@@ -217,6 +217,7 @@ export type SettingId =
     | 'organization-proxy'
     | 'organization-roles'
     | 'organization-security'
+    | 'organization-mcp-access'
     | 'organization-personal-api-keys'
     | 'passkeys'
     | 'login-sessions'

frontend/src/types.ts

@@ -593,6 +593,7 @@ export interface OrganizationType extends OrganizationBasicType {
     members_can_create_projects?: boolean
     members_can_use_personal_api_keys: boolean
     members_can_see_org_members?: boolean
+    read_only_mcp_access?: boolean
     allow_publicly_shared_resources: boolean
     metadata?: OrganizationMetadata
     member_count: number

posthog/api/organization.py

@@ -189,6 +189,7 @@ class Meta:
             "members_can_use_personal_api_keys",
             "members_can_see_org_members",
             "allow_publicly_shared_resources",
+            "read_only_mcp_access",
             "member_count",
             "is_ai_data_processing_approved",
             "is_ai_training_opted_in",
@@ -397,6 +398,15 @@ def validate_members_can_see_org_members(self, value: bool) -> bool:
     def get_member_count(self, organization: Organization) -> int:
         return _cached_per_org("member_count", str(organization.id), lambda: _fetch_member_count(organization))
 
+    def validate_read_only_mcp_access(self, value: bool) -> bool:
+        if self.instance and self.instance.read_only_mcp_access != value:
+            if not self.instance.is_feature_available(AvailableFeature.ORGANIZATION_SECURITY_SETTINGS):
+                raise serializers.ValidationError(
+                    "You must upgrade your plan to configure MCP access.",
+                    code="payment_required",
+                )
+        return value
+
     @tracer.start_as_current_span("organization_serializer.to_representation")
     def to_representation(self, instance):
         return super().to_representation(instance)

products/access_control/backend/tests/test_mcp_access.py

@@ -19,6 +19,37 @@
 from posthog.models.utils import generate_random_token_personal, hash_key_value
 
 
+class TestMCPAccessSetting(APIBaseTest):
+    def setUp(self) -> None:
+        super().setUp()
+        self.organization.available_product_features = [
+            {
+                "key": AvailableFeature.ORGANIZATION_SECURITY_SETTINGS,
+                "name": AvailableFeature.ORGANIZATION_SECURITY_SETTINGS,
+            }
+        ]
+        self.organization.save()
+        self.organization_membership.level = OrganizationMembership.Level.ADMIN
+        self.organization_membership.save()
+
+    def test_toggle_round_trip(self) -> None:
+        response = self.client.patch("/api/organizations/@current/", {"read_only_mcp_access": True})
+        assert response.status_code == 200
+        assert response.json()["read_only_mcp_access"] is True
+        self.organization.refresh_from_db()
+        assert self.organization.read_only_mcp_access is True
+
+        response = self.client.patch("/api/organizations/@current/", {"read_only_mcp_access": False})
+        assert response.json()["read_only_mcp_access"] is False
+
+    def test_toggle_requires_the_entitlement(self) -> None:
+        self.organization.available_product_features = []
+        self.organization.save()
+        response = self.client.patch("/api/organizations/@current/", {"read_only_mcp_access": True})
+        assert response.status_code == 400
+        assert response.json()["code"] == "payment_required"
+
+
 class TestMCPReadOnlyEnforcement(APIBaseTest):
     def setUp(self) -> None:
         super().setUp()