[pull] master from getsentry:master

.agents/skills/generate-frontend-forms/SKILL.md

@@ -914,7 +914,13 @@ mutationOptions={{
 
 Type the `mutationFn` with the API's data type, **not** the zod schema type. The schema is for client-side field validation — the mutation should accept whatever the API endpoint accepts. Don't use generic types like `Record<string, unknown>` either, as that breaks TanStack Form's ability to narrow field types.
 
+**NEVER pass call-site generics to `mutationOptions`, `useMutation`, or any TanStack Query function.** Types must be inferred, not asserted. See the full rules in `static/AGENTS.md` under "TanStack Query Type Inference."
+
 ```tsx
+// ❌ NEVER pass generics to mutationOptions/useMutation
+mutationOptions<unknown, RequestError, Variables, Context>({...})
+useMutation<Response, RequestError, Variables>({...})
+
 // ❌ Don't use generic types - breaks field type narrowing
 const opts = mutationOptions({
   mutationFn: (data: Record<string, unknown>) => fetchMutation({...}),
@@ -925,9 +931,15 @@ const opts = mutationOptions({
   mutationFn: (data: Partial<z.infer<typeof preferencesSchema>>) => fetchMutation({...}),
 });
 
-// ✅ Use the API's data type
+// ❌ Don't explicitly type context — it's inferred from onMutate return
+type MyContext = {previousData: UserDetails};
+
+// ❌ Don't use RequestError as the error generic — use runtime narrowing instead
+
+// ✅ Use the API's data type on mutationFn, let everything else be inferred
 const opts = mutationOptions({
-  mutationFn: (data: Partial<UserDetails>) => fetchMutation({...}),
+  mutationFn: (data: Partial<UserDetails>) =>
+    fetchMutation<UserDetails>({...}),
 });
 ```
 

.agents/skills/migrate-frontend-forms/SKILL.md

@@ -216,15 +216,24 @@ mutationOptions={{
 
 Make sure the zod schema's types are compatible with (i.e., assignable to) the API type. For example, if the API expects a string union like `'off' | 'low' | 'high'`, use `z.enum(['off', 'low', 'high'])` instead of `z.string()`.
 
-**Don't pass generics to `useMutation` either.** Type the `mutationFn` payload, and let `fetchMutation<TReturn>` carry the return type. `useMutation<TData, TError, TVariables>` is not the codebase style.
+**NEVER pass call-site generics to `useMutation`, `mutationOptions`, or any TanStack Query function.** This applies to ALL generics — data, error, variables, AND context. Types must be inferred, not asserted. See the full rules in `static/AGENTS.md` under "TanStack Query Type Inference."
 
 ```tsx
-// ❌ Generics on useMutation
+// ❌ Generics on useMutation — NEVER do this
 const mutation = useMutation<CodeOwner, RequestError, [Payload]>({
   mutationFn: ([payload]) => fetchMutation({url, method: 'POST', data: payload}),
 });
 
-// ✅ Type the payload; fetchMutation<T> carries the return type
+// ❌ Generics on mutationOptions — NEVER do this either
+mutationOptions<unknown, RequestError, Variables, MyContext>({...})
+
+// ❌ Explicit context type — inferred from onMutate return
+type MyContext = {changeId: string};
+
+// ❌ RequestError as error generic — it's a type assertion in disguise
+// Other things can go wrong that would NOT yield a RequestError
+
+// ✅ Type the mutationFn payload; fetchMutation<T> carries the return type
 const mutation = useMutation({
   mutationFn: (payload: {codeMappingId: string; raw: string}) =>
     fetchMutation<CodeOwner>({
@@ -233,6 +242,18 @@ const mutation = useMutation({
       data: payload,
     }),
 });
+
+// ✅ Context is inferred from onMutate, error is Error by default
+mutationOptions({
+  mutationFn: (variables: MyVars) => fetchMutation<MyResponse>({...}),
+  onMutate: async () => {
+    return {changeId: uniqueId()};  // context type inferred from this
+  },
+  onError: (_error, _vars, context) => {
+    // context?.changeId is typed automatically
+    // _error is Error — use runtime narrowing for RequestError
+  },
+})
 ```
 
 ### mapFormErrors → `setFieldErrors`

fixtures/backup/app-user-with-empty-email.json

@@ -1,12 +1,4 @@
 [
-  {
-    "model": "sentry.email",
-    "pk": 9,
-    "fields": {
-      "email": "",
-      "date_added": "2023-07-26T19:19:37.201Z"
-    }
-  },
   {
     "model": "sentry.user",
     "pk": 34,

src/sentry/api/urls.py

@@ -489,7 +489,6 @@
 from sentry.relocation.api.endpoints.recover import RelocationRecoverEndpoint
 from sentry.relocation.api.endpoints.retry import RelocationRetryEndpoint
 from sentry.relocation.api.endpoints.unpause import RelocationUnpauseEndpoint
-from sentry.replays.endpoints.data_export_notifications import DataExportNotificationsEndpoint
 from sentry.replays.endpoints.organization_replay_count import OrganizationReplayCountEndpoint
 from sentry.replays.endpoints.organization_replay_details import OrganizationReplayDetailsEndpoint
 from sentry.replays.endpoints.organization_replay_events_meta import (
@@ -3795,11 +3794,6 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         AcceptOrganizationInvite.as_view(),
         name="sentry-api-0-organization-accept-organization-invite",
     ),
-    re_path(
-        r"^data-export/notifications/google-cloud/$",
-        DataExportNotificationsEndpoint.as_view(),
-        name="sentry-api-0-data-export-notifications",
-    ),
     re_path(
         r"^notification-defaults/$",
         NotificationDefaultsEndpoints.as_view(),

src/sentry/backup/services/import_export/impl.py

@@ -535,6 +535,7 @@ def filter_objects(queryset_iterator):
                             # keep track of the new pk in the input map as well.
                             in_pk_map.insert(model_name, item.pk, item.pk, ImportKind.Inserted)
                             out_pk_map.insert(model_name, item.pk, item.pk, ImportKind.Inserted)
+                            item.normalize_before_relocation_export()
                             yield item
 
             def yield_objects():

src/sentry/conf/server.py

@@ -941,6 +941,7 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     "sentry.seer.entrypoints.operator",
     "sentry.seer.entrypoints.slack.messaging",
     "sentry.seer.entrypoints.slack.tasks",
+    "sentry.snuba.query_subscriptions.run",
     "sentry.snuba.tasks",
     "sentry.tasks.activity",
     "sentry.tasks.assemble",

src/sentry/db/models/base.py

@@ -294,6 +294,12 @@ def normalize_before_relocation_import(
 
         return old_pk
 
+    def normalize_before_relocation_export(self) -> None:
+        """
+        Called during export and enables records to clean/prep their data for export.
+        """
+        pass
+
     def write_relocation_import(
         self, _s: ImportScope, _f: ImportFlags
     ) -> tuple[int, ImportKind] | None:

src/sentry/dynamic_sampling/per_org/tasks/queries.py

@@ -26,7 +26,7 @@ class DynamicSamplingQueryFilters(StrEnum):
 
 
 class DynamicSamplingQueryFields(StrEnum):
-    ROOT_PROJECT = "sentry.dsc.root_project"
+    DSC_PROJECT_ID = "sentry.dsc.project_id"
     COUNT = "count()"
     COUNT_SAMPLE = "count_sample()"
 
@@ -126,11 +126,11 @@ def get_eap_project_volumes(
             ),
             "query_string": DynamicSamplingQueryFilters.IS_SEGMENT,
             "selected_columns": [
-                DynamicSamplingQueryFields.ROOT_PROJECT,
+                DynamicSamplingQueryFields.DSC_PROJECT_ID,
                 DynamicSamplingQueryFields.COUNT,
                 DynamicSamplingQueryFields.COUNT_SAMPLE,
             ],
-            "orderby": [DynamicSamplingQueryFields.ROOT_PROJECT],
+            "orderby": [DynamicSamplingQueryFields.DSC_PROJECT_ID],
             "referrer": Referrer.DYNAMIC_SAMPLING_PER_ORG_GET_EAP_PROJECT_VOLUMES.value,
             "config": SearchResolverConfig(
                 auto_fields=True,
@@ -141,13 +141,13 @@ def get_eap_project_volumes(
     ):
         total = _get_aggregate_int(row, DynamicSamplingQueryFields.COUNT)
         keep = _get_aggregate_int(row, DynamicSamplingQueryFields.COUNT_SAMPLE)
-        root_project = row.get(DynamicSamplingQueryFields.ROOT_PROJECT)
-        if root_project is None:
+        dsc_project_id = row.get(DynamicSamplingQueryFields.DSC_PROJECT_ID)
+        if dsc_project_id is None:
             continue
 
         project_volumes.append(
             ProjectVolume(
-                project_id=ProjectId(int(root_project)),
+                project_id=ProjectId(int(dsc_project_id)),
                 total=total,
                 keep=keep,
                 drop=max(total - keep, 0),

src/sentry/features/temporary.py

@@ -73,8 +73,6 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:dashboards-prebuilt-insights-dashboards", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable the details widget for dashboards
     manager.add("organizations:dashboards-details-widget", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enable text widgets for dashboards
-    manager.add("organizations:dashboards-text-widgets", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable Insights to Dashboards UI migration
     manager.add("organizations:insights-to-dashboards-ui-rollout", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable AI-powered dashboard generation via Seer

src/sentry/models/apitoken.py

@@ -572,6 +572,17 @@ def sanitize_relocation_json(
             lambda _: hashed_refresh_token,
         )
 
+    def normalize_before_relocation_export(self) -> None:
+        """
+        Trim ApiToken scopes to eliminate scopes that are no longer valid.
+
+        We have historical ApiToken records with the `project:distribution` scope
+        which is no longer valid for ApiTokens.
+        """
+        from sentry.receivers.tokens import enforce_scope_hierarchy
+
+        enforce_scope_hierarchy(self)
+
     @property
     def organization_id(self) -> int | None:
         from sentry.sentry_apps.models.sentry_app_installation import SentryAppInstallation