diff --git a/.oxfmtrc.json b/.oxfmtrc.json
index 296f4ce801e580..ce604276904fba 100644
--- a/.oxfmtrc.json
+++ b/.oxfmtrc.json
@@ -115,6 +115,7 @@
     "api-docs/**/*.json",
     ".vscode/**",
     "static/app/data/world.json",
-    "tests/sentry/grouping/**/*.json"
+    "tests/sentry/grouping/**/*.json",
+    "pyproject.toml"
   ]
 }
diff --git a/eslint.config.ts b/eslint.config.ts
index 323d3a70330f78..babc317f3f6c80 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -919,6 +919,7 @@ export default typescript.config([
     name: 'plugin/prettier',
     extends: [prettier],
     rules: {
+      curly: 'error',
       // import sorting is handled by oxfmt
       'import/order': 'off',
       'sort-imports': 'off',
diff --git a/scripts/analyze-styled.ts b/scripts/analyze-styled.ts
index 2dafee92cbbf80..e32090d803bf86 100644
--- a/scripts/analyze-styled.ts
+++ b/scripts/analyze-styled.ts
@@ -203,8 +203,12 @@ function getCommitsInDateRange(startDate: string, intervalDays: number): GitComm
 
 // CSV helper functions
 function escapeCsvField(field: string | number): string {
-  if (typeof field === 'number') return field.toString();
-  if (field === null || field === undefined) return '';
+  if (typeof field === 'number') {
+    return field.toString();
+  }
+  if (field === null || field === undefined) {
+    return '';
+  }
   const fieldStr = field.toString();
   if (fieldStr.includes(',') || fieldStr.includes('"') || fieldStr.includes('\n')) {
     return `"${fieldStr.replace(/"/g, '""')}"`;
@@ -213,7 +217,9 @@ function escapeCsvField(field: string | number): string {
 }
 
 function arrayToCSV(data: Array<Record<string, any>>): string {
-  if (data.length === 0) return '';
+  if (data.length === 0) {
+    return '';
+  }
 
   const headers = Object.keys(data[0] ?? {});
   const csvHeaders = headers.map(escapeCsvField).join(',');
@@ -647,7 +653,9 @@ class StyledComponentsDetector extends BaseDetector {
   private cssRuleCounts = new Map<string, number>();
 
   execute(node: ts.Node, context: DetectorContext): void {
-    if (!ts.isTaggedTemplateExpression(node)) return;
+    if (!ts.isTaggedTemplateExpression(node)) {
+      return;
+    }
 
     const taggedExpr = node;
 
@@ -656,7 +664,9 @@ class StyledComponentsDetector extends BaseDetector {
 
       if (callExpr.expression.getText() === 'styled') {
         const component = callExpr.arguments[0];
-        if (!component) return;
+        if (!component) {
+          return;
+        }
 
         let componentName = '';
         let componentType: 'intrinsic' | 'component' | 'unknown' = 'unknown';
@@ -810,9 +820,13 @@ class StyledComponentsDetector extends BaseDetector {
     let staticExpressions = 0;
 
     this.styledComponents.forEach(sc => {
-      if (sc.componentType === 'component') totalReactComponents++;
-      else if (sc.componentType === 'intrinsic') totalIntrinsic++;
-      else unknownComponents++;
+      if (sc.componentType === 'component') {
+        totalReactComponents++;
+      } else if (sc.componentType === 'intrinsic') {
+        totalIntrinsic++;
+      } else {
+        unknownComponents++;
+      }
 
       // Count expressions
       if (sc.hasExpressions) {
@@ -1040,7 +1054,9 @@ class StyledUsagePerFileDetector extends BaseDetector {
     // Track all TSX files we analyze
     this.totalTsxFiles.add(context.fileName);
 
-    if (!ts.isTaggedTemplateExpression(node)) return;
+    if (!ts.isTaggedTemplateExpression(node)) {
+      return;
+    }
 
     const taggedExpr = node;
 
@@ -1124,7 +1140,9 @@ class FlexOnlyDivsDetector extends BaseDetector {
   private styledComponents: StyledComponent[] = [];
 
   execute(node: ts.Node, context: DetectorContext): void {
-    if (!ts.isTaggedTemplateExpression(node)) return;
+    if (!ts.isTaggedTemplateExpression(node)) {
+      return;
+    }
 
     const taggedExpr = node;
 
@@ -1133,7 +1151,9 @@ class FlexOnlyDivsDetector extends BaseDetector {
 
       if (callExpr.expression.getText() === 'styled') {
         const component = callExpr.arguments[0];
-        if (!component) return;
+        if (!component) {
+          return;
+        }
 
         let componentName = '';
         let componentType: 'intrinsic' | 'component' | 'unknown' = 'unknown';
diff --git a/scripts/extractFormFields.ts b/scripts/extractFormFields.ts
index 36f5f8472b559c..736b94314ff6b0 100644
--- a/scripts/extractFormFields.ts
+++ b/scripts/extractFormFields.ts
@@ -71,14 +71,22 @@ class FormFieldExtractor {
 
     for (const sourceFile of this.program.getSourceFiles()) {
       // Skip node_modules
-      if (sourceFile.fileName.includes('node_modules')) continue;
+      if (sourceFile.fileName.includes('node_modules')) {
+        continue;
+      }
 
       // Only process app files
-      if (!sourceFile.fileName.includes('static/app/')) continue;
+      if (!sourceFile.fileName.includes('static/app/')) {
+        continue;
+      }
 
       // Skip test and story files
-      if (sourceFile.fileName.includes('.spec.')) continue;
-      if (sourceFile.fileName.includes('.stories.')) continue;
+      if (sourceFile.fileName.includes('.spec.')) {
+        continue;
+      }
+      if (sourceFile.fileName.includes('.stories.')) {
+        continue;
+      }
 
       const fileFields = this.extractFromFile(sourceFile);
       fields.push(...fileFields);
@@ -169,7 +177,9 @@ class FormFieldExtractor {
 
     // Extract 'name' attribute
     const nameAttr = this.getJsxAttribute(node, 'name');
-    if (!nameAttr) return null;
+    if (!nameAttr) {
+      return null;
+    }
 
     // Extract metadata from render prop children
     const fieldMetadata = this.extractFieldMetadata(node, sourceFile);
@@ -219,7 +229,9 @@ class FormFieldExtractor {
 
         // Extract label/hintText props from any component
         const label = this.getJsxAttributeExpression(node, 'label', sourceFile);
-        if (label && !metadata.label) metadata.label = label;
+        if (label && !metadata.label) {
+          metadata.label = label;
+        }
 
         if (this.hasJsxAttribute(node, 'hintText') && !metadata.hintText) {
           const hintText = this.getJsxAttributeExpression(node, 'hintText', sourceFile);
@@ -230,7 +242,9 @@ class FormFieldExtractor {
         // Extract label from Meta.Label (text is in children)
         if (tagName?.endsWith('.Label') || tagName === 'Meta.Label') {
           const text = this.getJsxTextContent(node, sourceFile);
-          if (text && !metadata.label) metadata.label = text;
+          if (text && !metadata.label) {
+            metadata.label = text;
+          }
         }
 
         // Extract hintText from Meta.HintText (text is in children)
@@ -269,7 +283,9 @@ class FormFieldExtractor {
       // Direct text: <Meta.Label>Name</Meta.Label>
       if (ts.isJsxText(child)) {
         const text = child.text.trim();
-        if (text) return `"${text}"`;
+        if (text) {
+          return `"${text}"`;
+        }
       }
       // Expression: <Meta.Label>{t('Name')}</Meta.Label> -> t('Name')
       if (ts.isJsxExpression(child) && child.expression) {
diff --git a/scripts/genPlatformProductInfo.ts b/scripts/genPlatformProductInfo.ts
index 0a445e91d573af..16b31ac937ca7f 100644
--- a/scripts/genPlatformProductInfo.ts
+++ b/scripts/genPlatformProductInfo.ts
@@ -114,7 +114,9 @@ function parseLink(link: string): {lang: string; guide?: string} | null {
   const m = link.match(
     /\/platforms\/([\w-]+)(?:\/(?:guides|integrations)\/([\w-]+))?\/?/
   );
-  if (!m) return null;
+  if (!m) {
+    return null;
+  }
   return {lang: m[1]!, guide: m[2]};
 }
 
@@ -166,8 +168,12 @@ function unwrapTypeAssertion(expr: ts.Expression): ts.Expression {
 
 // Property key text from an Identifier or string literal name.
 function propertyKeyName(prop: ts.PropertyAssignment): string | undefined {
-  if (ts.isIdentifier(prop.name)) return prop.name.text;
-  if (ts.isStringLiteral(prop.name)) return prop.name.text;
+  if (ts.isIdentifier(prop.name)) {
+    return prop.name.text;
+  }
+  if (ts.isStringLiteral(prop.name)) {
+    return prop.name.text;
+  }
   return undefined;
 }
 
@@ -181,12 +187,16 @@ function readPlatforms(): PlatformEntry[] {
   }
   const out: PlatformEntry[] = [];
   for (const element of init.elements) {
-    if (!ts.isObjectLiteralExpression(element)) continue;
+    if (!ts.isObjectLiteralExpression(element)) {
+      continue;
+    }
     let id: string | undefined;
     let link = '';
     let deprecated = false;
     for (const prop of element.properties) {
-      if (!ts.isPropertyAssignment(prop)) continue;
+      if (!ts.isPropertyAssignment(prop)) {
+        continue;
+      }
       const key = propertyKeyName(prop);
       if (key === 'id' && ts.isStringLiteral(prop.initializer)) {
         id = prop.initializer.text;
@@ -199,7 +209,9 @@ function readPlatforms(): PlatformEntry[] {
         deprecated = true;
       }
     }
-    if (!id) continue;
+    if (!id) {
+      continue;
+    }
 
     let lang: string | null = null;
     let guide: string | null = null;
@@ -234,9 +246,13 @@ function readLegacyToggleableKeys(): Set<string> {
   }
   const keys = new Set<string>();
   for (const prop of obj.properties) {
-    if (!ts.isPropertyAssignment(prop)) continue;
+    if (!ts.isPropertyAssignment(prop)) {
+      continue;
+    }
     const key = propertyKeyName(prop);
-    if (key) keys.add(key);
+    if (key) {
+      keys.add(key);
+    }
   }
   return keys;
 }
@@ -255,7 +271,9 @@ function readWithMetricsOnboarding(): Set<string> {
   }
   const out = new Set<string>();
   for (const element of arg.elements) {
-    if (ts.isStringLiteral(element)) out.add(element.text);
+    if (ts.isStringLiteral(element)) {
+      out.add(element.text);
+    }
   }
   return out;
 }
@@ -266,10 +284,14 @@ interface Frontmatter {
 }
 
 function readFrontmatter(file: string): Frontmatter | null {
-  if (!existsSync(file)) return null;
+  if (!existsSync(file)) {
+    return null;
+  }
   const text = readFileSync(file, 'utf8');
   const m = text.match(/^---\n([\s\S]*?)\n---/);
-  if (!m) return {};
+  if (!m) {
+    return {};
+  }
   return (parseYaml(m[1]!) as Frontmatter) ?? {};
 }
 
@@ -288,7 +310,9 @@ function findGuideOverridePage(
 ): string | null {
   for (const dir of ['guides', 'integrations']) {
     const f = path.join(DOCS_PLATFORMS_DIR, lang, dir, guide, feature, 'index.mdx');
-    if (existsSync(f)) return f;
+    if (existsSync(f)) {
+      return f;
+    }
   }
   return null;
 }
@@ -299,11 +323,17 @@ function isSupported(
   lang: string,
   guide: string | null
 ): boolean {
-  if (!fm) return false;
+  if (!fm) {
+    return false;
+  }
   const canonical = guide ? `${lang}.${guide}` : lang;
   if (Array.isArray(fm.supported) && fm.supported.length) {
-    if (fm.supported.includes(canonical)) return true;
-    if (!fm.supported.includes(lang)) return false;
+    if (fm.supported.includes(canonical)) {
+      return true;
+    }
+    if (!fm.supported.includes(lang)) {
+      return false;
+    }
   }
   if (Array.isArray(fm.notSupported)) {
     if (fm.notSupported.includes(canonical) || fm.notSupported.includes(lang)) {
@@ -320,13 +350,23 @@ function isSupported(
 // nothing for platforms that have neither a curated toggle entry nor a wizard.
 function hasOnboardingWizard(platformId: string): boolean {
   const dir = path.join(GETTING_STARTED_DOCS_DIR, platformId);
-  if (!existsSync(dir)) return false;
+  if (!existsSync(dir)) {
+    return false;
+  }
   for (const entry of readdirSync(dir, {withFileTypes: true})) {
-    if (!entry.isFile()) continue;
-    if (entry.name.endsWith('.spec.tsx') || entry.name.endsWith('.spec.ts')) continue;
-    if (!entry.name.endsWith('.tsx') && !entry.name.endsWith('.ts')) continue;
+    if (!entry.isFile()) {
+      continue;
+    }
+    if (entry.name.endsWith('.spec.tsx') || entry.name.endsWith('.spec.ts')) {
+      continue;
+    }
+    if (!entry.name.endsWith('.tsx') && !entry.name.endsWith('.ts')) {
+      continue;
+    }
     const content = readFileSync(path.join(dir, entry.name), 'utf8');
-    if (WIZARD_PATTERN.test(content)) return true;
+    if (WIZARD_PATTERN.test(content)) {
+      return true;
+    }
   }
   return false;
 }
@@ -335,7 +375,9 @@ function deriveProducts(
   platform: PlatformEntry,
   withMetricsOnboarding: Set<string>
 ): string[] {
-  if (!platform.lang) return [];
+  if (!platform.lang) {
+    return [];
+  }
   const products: string[] = [];
   for (const [product, feature] of Object.entries(FEATURES)) {
     let supported: boolean | null = null;
@@ -352,9 +394,15 @@ function deriveProducts(
         : false;
     }
 
-    if (!supported) continue;
-    if (product === 'METRICS' && !withMetricsOnboarding.has(platform.id)) continue;
-    if (PRODUCT_EXCLUSIONS[platform.id]?.has(product)) continue;
+    if (!supported) {
+      continue;
+    }
+    if (product === 'METRICS' && !withMetricsOnboarding.has(platform.id)) {
+      continue;
+    }
+    if (PRODUCT_EXCLUSIONS[platform.id]?.has(product)) {
+      continue;
+    }
 
     products.push(product);
   }
@@ -399,7 +447,9 @@ import type {PlatformKey} from 'sentry/types/project';
       continue;
     }
     lines.push(`  ${key}: [`);
-    for (const p of products) lines.push(`    ProductSolution.${p},`);
+    for (const p of products) {
+      lines.push(`    ProductSolution.${p},`);
+    }
     lines.push('  ],');
   }
   lines.push('};');
@@ -417,15 +467,23 @@ function main() {
     // consumer (scmPlatformFeatures.tsx) routes between the two maps via
     // `platform in platformProductAvailability`, so curated entries here
     // would be redundant.
-    if (legacyKeys.has(platform.id)) continue;
-    if (platform.deprecated) continue;
-    if (platform.id === 'other') continue;
+    if (legacyKeys.has(platform.id)) {
+      continue;
+    }
+    if (platform.deprecated) {
+      continue;
+    }
+    if (platform.id === 'other') {
+      continue;
+    }
     // Only include platforms whose onboarding flow is wizard-driven. The
     // consumer surfaces information cards for these platforms because the
     // wizard CLI handles configuration; toggles aren't actionable. Platforms
     // with neither a curated toggle entry nor a wizard render nothing on the
     // SCM step.
-    if (!hasOnboardingWizard(platform.id)) continue;
+    if (!hasOnboardingWizard(platform.id)) {
+      continue;
+    }
     out[platform.id] = deriveProducts(platform, withMetricsOnboarding);
   }
 
diff --git a/scripts/routes.ts b/scripts/routes.ts
index 2b5f7894b48a54..e9f134f80ec2a2 100644
--- a/scripts/routes.ts
+++ b/scripts/routes.ts
@@ -212,7 +212,9 @@ const CONSTANTS: Record<string, string> = {
 function resolveTemplate(expr: string): string {
   return expr.replace(/\$\{([^}]+)\}/g, (_, inner: string) => {
     const key = inner.trim();
-    if (CONSTANTS[key] !== undefined) return CONSTANTS[key];
+    if (CONSTANTS[key] !== undefined) {
+      return CONSTANTS[key];
+    }
     const hint = (key.split(/[.[(\s]/)[0] ?? key).trim();
     return `<${hint}>`;
   });
@@ -268,7 +270,9 @@ const ACCOUNT_SETTINGS_ROOTS = [
 
 function remapFragment(fragmentPath: string): string | null {
   // :orgId/ is from experimentalSpaChildRoutes under /auth/login/
-  if (fragmentPath === ':orgId/') return '/auth/login/:orgId/';
+  if (fragmentPath === ':orgId/') {
+    return '/auth/login/:orgId/';
+  }
 
   // accountSettingsChildren: bare paths like details/, security/mfa/:authId/, …
   if (
@@ -278,7 +282,9 @@ function remapFragment(fragmentPath: string): string | null {
   }
 
   // accountSettingsRoutes root (the variable's own path: 'account/')
-  if (fragmentPath === 'account/') return '/settings/account/';
+  if (fragmentPath === 'account/') {
+    return '/settings/account/';
+  }
 
   // projectSettingsChildren: incorrectly parented under account/
   if (fragmentPath.startsWith('account/')) {
@@ -296,19 +302,25 @@ function remapFragment(fragmentPath: string): string | null {
   }
 
   // transactionSummaryRoute root
-  if (fragmentPath === 'summary/') return '/performance/summary/';
+  if (fragmentPath === 'summary/') {
+    return '/performance/summary/';
+  }
 
   // Transaction summary tab children
   if (fragmentPath.startsWith('summary/')) {
     const suffix = fragmentPath.slice('summary/'.length);
     const topSegment = suffix.split('/')[0] + '/';
-    if (SUMMARY_TABS.has(topSegment)) return `/performance/summary/${suffix}`;
+    if (SUMMARY_TABS.has(topSegment)) {
+      return `/performance/summary/${suffix}`;
+    }
     // Everything else under summary/ is a domainViewChildRoute
     return `/insights/${suffix}`;
   }
 
   // traceView root — assembled into /performance/ (and /dashboards/, /traces/)
-  if (fragmentPath === 'trace/:traceSlug/') return '/performance/trace/:traceSlug/';
+  if (fragmentPath === 'trace/:traceSlug/') {
+    return '/performance/trace/:traceSlug/';
+  }
 
   // alertChildRoutes entries: incorrectly parented under trace/:traceSlug/
   if (fragmentPath.startsWith('trace/:traceSlug/')) {
@@ -391,7 +403,9 @@ const seen = new Set<string>();
 
 for (const line of lines) {
   const indent = line.search(/\S/);
-  if (indent === -1) continue;
+  if (indent === -1) {
+    continue;
+  }
 
   let pathValue: string | null = null;
   let hasUnknown = false;
@@ -409,7 +423,9 @@ for (const line of lines) {
     hasUnknown = pathValue.includes('<');
   }
 
-  if (pathValue === null) continue;
+  if (pathValue === null) {
+    continue;
+  }
 
   while (stack.length > 0 && stack[stack.length - 1]!.indent >= indent) {
     stack.pop();
@@ -439,7 +455,9 @@ type MappedPath = RawPath & {wasFragment: boolean};
 const allPaths: MappedPath[] = rawPaths.map(({fullPath, hasUnknown}) => {
   if (!fullPath.startsWith('/')) {
     const remapped = remapFragment(fullPath);
-    if (remapped) return {fullPath: remapped, hasUnknown, wasFragment: true};
+    if (remapped) {
+      return {fullPath: remapped, hasUnknown, wasFragment: true};
+    }
     return {fullPath, hasUnknown, wasFragment: true};
   }
   return {fullPath, hasUnknown, wasFragment: false};
@@ -469,7 +487,9 @@ for (const {fullPath, hasUnknown} of deduped) {
 
   if (!showAll) {
     const providedInRoute = required.filter(p => effectiveParams[p] !== undefined);
-    if (required.length > 0 && providedInRoute.length === 0) continue;
+    if (required.length > 0 && providedInRoute.length === 0) {
+      continue;
+    }
   }
 
   let resolved = fullPath;
diff --git a/scripts/type-coverage-diff.ts b/scripts/type-coverage-diff.ts
index 2df476a9fa5b27..95b3f785fb4a5d 100644
--- a/scripts/type-coverage-diff.ts
+++ b/scripts/type-coverage-diff.ts
@@ -119,7 +119,9 @@ function parseArgs(): Options {
     } else if (arg === '--verbose' || arg === '-v') {
       opts.verbose = true;
     } else if (arg === '--ignore-files') {
-      if (!opts.ignoreFiles) opts.ignoreFiles = [];
+      if (!opts.ignoreFiles) {
+        opts.ignoreFiles = [];
+      }
       opts.ignoreFiles.push(args[++i]!);
     } else {
       console.error(colors.red(`Unknown option: ${arg}`));
@@ -361,14 +363,18 @@ function formatItems<
   color: (text: string) => string,
   formatter?: (item: T) => string
 ): void {
-  if (items.length === 0) return;
+  if (items.length === 0) {
+    return;
+  }
 
   console.log(colors.bold(`\n${title} (${items.length})`));
   console.log('='.repeat(title.length + ` (${items.length})`.length));
 
   // Sort by file, then by line
   const sortedItems = items.sort((a, b) => {
-    if (a.file !== b.file) return a.file.localeCompare(b.file);
+    if (a.file !== b.file) {
+      return a.file.localeCompare(b.file);
+    }
     return a.line - b.line;
   });
 
diff --git a/scripts/type-coverage.ts b/scripts/type-coverage.ts
index 26c67222b850b9..cc8ade85514c2d 100644
--- a/scripts/type-coverage.ts
+++ b/scripts/type-coverage.ts
@@ -33,15 +33,24 @@ function parseArgs(): Options {
   const opts: Options = {tsconfigPath: 'tsconfig.json'};
   for (let i = 0; i < args.length; i++) {
     const a = args[i];
-    if (a === '--fail-below') opts.failBelow = Number(args[++i]);
-    else if (a === '--json') opts.json = true;
-    else if (a === '--project' || a === '-p') opts.tsconfigPath = args[++i]!;
-    else if (a === '--list-any') opts.listAny = true;
-    else if (a === '--list-nonnull') opts.listNonNull = true;
-    else if (a === '--list-type-assertions') opts.listTypeAssertions = true;
-    else if (a === '--detail') opts.detail = true;
-    else if (a === '--ignore-files') {
-      if (!opts.ignoreFiles) opts.ignoreFiles = [];
+    if (a === '--fail-below') {
+      opts.failBelow = Number(args[++i]);
+    } else if (a === '--json') {
+      opts.json = true;
+    } else if (a === '--project' || a === '-p') {
+      opts.tsconfigPath = args[++i]!;
+    } else if (a === '--list-any') {
+      opts.listAny = true;
+    } else if (a === '--list-nonnull') {
+      opts.listNonNull = true;
+    } else if (a === '--list-type-assertions') {
+      opts.listTypeAssertions = true;
+    } else if (a === '--detail') {
+      opts.detail = true;
+    } else if (a === '--ignore-files') {
+      if (!opts.ignoreFiles) {
+        opts.ignoreFiles = [];
+      }
       opts.ignoreFiles.push(args[++i]!);
     }
   }
@@ -49,9 +58,13 @@ function parseArgs(): Options {
 }
 
 const isAny = (type: ts.Type, typeChecker: ts.TypeChecker) => {
-  if (type.flags & ts.TypeFlags.Any) return true;
+  if (type.flags & ts.TypeFlags.Any) {
+    return true;
+  }
   const typeText = typeChecker.typeToString(type);
-  if (typeText === 'any') return true;
+  if (typeText === 'any') {
+    return true;
+  }
   // Check for 'any' within generic types like Record<string, any>, Array<any>, etc.
   return /\bany\b/.test(typeText);
 };
@@ -67,7 +80,9 @@ function isContextuallyTypedCallbackParam(
   typeChecker: ts.TypeChecker
 ): boolean {
   const parent = param.parent;
-  if (!ts.isFunctionExpression(parent) && !ts.isArrowFunction(parent)) return false;
+  if (!ts.isFunctionExpression(parent) && !ts.isArrowFunction(parent)) {
+    return false;
+  }
 
   // Check for styled-components pattern: styled('div')`...${p => ...}...`
   let current: ts.Node | undefined = parent.parent;
@@ -99,17 +114,23 @@ function isContextuallyTypedCallbackParam(
 
   // Original contextual type checking
   const contextualType = typeChecker.getContextualType(parent);
-  if (!contextualType) return false;
+  if (!contextualType) {
+    return false;
+  }
 
   const signatures = typeChecker.getSignaturesOfType(
     contextualType,
     ts.SignatureKind.Call
   );
-  if (signatures.length === 0) return false;
+  if (signatures.length === 0) {
+    return false;
+  }
 
   const sig = signatures[0]!;
   const paramIndex = parent.parameters.indexOf(param);
-  if (paramIndex < 0 || paramIndex >= sig.parameters.length) return false;
+  if (paramIndex < 0 || paramIndex >= sig.parameters.length) {
+    return false;
+  }
 
   const paramType = typeChecker.getTypeOfSymbolAtLocation(
     sig.parameters[paramIndex]!,
@@ -219,7 +240,9 @@ function countBindingPatternElements(
   let count = 0;
 
   for (const element of pattern.elements) {
-    if (ts.isOmittedExpression(element)) continue;
+    if (ts.isOmittedExpression(element)) {
+      continue;
+    }
 
     count++;
     let typed = false;
@@ -565,14 +588,20 @@ function main() {
   function bump(file: string, typed: boolean) {
     const rec = (perFile[file] ||= {total: 0, typed: 0});
     rec.total++;
-    if (typed) rec.typed++;
+    if (typed) {
+      rec.typed++;
+    }
     totals.total++;
-    if (typed) totals.typed++;
+    if (typed) {
+      totals.typed++;
+    }
   }
 
   // Analyze each source file
   for (const sourceFile of program.getSourceFiles()) {
-    if (!files.includes(sourceFile.fileName)) continue;
+    if (!files.includes(sourceFile.fileName)) {
+      continue;
+    }
 
     const relPath = path.relative(process.cwd(), sourceFile.fileName);
     const fileBump = (typed: boolean) => bump(relPath, typed);
@@ -608,9 +637,15 @@ function main() {
         coverage: Number(((c.typed / c.total) * 100).toFixed(2)),
       })),
     };
-    if (opts.listAny) data.anySymbols = anyHits;
-    if (opts.listNonNull) data.nonNullAssertions = nonNullHits;
-    if (opts.listTypeAssertions) data.typeAssertions = typeAssertionHits;
+    if (opts.listAny) {
+      data.anySymbols = anyHits;
+    }
+    if (opts.listNonNull) {
+      data.nonNullAssertions = nonNullHits;
+    }
+    if (opts.listTypeAssertions) {
+      data.typeAssertions = typeAssertionHits;
+    }
     console.log(JSON.stringify(data, null, 2));
   } else if (opts.listAny || opts.listNonNull || opts.listTypeAssertions) {
     if (opts.listAny) {
@@ -622,7 +657,9 @@ function main() {
           console.log();
           // Sort hits by file path first, then by line number
           const sortedHits = anyHits.sort((a, b) => {
-            if (a.file !== b.file) return a.file.localeCompare(b.file);
+            if (a.file !== b.file) {
+              return a.file.localeCompare(b.file);
+            }
             return a.line - b.line;
           });
           for (const hit of sortedHits) {
@@ -644,7 +681,9 @@ function main() {
           console.log();
           // Sort hits by file path first, then by line number
           const sortedHits = nonNullHits.sort((a, b) => {
-            if (a.file !== b.file) return a.file.localeCompare(b.file);
+            if (a.file !== b.file) {
+              return a.file.localeCompare(b.file);
+            }
             return a.line - b.line;
           });
           for (const hit of sortedHits) {
@@ -666,7 +705,9 @@ function main() {
           console.log();
           // Sort hits by file path first, then by line number
           const sortedHits = typeAssertionHits.sort((a, b) => {
-            if (a.file !== b.file) return a.file.localeCompare(b.file);
+            if (a.file !== b.file) {
+              return a.file.localeCompare(b.file);
+            }
             return a.line - b.line;
           });
           for (const hit of sortedHits) {
@@ -703,7 +744,9 @@ function main() {
 
     if (worst.length) {
       console.log(colors.bold('Lowest coverage files:'));
-      for (const w of worst) console.log(`  ${colors.dim(w.file)}  ${w.pct.toFixed(2)}%`);
+      for (const w of worst) {
+        console.log(`  ${colors.dim(w.file)}  ${w.pct.toFixed(2)}%`);
+      }
       console.log();
     }
   }
diff --git a/src/sentry/api/serializers/rest_framework/dashboard.py b/src/sentry/api/serializers/rest_framework/dashboard.py
index 874c9686f8faf9..c0edf8730a1653 100644
--- a/src/sentry/api/serializers/rest_framework/dashboard.py
+++ b/src/sentry/api/serializers/rest_framework/dashboard.py
@@ -539,9 +539,9 @@ def validate(self, data):
 
         description = data.get("description")
         description_length = len(description) if description else 0
-        if description_length > 255:
+        if description_length > 350:
             raise serializers.ValidationError(
-                {"description": "Ensure description has no more than 255 characters."}
+                {"description": "Ensure description has no more than 350 characters."}
             )
 
         if data.get("queries"):
diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py
index 4d749efeeab79d..30750f3d0d7d81 100644
--- a/src/sentry/conf/server.py
+++ b/src/sentry/conf/server.py
@@ -885,6 +885,7 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     "sentry.hybridcloud.tasks.deliver_webhooks",
     "sentry.incidents.tasks",
     "sentry.ingest.transaction_clusterer.tasks",
+    "sentry.integrations.data_forwarding.tasks",
     "sentry.integrations.github.tasks.codecov_account_link",
     "sentry.integrations.github.tasks.codecov_account_unlink",
     "sentry.integrations.github.tasks.link_all_repos",
diff --git a/src/sentry/data_export/endpoints/data_export.py b/src/sentry/data_export/endpoints/data_export.py
index ba92949eb6abfe..491ec87a00e009 100644
--- a/src/sentry/data_export/endpoints/data_export.py
+++ b/src/sentry/data_export/endpoints/data_export.py
@@ -4,6 +4,7 @@
 import sentry_sdk
 from django.core.exceptions import ValidationError
 from rest_framework import serializers
+from rest_framework.authentication import SessionAuthentication
 from rest_framework.request import Request
 from rest_framework.response import Response
 
@@ -50,7 +51,14 @@
 }
 
 logger = logging.getLogger(__name__)
-MAX_SYNC_LIMIT = 10_000
+MAX_EXPORT_LIMIT = 10_000
+
+
+def is_api_or_agent_request(request: Request) -> bool:
+    """
+    True when the request did NOT come from a logged-in browser session.
+    """
+    return not isinstance(request.successful_authenticator, SessionAuthentication)
 
 
 class DataExportQuerySerializer(serializers.Serializer[dict[str, Any]]):
@@ -274,7 +282,22 @@ def _get_project_id(self, request: Request) -> str:
             project_id = query_info["project"]
         return project_id
 
-    def _parse_limit(self, data: dict[str, Any]) -> tuple[int | None, bool]:
+    def _parse_limit(self, data: dict[str, Any], is_api_request: bool) -> tuple[int | None, bool]:
+        """
+        Determine the export row limit and whether to run synchronously.
+
+        Caller behavior:
+          - API-token / agent requests (`is_api_request=True`): hard cap of
+            ``MAX_EXPORT_LIMIT`` rows for every dataset. Unspecified or
+            larger limits are clamped down. Larger self-serve exports were
+            unreliable in practice; GDPR data-portability requests are
+            handled out-of-band via sentry.io/contact/gdpr/.
+          - Browser/session requests (`is_api_request=False`):
+              - logs full export: hard cap of ``MAX_EXPORT_LIMIT`` (the
+                sync download path is sized for this).
+              - discover / spans: no enforced cap; existing behavior is
+                preserved to avoid regressing in-product exports.
+        """
         limit = data.get("limit")
 
         if limit is not None:
@@ -282,13 +305,17 @@ def _parse_limit(self, data: dict[str, Any]) -> tuple[int | None, bool]:
                 limit = int(limit)
             except (TypeError, ValueError):
                 limit = None
-        run_sync = (
-            limit is not None
-            and limit <= MAX_SYNC_LIMIT
-            and data["query_type"] == ExportQueryType.TRACE_ITEM_FULL_EXPORT_STR
+
+        is_logs_full_export = (
+            data["query_type"] == ExportQueryType.TRACE_ITEM_FULL_EXPORT_STR
             and data["query_info"].get("dataset") == "logs"
         )
-        return limit, run_sync
+
+        if is_api_request or is_logs_full_export:
+            if limit is None or limit > MAX_EXPORT_LIMIT:
+                limit = MAX_EXPORT_LIMIT
+
+        return limit, is_logs_full_export
 
     def post(self, request: Request, organization: Organization) -> Response:
         """
@@ -335,7 +362,9 @@ def post(self, request: Request, organization: Organization) -> Response:
             return Response(serializer.errors, status=400)
         validated_data = serializer.validated_data
 
-        limit, run_sync = self._parse_limit(validated_data)
+        limit, run_sync = self._parse_limit(
+            validated_data, is_api_request=is_api_or_agent_request(request)
+        )
 
         try:
             # If this user has sent a request with the same payload and organization,
@@ -389,9 +418,11 @@ def _schedule_export_task(
         export_format = validated_data["format"]
         dataset = qi.get("dataset")
         if run_sync:
+            # `_parse_limit` guarantees a clamped int whenever run_sync is True.
+            assert limit is not None
             export_data_to_stored_blobs_sync(
                 data_export=data_export,
-                export_limit=limit or MAX_SYNC_LIMIT,
+                export_limit=limit,
                 environment_id=environment_id,
             )
         else:
diff --git a/src/sentry/integrations/data_forwarding/amazon_sqs/forwarder.py b/src/sentry/integrations/data_forwarding/amazon_sqs/forwarder.py
index 8f12d19dee14cb..c1f1bf6bc27b17 100644
--- a/src/sentry/integrations/data_forwarding/amazon_sqs/forwarder.py
+++ b/src/sentry/integrations/data_forwarding/amazon_sqs/forwarder.py
@@ -27,7 +27,12 @@ class AmazonSQSForwarder(BaseDataForwarder):
     def get_event_payload(
         self, event: Event | GroupEvent, config: dict[str, Any]
     ) -> dict[str, Any]:
-        return serialize(event)
+        # We do this since serialize(event) returns datetime objects, and taskbroker doesn't support
+        # those as arguments. This dump -> load step gets around it, and leaves the payload being
+        # forwarded in the same format it has always been.
+        return orjson.loads(
+            orjson.dumps(serialize(event), option=orjson.OPT_UTC_Z | orjson.OPT_NON_STR_KEYS)
+        )
 
     def is_unrecoverable_client_error(self, error: ClientError) -> bool:
         error_str = str(error)
@@ -138,3 +143,66 @@ def sqs_send_message(message):
             raise
 
         return True
+
+    def get_task_payload(self, event: Event | GroupEvent, config: dict[str, Any]) -> dict[str, Any]:
+        return {
+            "event_id": event.event_id,
+            "project_slug": event.project.slug,
+            "date": event.datetime.strftime("%Y-%m-%d"),
+        }
+
+    @staticmethod
+    def forward_event_from_task(
+        *,
+        config: dict[str, Any],
+        event_payload: dict[str, Any],
+        task_payload: dict[str, Any],
+    ) -> None:
+        queue_url = config["queue_url"]
+        region = config["region"]
+        access_key = config["access_key"]
+        secret_key = config["secret_key"]
+        message_group_id = config.get("message_group_id")
+        s3_bucket = config.get("s3_bucket")
+
+        boto3_args = {
+            "aws_access_key_id": access_key,
+            "aws_secret_access_key": secret_key,
+            "region_name": region,
+        }
+
+        if s3_bucket:
+            date = task_payload["date"]
+            project_slug = task_payload["project_slug"]
+            event_id = task_payload["event_id"]
+            key = f"{project_slug}/{date}/{event_id}"
+
+            s3_client = boto3.client(
+                service_name="s3", config=Config(signature_version="s3v4"), **boto3_args
+            )
+            s3_client.put_object(
+                Bucket=s3_bucket,
+                Body=orjson.dumps(
+                    event_payload, option=orjson.OPT_UTC_Z | orjson.OPT_NON_STR_KEYS
+                ).decode(),
+                Key=key,
+            )
+
+            url = f"https://{s3_bucket}.s3.{region}.amazonaws.com/{key}"
+            event_payload = {"s3Url": url, "eventID": event_id}
+
+        message = orjson.dumps(
+            event_payload, option=orjson.OPT_UTC_Z | orjson.OPT_NON_STR_KEYS
+        ).decode()
+
+        if len(message) > AWS_SQS_MAX_MESSAGE_SIZE:
+            return
+
+        client = boto3.client(service_name="sqs", **boto3_args)
+        send_message_args = {"QueueUrl": queue_url, "MessageBody": message}
+
+        if message_group_id:
+            send_message_args["MessageGroupId"] = message_group_id
+            send_message_args["MessageDeduplicationId"] = uuid4().hex
+
+        client.send_message(**send_message_args)
diff --git a/src/sentry/integrations/data_forwarding/base.py b/src/sentry/integrations/data_forwarding/base.py
index 3c56a9db838140..fc5c6bd425ce63 100644
--- a/src/sentry/integrations/data_forwarding/base.py
+++ b/src/sentry/integrations/data_forwarding/base.py
@@ -1,11 +1,13 @@
 import logging
+import random
 from abc import ABC, abstractmethod
 from typing import Any, ClassVar
 
-from sentry import ratelimits
+from sentry import options, ratelimits
 from sentry.integrations.models.data_forwarder_project import DataForwarderProject
 from sentry.integrations.types import DataForwarderProviderSlug
 from sentry.services.eventstore.models import Event, GroupEvent
+from sentry.utils import metrics
 
 logger = logging.getLogger(__name__)
 
@@ -57,13 +59,47 @@ def get_event_payload(
     ) -> dict[str, Any]:
         raise NotImplementedError
 
+    @abstractmethod
+    def get_task_payload(self, event: Event | GroupEvent, config: dict[str, Any]) -> dict[str, Any]:
+        """
+        Allows providers to create task-safe payloads from the event to avoid refetching in the task.
+        """
+        raise NotImplementedError
+
+    @staticmethod
+    @abstractmethod
+    def forward_event_from_task(
+        *,
+        config: dict[str, Any],
+        event_payload: dict[str, Any],
+        task_payload: dict[str, Any],
+    ) -> None:
+        """
+        Similar to forward_event, but raises any exception to allow for retries in a task.
+        The task_payload is derived from get_task_payload, to avoid needing to refetch the event.
+        """
+        raise NotImplementedError
+
     def post_process(
         self, event: Event | GroupEvent, data_forwarder_project: DataForwarderProject
     ) -> None:
+        from sentry.integrations.data_forwarding.tasks import forward_event
+
         config = data_forwarder_project.get_config()
         self.initialize_variables(event, config)
         if self.is_ratelimited(event):
             return
 
-        payload = self.get_event_payload(event=event, config=config)
-        self.forward_event(event=event, payload=payload, config=config)
+        event_payload = self.get_event_payload(event=event, config=config)
+        if random.random() < options.get("data-forwarding.task-rollout-rate"):
+            task_payload = self.get_task_payload(event=event, config=config)
+            forward_event.delay(
+                data_forwarder_project_id=data_forwarder_project.id,
+                event_payload=event_payload,
+                task_payload=task_payload,
+            )
+            metrics.incr(
+                "data_forwarding.post_process.task_scheduled", tags={"provider": self.provider}
+            )
+        else:
+            self.forward_event(event=event, payload=event_payload, config=config)
diff --git a/src/sentry/integrations/data_forwarding/segment/forwarder.py b/src/sentry/integrations/data_forwarding/segment/forwarder.py
index 56d8b26882f597..0ea41a876ea769 100644
--- a/src/sentry/integrations/data_forwarding/segment/forwarder.py
+++ b/src/sentry/integrations/data_forwarding/segment/forwarder.py
@@ -98,7 +98,7 @@ def forward_event(
                     self.endpoint,
                     json=payload,
                     auth=(write_key, ""),
-                    timeout=10,
+                    timeout=(3.5, 10),
                 )
                 response.raise_for_status()
         except Exception:
@@ -108,3 +108,43 @@ def forward_event(
             )
             return False
         return True
+
+    def get_task_payload(self, event: Event | GroupEvent, config: dict[str, Any]) -> dict[str, Any]:
+        # we avoid instantiating interfaces here as they're only going to be
+        # used if there's a User present
+        user_interface = event.interfaces.get("user")
+        if not user_interface:
+            return {"event_type": event.get_event_type(), "has_user": False}
+
+        # if the user id is not present, we can't forward the event
+        return {
+            "event_type": event.get_event_type(),
+            "has_user": True if user_interface.id else False,
+        }
+
+    @staticmethod
+    def forward_event_from_task(
+        *,
+        config: dict[str, Any],
+        event_payload: dict[str, Any],
+        task_payload: dict[str, Any],
+    ) -> None:
+        # we currently only support errors
+        if task_payload.get("event_type") != "error":
+            return
+
+        if not task_payload.get("has_user", False):
+            return
+
+        write_key = config["write_key"]
+        if not write_key:
+            return
+
+        with http.build_session() as session:
+            response = session.post(
+                SegmentForwarder.endpoint,
+                json=event_payload,
+                auth=(write_key, ""),
+                timeout=(3.5, 10),
+            )
+            response.raise_for_status()
diff --git a/src/sentry/integrations/data_forwarding/splunk/forwarder.py b/src/sentry/integrations/data_forwarding/splunk/forwarder.py
index 7959a66e73ddcf..315c9b16e44cfa 100644
--- a/src/sentry/integrations/data_forwarding/splunk/forwarder.py
+++ b/src/sentry/integrations/data_forwarding/splunk/forwarder.py
@@ -149,3 +149,30 @@ def forward_event(
                 return False
             raise
         return True
+
+    def get_task_payload(self, event: Event | GroupEvent, config: dict[str, Any]) -> dict[str, Any]:
+        return {"host": self.host}
+
+    @staticmethod
+    def forward_event_from_task(
+        *,
+        config: dict[str, Any],
+        event_payload: dict[str, Any],
+        task_payload: dict[str, Any],
+    ) -> None:
+        token = config.get("token")
+        index = config.get("index")
+        instance = config.get("instance_url")
+
+        if not token or not index or not instance:
+            return
+
+        if not instance.endswith("/services/collector"):
+            instance = instance.rstrip("/") + "/services/collector"
+
+        host = task_payload.get("host")
+        if host:
+            event_payload["host"] = host
+
+        client = SplunkApiClient(instance, token)
+        client.request(event_payload)
diff --git a/src/sentry/integrations/data_forwarding/tasks.py b/src/sentry/integrations/data_forwarding/tasks.py
new file mode 100644
index 00000000000000..2698a0c0e13277
--- /dev/null
+++ b/src/sentry/integrations/data_forwarding/tasks.py
@@ -0,0 +1,87 @@
+import logging
+from typing import Any
+
+from botocore.exceptions import ClientError, ParamValidationError
+from requests import HTTPError, Timeout
+from requests.exceptions import ChunkedEncodingError, ConnectionError, RequestException
+from taskbroker_client.retry import Retry
+
+from sentry.integrations.data_forwarding import FORWARDER_REGISTRY
+from sentry.integrations.models.data_forwarder_project import DataForwarderProject
+from sentry.shared_integrations.exceptions import (
+    ApiForbiddenError,
+    ApiHostError,
+    ApiInvalidRequestError,
+    ApiTimeoutError,
+    ApiUnauthorized,
+)
+from sentry.silo.base import SiloMode
+from sentry.tasks.base import instrumented_task
+from sentry.taskworker.namespaces import integrations_tasks
+from sentry.utils import metrics
+
+logger = logging.getLogger(__name__)
+
+
+_DATA_FORWARDING_RETRY_ON = (RequestException,)
+_DATA_FORWARDING_RETRY_IGNORE = (
+    ClientError,
+    ParamValidationError,
+    ApiUnauthorized,
+    ApiInvalidRequestError,
+    ApiForbiddenError,
+)
+_DATA_FORWARDING_SILENCED = (
+    ChunkedEncodingError,
+    Timeout,
+    ApiHostError,
+    ApiTimeoutError,
+    ConnectionError,
+    HTTPError,
+    *_DATA_FORWARDING_RETRY_IGNORE,
+)
+
+
+@instrumented_task(
+    name="sentry.integrations.data_forwarding.tasks.forward_event",
+    namespace=integrations_tasks,
+    retry=Retry(
+        times=3,
+        delay=60 * 5,
+        on=_DATA_FORWARDING_RETRY_ON,
+        ignore=_DATA_FORWARDING_RETRY_IGNORE,
+    ),
+    processing_deadline_duration=12,
+    silo_mode=SiloMode.CELL,
+    silenced_exceptions=_DATA_FORWARDING_SILENCED,
+)
+def forward_event(
+    data_forwarder_project_id: int,
+    event_payload: dict[str, Any],
+    task_payload: dict[str, Any],
+) -> None:
+    logging_ctx: dict[str, Any] = {"data_forwarder_project_id": data_forwarder_project_id}
+    try:
+        data_forwarder_project = DataForwarderProject.objects.select_related("data_forwarder").get(
+            id=data_forwarder_project_id
+        )
+    except DataForwarderProject.DoesNotExist:
+        logger.warning("data_forwarding.data_forwarder_project_not_found", extra=logging_ctx)
+        return
+
+    provider = data_forwarder_project.data_forwarder.provider
+    logging_ctx["provider"] = provider
+    logging_ctx["project_id"] = data_forwarder_project.project_id
+
+    forwarder = FORWARDER_REGISTRY.get(provider)
+    if not forwarder:
+        logger.warning("data_forwarding.missing_provider", extra=logging_ctx)
+        return
+
+    forwarder.forward_event_from_task(
+        config=data_forwarder_project.get_config(),
+        event_payload=event_payload,
+        task_payload=task_payload,
+    )
+    metrics.incr("data_forwarding.forwarding_task_succeeded", tags={"provider": provider})
+    logger.info("data_forwarding.forwarding_task_succeeded", extra=logging_ctx)
diff --git a/src/sentry/issue_detection/detectors/io_main_thread_detector.py b/src/sentry/issue_detection/detectors/io_main_thread_detector.py
index 765d9d0b2abeb3..7dd55f4dd21e2b 100644
--- a/src/sentry/issue_detection/detectors/io_main_thread_detector.py
+++ b/src/sentry/issue_detection/detectors/io_main_thread_detector.py
@@ -119,7 +119,7 @@ class FileIOMainThreadDetector(BaseIOMainThreadDetector):
     Checks for a file io span on the main thread
     """
 
-    IGNORED_SUFFIXES = [".nib", ".plist", "kblayout_iphone.dat"]
+    IGNORED_SUFFIXES = [".nib", ".plist", "kblayout_iphone.dat", "kblayouts_iphone.dat"]
     SPAN_PREFIX = "file"
     type = DetectorType.FILE_IO_MAIN_THREAD
     settings_key = DetectorType.FILE_IO_MAIN_THREAD
diff --git a/src/sentry/options/defaults.py b/src/sentry/options/defaults.py
index ad9651c003abb9..5d4375d315280c 100644
--- a/src/sentry/options/defaults.py
+++ b/src/sentry/options/defaults.py
@@ -113,6 +113,12 @@
     default=300,  # 5 minutes
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
+register(
+    "data-forwarding.task-rollout-rate",
+    type=Float,
+    default=0.0,
+    flags=FLAG_AUTOMATOR_MODIFIABLE,
+)
 
 # Redis
 register(
diff --git a/src/sentry/profiles/consumers/process/factory.py b/src/sentry/profiles/consumers/process/factory.py
index 48f2c4421cbc60..9fd1e5f510a573 100644
--- a/src/sentry/profiles/consumers/process/factory.py
+++ b/src/sentry/profiles/consumers/process/factory.py
@@ -11,15 +11,32 @@
 from sentry.processing.backpressure.arroyo import HealthChecker, create_backpressure_step
 from sentry.profiles.task import process_profile_task
 
+# Headers from consumer are Iterable[tuple[str, str | bytes]], from taskbroker are dict[str, str]
+Headers = Iterable[tuple[str, str | bytes]] | dict[str, str]
 
-def process_message(message: Message[KafkaPayload]) -> None:
-    if should_drop(message.payload.headers):
+
+def _process_profile_message(
+    message_bytes: bytes,
+    headers: Headers,
+    inline: bool = False,
+) -> None:
+    """Process a profile message from Kafka. Used by both consumer and taskbroker passthrough."""
+    if should_drop(headers):
+        return
+
+    sampled = is_sampled(headers)
+
+    if not sampled and not options.get("profiling.profile_metrics.unsampled_profiles.enabled"):
         return
 
-    sampled = is_sampled(message.payload.headers)
+    if inline:
+        process_profile_task(payload=message_bytes, sampled=sampled)
+    else:
+        process_profile_task.delay(payload=message_bytes, sampled=sampled)
 
-    if sampled or options.get("profiling.profile_metrics.unsampled_profiles.enabled"):
-        process_profile_task.delay(payload=message.payload.value, sampled=sampled)
+
+def process_message(message: Message[KafkaPayload]) -> None:
+    _process_profile_message(message.payload.value, message.payload.headers)
 
 
 class ProcessProfileStrategyFactory(ProcessingStrategyFactory[KafkaPayload]):
@@ -42,7 +59,9 @@ def create_with_partitions(
         )
 
 
-def is_sampled(headers: Iterable[tuple[str, str | bytes]]) -> bool:
+def is_sampled(headers: Headers) -> bool:
+    if isinstance(headers, dict):
+        return headers.get("sampled", "true") == "true"
     for k, v in headers:
         if k == "sampled":
             if isinstance(v, bytes):
@@ -50,14 +69,14 @@ def is_sampled(headers: Iterable[tuple[str, str | bytes]]) -> bool:
     return True
 
 
-HEADER_KEYS = {"project_id"}
-
-
-def should_drop(headers: Iterable[tuple[str, str | bytes]]) -> bool:
-    context = {}
-    for k, v in headers:
-        if k == "project_id" and isinstance(v, bytes):
-            context[k] = v.decode("utf-8")
+def should_drop(headers: Headers) -> bool:
+    if isinstance(headers, dict):
+        context = {"project_id": headers["project_id"]} if "project_id" in headers else {}
+    else:
+        context = {}
+        for k, v in headers:
+            if k == "project_id" and isinstance(v, bytes):
+                context[k] = v.decode("utf-8")
 
     if "project_id" in context and killswitch_matches_context(
         "profiling.killswitch.ingest-profiles", context
diff --git a/src/sentry/profiles/task.py b/src/sentry/profiles/task.py
index dd25fa2ca2e757..99df17d9dc9e02 100644
--- a/src/sentry/profiles/task.py
+++ b/src/sentry/profiles/task.py
@@ -62,7 +62,7 @@
 from sentry.signals import first_profile_received
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task
-from sentry.taskworker.namespaces import ingest_profiling_tasks
+from sentry.taskworker.namespaces import ingest_profiling_passthrough_tasks, ingest_profiling_tasks
 from sentry.utils import json, metrics
 from sentry.utils.arroyo_producer import SingletonProducer, get_arroyo_producer
 from sentry.utils.eap import hex_to_item_id
@@ -121,6 +121,25 @@ def _get_profiles_producer_from_topic(topic: Topic) -> KafkaProducer:
 logger = logging.getLogger(__name__)
 
 
+@instrumented_task(
+    name="sentry.profiles.task.process_profile_from_kafka",
+    namespace=ingest_profiling_passthrough_tasks,
+    processing_deadline_duration=60,
+    retry=Retry(times=2, delay=5),
+    compression_type=CompressionType.ZSTD,
+    silo_mode=SiloMode.CELL,
+    pass_headers=True,
+)
+def process_profile_from_kafka(
+    message_bytes: bytes,
+    headers: dict[str, str],
+) -> None:
+    """Process a profile from raw Kafka message bytes (taskbroker passthrough mode)."""
+    from sentry.profiles.consumers.process.factory import _process_profile_message
+
+    _process_profile_message(message_bytes, headers, inline=True)
+
+
 @instrumented_task(
     name="sentry.profiles.task.process_profile",
     namespace=ingest_profiling_tasks,
diff --git a/src/sentry/seer/endpoints/group_ai_autofix.py b/src/sentry/seer/endpoints/group_ai_autofix.py
index f6bd2124ae198d..8b10d5ef187e43 100644
--- a/src/sentry/seer/endpoints/group_ai_autofix.py
+++ b/src/sentry/seer/endpoints/group_ai_autofix.py
@@ -9,7 +9,6 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from sentry import features
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import cell_silo_endpoint
@@ -25,14 +24,9 @@
 from sentry.apidocs.parameters import GlobalParams, IssueParams
 from sentry.apidocs.utils import inline_sentry_response_serializer
 from sentry.constants import CELL_API_DEPRECATION_DATE
-from sentry.integrations.models.repository_project_path_config import RepositoryProjectPathConfig
-from sentry.issues.auto_source_code_config.code_mapping import get_sorted_code_mapping_configs
 from sentry.issues.endpoints.bases.group import GroupAiEndpoint
 from sentry.models.group import Group
-from sentry.models.organization import Organization
-from sentry.models.repository import Repository
 from sentry.ratelimits.config import RateLimitConfig
-from sentry.seer.autofix.autofix import trigger_legacy_autofix
 from sentry.seer.autofix.autofix_agent import (
     UNKNOWN_RUN_ID_FOR_GROUP,
     AutofixStep,
@@ -51,13 +45,10 @@
 from sentry.seer.autofix.utils import (
     AutofixStoppingPoint,
     CodingAgentProviderType,
-    get_autofix_state,
     has_project_connected_repos,
 )
 from sentry.seer.models import SeerPermissionError
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
-from sentry.users.services.user.service import user_service
-from sentry.utils.cache import cache
 
 logger = logging.getLogger(__name__)
 
@@ -78,30 +69,6 @@ def _parse_autofix_referrer(raw: str | None) -> AutofixReferrer:
         return AutofixReferrer.UNKNOWN
 
 
-class AutofixRequestSerializer(CamelSnakeSerializer):
-    event_id = serializers.CharField(
-        required=False,
-        help_text="Run issue fix on a specific event. If not provided, the recommended event for the issue will be used.",
-    )
-    instruction = serializers.CharField(
-        required=False,
-        help_text="Optional custom instruction to guide the issue fix process.",
-        allow_blank=True,
-    )
-    pr_to_comment_on_url = serializers.URLField(
-        required=False, help_text="URL of a pull request where the issue fix should add comments."
-    )
-    stopping_point = serializers.ChoiceField(
-        required=False,
-        choices=["root_cause", "solution", "code_changes", "open_pr"],
-        help_text="Where the issue fix process should stop. If not provided, will run to root cause.",
-    )
-    referrer = serializers.CharField(
-        required=False,
-        help_text="Referrer identifying where the issue fix was triggered from.",
-    )
-
-
 class ExplorerAutofixRequestSerializer(CamelSnakeSerializer):
     """Serializer for the agent-based autofix requests."""
 
@@ -185,34 +152,6 @@ class GroupAutofixEndpoint(GroupAiEndpoint):
         }
     )
 
-    def _should_use_agent(self, request: Request, organization: Organization) -> bool:
-        """Check if explorer mode should be used based on query params and feature flags."""
-        if request.GET.get("mode") != "explorer":
-            return False
-
-        feature_names = [
-            # Access to seer agent
-            "organizations:seer-explorer",
-            # Access to seer agent powered autofix
-            "organizations:autofix-on-explorer",
-        ]
-
-        batch_features = features.batch_has(
-            feature_names,
-            organization=organization,
-            actor=request.user,
-        )
-
-        if batch_features is None:
-            return False
-
-        org_features = batch_features.get(f"organization:{organization.id}", {})
-        for feature_name in feature_names:
-            if bool(org_features.get(feature_name)):
-                return True
-
-        return False
-
     @extend_schema(
         operation_id="Start Seer Issue Fix",
         parameters=[
@@ -220,7 +159,7 @@ def _should_use_agent(self, request: Request, organization: Organization) -> boo
             IssueParams.ISSUES_OR_GROUPS,
             IssueParams.ISSUE_ID,
         ],
-        request=AutofixRequestSerializer,
+        request=ExplorerAutofixRequestSerializer,
         responses={
             202: inline_sentry_response_serializer("AutofixPostResponse", AutofixPostResponse),
             400: RESPONSE_BAD_REQUEST,
@@ -243,12 +182,6 @@ def post(self, request: Request, group: Group) -> Response:
 
         The process runs asynchronously, and you can get the state using the GET endpoint.
         """
-        if self._should_use_agent(request, group.organization):
-            return self._post_agent(request, group)
-        return self._post_legacy(request, group)
-
-    def _post_agent(self, request: Request, group: Group) -> Response:
-        """Handle POST for the agent-based autofix."""
         if not has_project_connected_repos(group.organization, group.project):
             return Response(
                 {"detail": "SCM integration is not configured for this project."},
@@ -334,28 +267,6 @@ def _post_agent(self, request: Request, group: Group) -> Response:
                 return Response(status=status.HTTP_404_NOT_FOUND)
             raise PermissionDenied(SEER_PERMISSION_DENIED)
 
-    def _post_legacy(self, request: Request, group: Group) -> Response:
-        """Handle POST for legacy autofix."""
-        serializer = AutofixRequestSerializer(data=request.data)
-        if not serializer.is_valid():
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-        data = serializer.validated_data
-
-        stopping_point = data.get("stopping_point")
-        stopping_point = AutofixStoppingPoint(stopping_point) if stopping_point else None
-
-        return trigger_legacy_autofix(
-            group=group,
-            # This event_id is the event that the user is looking at when they click the "Fix" button
-            event_id=data.get("event_id"),
-            user=request.user,
-            referrer=_parse_autofix_referrer(data.get("referrer")),
-            instruction=data.get("instruction"),
-            pr_to_comment_on_url=data.get("pr_to_comment_on_url"),
-            stopping_point=stopping_point,
-        )
-
     @extend_schema(
         operation_id="Retrieve Seer Issue Fix State",
         parameters=[
@@ -385,12 +296,6 @@ def get(self, request: Request, group: Group) -> Response:
 
         This endpoint although documented is still experimental and the payload may change in the future.
         """
-        if self._should_use_agent(request, group.organization):
-            return self._get_agent(request, group)
-        return self._get_legacy(request, group)
-
-    def _get_agent(self, request: Request, group: Group) -> Response:
-        """Handle GET for the agent-based autofix."""
         try:
             state = get_autofix_agent_state(group.organization, group.id)
         except SeerPermissionError as e:
@@ -411,7 +316,6 @@ def _get_agent(self, request: Request, group: Group) -> Response:
                     organization_id=group.organization.id,
                 )
 
-        # Return the agent state directly - frontend will handle the format
         return Response(
             {
                 "autofix": {
@@ -431,101 +335,3 @@ def _get_agent(self, request: Request, group: Group) -> Response:
                 }
             }
         )
-
-    def _get_legacy(self, request: Request, group: Group) -> Response:
-        """Handle GET for legacy autofix."""
-        access_check_cache_key = f"autofix_access_check:{group.id}"
-        access_check_cache_value = cache.get(access_check_cache_key)
-
-        check_repo_access = False
-        if not access_check_cache_value:
-            check_repo_access = True
-
-        is_user_watching = request.GET.get("isUserWatching", False)
-
-        try:
-            autofix_state = get_autofix_state(
-                group_id=group.id,
-                organization_id=group.organization.id,
-                check_repo_access=check_repo_access,
-                is_user_fetching=bool(is_user_watching),
-            )
-        except SeerPermissionError:
-            logger.exception(
-                "group_ai_autofix.get.seer_permission_error",
-                extra={"group_id": group.id, "organization_id": group.organization.id},
-            )
-
-            raise PermissionDenied("You are not authorized to access this autofix state")
-
-        if autofix_state and autofix_state.coding_agents and request.user.id:
-            agent_providers = {a.provider for a in autofix_state.coding_agents.values()}
-            if CodingAgentProviderType.GITHUB_COPILOT_AGENT in agent_providers:
-                poll_github_copilot_agents(autofix_state, user_id=request.user.id)
-            if CodingAgentProviderType.CLAUDE_CODE_AGENT in agent_providers:
-                poll_claude_code_agents(autofix_state=autofix_state)
-
-        if check_repo_access:
-            cache.set(access_check_cache_key, True, timeout=60)  # 1 minute timeout
-
-        response_state: dict[str, Any] | None = None
-
-        if autofix_state:
-            response_state = autofix_state.dict()
-            user_ids = autofix_state.actor_ids
-            if user_ids:
-                users = user_service.serialize_many(
-                    filter={"user_ids": user_ids, "organization_id": request.organization.id},
-                    as_user=request.user,
-                )
-
-                users_map = {user["id"]: user for user in users}
-
-                response_state["users"] = users_map
-
-            project = group.project
-            repositories = []
-
-            autofix_codebase_state = response_state.get("codebases", {})
-
-            repo_code_mappings: dict[str, RepositoryProjectPathConfig] = {}
-            if project:
-                code_mappings = get_sorted_code_mapping_configs(project=project)
-                for mapping in code_mappings:
-                    repo = mapping.project_repository.repository
-                    if repo.external_id:
-                        repo_code_mappings[repo.external_id] = mapping
-
-            for repo_external_id, repo_state in autofix_codebase_state.items():
-                retrieved_mapping: RepositoryProjectPathConfig | None = repo_code_mappings.get(
-                    repo_external_id, None
-                )
-
-                if not retrieved_mapping:
-                    continue
-
-                mapping_repo: Repository = retrieved_mapping.project_repository.repository
-
-                repositories.append(
-                    {
-                        "integration_id": mapping_repo.integration_id,
-                        "url": mapping_repo.url,
-                        "external_id": repo_external_id,
-                        "name": mapping_repo.name,
-                        "provider": mapping_repo.provider,
-                        "default_branch": retrieved_mapping.default_branch,
-                        "is_readable": repo_state.get("is_readable", None),
-                        "is_writeable": repo_state.get("is_writeable", None),
-                    }
-                )
-
-            response_state["repositories"] = repositories
-
-            # Remove unnecessary or sensitive data to reduce returned payload size
-            for key in ["usage", "signals"]:
-                response_state.pop(key, None)
-            for request_key in ["issue", "trace_tree", "profile", "issue_summary", "logs"]:
-                if "request" in response_state and request_key in response_state["request"]:
-                    del response_state["request"][request_key]
-
-        return Response({"autofix": response_state})
diff --git a/src/sentry/spans/buffer.py b/src/sentry/spans/buffer.py
index fcbca35b4d2310..ad1aade2ed2133 100644
--- a/src/sentry/spans/buffer.py
+++ b/src/sentry/spans/buffer.py
@@ -102,7 +102,7 @@
 import math
 import time
 import uuid
-from collections.abc import Generator, MutableMapping, Sequence
+from collections.abc import Generator, Mapping, MutableMapping, Sequence
 from hashlib import blake2b
 from typing import Any, NamedTuple, cast
 
@@ -120,13 +120,18 @@
 from sentry.spans.buffer_logger import (
     BufferLogger,
     DeadlineUpdateLog,
-    FlusherLogEntry,
     FlusherLogger,
     FlushSegmentLog,
     InsertSpansMetrics,
     SubsegmentDebugLog,
 )
-from sentry.spans.buffer_types import EvalshaResult, InsertedSubsegment, Span, Subsegment
+from sentry.spans.buffer_types import (
+    EvalshaResult,
+    InsertedSubsegment,
+    LoadedSegmentData,
+    Span,
+    Subsegment,
+)
 from sentry.spans.consumers.process_segments.types import attribute_value
 from sentry.spans.debug_trace_logger import DebugTraceLogger
 from sentry.spans.segment_key import (
@@ -223,7 +228,6 @@ def __init__(self, assigned_shards: list[int], slice_id: int | None = None):
         self.slice_id = slice_id
         self.add_buffer_sha: str | None = None
         self.any_shard_at_limit = False
-        self._last_decompress_latency_ms = 0
         self._current_compression_level = None
         self._zstd_compressor: zstandard.ZstdCompressor | None = None
         self._zstd_decompressor = zstandard.ZstdDecompressor()
@@ -657,7 +661,6 @@ def flush_segments(self, now: int) -> dict[SegmentKey, FlushedSegment]:
         queue_keys = []
         shard_factor = max(1, len(self.assigned_shards))
         max_flush_segments = options.get("spans.buffer.max-flush-segments")
-        flusher_logger_enabled = options.get("spans.buffer.flusher-cumulative-logger-enabled")
         max_segments_per_shard = math.ceil(max_flush_segments / shard_factor)
 
         ids_start = time.monotonic()
@@ -680,6 +683,7 @@ def flush_segments(self, now: int) -> dict[SegmentKey, FlushedSegment]:
 
         acquired_locks = self._acquire_flush_locks([k for _, _, k, _ in segment_keys])
         segment_keys = [entry for entry in segment_keys if entry[2] in acquired_locks]
+        segment_key_values = [k for _, _, k, _ in segment_keys]
 
         data_start = time.monotonic()
         with metrics.timer("spans.buffer.flush_segments.load_segment_data"):
@@ -687,21 +691,23 @@ def flush_segments(self, now: int) -> dict[SegmentKey, FlushedSegment]:
             segment_to_queue = {
                 segment_key: queue_key for _, queue_key, segment_key, _ in segment_keys
             }
-            segments, payload_keys_map = self._load_segment_data(
-                [k for _, _, k, _ in segment_keys],
-                segment_to_queue,
-                now,
-            )
+            loaded_segment_data, decompress_latency_ms = self._load_segment_data(segment_key_values)
         load_data_latency_ms = int((time.monotonic() - data_start) * 1000)
 
+        self._record_segment_loss_metrics(
+            segment_key_values,
+            segment_to_queue,
+            now,
+            loaded_segment_data.payloads,
+        )
+
         return_segments = {}
         num_has_root_spans = 0
         any_shard_at_limit = False
-        flusher_log_entries: list[FlusherLogEntry] = []
 
         for shard, queue_key, segment_key, score in segment_keys:
             segment_span_id = segment_key_to_span_id(segment_key).decode("ascii")
-            segment = segments.get(segment_key, [])
+            segment = loaded_segment_data.payloads.get(segment_key, [])
             project_id, _, _ = parse_segment_key(segment_key)
             if len(segment) >= max_segments_per_shard:
                 any_shard_at_limit = True
@@ -737,7 +743,7 @@ def flush_segments(self, now: int) -> dict[SegmentKey, FlushedSegment]:
                 queue_key=queue_key,
                 spans=output_spans,
                 project_id=int(project_id.decode("ascii")),
-                payload_keys=payload_keys_map.get(segment_key, []),
+                payload_keys=loaded_segment_data.payload_keys.get(segment_key, []),
             )
             num_has_root_spans += int(has_root_span)
 
@@ -751,24 +757,13 @@ def flush_segments(self, now: int) -> dict[SegmentKey, FlushedSegment]:
                 timestamp=now,
             ).emit(self._get_debug_trace_logger)
 
-            if flusher_logger_enabled and segment:
-                project_id, trace_id, _ = parse_segment_key(segment_key)
-                project_and_trace = f"{project_id.decode('ascii')}:{trace_id.decode('ascii')}"
-                flusher_log_entries.append(
-                    FlusherLogEntry(
-                        project_and_trace,
-                        len(segment),
-                        sum(len(s) for s in segment),
-                    )
-                )
-
-        if flusher_logger_enabled and flusher_log_entries:
-            self._flusher_logger.log(
-                flusher_log_entries,
-                load_ids_latency_ms,
-                load_data_latency_ms,
-                self._last_decompress_latency_ms,
-            )
+        self._flusher_logger.log_loaded_segments(
+            segment_key_values,
+            loaded_segment_data.payloads,
+            load_ids_latency_ms=load_ids_latency_ms,
+            load_data_latency_ms=load_data_latency_ms,
+            decompress_latency_ms=decompress_latency_ms,
+        )
 
         metrics.timing("spans.buffer.flush_segments.num_segments", len(return_segments))
         metrics.timing("spans.buffer.flush_segments.has_root_span", num_has_root_spans)
@@ -779,29 +774,37 @@ def flush_segments(self, now: int) -> dict[SegmentKey, FlushedSegment]:
     def _load_segment_data(
         self,
         segment_keys: list[SegmentKey],
-        segment_to_queue: dict[SegmentKey, QueueKey],
-        now: int,
-    ) -> tuple[dict[SegmentKey, list[bytes]], dict[SegmentKey, list[PayloadKey]]]:
+    ) -> tuple[LoadedSegmentData, int]:
         """
         Loads the segments from Redis, given a list of segment keys.
 
         :param segment_keys: List of segment keys to load.
-        :param segment_to_queue: Mapping of segment keys to their queue keys for TTL checking.
-        :param now: Current timestamp for age calculation.
-        :return: payloads mapping segment keys to lists of span payloads.
+        :return: Loaded payloads and payload keys, plus decompression latency.
         """
 
         page_size = options.get("spans.buffer.segment-page-size")
+        payload_keys = self._load_payload_keys(segment_keys)
+        payloads, decompress_latency_ms = self._load_payloads_from_keys(
+            segment_keys,
+            payload_keys,
+            page_size,
+        )
 
-        payloads: dict[SegmentKey, list[bytes]] = {key: [] for key in segment_keys}
-        payload_keys_map: dict[SegmentKey, list[PayloadKey]] = {key: [] for key in segment_keys}
-        self._last_decompress_latency_ms = 0
-        decompress_latency_ms = 0.0
+        return (
+            LoadedSegmentData(payloads, payload_keys),
+            decompress_latency_ms,
+        )
 
-        # Maps each payload key back to the segment it belongs to.
-        # Multiple distributed payload keys map to one segment.
-        scan_key_to_segment: dict[SegmentKey | PayloadKey, SegmentKey] = {}
-        cursors: dict[bytes, int] = {}
+    def _load_payload_keys(
+        self, segment_keys: Sequence[SegmentKey]
+    ) -> dict[SegmentKey, list[PayloadKey]]:
+        """
+        Load the payload keys indexed under each segment key.
+
+        Segment keys point to member-key indexes; indexes contain payload keys
+        that point to spans payloads for the segment.
+        """
+        payload_keys: dict[SegmentKey, list[PayloadKey]] = {key: [] for key in segment_keys}
 
         with self.client.pipeline(transaction=False) as p:
             for key in segment_keys:
@@ -811,17 +814,33 @@ def _load_segment_data(
         for key, payload_key_span_ids in zip(segment_keys, mk_results):
             project_id, trace_id, _ = parse_segment_key(key)
             project_and_trace = f"{project_id.decode('ascii')}:{trace_id.decode('ascii')}"
-            segment_payload_keys: list[PayloadKey] = []
             for payload_key_span_id in payload_key_span_ids:
                 payload_key = self._get_payload_key(
                     project_and_trace, payload_key_span_id.decode("ascii")
                 )
-                segment_payload_keys.append(payload_key)
-                scan_key_to_segment[payload_key] = key
-                cursors[payload_key] = 0
-            payload_keys_map[key] = segment_payload_keys
+                payload_keys[key].append(payload_key)
+
+        return payload_keys
 
-        def _add_spans(key: SegmentKey, raw_data: bytes):
+    def _load_payloads_from_keys(
+        self,
+        segment_keys: Sequence[SegmentKey],
+        payload_keys: Mapping[SegmentKey, Sequence[PayloadKey]],
+        page_size: int,
+    ) -> tuple[dict[SegmentKey, list[bytes]], int]:
+        """
+        Scan payload keys and return decompressed payloads grouped by segment key.
+        """
+        payloads: dict[SegmentKey, list[bytes]] = {key: [] for key in segment_keys}
+        decompress_latency_ms = 0.0
+        segment_by_payload_key = {
+            payload_key: segment_key
+            for segment_key, segment_payload_keys in payload_keys.items()
+            for payload_key in segment_payload_keys
+        }
+        cursors = {payload_key: 0 for payload_key in segment_by_payload_key}
+
+        def _add_spans(key: SegmentKey, raw_data: bytes) -> None:
             """
             Decompress and add spans to the segment.
             """
@@ -842,7 +861,7 @@ def _add_spans(key: SegmentKey, raw_data: bytes):
                 scan_results = p.execute()
 
             for key, (cursor, scan_values) in zip(current_keys, scan_results):
-                segment_key = scan_key_to_segment[key]
+                segment_key = segment_by_payload_key[key]
                 for scan_value in scan_values:
                     if segment_key in payloads:
                         _add_spans(segment_key, scan_value)
@@ -852,6 +871,15 @@ def _add_spans(key: SegmentKey, raw_data: bytes):
                 else:
                     cursors[key] = cursor
 
+        return payloads, int(decompress_latency_ms)
+
+    def _record_segment_loss_metrics(
+        self,
+        segment_keys: Sequence[SegmentKey],
+        segment_to_queue: dict[SegmentKey, QueueKey],
+        now: int,
+        payloads: dict[SegmentKey, list[bytes]],
+    ) -> None:
         # Fetch ingested counts for all segments to calculate dropped spans
         with self.client.pipeline(transaction=False) as p:
             for key in segment_keys:
@@ -932,10 +960,6 @@ def _add_spans(key: SegmentKey, raw_data: bytes):
                 # worst-case.
                 metrics.incr("spans.buffer.empty_segments")
 
-        self._last_decompress_latency_ms = int(decompress_latency_ms)
-
-        return payloads, payload_keys_map
-
     def done_flush_segments(self, segment_keys: dict[SegmentKey, FlushedSegment]):
         metrics.timing("spans.buffer.done_flush_segments.num_segments", len(segment_keys))
         with metrics.timer("spans.buffer.done_flush_segments"):
diff --git a/src/sentry/spans/buffer_logger.py b/src/sentry/spans/buffer_logger.py
index ee3a8641dcac61..6fae92f605a1d9 100644
--- a/src/sentry/spans/buffer_logger.py
+++ b/src/sentry/spans/buffer_logger.py
@@ -2,7 +2,7 @@
 
 import logging
 import time
-from collections.abc import Callable, Sequence
+from collections.abc import Callable, Mapping, Sequence
 from typing import Any, NamedTuple, TypeVar
 
 from sentry_redis_tools.clients import RedisCluster, StrictRedis
@@ -10,7 +10,7 @@
 from sentry import options
 from sentry.spans.buffer_types import EvalshaData, EvalshaResult, InsertedSubsegment, Span
 from sentry.spans.debug_trace_logger import DebugTraceLogger
-from sentry.spans.segment_key import SegmentKey
+from sentry.spans.segment_key import SegmentKey, parse_segment_key
 from sentry.utils import metrics
 
 logger = logging.getLogger(__name__)
@@ -166,21 +166,54 @@ def __init__(self) -> None:
         self._cumulative_decompress_latency_ms: int = 0
         self._last_log_time: float | None = None
 
-    def log(
+    def log_loaded_segments(
         self,
-        entries: list[FlusherLogEntry],
+        segment_keys: Sequence[SegmentKey],
+        payloads: Mapping[SegmentKey, Sequence[bytes]],
+        *,
         load_ids_latency_ms: int,
         load_data_latency_ms: int,
         decompress_latency_ms: int,
     ) -> None:
         """
-        Record a batch of flush operations and periodically log the top traces sorted by
+        Record loaded segments and periodically log the top traces sorted by
         cumulative bytes flushed.
         """
-
         if not options.get("spans.buffer.flusher-cumulative-logger-enabled"):
             return
 
+        entries: list[FlusherLogEntry] = []
+        for segment_key in segment_keys:
+            segment = payloads.get(segment_key, [])
+            if not segment:
+                continue
+
+            project_id, trace_id, _ = parse_segment_key(segment_key)
+            entries.append(
+                FlusherLogEntry(
+                    f"{project_id.decode('ascii')}:{trace_id.decode('ascii')}",
+                    len(segment),
+                    sum(len(payload) for payload in segment),
+                )
+            )
+
+        if not entries:
+            return
+
+        self._log_entries(
+            entries,
+            load_ids_latency_ms,
+            load_data_latency_ms,
+            decompress_latency_ms,
+        )
+
+    def _log_entries(
+        self,
+        entries: list[FlusherLogEntry],
+        load_ids_latency_ms: int,
+        load_data_latency_ms: int,
+        decompress_latency_ms: int,
+    ) -> None:
         self._cumulative_load_ids_latency_ms += load_ids_latency_ms
         self._cumulative_load_data_latency_ms += load_data_latency_ms
         self._cumulative_decompress_latency_ms += decompress_latency_ms
diff --git a/src/sentry/spans/buffer_types.py b/src/sentry/spans/buffer_types.py
index 88b47cd6df3d9a..4b18624fd356f6 100644
--- a/src/sentry/spans/buffer_types.py
+++ b/src/sentry/spans/buffer_types.py
@@ -10,7 +10,7 @@
 from collections.abc import Sequence
 from typing import Any, NamedTuple
 
-from sentry.spans.segment_key import SegmentKey
+from sentry.spans.segment_key import PayloadKey, SegmentKey
 
 type DataPoint = tuple[bytes, float]
 type EvalshaData = list[DataPoint]
@@ -102,3 +102,8 @@ def queue_shard(self) -> int:
     @property
     def is_detached_segment(self) -> bool:
         return self.result.segment_key.endswith(self.subsegment.salt.encode("ascii"))
+
+
+class LoadedSegmentData(NamedTuple):
+    payloads: dict[SegmentKey, list[bytes]]
+    payload_keys: dict[SegmentKey, list[PayloadKey]]
diff --git a/src/sentry/spans/consumers/process_segments/message.py b/src/sentry/spans/consumers/process_segments/message.py
index 18e7e5f0640aa4..a0d10c0147de38 100644
--- a/src/sentry/spans/consumers/process_segments/message.py
+++ b/src/sentry/spans/consumers/process_segments/message.py
@@ -1,7 +1,10 @@
+import hashlib
 import logging
 import types
 import uuid
+from collections import OrderedDict
 from collections.abc import Mapping, Sequence
+from datetime import datetime
 from typing import Any
 
 import sentry_sdk
@@ -36,6 +39,7 @@
 from sentry.spans.grouping.api import load_span_grouping_config
 from sentry.utils import metrics
 from sentry.utils.dates import to_datetime
+from sentry.utils.last_seen import LAST_SEEN_INTERVAL_SECONDS
 from sentry.utils.outcomes import Outcome, OutcomeAggregator
 from sentry.utils.projectflags import set_project_flag_and_signal
 
@@ -101,7 +105,41 @@ def _process_segment(
 
     _add_segment_name(segment_span, spans)
     _compute_breakdowns(segment_span, spans, project)
-    _create_models(segment_span, project)
+
+    environment_name = attribute_value(segment_span, ATTRIBUTE_NAMES.SENTRY_ENVIRONMENT)
+    release_name = attribute_value(segment_span, ATTRIBUTE_NAMES.SENTRY_RELEASE)
+    dist_name = attribute_value(segment_span, ATTRIBUTE_NAMES.SENTRY_DIST)
+    date = to_datetime(segment_span["end_timestamp"])
+
+    cache_key = f"{project.id}:{_to_string(environment_name)}:{_to_string(release_name)}:{_to_string(dist_name)}"
+
+    cache = _get_cache()
+    cache_metric_name = "spans.consumers.process_segments.cache"
+    cached_timestamp = cache.get(cache_key)
+    timestamp = int(date.timestamp())
+
+    # If no cached value exists this is the first time we've seen this combination. Here
+    # we follow the maximalist path. Models are created and onboarding signals issued.
+    if cached_timestamp is None:
+        _create_models(project, environment_name, release_name, dist_name, date)
+        cache.set(cache_key, timestamp)
+        metrics.incr(cache_metric_name, tags={"outcome": "miss"})
+    # If a cached value was found and the timestamp specified by the current event exceeds
+    # the previously cached timestamp by at least `LAST_SEEN_INTERVAL_SECONDS` then we
+    # perform small mutations on select models. From the code in this module this may appear
+    # to only save one or two cache lookups, however, certain billing logic tied to the
+    # feature flag check runs when this program is executed in getsentry. In the minimal
+    # case its three extra saved queries but up to six additional cache lookups have been
+    # observed.
+    elif timestamp - LAST_SEEN_INTERVAL_SECONDS >= cached_timestamp:
+        _bump_release_last_seen(project, environment_name, release_name, date)
+        cache.set(cache_key, timestamp)
+        metrics.incr(cache_metric_name, tags={"action": "bump", "outcome": "hit"})
+    # If a cached value was found and the timestamp does NOT exceed the interval then we
+    # do nothing! This should be the majority of events.
+    else:
+        metrics.incr(cache_metric_name, tags={"action": "noop", "outcome": "hit"})
+
     _detect_performance_problems(segment_span, spans, project)
     _record_signals(segment_span, spans, project)
 
@@ -205,16 +243,13 @@ def _compute_breakdowns(
 
 
 @metrics.wraps("spans.consumers.process_segments.create_models")
-def _create_models(segment: CompatibleSpan, project: Project) -> None:
+def _create_models(
+    project: Project, environment_name: Any, release_name: Any, dist_name: Any, date: datetime
+) -> None:
     """
     Creates the Environment and Release models, along with the necessary
     relationships between them and the Project model.
     """
-    environment_name = attribute_value(segment, ATTRIBUTE_NAMES.SENTRY_ENVIRONMENT)
-    release_name = attribute_value(segment, ATTRIBUTE_NAMES.SENTRY_RELEASE)
-    dist_name = attribute_value(segment, ATTRIBUTE_NAMES.SENTRY_DIST)
-    date = to_datetime(segment["end_timestamp"])
-
     environment = Environment.get_or_create(project=project, name=environment_name)
 
     if not release_name:
@@ -343,3 +378,93 @@ def _track_outcomes(segment_span: CompatibleSpan, spans: list[CompatibleSpan]) -
         category=DataCategory.SPAN_INDEXED,
         quantity=len(spans),
     )
+
+
+@metrics.wraps("spans.consumers.process_segments.bump_release_last_seen")
+def _bump_release_last_seen(
+    project: Project, environment_name: Any, release_name: Any, date: datetime
+) -> None:
+    if not release_name:
+        return
+
+    environment = Environment.get_or_create(project=project, name=environment_name)
+
+    try:
+        release = Release.get_or_create(project=project, version=release_name, date_added=date)
+    except ValidationError:
+        return
+
+    # Bumps release-environment last-seen.
+    ReleaseEnvironment.get_or_create(
+        project=project, release=release, environment=environment, datetime=date
+    )
+
+    # Bumps release-project-environment last-seen.
+    ReleaseProjectEnvironment.get_or_create(
+        project=project, release=release, environment=environment, datetime=date
+    )
+
+
+def _to_string(s: Any) -> str:
+    return s if isinstance(s, str) else ""
+
+
+class BoundedLRUCache:
+    """
+    A bounded, in-memory LRU cache.
+
+    :param max_size: The maximum number of keys the cache may contain.
+        The size of the cache is bounded to 100-bytes per entry. To determine how
+        much memory the cache will consume multiply `max_size` by 100. At a
+        `max_size` of one million entries the cache will consume 100 megabytes of
+        memory.
+    """
+
+    def __init__(self, max_size: int):
+        self.cache: OrderedDict[int, int] = OrderedDict()
+        self.max_size = max_size
+
+    def get(self, key: str) -> int | None:
+        k = self._hash_key(key)
+        if k in self.cache:
+            self.cache.move_to_end(k)
+            return self.cache[k]
+        else:
+            return None
+
+    def set(self, key: str, value: int) -> None:
+        k = self._hash_key(key)
+        self.cache[k] = value
+        self.cache.move_to_end(k)
+        if len(self.cache) > self.max_size:
+            self.cache.popitem(last=False)
+        return None
+
+    def _hash_key(self, key: str) -> int:
+        """
+        Return the hash of the `key` as an integer.
+
+        Cache keys are strings and technically unbounded, though its likely bounds on string length
+        are enforced upstream. Nevertheless strings consume more memory than we should be
+        reasonably willing to allocate to this job.
+
+        The `key` is hashed using `blake2b`. A digest-size of 11-bytes was chosen. 11-bytes is
+        significant because its the largest digest size before byte size increases to the next
+        4-byte boundary. The next smallest boundary was a digest size of 7 at time of testing.
+        For one billion unique cache key permutations there is a 1 in 600 million chance of
+        collision.
+
+        This method outputs a 36-byte integer.
+        """
+        digest = hashlib.blake2b(key.encode(), digest_size=11).digest()
+        return int.from_bytes(digest, "big")
+
+
+def _get_cache() -> BoundedLRUCache:
+    global cache
+    if cache is None:
+        cache = BoundedLRUCache(max_size=100_000)
+    return cache
+
+
+cache: BoundedLRUCache | None = None
diff --git a/src/sentry/tasks/base.py b/src/sentry/tasks/base.py
index b696acbfec3763..988172abfc7f77 100644
--- a/src/sentry/tasks/base.py
+++ b/src/sentry/tasks/base.py
@@ -45,6 +45,7 @@ def instrumented_task(
     report_timeout_errors: bool = True,
     silenced_exceptions: tuple[type[BaseException], ...] | None = None,
     silo_mode: SiloMode | None = None,
+    pass_headers: bool = False,
     **kwargs,
 ) -> Callable[[Callable[P, R]], Task[P, R]]:
     """
@@ -127,6 +128,7 @@ def wrapped(func: Callable[P, R]) -> Task[P, R]:
             compression_type=compression_type,
             report_timeout_errors=report_timeout_errors,
             silenced_exceptions=silenced_exceptions,
+            pass_headers=pass_headers,
         )(func)
 
         if silo_mode:
@@ -150,6 +152,7 @@ def wrapped(func: Callable[P, R]) -> Task[P, R]:
                 compression_type=compression_type,
                 report_timeout_errors=report_timeout_errors,
                 silenced_exceptions=silenced_exceptions,
+                pass_headers=pass_headers,
             )(func)
 
             if silo_mode:
diff --git a/src/sentry/taskworker/namespaces.py b/src/sentry/taskworker/namespaces.py
index 374dfdf7cdcb84..bfadb09ea4886e 100644
--- a/src/sentry/taskworker/namespaces.py
+++ b/src/sentry/taskworker/namespaces.py
@@ -87,6 +87,11 @@
     app_feature="profiles",
 )
 
+ingest_profiling_passthrough_tasks = app.taskregistry.create_namespace(
+    "ingest.profiling.passthrough",
+    app_feature="profiles",
+)
+
 ingest_transactions_tasks = app.taskregistry.create_namespace(
     "ingest.transactions",
     app_feature="transactions",
diff --git a/src/sentry/utils/last_seen.py b/src/sentry/utils/last_seen.py
index 62f29714b51a7b..75f3418dab9d11 100644
--- a/src/sentry/utils/last_seen.py
+++ b/src/sentry/utils/last_seen.py
@@ -7,6 +7,8 @@
 from django.core.cache import cache
 from django.db.utils import OperationalError
 
+LAST_SEEN_INTERVAL_SECONDS = 60
+
 
 class HasLastSeen(Protocol):
     id: int
@@ -23,7 +25,7 @@ def try_bump_last_seen(
     metrics_tags: dict[str, str],
 ) -> bool:
     """Throttled last_seen bump — at most once per 60s per row via a cache-based lock."""
-    if instance.last_seen >= datetime - timedelta(seconds=60):
+    if instance.last_seen >= datetime - timedelta(seconds=LAST_SEEN_INTERVAL_SECONDS):
         metrics_tags["bumped"] = "false"
         return False
 
diff --git a/static/app/components/acl/useRole.tsx b/static/app/components/acl/useRole.tsx
index 60a784fe1242ed..e662dfbf5fe9f3 100644
--- a/static/app/components/acl/useRole.tsx
+++ b/static/app/components/acl/useRole.tsx
@@ -28,7 +28,9 @@ function getProjectRole(
   project: DetailedProject | undefined,
   role: 'debugFilesRole' | 'attachmentsRole'
 ): string | undefined {
-  if (!project) return undefined;
+  if (!project) {
+    return undefined;
+  }
 
   if (role === 'debugFilesRole') {
     return project.debugFilesRole ?? undefined;
diff --git a/static/app/components/charts/useChartXRangeSelection.spec.tsx b/static/app/components/charts/useChartXRangeSelection.spec.tsx
index a09f269b1a91eb..88c4b6d391d336 100644
--- a/static/app/components/charts/useChartXRangeSelection.spec.tsx
+++ b/static/app/components/charts/useChartXRangeSelection.spec.tsx
@@ -133,9 +133,15 @@ describe('useChartXRangeSelection', () => {
           }),
         }),
         convertToPixel: jest.fn((_config, value) => {
-          if (value === 100) return 500;
-          if (value === 90) return 450;
-          if (value === 10) return 50;
+          if (value === 100) {
+            return 500;
+          }
+          if (value === 90) {
+            return 450;
+          }
+          if (value === 10) {
+            return 50;
+          }
           return 0;
         }),
       } as any;
@@ -380,8 +386,12 @@ describe('useChartXRangeSelection', () => {
           }),
         }),
         convertToPixel: jest.fn((_config, value) => {
-          if (value === 100) return 500; // xMax
-          if (value === 90) return 480; // Above 60% threshold
+          if (value === 100) {
+            return 500;
+          } // xMax
+          if (value === 90) {
+            return 480;
+          } // Above 60% threshold
           return 0;
         }),
       } as any;
@@ -694,10 +704,18 @@ describe('useChartXRangeSelection', () => {
         convertToPixel: jest.fn((_config, value) => {
           // Selection range pixels: xMin=50, xMax=150
           // yMin pixel = 200
-          if (value === 100) return 200; // xMax extent
-          if (value === 0) return 200; // yMin extent
-          if (value === 10) return 50; // selection xMin
-          if (value === 90) return 150; // selection xMax
+          if (value === 100) {
+            return 200;
+          } // xMax extent
+          if (value === 0) {
+            return 200;
+          } // yMin extent
+          if (value === 10) {
+            return 50;
+          } // selection xMin
+          if (value === 90) {
+            return 150;
+          } // selection xMax
           return 100;
         }),
         getDom: jest.fn().mockReturnValue({
@@ -775,10 +793,18 @@ describe('useChartXRangeSelection', () => {
         convertToPixel: jest.fn((_config, value) => {
           // Selection range pixels: xMin=50, xMax=150
           // yMin pixel = 200
-          if (value === 100) return 200; // xMax extent
-          if (value === 0) return 200; // yMin extent
-          if (value === 10) return 50; // selection xMin
-          if (value === 90) return 150; // selection xMax
+          if (value === 100) {
+            return 200;
+          } // xMax extent
+          if (value === 0) {
+            return 200;
+          } // yMin extent
+          if (value === 10) {
+            return 50;
+          } // selection xMin
+          if (value === 90) {
+            return 150;
+          } // selection xMax
           return 100;
         }),
         getDom: jest.fn().mockReturnValue({
@@ -854,10 +880,18 @@ describe('useChartXRangeSelection', () => {
           }),
         }),
         convertToPixel: jest.fn((_config, value) => {
-          if (value === 100) return 200;
-          if (value === 0) return 200;
-          if (value === 10) return 50;
-          if (value === 90) return 150;
+          if (value === 100) {
+            return 200;
+          }
+          if (value === 0) {
+            return 200;
+          }
+          if (value === 10) {
+            return 50;
+          }
+          if (value === 90) {
+            return 150;
+          }
           return 100;
         }),
         getDom: jest.fn().mockReturnValue({
diff --git a/static/app/components/charts/useChartXRangeSelection.tsx b/static/app/components/charts/useChartXRangeSelection.tsx
index 23314a27235459..71008c93735478 100644
--- a/static/app/components/charts/useChartXRangeSelection.tsx
+++ b/static/app/components/charts/useChartXRangeSelection.tsx
@@ -156,14 +156,18 @@ export function useChartXRangeSelection({
   const previousInitialSelection = usePrevious(initialSelection);
 
   const clearSelection = useCallback(() => {
-    if (!selectionState?.selection) return;
+    if (!selectionState?.selection) {
+      return;
+    }
 
     const chartInstance = chartRef.current?.getEchartsInstance();
 
     chartInstance?.dispatchAction({type: 'brush', areas: []});
 
     // Restore the tooltip as we clear selection
-    if (tooltipFrameRef.current) cancelAnimationFrame(tooltipFrameRef.current);
+    if (tooltipFrameRef.current) {
+      cancelAnimationFrame(tooltipFrameRef.current);
+    }
 
     tooltipFrameRef.current = requestAnimationFrame(() => {
       chartInstance?.setOption({tooltip: {show: true}}, {silent: true});
@@ -192,7 +196,9 @@ export function useChartXRangeSelection({
 
       // Disable the tooltip as we start dragging, as it covers regions of the chart that the user
       // may want to select. The tooltip remains hidden until the box is cleared.
-      if (tooltipFrameRef.current) cancelAnimationFrame(tooltipFrameRef.current);
+      if (tooltipFrameRef.current) {
+        cancelAnimationFrame(tooltipFrameRef.current);
+      }
 
       tooltipFrameRef.current = requestAnimationFrame(() => {
         chartInstance.setOption(
@@ -210,7 +216,9 @@ export function useChartXRangeSelection({
 
   const onBrushEnd = useCallback<EChartBrushEndHandler>(
     (evt, chartInstance) => {
-      if (!chartInstance) return;
+      if (!chartInstance) {
+        return;
+      }
 
       const area = evt.areas[0];
 
@@ -251,7 +259,9 @@ export function useChartXRangeSelection({
   }, [chartRef]);
 
   const syncSelectionStates = useCallback(() => {
-    if (disabled) return;
+    if (disabled) {
+      return;
+    }
 
     const chartInstance = chartRef.current?.getEchartsInstance();
 
@@ -312,10 +322,14 @@ export function useChartXRangeSelection({
   ]);
 
   useEffect(() => {
-    if (disabled || !selectionState?.selection) return;
+    if (disabled || !selectionState?.selection) {
+      return;
+    }
 
     const chartInstance = chartRef.current?.getEchartsInstance();
-    if (!chartInstance) return;
+    if (!chartInstance) {
+      return;
+    }
 
     const handleInsideSelectionClick = (event: MouseEvent) => {
       const [selectedMin, selectedMax] = selectionState.selection.range;
@@ -326,7 +340,9 @@ export function useChartXRangeSelection({
       // @ts-expect-error TODO Abdullah Khan: chartInstance.getModel is a private method, but we access it to get the axis extremes
       // could not find a better way, this works out perfectly for now. Passing down the entire series data to the hook is more gross.
       const yAxis = chartInstance.getModel()?.getComponent?.('yAxis', 0);
-      if (!yAxis) return;
+      if (!yAxis) {
+        return;
+      }
 
       const yMin = yAxis.axis.scale.getExtent()[0];
       const yMinPixel = chartInstance.convertToPixel({yAxisIndex: 0}, yMin);
@@ -467,8 +483,9 @@ export function useChartXRangeSelection({
       !selectionState?.actionMenuPosition ||
       !actionMenuRenderer ||
       !selectionState.isActionMenuVisible
-    )
+    ) {
       return null;
+    }
 
     // We want the top right corner of the action menu to be aligned with the bottom left
     // corner of the selection box, when the menu is positioned to the left. Using a transform, saves us
diff --git a/static/app/components/commandPalette/ui/cmdk.tsx b/static/app/components/commandPalette/ui/cmdk.tsx
index 06ace3d3c18740..ea55cf34eb39e6 100644
--- a/static/app/components/commandPalette/ui/cmdk.tsx
+++ b/static/app/components/commandPalette/ui/cmdk.tsx
@@ -121,7 +121,9 @@ function CMDKActionWithResource<TData = unknown>({
       ? data.map((item, i) => {
           // CommandPaletteActionGroup has an `actions` prop that CMDKAction doesn't
           // accept, so we skip groups here — they can't be auto-rendered as leaf nodes.
-          if ('actions' in item) return null;
+          if ('actions' in item) {
+            return null;
+          }
           return <CMDKAction key={i} {...item} />;
         })
       : null;
diff --git a/static/app/components/commandPalette/ui/collection.tsx b/static/app/components/commandPalette/ui/collection.tsx
index a4105dec3f7459..941f266147dc92 100644
--- a/static/app/components/commandPalette/ui/collection.tsx
+++ b/static/app/components/commandPalette/ui/collection.tsx
@@ -87,7 +87,9 @@ export function makeCollection<T>(): CollectionInstance<T> {
 
         unregister(key) {
           const node = nodes.current.get(key);
-          if (!node) return;
+          if (!node) {
+            return;
+          }
           nodes.current.delete(key);
           childIndex.current.get(node.parent)?.delete(key);
           childIndex.current.delete(key);
diff --git a/static/app/components/commandPalette/ui/commandPalette.tsx b/static/app/components/commandPalette/ui/commandPalette.tsx
index 51974f46ef5077..3bb6c5d44cf5e0 100644
--- a/static/app/components/commandPalette/ui/commandPalette.tsx
+++ b/static/app/components/commandPalette/ui/commandPalette.tsx
@@ -177,7 +177,9 @@ export function CommandPalette({
       !isLoading &&
       !isEmptyPromptQuery;
 
-    if (!showSeerFallback) return [scored, scoredPrefixMap, false];
+    if (!showSeerFallback) {
+      return [scored, scoredPrefixMap, false];
+    }
 
     const truncated =
       state.query.length > 24 ? state.query.slice(0, 24) + '...' : state.query;
@@ -690,10 +692,16 @@ function presortBySlotRef(
     const aEl = a.ref?.current ?? null;
     const bEl = b.ref?.current ?? null;
 
-    if (aEl === bEl) return 0; // both null, or same outlet element — preserve order
+    if (aEl === bEl) {
+      return 0;
+    } // both null, or same outlet element — preserve order
 
-    if (!aEl) return 1; // a has no slot ref → sort after b
-    if (!bEl) return -1; // b has no slot ref → sort a before b
+    if (!aEl) {
+      return 1;
+    } // a has no slot ref → sort after b
+    if (!bEl) {
+      return -1;
+    } // b has no slot ref → sort a before b
     return aEl.compareDocumentPosition(bEl) & Node.DOCUMENT_POSITION_FOLLOWING ? -1 : 1;
   });
 }
@@ -713,7 +721,9 @@ function scoreNode(
   let bestLength = Infinity;
   let matched = false;
   for (const candidate of [label, details, ...keywords]) {
-    if (!candidate) continue;
+    if (!candidate) {
+      continue;
+    }
     const result = fzf(candidate, query, false);
     if (result.end !== -1 && result.score > best) {
       best = result.score;
@@ -856,7 +866,9 @@ function flattenActions(
     let root: CollectionTreeNode<CMDKActionData> = item;
     while (root.parent !== null) {
       const parent = nodeMap.get(root.parent);
-      if (!parent) break;
+      if (!parent) {
+        break;
+      }
       root = parent;
     }
     nodeRootKey.set(item.key, root.key);
@@ -871,9 +883,13 @@ function flattenActions(
   const rootBestScore = new Map<string, CommandPaletteScore>();
   for (const [key, score] of scores) {
     const node = nodeMap.get(key);
-    if (node?.parent === null && node.children.length === 0) continue;
+    if (node?.parent === null && node.children.length === 0) {
+      continue;
+    }
     const rootKey = nodeRootKey.get(key);
-    if (rootKey === undefined) continue;
+    if (rootKey === undefined) {
+      continue;
+    }
     const current = rootBestScore.get(rootKey);
     if (current === undefined || compareCommandPaletteScores(score, current) < 0) {
       rootBestScore.set(rootKey, score);
@@ -914,7 +930,9 @@ function flattenActions(
   const usedSectionHeaders = new Set<string>();
 
   const flattened = collected.flatMap((item): CMDKFlatItem[] => {
-    if (seen.has(item.key)) return [];
+    if (seen.has(item.key)) {
+      return [];
+    }
     seen.add(item.key);
 
     if (item.children.length > 0) {
@@ -927,7 +945,9 @@ function flattenActions(
       const shouldUseFallbackChildren =
         matched.length === 0 && scores.get(item.key)?.matched;
       const candidateChildren = shouldUseFallbackChildren ? fallbackChildren : matched;
-      if (!candidateChildren.length) return [];
+      if (!candidateChildren.length) {
+        return [];
+      }
       const sortedMatches = shouldUseFallbackChildren
         ? candidateChildren
         : candidateChildren.sort((a, b) =>
@@ -945,7 +965,9 @@ function flattenActions(
       const intermediatePath: string[] = [];
       while (root.parent !== null) {
         const parent = nodeMap.get(root.parent);
-        if (!parent) break;
+        if (!parent) {
+          break;
+        }
         intermediatePath.unshift(root.display.label);
         root = parent;
       }
@@ -1045,7 +1067,9 @@ function getSourceAction(
   const headerMatch = actions.find(
     candidate => candidate.key === `${sourceActionKey}:header`
   );
-  if (headerMatch) return headerMatch;
+  if (headerMatch) {
+    return headerMatch;
+  }
 
   // For nested groups the original header was replaced by the root ancestor header.
   // The prefix map stores the group label under a distinct `:source-label` key.
diff --git a/static/app/components/commandPalette/ui/commandPaletteGlobalActions.tsx b/static/app/components/commandPalette/ui/commandPaletteGlobalActions.tsx
index 8c597a30dd056c..4eff37b15aa662 100644
--- a/static/app/components/commandPalette/ui/commandPaletteGlobalActions.tsx
+++ b/static/app/components/commandPalette/ui/commandPaletteGlobalActions.tsx
@@ -282,7 +282,9 @@ export function GlobalCommandPaletteActions() {
     })
       .flatMap(section =>
         section.items.filter(navItem => {
-          if (navItem.show === undefined) return true;
+          if (navItem.show === undefined) {
+            return true;
+          }
           return typeof navItem.show === 'function'
             ? navItem.show({...context, ...section})
             : navItem.show;
diff --git a/static/app/components/core/avatar/sentryAppAvatar.tsx b/static/app/components/core/avatar/sentryAppAvatar.tsx
index 3a910251f5d241..3cbf965ae399f8 100644
--- a/static/app/components/core/avatar/sentryAppAvatar.tsx
+++ b/static/app/components/core/avatar/sentryAppAvatar.tsx
@@ -59,7 +59,9 @@ function getSentryAppAvatarProps(
   )?.avatarUrl;
 
   // If there is no upload URL, return null and fall
-  if (!uploadUrl) return null;
+  if (!uploadUrl) {
+    return null;
+  }
 
   return {
     type: 'upload',
diff --git a/static/app/components/core/avatarButton/avatarButton.tsx b/static/app/components/core/avatarButton/avatarButton.tsx
index beb53604439f25..8ab8f539c18dc0 100644
--- a/static/app/components/core/avatarButton/avatarButton.tsx
+++ b/static/app/components/core/avatarButton/avatarButton.tsx
@@ -141,24 +141,25 @@ function shouldPadImage(data: Uint8ClampedArray): 'fill' | 'padded' {
   if (!(data[3]!>=128   || data[51]!>=128  || data[99]!>=128  ||
         data[147]!>=128 || data[195]!>=128 || data[243]!>=128 ||
         data[291]!>=128 || data[339]!>=128 || data[387]!>=128 ||
-        data[435]!>=128 || data[483]!>=128 || data[531]!>=128)) return 'padded';
+        data[435]!>=128 || data[483]!>=128 || data[531]!>=128)) {return 'padded';}
   // oxfmt-ignore
   if (!(data[47]!>=128  || data[95]!>=128  || data[143]!>=128 ||
         data[191]!>=128 || data[239]!>=128 || data[287]!>=128 ||
         data[335]!>=128 || data[383]!>=128 || data[431]!>=128 ||
-        data[479]!>=128 || data[527]!>=128 || data[575]!>=128)) return 'padded';
+        data[479]!>=128 || data[527]!>=128 || data[575]!>=128)) {return 'padded';}
   // oxfmt-ignore
   if (!(data[3]!>=128  || data[7]!>=128  || data[11]!>=128 ||
         data[15]!>=128 || data[19]!>=128 || data[23]!>=128 ||
         data[27]!>=128 || data[31]!>=128 || data[35]!>=128 ||
-        data[39]!>=128 || data[43]!>=128 || data[47]!>=128)) return 'padded';
+        data[39]!>=128 || data[43]!>=128 || data[47]!>=128)) {return 'padded';}
   // oxfmt-ignore
   if (!(data[531]!>=128 || data[535]!>=128 || data[539]!>=128 ||
         data[543]!>=128 || data[547]!>=128 || data[551]!>=128 ||
         data[555]!>=128 || data[559]!>=128 || data[563]!>=128 ||
-        data[567]!>=128 || data[571]!>=128 || data[575]!>=128)) return 'padded';
-  if (data[3]! < 128 || data[47]! < 128 || data[531]! < 128 || data[575]! < 128)
+        data[567]!>=128 || data[571]!>=128 || data[575]!>=128)) {return 'padded';}
+  if (data[3]! < 128 || data[47]! < 128 || data[531]! < 128 || data[575]! < 128) {
     return 'padded';
+  }
 
   return 'fill';
 }
@@ -171,7 +172,9 @@ function readPixels(img: HTMLImageElement): Uint8ClampedArray | null {
     canvas.width = SAMPLE_SIZE;
     canvas.height = SAMPLE_SIZE;
     const ctx = canvas.getContext('2d');
-    if (!ctx) return null;
+    if (!ctx) {
+      return null;
+    }
 
     // Draw the image on a 12x12 canvas to make the sampling more efficient
     const naturalW = img.naturalWidth || img.width;
@@ -199,7 +202,9 @@ function sampleAvatarColor(
   img: HTMLImageElement
 ): {hex: string | null; style: 'fill' | 'padded'} | null {
   const data = readPixels(img);
-  if (!data) return null;
+  if (!data) {
+    return null;
+  }
 
   const style = shouldPadImage(data);
 
@@ -215,7 +220,9 @@ function sampleAvatarColor(
 
   for (let i = 0; i < data.length; i += 4) {
     /* eslint-disable @typescript-eslint/no-non-null-assertion */
-    if (data[i + 3]! < 128) continue;
+    if (data[i + 3]! < 128) {
+      continue;
+    }
 
     const r = data[i]!,
       g = data[i + 1]!,
@@ -238,7 +245,9 @@ function sampleAvatarColor(
   }
 
   const [r, g, b, count] = ccount > 0 ? [cr, cg, cb, ccount] : [ar, ag, ab, acount];
-  if (count === 0) return {hex: null, style};
+  if (count === 0) {
+    return {hex: null, style};
+  }
 
   const toHex = (v: number) =>
     Math.round(v / count)
@@ -265,7 +274,9 @@ async function resolveImageAvatarColors(
 ): Promise<{chonk: string | undefined; style: 'fill' | 'padded'} | null> {
   const sampled = await fetchAvatarColor(url);
 
-  if (!sampled?.hex) return null;
+  if (!sampled?.hex) {
+    return null;
+  }
 
   const chonk = color(sampled.hex)
     .darken(theme === 'dark' ? 0.85 : 0.45)
diff --git a/static/app/components/core/compactSelect/control.tsx b/static/app/components/core/compactSelect/control.tsx
index 0091352c2eea7d..98a3e7cb23c557 100644
--- a/static/app/components/core/compactSelect/control.tsx
+++ b/static/app/components/core/compactSelect/control.tsx
@@ -429,7 +429,9 @@ export function Control({
     const values = Array.isArray(value) ? value : [value];
     const options = items
       .flatMap(item => {
-        if ('options' in item) return item.options;
+        if ('options' in item) {
+          return item.options;
+        }
         return item;
       })
       .filter(item => values.includes(item.value));
@@ -461,8 +463,12 @@ export function Control({
   });
 
   const hasSelection = useMemo(() => {
-    if (value === undefined) return false;
-    if (Array.isArray(value)) return value.length > 0;
+    if (value === undefined) {
+      return false;
+    }
+    if (Array.isArray(value)) {
+      return value.length > 0;
+    }
     return true;
   }, [value]);
 
diff --git a/static/app/components/core/compactSelect/gridList/index.tsx b/static/app/components/core/compactSelect/gridList/index.tsx
index 0353809e9e78de..ad4dfde662b76c 100644
--- a/static/app/components/core/compactSelect/gridList/index.tsx
+++ b/static/app/components/core/compactSelect/gridList/index.tsx
@@ -132,7 +132,9 @@ function GridList({
             >
               {virtualizer.items.map(row => {
                 const item = listItems[row.index];
-                if (!item) return null;
+                if (!item) {
+                  return null;
+                }
                 if (item.type === 'section') {
                   return (
                     <GridListSection
diff --git a/static/app/components/core/compactSelect/listBox/index.tsx b/static/app/components/core/compactSelect/listBox/index.tsx
index a486ae5990b73a..7cb36c61ef898f 100644
--- a/static/app/components/core/compactSelect/listBox/index.tsx
+++ b/static/app/components/core/compactSelect/listBox/index.tsx
@@ -243,7 +243,9 @@ export function ListBox<T extends ObjectLike>({
             {overlayIsOpen &&
               virtualizer.items.map(row => {
                 const item = listItems[row.index];
-                if (!item) return null;
+                if (!item) {
+                  return null;
+                }
                 if (item.type === 'section') {
                   return (
                     <ListBoxSection
diff --git a/static/app/components/core/compactSelect/utils.tsx b/static/app/components/core/compactSelect/utils.tsx
index da6ad701bbc080..ec1a3cbf194af1 100644
--- a/static/app/components/core/compactSelect/utils.tsx
+++ b/static/app/components/core/compactSelect/utils.tsx
@@ -30,8 +30,12 @@ import type {
 export function getSearchConfig<Value extends SelectKey>(
   search: boolean | SearchConfig<Value> | undefined
 ): SearchConfig<Value> | undefined {
-  if (!search) return undefined;
-  if (search === true) return {};
+  if (!search) {
+    return undefined;
+  }
+  if (search === true) {
+    return {};
+  }
   return search;
 }
 
@@ -466,7 +470,9 @@ export function getDuplicateOptionKeysInfo<Value extends SelectKey>(
 
       optionCount += 1;
       const key = String(item.key);
-      if (duplicates.has(key)) continue;
+      if (duplicates.has(key)) {
+        continue;
+      }
 
       if (seen.has(key)) {
         duplicates.add(key);
diff --git a/static/app/components/core/form/field/baseField.tsx b/static/app/components/core/form/field/baseField.tsx
index da2d5e18b6d239..30e7e9136b3838 100644
--- a/static/app/components/core/form/field/baseField.tsx
+++ b/static/app/components/core/form/field/baseField.tsx
@@ -150,9 +150,13 @@ export function BaseField<T extends HTMLElement>(
 }
 
 function animateRowHighlight(node: HTMLElement | null) {
-  if (!node) return;
+  if (!node) {
+    return;
+  }
   const name = node.getAttribute('name');
-  if (!name) return;
+  if (!name) {
+    return;
+  }
   const fieldRow = node.closest<HTMLElement>(`#${CSS.escape(name)}`);
   if (fieldRow) {
     fieldRow.dataset.highlight = '';
diff --git a/static/app/components/core/form/scrapsForm.tsx b/static/app/components/core/form/scrapsForm.tsx
index 5b8067e8670a91..b343c723a1b7e7 100644
--- a/static/app/components/core/form/scrapsForm.tsx
+++ b/static/app/components/core/form/scrapsForm.tsx
@@ -81,7 +81,7 @@ function SubmitButton(props: ButtonProps) {
           variant="primary"
           type="submit"
           form={form.formId}
-          busy={isSubmitting}
+          busy={isSubmitting || props.busy}
           disabled={isSubmitting || props.disabled}
         />
       )}
diff --git a/static/app/components/core/inspector.tsx b/static/app/components/core/inspector.tsx
index 140deb3491790f..3458e5c0cea322 100644
--- a/static/app/components/core/inspector.tsx
+++ b/static/app/components/core/inspector.tsx
@@ -727,12 +727,16 @@ function isTraceElement(el: unknown): el is TraceElement {
 }
 
 function getComponentName(el: unknown): string {
-  if (!isTraceElement(el)) return 'unknown';
+  if (!isTraceElement(el)) {
+    return 'unknown';
+  }
   return el.dataset.sentryComponent || el.dataset.sentryElement || 'unknown';
 }
 
 function getSourcePath(el: unknown): string {
-  if (!isTraceElement(el)) return 'unknown path';
+  if (!isTraceElement(el)) {
+    return 'unknown path';
+  }
   return el.dataset.sentrySourcePath?.split(/static\//)[1] || 'unknown path';
 }
 
@@ -748,7 +752,9 @@ function getComponentStorybookFile(
   stories: Record<string, string>
 ): string | null {
   const sourcePath = getSourcePath(el);
-  if (!sourcePath) return null;
+  if (!sourcePath) {
+    return null;
+  }
 
   const mdxSourcePath = sourcePath.replace(/\.tsx$/, '.mdx');
 
@@ -765,7 +771,9 @@ function getComponentStorybookFile(
 }
 
 function getSourcePathFromMouseEvent(event: MouseEvent): TraceElement[] | null {
-  if (!event.target || !isTraceElement(event.target)) return null;
+  if (!event.target || !isTraceElement(event.target)) {
+    return null;
+  }
 
   const target = event.target;
 
@@ -773,7 +781,9 @@ function getSourcePathFromMouseEvent(event: MouseEvent): TraceElement[] | null {
     ? target
     : target.closest('[data-sentry-source-path]');
 
-  if (!head) return null;
+  if (!head) {
+    return null;
+  }
 
   const trace: TraceElement[] = [head as TraceElement];
 
@@ -783,7 +793,9 @@ function getSourcePathFromMouseEvent(event: MouseEvent): TraceElement[] | null {
     const next = head.parentElement?.closest(
       '[data-sentry-source-path]'
     ) as TraceElement | null;
-    if (!next || next === head) break;
+    if (!next || next === head) {
+      break;
+    }
     trace.push(next);
     head = next;
   }
@@ -792,12 +804,16 @@ function getSourcePathFromMouseEvent(event: MouseEvent): TraceElement[] | null {
 }
 
 function isCoreComponent(el: unknown): boolean {
-  if (!isTraceElement(el)) return false;
+  if (!isTraceElement(el)) {
+    return false;
+  }
   return el.dataset.sentrySourcePath?.includes('app/components/core') ?? false;
 }
 
 function isViewComponent(el: unknown): boolean {
-  if (!isTraceElement(el)) return false;
+  if (!isTraceElement(el)) {
+    return false;
+  }
   return el.dataset.sentrySourcePath?.includes('app/views') ?? false;
 }
 
diff --git a/static/app/components/events/interfaces/frame/frameRegisters/utils.tsx b/static/app/components/events/interfaces/frame/frameRegisters/utils.tsx
index b5c4555320d68a..6c3ad10e89ca50 100644
--- a/static/app/components/events/interfaces/frame/frameRegisters/utils.tsx
+++ b/static/app/components/events/interfaces/frame/frameRegisters/utils.tsx
@@ -59,8 +59,12 @@ export function getSortedRegisters(
       }
 
       // Mapped registers come before unmapped ones
-      if (indexA !== -1) return -1;
-      if (indexB !== -1) return 1;
+      if (indexA !== -1) {
+        return -1;
+      }
+      if (indexB !== -1) {
+        return 1;
+      }
     }
 
     // Fallback: natural sort (handles numeric suffixes correctly)
diff --git a/static/app/components/events/ourlogs/ourlogsDrawer.tsx b/static/app/components/events/ourlogs/ourlogsDrawer.tsx
index 40f8d396578211..d7e9e8fc25e454 100644
--- a/static/app/components/events/ourlogs/ourlogsDrawer.tsx
+++ b/static/app/components/events/ourlogs/ourlogsDrawer.tsx
@@ -161,7 +161,6 @@ export function OurlogsDrawer({
             <LogsInfiniteTable
               embedded
               embeddedOptions={embeddedOptions}
-              expanded
               additionalData={additionalData}
               analyticsPageSource={LogsAnalyticsPageSource.ISSUE_DETAILS}
             />
diff --git a/static/app/components/pipeline/pipelineIntegrationAwsLambda.spec.tsx b/static/app/components/pipeline/pipelineIntegrationAwsLambda.spec.tsx
index 6df2cfc1eeb082..11964547949873 100644
--- a/static/app/components/pipeline/pipelineIntegrationAwsLambda.spec.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationAwsLambda.spec.tsx
@@ -50,12 +50,15 @@ describe('ProjectSelectStep', () => {
     });
   });
 
-  it('shows submitting state when isAdvancing', () => {
+  it('shows busy state when isAdvancing', () => {
     ProjectsStore.loadInitialData([ProjectFixture()]);
 
     render(<ProjectSelectStep {...makeStepProps({stepData: {}, isAdvancing: true})} />);
 
-    expect(screen.getByRole('button', {name: 'Submitting...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Continue'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 
   it('disables submit button when isInitializing', () => {
@@ -159,10 +162,13 @@ describe('CloudFormationStep', () => {
     });
   });
 
-  it('shows verifying state when isAdvancing', () => {
+  it('shows busy state when isAdvancing', () => {
     render(<CloudFormationStep {...makeStepProps({stepData, isAdvancing: true})} />);
 
-    expect(screen.getByRole('button', {name: 'Verifying...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Continue'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 });
 
diff --git a/static/app/components/pipeline/pipelineIntegrationAwsLambda.tsx b/static/app/components/pipeline/pipelineIntegrationAwsLambda.tsx
index 722117873ddb81..6aeddc8d4c6b41 100644
--- a/static/app/components/pipeline/pipelineIntegrationAwsLambda.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationAwsLambda.tsx
@@ -101,8 +101,8 @@ function ProjectSelectStep({
           {t('Currently only supports Node and Python Lambda functions.')}
         </Text>
         <Flex>
-          <form.SubmitButton disabled={isAdvancing || isInitializing}>
-            {isAdvancing ? t('Submitting...') : t('Continue')}
+          <form.SubmitButton busy={isAdvancing} disabled={isInitializing}>
+            {t('Continue')}
           </form.SubmitButton>
         </Flex>
       </Stack>
@@ -292,9 +292,7 @@ function CloudFormationStep({
           </div>
         )}
         <Flex>
-          <form.SubmitButton disabled={isAdvancing}>
-            {isAdvancing ? t('Verifying...') : t('Continue')}
-          </form.SubmitButton>
+          <form.SubmitButton busy={isAdvancing}>{t('Continue')}</form.SubmitButton>
         </Flex>
       </Stack>
     </form.AppForm>
@@ -436,7 +434,8 @@ function InstrumentationStep({
         <Button
           variant="primary"
           size="sm"
-          disabled={isAdvancing || enabledCount === 0}
+          busy={isAdvancing}
+          disabled={enabledCount === 0}
           onClick={() => {
             const enabledFunctions = Object.entries(enabled)
               .filter(([_, v]) => v)
@@ -444,7 +443,7 @@ function InstrumentationStep({
             advance({enabledFunctions});
           }}
         >
-          {isAdvancing ? t('Instrumenting...') : t('Instrument Functions')}
+          {t('Instrument Functions')}
         </Button>
         {failedNames.size > 0 && (
           <Text size="sm">
diff --git a/static/app/components/pipeline/pipelineIntegrationBitbucket.spec.tsx b/static/app/components/pipeline/pipelineIntegrationBitbucket.spec.tsx
index bdd175d0f9ef66..3b9faecb693cc6 100644
--- a/static/app/components/pipeline/pipelineIntegrationBitbucket.spec.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationBitbucket.spec.tsx
@@ -81,7 +81,7 @@ describe('BitbucketAuthorizeStep', () => {
     ).toBeInTheDocument();
   });
 
-  it('shows loading state when isAdvancing is true', () => {
+  it('shows busy state when isAdvancing is true', () => {
     render(
       <BitbucketAuthorizeStep
         {...makeStepProps({
@@ -94,7 +94,10 @@ describe('BitbucketAuthorizeStep', () => {
       />
     );
 
-    expect(screen.getByRole('button', {name: 'Authorizing...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Authorize Bitbucket'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 
   it('disables authorize button when authorizeUrl is not provided', () => {
diff --git a/static/app/components/pipeline/pipelineIntegrationBitbucket.tsx b/static/app/components/pipeline/pipelineIntegrationBitbucket.tsx
index e1e415c1710f5b..783b5193d39dc7 100644
--- a/static/app/components/pipeline/pipelineIntegrationBitbucket.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationBitbucket.tsx
@@ -59,11 +59,7 @@ function BitbucketAuthorizeStep({
           </Text>
         )}
       </Stack>
-      {isAdvancing ? (
-        <Button size="sm" disabled>
-          {t('Authorizing...')}
-        </Button>
-      ) : isWaitingForCallback ? (
+      {isWaitingForCallback && !isAdvancing ? (
         <Button size="sm" onClick={openPopup}>
           {t('Reopen authorization window')}
         </Button>
@@ -72,6 +68,7 @@ function BitbucketAuthorizeStep({
           size="sm"
           variant="primary"
           onClick={openPopup}
+          busy={isAdvancing}
           disabled={!stepData?.authorizeUrl}
         >
           {t('Authorize Bitbucket')}
diff --git a/static/app/components/pipeline/pipelineIntegrationClaudeCode.spec.tsx b/static/app/components/pipeline/pipelineIntegrationClaudeCode.spec.tsx
index 29c6504563bf33..42602764ef6e8a 100644
--- a/static/app/components/pipeline/pipelineIntegrationClaudeCode.spec.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationClaudeCode.spec.tsx
@@ -27,12 +27,15 @@ describe('ClaudeCodeApiKeyStep', () => {
     });
   });
 
-  it('shows loading state when isAdvancing', () => {
+  it('shows busy state when isAdvancing', () => {
     render(
       <ClaudeCodeApiKeyStep {...makeStepProps({stepData: {}, isAdvancing: true})} />
     );
 
-    expect(screen.getByRole('button', {name: 'Submitting...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Continue'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 
   it('disables submit button when isInitializing', () => {
diff --git a/static/app/components/pipeline/pipelineIntegrationClaudeCode.tsx b/static/app/components/pipeline/pipelineIntegrationClaudeCode.tsx
index 38f8ff475a3951..5d4e66a6b3c5a1 100644
--- a/static/app/components/pipeline/pipelineIntegrationClaudeCode.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationClaudeCode.tsx
@@ -55,8 +55,8 @@ function ClaudeCodeApiKeyStep({
           )}
         </form.AppField>
         <Flex>
-          <form.SubmitButton disabled={isAdvancing || isInitializing}>
-            {isAdvancing ? t('Submitting...') : t('Continue')}
+          <form.SubmitButton busy={isAdvancing} disabled={isInitializing}>
+            {t('Continue')}
           </form.SubmitButton>
         </Flex>
       </Stack>
diff --git a/static/app/components/pipeline/pipelineIntegrationCursor.spec.tsx b/static/app/components/pipeline/pipelineIntegrationCursor.spec.tsx
index bd2ecc06e285f1..d1e38d68e73c7b 100644
--- a/static/app/components/pipeline/pipelineIntegrationCursor.spec.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationCursor.spec.tsx
@@ -27,10 +27,13 @@ describe('CursorApiKeyStep', () => {
     });
   });
 
-  it('shows loading state when isAdvancing', () => {
+  it('shows busy state when isAdvancing', () => {
     render(<CursorApiKeyStep {...makeStepProps({stepData: {}, isAdvancing: true})} />);
 
-    expect(screen.getByRole('button', {name: 'Submitting...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Continue'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 
   it('disables submit button when isInitializing', () => {
diff --git a/static/app/components/pipeline/pipelineIntegrationCursor.tsx b/static/app/components/pipeline/pipelineIntegrationCursor.tsx
index b25adac5e4d360..2a7b0efa2104a7 100644
--- a/static/app/components/pipeline/pipelineIntegrationCursor.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationCursor.tsx
@@ -55,8 +55,8 @@ function CursorApiKeyStep({
           )}
         </form.AppField>
         <Flex>
-          <form.SubmitButton disabled={isAdvancing || isInitializing}>
-            {isAdvancing ? t('Submitting...') : t('Continue')}
+          <form.SubmitButton busy={isAdvancing} disabled={isInitializing}>
+            {t('Continue')}
           </form.SubmitButton>
         </Flex>
       </Stack>
diff --git a/static/app/components/pipeline/pipelineIntegrationDiscord.spec.tsx b/static/app/components/pipeline/pipelineIntegrationDiscord.spec.tsx
index acb35c76c6ed02..c7e7a26c75d7ef 100644
--- a/static/app/components/pipeline/pipelineIntegrationDiscord.spec.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationDiscord.spec.tsx
@@ -60,7 +60,7 @@ describe('DiscordOAuthLoginStep', () => {
     });
   });
 
-  it('shows loading state when isAdvancing is true', () => {
+  it('shows busy state when isAdvancing is true', () => {
     render(
       <DiscordOAuthLoginStep
         {...makeStepProps({
@@ -70,7 +70,10 @@ describe('DiscordOAuthLoginStep', () => {
       />
     );
 
-    expect(screen.getByRole('button', {name: 'Authorizing...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Authorize Discord'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 
   it('disables authorize button when oauthUrl is not provided', () => {
diff --git a/static/app/components/pipeline/pipelineIntegrationGitHub.spec.tsx b/static/app/components/pipeline/pipelineIntegrationGitHub.spec.tsx
index 52d6be862be72b..c50f0c5ad5fddf 100644
--- a/static/app/components/pipeline/pipelineIntegrationGitHub.spec.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationGitHub.spec.tsx
@@ -61,7 +61,7 @@ describe('GitHubOAuthLoginStep', () => {
     });
   });
 
-  it('shows loading state when isAdvancing is true', () => {
+  it('shows busy state when isAdvancing is true', () => {
     render(
       <GitHubOAuthLoginStep
         {...makeStepProps({
@@ -71,7 +71,10 @@ describe('GitHubOAuthLoginStep', () => {
       />
     );
 
-    expect(screen.getByRole('button', {name: 'Authorizing...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Authorize GitHub'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 
   it('disables authorize button when isInitializing', () => {
@@ -276,7 +279,7 @@ describe('OrgSelectionStep', () => {
     ).toBeInTheDocument();
   });
 
-  it('shows completing state when isAdvancing in fresh install view', () => {
+  it('shows busy state when isAdvancing in fresh install view', () => {
     render(
       <OrgSelectionStep
         {...makeStepProps({
@@ -289,6 +292,8 @@ describe('OrgSelectionStep', () => {
       />
     );
 
-    expect(screen.getByRole('button', {name: 'Completing...'})).toBeDisabled();
+    expect(
+      screen.getByRole('button', {name: 'Reopen installation window'})
+    ).toHaveAttribute('aria-busy', 'true');
   });
 });
diff --git a/static/app/components/pipeline/pipelineIntegrationGitHub.tsx b/static/app/components/pipeline/pipelineIntegrationGitHub.tsx
index 67e3e2e2848914..5d5d7258334e0a 100644
--- a/static/app/components/pipeline/pipelineIntegrationGitHub.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationGitHub.tsx
@@ -207,7 +207,7 @@ function FreshInstallSteps({
   onInstall: () => void;
   popupBlockedNotice?: React.ReactNode;
 }) {
-  if (isAdvancing) {
+  if (isWaitingForCallback || isAdvancing) {
     return (
       <Stack gap="lg" align="start">
         <Text>
@@ -215,22 +215,7 @@ function FreshInstallSteps({
             'Complete the installation in the popup window. Once finished, this page will update automatically.'
           )}
         </Text>
-        <Button size="sm" disabled>
-          {t('Completing...')}
-        </Button>
-      </Stack>
-    );
-  }
-
-  if (isWaitingForCallback) {
-    return (
-      <Stack gap="lg" align="start">
-        <Text>
-          {t(
-            'Complete the installation in the popup window. Once finished, this page will update automatically.'
-          )}
-        </Text>
-        <Button size="sm" onClick={onInstall}>
+        <Button size="sm" onClick={onInstall} busy={isAdvancing}>
           {t('Reopen installation window')}
         </Button>
       </Stack>
diff --git a/static/app/components/pipeline/pipelineIntegrationGitLab.spec.tsx b/static/app/components/pipeline/pipelineIntegrationGitLab.spec.tsx
index a28b5023d962bb..08128de0aa4efe 100644
--- a/static/app/components/pipeline/pipelineIntegrationGitLab.spec.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationGitLab.spec.tsx
@@ -246,7 +246,7 @@ describe('InstallationConfigStep', () => {
     });
   });
 
-  it('shows submitting state when isAdvancing is true', async () => {
+  it('shows busy state when isAdvancing is true', async () => {
     render(
       <InstallationConfigStep
         {...makeStepProps({
@@ -259,7 +259,10 @@ describe('InstallationConfigStep', () => {
     await userEvent.click(screen.getByRole('button', {name: 'Next'}));
     await userEvent.click(screen.getByRole('button', {name: 'Next'}));
 
-    expect(screen.getByRole('button', {name: 'Submitting...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Continue'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 
   it('disables submit button when isInitializing', async () => {
@@ -317,7 +320,7 @@ describe('GitLabOAuthLoginStep', () => {
     });
   });
 
-  it('shows loading state when isAdvancing is true', () => {
+  it('shows busy state when isAdvancing is true', () => {
     render(
       <GitLabOAuthLoginStep
         {...makeStepProps({
@@ -327,7 +330,10 @@ describe('GitLabOAuthLoginStep', () => {
       />
     );
 
-    expect(screen.getByRole('button', {name: 'Authorizing...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Authorize GitLab'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 
   it('disables authorize button when oauthUrl is not provided', () => {
diff --git a/static/app/components/pipeline/pipelineIntegrationGitLab.tsx b/static/app/components/pipeline/pipelineIntegrationGitLab.tsx
index 990607c4a88045..1f8d9e8011db16 100644
--- a/static/app/components/pipeline/pipelineIntegrationGitLab.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationGitLab.tsx
@@ -202,8 +202,8 @@ function InstallationConfigStep({
           }
         </form.Subscribe>
         <Flex>
-          <form.SubmitButton disabled={isAdvancing || isInitializing}>
-            {isAdvancing ? t('Submitting...') : t('Continue')}
+          <form.SubmitButton busy={isAdvancing} disabled={isInitializing}>
+            {t('Continue')}
           </form.SubmitButton>
         </Flex>
       </Stack>
diff --git a/static/app/components/pipeline/pipelineIntegrationOpsgenie.spec.tsx b/static/app/components/pipeline/pipelineIntegrationOpsgenie.spec.tsx
index 949d2cb7b6ff93..20485bbad609be 100644
--- a/static/app/components/pipeline/pipelineIntegrationOpsgenie.spec.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationOpsgenie.spec.tsx
@@ -69,14 +69,17 @@ describe('OpsgenieInstallationConfigStep', () => {
     });
   });
 
-  it('shows loading state when isAdvancing', () => {
+  it('shows busy state when isAdvancing', () => {
     render(
       <OpsgenieInstallationConfigStep
         {...makeStepProps({stepData: {baseUrlChoices}, isAdvancing: true})}
       />
     );
 
-    expect(screen.getByRole('button', {name: 'Submitting...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Continue'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 
   it('disables submit button when isInitializing', () => {
diff --git a/static/app/components/pipeline/pipelineIntegrationOpsgenie.tsx b/static/app/components/pipeline/pipelineIntegrationOpsgenie.tsx
index 25ac49818e3436..798932c6b6694a 100644
--- a/static/app/components/pipeline/pipelineIntegrationOpsgenie.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationOpsgenie.tsx
@@ -115,8 +115,8 @@ function OpsgenieInstallationConfigStep({
           )}
         </form.AppField>
         <Flex>
-          <form.SubmitButton disabled={isAdvancing || isInitializing}>
-            {isAdvancing ? t('Submitting...') : t('Continue')}
+          <form.SubmitButton busy={isAdvancing} disabled={isInitializing}>
+            {t('Continue')}
           </form.SubmitButton>
         </Flex>
       </Stack>
diff --git a/static/app/components/pipeline/pipelineIntegrationPagerDuty.spec.tsx b/static/app/components/pipeline/pipelineIntegrationPagerDuty.spec.tsx
index 4d32b37f841f2d..1a96bcab70d6f1 100644
--- a/static/app/components/pipeline/pipelineIntegrationPagerDuty.spec.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationPagerDuty.spec.tsx
@@ -58,7 +58,7 @@ describe('PagerDutyInstallStep', () => {
     });
   });
 
-  it('shows loading state when isAdvancing is true', () => {
+  it('shows busy state when isAdvancing is true', () => {
     render(
       <PagerDutyInstallStep
         {...makeStepProps({
@@ -68,7 +68,10 @@ describe('PagerDutyInstallStep', () => {
       />
     );
 
-    expect(screen.getByRole('button', {name: 'Installing...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Install PagerDuty App'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 
   it('disables install button when installUrl is not provided', () => {
diff --git a/static/app/components/pipeline/pipelineIntegrationPagerDuty.tsx b/static/app/components/pipeline/pipelineIntegrationPagerDuty.tsx
index 19f757c8899cc4..31a8d4edba0c8f 100644
--- a/static/app/components/pipeline/pipelineIntegrationPagerDuty.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationPagerDuty.tsx
@@ -50,11 +50,7 @@ function PagerDutyInstallStep({
           </Text>
         )}
       </Stack>
-      {isAdvancing ? (
-        <Button size="sm" disabled>
-          {t('Installing...')}
-        </Button>
-      ) : popupStatus === 'popup-open' ? (
+      {popupStatus === 'popup-open' && !isAdvancing ? (
         <Button size="sm" onClick={openPopup}>
           {t('Reopen installation window')}
         </Button>
@@ -63,6 +59,7 @@ function PagerDutyInstallStep({
           size="sm"
           variant="primary"
           onClick={openPopup}
+          busy={isAdvancing}
           disabled={!stepData?.installUrl}
         >
           {t('Install PagerDuty App')}
diff --git a/static/app/components/pipeline/pipelineIntegrationPerforce.spec.tsx b/static/app/components/pipeline/pipelineIntegrationPerforce.spec.tsx
index eabeccf709e695..5e1c6596311760 100644
--- a/static/app/components/pipeline/pipelineIntegrationPerforce.spec.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationPerforce.spec.tsx
@@ -116,14 +116,17 @@ describe('PerforceInstallationConfigStep', () => {
     });
   });
 
-  it('shows loading state when isAdvancing', () => {
+  it('shows busy state when isAdvancing', () => {
     render(
       <PerforceInstallationConfigStep
         {...makeStepProps({stepData: {}, isAdvancing: true})}
       />
     );
 
-    expect(screen.getByRole('button', {name: 'Connecting...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Connect'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 
   it('disables submit button when isInitializing', () => {
diff --git a/static/app/components/pipeline/pipelineIntegrationPerforce.tsx b/static/app/components/pipeline/pipelineIntegrationPerforce.tsx
index 2fac86a7bf5a91..ac2632d542d55e 100644
--- a/static/app/components/pipeline/pipelineIntegrationPerforce.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationPerforce.tsx
@@ -194,8 +194,8 @@ function PerforceInstallationConfigStep({
           )}
         </form.AppField>
         <Flex>
-          <form.SubmitButton disabled={isAdvancing || isInitializing}>
-            {isAdvancing ? t('Connecting...') : t('Connect')}
+          <form.SubmitButton busy={isAdvancing} disabled={isInitializing}>
+            {t('Connect')}
           </form.SubmitButton>
         </Flex>
       </Stack>
diff --git a/static/app/components/pipeline/pipelineIntegrationSlack.spec.tsx b/static/app/components/pipeline/pipelineIntegrationSlack.spec.tsx
index 517aacb93bc7cf..bfe05026e1f08c 100644
--- a/static/app/components/pipeline/pipelineIntegrationSlack.spec.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationSlack.spec.tsx
@@ -58,7 +58,7 @@ describe('SlackOAuthLoginStep', () => {
     });
   });
 
-  it('shows loading state when isAdvancing is true', () => {
+  it('shows busy state when isAdvancing is true', () => {
     render(
       <SlackOAuthLoginStep
         {...makeStepProps({
@@ -68,7 +68,10 @@ describe('SlackOAuthLoginStep', () => {
       />
     );
 
-    expect(screen.getByRole('button', {name: 'Authorizing...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Authorize Slack'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 
   it('disables authorize button when oauthUrl is not provided', () => {
diff --git a/static/app/components/pipeline/pipelineIntegrationVercel.spec.tsx b/static/app/components/pipeline/pipelineIntegrationVercel.spec.tsx
index f24ce5c609ea48..8a8eb4d2e48241 100644
--- a/static/app/components/pipeline/pipelineIntegrationVercel.spec.tsx
+++ b/static/app/components/pipeline/pipelineIntegrationVercel.spec.tsx
@@ -58,7 +58,7 @@ describe('VercelOAuthLoginStep', () => {
     });
   });
 
-  it('shows loading state when isAdvancing is true', () => {
+  it('shows busy state when isAdvancing is true', () => {
     render(
       <VercelOAuthLoginStep
         {...makeStepProps({
@@ -68,7 +68,10 @@ describe('VercelOAuthLoginStep', () => {
       />
     );
 
-    expect(screen.getByRole('button', {name: 'Authorizing...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Authorize Vercel'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 
   it('disables authorize button when oauthUrl is not provided', () => {
diff --git a/static/app/components/pipeline/shared/oauthLoginStep.spec.tsx b/static/app/components/pipeline/shared/oauthLoginStep.spec.tsx
index c3cf4b042c71c3..80a49324510ba1 100644
--- a/static/app/components/pipeline/shared/oauthLoginStep.spec.tsx
+++ b/static/app/components/pipeline/shared/oauthLoginStep.spec.tsx
@@ -197,7 +197,7 @@ describe('OAuthLoginStep', () => {
     ).not.toBeInTheDocument();
   });
 
-  it('shows loading state when isLoading is true', () => {
+  it('shows busy state when isLoading is true', () => {
     render(
       <OAuthLoginStep
         serviceName="GitLab"
@@ -207,6 +207,9 @@ describe('OAuthLoginStep', () => {
       />
     );
 
-    expect(screen.getByRole('button', {name: 'Authorizing...'})).toBeDisabled();
+    expect(screen.getByRole('button', {name: 'Authorize GitLab'})).toHaveAttribute(
+      'aria-busy',
+      'true'
+    );
   });
 });
diff --git a/static/app/components/pipeline/shared/oauthLoginStep.tsx b/static/app/components/pipeline/shared/oauthLoginStep.tsx
index ca152484c4c853..a985e53a08083d 100644
--- a/static/app/components/pipeline/shared/oauthLoginStep.tsx
+++ b/static/app/components/pipeline/shared/oauthLoginStep.tsx
@@ -67,16 +67,18 @@ export function OAuthLoginStep({
           </Text>
         )}
       </Stack>
-      {isLoading ? (
-        <Button size="sm" disabled>
-          {t('Authorizing...')}
-        </Button>
-      ) : popupStatus === 'popup-open' ? (
+      {popupStatus === 'popup-open' && !isLoading ? (
         <Button size="sm" onClick={openPopup}>
           {t('Reopen authorization window')}
         </Button>
       ) : (
-        <Button size="sm" variant="primary" onClick={openPopup} disabled={!oauthUrl}>
+        <Button
+          size="sm"
+          variant="primary"
+          onClick={openPopup}
+          busy={isLoading}
+          disabled={!oauthUrl}
+        >
           {tct('Authorize [service]', {service: serviceName})}
         </Button>
       )}
diff --git a/static/app/components/replays/canvasReplayerPlugin.spec.ts b/static/app/components/replays/canvasReplayerPlugin.spec.ts
index fd960d27e67a51..9e2bd57c254d68 100644
--- a/static/app/components/replays/canvasReplayerPlugin.spec.ts
+++ b/static/app/components/replays/canvasReplayerPlugin.spec.ts
@@ -22,16 +22,22 @@ jest.mock('lodash/debounce', () =>
   jest.fn().mockImplementation((callback, timeout) => {
     let timeoutId: ReturnType<typeof setTimeout> | null = null;
     const debounced = jest.fn((...args) => {
-      if (timeoutId) clearTimeout(timeoutId);
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
       timeoutId = setTimeout(() => callback(...args), timeout);
     });
 
     const cancel = jest.fn(() => {
-      if (timeoutId) clearTimeout(timeoutId);
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
     });
 
     const flush = jest.fn(() => {
-      if (timeoutId) clearTimeout(timeoutId);
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
       callback();
     });
 
@@ -197,8 +203,12 @@ describe('canvasReplayerPlugin', () => {
     const canvas2 = createCanvasNode();
 
     const replayer = createReplayer(requestedId => {
-      if (requestedId === id1) return canvas1;
-      if (requestedId === id2) return canvas2;
+      if (requestedId === id1) {
+        return canvas1;
+      }
+      if (requestedId === id2) {
+        return canvas2;
+      }
       return null;
     });
 
diff --git a/static/app/components/searchQueryBuilder/askSeer/askSeerOption.tsx b/static/app/components/searchQueryBuilder/askSeer/askSeerOption.tsx
index d301f45b6f8fd0..0729dae919811b 100644
--- a/static/app/components/searchQueryBuilder/askSeer/askSeerOption.tsx
+++ b/static/app/components/searchQueryBuilder/askSeer/askSeerOption.tsx
@@ -41,7 +41,9 @@ export function AskSeerOption<T>({state}: {state: ComboBoxState<T>}) {
   );
 
   const handleClick = () => {
-    if (optionDisableOverride) return;
+    if (optionDisableOverride) {
+      return;
+    }
     trackAnalytics('ai_query.interface', {
       organization,
       area: analyticsArea,
diff --git a/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerComboBox.tsx b/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerComboBox.tsx
index bc39f8e350ddc8..d6fbc16d25cb5d 100644
--- a/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerComboBox.tsx
+++ b/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerComboBox.tsx
@@ -195,7 +195,9 @@ export function AskSeerComboBox<T extends QueryTokensProps>({
     onInputChange: setSearchQuery,
     defaultFilter: () => true,
     onSelectionChange(key) {
-      if (typeof key !== 'string') return;
+      if (typeof key !== 'string') {
+        return;
+      }
 
       if (key === 'none-of-these') {
         trackAnalytics('ai_query.rejected', {
diff --git a/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerPollingComboBox.tsx b/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerPollingComboBox.tsx
index 98e744a8e1883c..362f04cd0967fd 100644
--- a/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerPollingComboBox.tsx
+++ b/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerPollingComboBox.tsx
@@ -228,7 +228,9 @@ export function AskSeerPollingComboBox<T extends QueryTokensProps>({
     onInputChange: setSearchQuery,
     defaultFilter: () => true,
     onSelectionChange(key) {
-      if (typeof key !== 'string') return;
+      if (typeof key !== 'string') {
+        return;
+      }
 
       if (key === 'none-of-these') {
         trackAnalytics('ai_query.rejected', {
diff --git a/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerSearchPopover.tsx b/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerSearchPopover.tsx
index bd63dfc9993140..05fc2b1e857b30 100644
--- a/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerSearchPopover.tsx
+++ b/static/app/components/searchQueryBuilder/askSeerCombobox/askSeerSearchPopover.tsx
@@ -25,10 +25,14 @@ export function AskSeerSearchPopover(props: PopoverProps) {
       <ListBoxOverlay
         ref={element => {
           popoverRef.current = element;
-          if (!element || !props.containerRef.current) return;
+          if (!element || !props.containerRef.current) {
+            return;
+          }
 
           const resizeObserver = new ResizeObserver(entries => {
-            if (!props.containerRef.current) return;
+            if (!props.containerRef.current) {
+              return;
+            }
             element.style.width = `${entries[0]?.target.clientWidth}px`;
           });
 
diff --git a/static/app/components/searchQueryBuilder/askSeerCombobox/utils.ts b/static/app/components/searchQueryBuilder/askSeerCombobox/utils.ts
index 1179c5a73a9d13..d6a98c202975d4 100644
--- a/static/app/components/searchQueryBuilder/askSeerCombobox/utils.ts
+++ b/static/app/components/searchQueryBuilder/askSeerCombobox/utils.ts
@@ -114,12 +114,16 @@ function formatToken(token: string): string {
 }
 
 export function formatQueryToNaturalLanguage(query: string): string {
-  if (!query.trim()) return '';
+  if (!query.trim()) {
+    return '';
+  }
   const tokens = query.match(/(?:[^\s"]|"[^"]*")+/g) || [];
   const formattedTokens = tokens.map(formatToken);
 
   const formattedQuery = formattedTokens.reduce((result, token, index) => {
-    if (index === 0) return token;
+    if (index === 0) {
+      return token;
+    }
 
     const currentOriginalToken = tokens[index] || '';
     const prevOriginalToken = tokens[index - 1] || '';
diff --git a/static/app/components/searchQueryBuilder/hooks/useSelectOnDrag.tsx b/static/app/components/searchQueryBuilder/hooks/useSelectOnDrag.tsx
index 51f18bd912124a..05c0416a7a25ac 100644
--- a/static/app/components/searchQueryBuilder/hooks/useSelectOnDrag.tsx
+++ b/static/app/components/searchQueryBuilder/hooks/useSelectOnDrag.tsx
@@ -88,7 +88,9 @@ function getItemIndexAtPosition(
 ) {
   for (const [i, key] of keys.entries()) {
     const coords = coordinates[key];
-    if (!coords) continue;
+    if (!coords) {
+      continue;
+    }
 
     // If we are above this item, we must be in between this and the
     // previous item on the row above it.
diff --git a/static/app/components/searchQueryBuilder/tokens/combobox.tsx b/static/app/components/searchQueryBuilder/tokens/combobox.tsx
index fa06d8fe557e53..5d343c5edef841 100644
--- a/static/app/components/searchQueryBuilder/tokens/combobox.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/combobox.tsx
@@ -477,7 +477,9 @@ export function SearchQueryBuilderCombobox<
           /^\w$/.test(e.key) ||
           e.key === ','
         ) {
-          if (isOpen || isCtrlKeyPressed(e)) return;
+          if (isOpen || isCtrlKeyPressed(e)) {
+            return;
+          }
           state.open();
           return;
         }
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/filterOperator.tsx b/static/app/components/searchQueryBuilder/tokens/filter/filterOperator.tsx
index ddc0b80aceda82..cd30b54cb9fbe2 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/filterOperator.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/filterOperator.tsx
@@ -267,7 +267,9 @@ export function FilterOperator({state, item, token, onOpenChange}: FilterOperato
             onlyOperator={onlyOperator}
             {...mergeProps(triggerProps, filterButtonProps, focusWithinProps)}
             ref={r => {
-              if (!r || !triggerProps.ref) return;
+              if (!r || !triggerProps.ref) {
+                return;
+              }
 
               if (typeof triggerProps.ref === 'function') {
                 triggerProps.ref(r);
diff --git a/static/app/components/searchQueryBuilder/tokens/filter/valueListBox.tsx b/static/app/components/searchQueryBuilder/tokens/filter/valueListBox.tsx
index d840a31b454e51..aa2c2ebb94ff4d 100644
--- a/static/app/components/searchQueryBuilder/tokens/filter/valueListBox.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/filter/valueListBox.tsx
@@ -25,13 +25,17 @@ function constrainAndAlignListBox({
   referenceRef,
   refsToSync,
 }: ConstrainAndAlignListBoxArgs) {
-  if (!referenceRef.current || !popoverRef.current) return;
+  if (!referenceRef.current || !popoverRef.current) {
+    return;
+  }
 
   const referenceRect = referenceRef.current.getBoundingClientRect();
   const popoverRect = popoverRef.current.getBoundingClientRect();
 
   refsToSync.forEach(ref => {
-    if (!ref.current) return;
+    if (!ref.current) {
+      return;
+    }
     ref.current.style.maxWidth = `${referenceRect.width}px`;
   });
 
@@ -129,7 +133,9 @@ export function ValueListBox<T extends SelectOptionOrSectionWithKey<string>>({
     (element: HTMLUListElement | null) => {
       listBoxRef.current = element;
 
-      if (!element) return;
+      if (!element) {
+        return;
+      }
 
       const refsToSync = [listBoxRef, popoverRef];
 
diff --git a/static/app/components/searchQueryBuilder/tokens/freeText.tsx b/static/app/components/searchQueryBuilder/tokens/freeText.tsx
index ce47ca0d307c3c..dc85843fea7c51 100644
--- a/static/app/components/searchQueryBuilder/tokens/freeText.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/freeText.tsx
@@ -631,8 +631,12 @@ function SearchQueryBuilderInputInternal({
 
           if (
             parsedText?.some(textToken => {
-              if (textToken.type !== Token.FILTER) return false;
-              if (textToken.negated) return `!${textToken.key.text}` === filterValue;
+              if (textToken.type !== Token.FILTER) {
+                return false;
+              }
+              if (textToken.negated) {
+                return `!${textToken.key.text}` === filterValue;
+              }
               return textToken.key.text === filterValue;
             })
           ) {
diff --git a/static/app/components/searchQueryBuilder/tokens/useSortedFilterKeyItems.tsx b/static/app/components/searchQueryBuilder/tokens/useSortedFilterKeyItems.tsx
index d256d2141c6d8f..739c0d0340a7b2 100644
--- a/static/app/components/searchQueryBuilder/tokens/useSortedFilterKeyItems.tsx
+++ b/static/app/components/searchQueryBuilder/tokens/useSortedFilterKeyItems.tsx
@@ -195,7 +195,9 @@ export function useSortedFilterKeyItems({
 
   const flatKeys = useMemo(() => {
     const keys = Object.values(filterKeys);
-    if (!asyncKeys?.length) return keys;
+    if (!asyncKeys?.length) {
+      return keys;
+    }
 
     return [...keys, ...asyncKeys.filter(k => !staticKeyValues.has(k.key))];
   }, [filterKeys, asyncKeys, staticKeyValues]);
@@ -212,7 +214,9 @@ export function useSortedFilterKeyItems({
   // Merged lookup of static + async keys, used for validating search results.
   // Without this, async-only keys would be filtered out by the `filterKeys` check.
   const allKeysLookup = useMemo(() => {
-    if (!asyncKeys?.length) return filterKeys;
+    if (!asyncKeys?.length) {
+      return filterKeys;
+    }
 
     const merged = {...filterKeys};
     for (const tag of asyncKeys) {
diff --git a/static/app/icons/icons.stories.tsx b/static/app/icons/icons.stories.tsx
index 7f2f91f064a6ff..773b28396f552d 100644
--- a/static/app/icons/icons.stories.tsx
+++ b/static/app/icons/icons.stories.tsx
@@ -1829,7 +1829,9 @@ function Section(props: CategorySectionProps) {
     const iconFilter = createIconFilter(props.searchTerm);
     filteredIcons = filteredIcons.filter(iconFilter);
   }
-  if (filteredIcons.length === 0) return null;
+  if (filteredIcons.length === 0) {
+    return null;
+  }
 
   return (
     <Flex as="section" direction="column" gap="xl">
diff --git a/static/app/stories/moduleExports.tsx b/static/app/stories/moduleExports.tsx
index 2b627febaf1e34..71fb72c91200c5 100644
--- a/static/app/stories/moduleExports.tsx
+++ b/static/app/stories/moduleExports.tsx
@@ -5,7 +5,9 @@ import {Heading} from '@sentry/scraps/text';
 import {addSuccessMessage} from 'sentry/actionCreators/indicator';
 
 export function ModuleExports(props: {exports: TypeLoader.TypeLoaderResult['exports']}) {
-  if (!props.exports?.exports || !props.exports.module) return null;
+  if (!props.exports?.exports || !props.exports.module) {
+    return null;
+  }
 
   const lines = [];
   // canonical source: @sentry/scraps/<component> (no deep imports)
@@ -65,7 +67,9 @@ export function ModuleExports(props: {exports: TypeLoader.TypeLoaderResult['expo
     }
   }
 
-  if (!lines.length) return null;
+  if (!lines.length) {
+    return null;
+  }
 
   return (
     <Stack gap="md" paddingTop="xl">
diff --git a/static/app/stories/view/index.tsx b/static/app/stories/view/index.tsx
index 8131e850511439..4c89f17e36ca83 100644
--- a/static/app/stories/view/index.tsx
+++ b/static/app/stories/view/index.tsx
@@ -71,7 +71,9 @@ function StoryDetail() {
 
     while (queue.length > 0) {
       const node = queue.pop();
-      if (!node) break;
+      if (!node) {
+        break;
+      }
 
       if (node.filesystemPath === location.query.name) {
         storyNode = node;
@@ -176,7 +178,9 @@ function getStoryFromParams(
 
   while (queue.length > 0) {
     const node = queue.pop();
-    if (!node) break;
+    if (!node) {
+      break;
+    }
 
     if (node.category === context.category && node.slug === context.slug) {
       return node;
diff --git a/static/app/stories/view/storyExports.tsx b/static/app/stories/view/storyExports.tsx
index fc966cdff3b2cf..013265036bf0bd 100644
--- a/static/app/stories/view/storyExports.tsx
+++ b/static/app/stories/view/storyExports.tsx
@@ -141,8 +141,12 @@ function MDXStoryTitle(props: {story: MDXStoryDescriptor}) {
 function StoryTabList() {
   const {story} = useStory();
 
-  if (!isMDXStory(story)) return null;
-  if (story.exports.frontmatter?.layout === 'document') return null;
+  if (!isMDXStory(story)) {
+    return null;
+  }
+  if (story.exports.frontmatter?.layout === 'document') {
+    return null;
+  }
 
   return (
     <TabList>
@@ -296,7 +300,9 @@ function StoryGrid(props: React.ComponentProps<typeof Grid>) {
 function StoryModuleExports(props: {
   exports: TypeLoader.TypeLoaderResult['exports'] | undefined;
 }) {
-  if (!props.exports) return null;
+  if (!props.exports) {
+    return null;
+  }
   return <Storybook.ModuleExports exports={props.exports} />;
 }
 
diff --git a/static/app/stories/view/storyTableOfContents.tsx b/static/app/stories/view/storyTableOfContents.tsx
index f05a2a3f6c5fb4..8cd45ee7586ebc 100644
--- a/static/app/stories/view/storyTableOfContents.tsx
+++ b/static/app/stories/view/storyTableOfContents.tsx
@@ -87,7 +87,9 @@ function useActiveSection(entries: Entry[]): [string, (id: string) => void] {
   const [activeId, setActiveId] = useState('');
 
   useLayoutEffect(() => {
-    if (entries.length === 0) return void 0;
+    if (entries.length === 0) {
+      return void 0;
+    }
 
     const observer = new IntersectionObserver(
       intersectionEntries => {
@@ -175,7 +177,9 @@ export function StoryTableOfContents() {
   const nestedEntries = useMemo(() => nestContentEntries(entries), [entries]);
   const [activeId, setActiveId] = useActiveSection(entries);
 
-  if (nestedEntries.length === 0) return null;
+  if (nestedEntries.length === 0) {
+    return null;
+  }
 
   return (
     <StoryIndexContainer>
diff --git a/static/app/utils/api/useFetchParallelPages.spec.tsx b/static/app/utils/api/useFetchParallelPages.spec.tsx
deleted file mode 100644
index fcdab06f0f5774..00000000000000
--- a/static/app/utils/api/useFetchParallelPages.spec.tsx
+++ /dev/null
@@ -1,281 +0,0 @@
-import {renderHookWithProviders, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import {apiOptions} from 'sentry/utils/api/apiOptions';
-import {useFetchParallelPages} from 'sentry/utils/api/useFetchParallelPages';
-
-const MOCK_API_ENDPOINT = '/api-tokens/';
-
-function getQueryOptionsFactory() {
-  return jest.fn().mockImplementation(({cursor, per_page}) =>
-    apiOptions.as<string>()(MOCK_API_ENDPOINT, {
-      query: {cursor, per_page},
-      staleTime: Infinity,
-    })
-  );
-}
-
-describe('useFetchParallelPages', () => {
-  it('should not call the queryFn when enabled is false', () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'text result',
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchParallelPages, {
-      initialProps: {
-        enabled: false,
-        getQueryOptions,
-        hits: 13,
-        perPage: 10,
-      },
-    });
-
-    expect(result.current.status).toBe('pending');
-    expect(result.current.isFetching).toBeFalsy();
-    expect(getQueryOptions).not.toHaveBeenCalled();
-  });
-
-  it('should immediately switch to isFetching=true when the prop is changed', async () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'text result',
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result, rerender} = renderHookWithProviders(useFetchParallelPages, {
-      initialProps: {
-        enabled: false,
-        getQueryOptions,
-        hits: 13,
-        perPage: 10,
-      },
-    });
-
-    expect(result.current.status).toBe('pending');
-    expect(result.current.isFetching).toBeFalsy();
-    expect(getQueryOptions).not.toHaveBeenCalled();
-
-    rerender({enabled: true, getQueryOptions, hits: 13, perPage: 10});
-
-    expect(result.current.status).toBe('pending');
-    expect(result.current.isFetching).toBeTruthy();
-    expect(getQueryOptions).toHaveBeenCalled();
-
-    // Wait for the query to resolve
-    await waitFor(() => expect(result.current.status).toBe('pending'));
-    expect(result.current.isFetching).toBeTruthy();
-  });
-
-  it('should call the queryFn zero times, when hits is 0', () => {
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchParallelPages, {
-      initialProps: {
-        enabled: true,
-        getQueryOptions,
-        hits: 0,
-        perPage: 10,
-      },
-    });
-
-    expect(result.current.status).toBe('success');
-    expect(result.current.isFetching).toBeFalsy();
-    expect(getQueryOptions).not.toHaveBeenCalled();
-  });
-
-  it('should call the queryFn zero times, and flip to state=success when hits is 0', () => {
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result, rerender} = renderHookWithProviders(useFetchParallelPages, {
-      initialProps: {
-        enabled: false,
-        getQueryOptions,
-        hits: 0,
-        perPage: 10,
-      },
-    });
-
-    expect(result.current.status).toBe('pending');
-    expect(result.current.isFetching).toBeFalsy();
-    expect(getQueryOptions).not.toHaveBeenCalled();
-
-    rerender({enabled: true, getQueryOptions, hits: 0, perPage: 10});
-
-    expect(result.current.status).toBe('success');
-    expect(result.current.isFetching).toBeFalsy();
-    expect(getQueryOptions).not.toHaveBeenCalled();
-  });
-
-  it('should call the queryFn 1 times, when hits is less than the perPage size', async () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'text result',
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchParallelPages, {
-      initialProps: {
-        enabled: true,
-        getQueryOptions,
-        hits: 7,
-        perPage: 10,
-      },
-    });
-
-    expect(result.current.status).toBe('pending');
-    expect(result.current.isFetching).toBeTruthy();
-
-    // Wait for the query to resolve
-    await waitFor(() => expect(result.current.status).toBe('success'));
-    expect(result.current.isFetching).toBeFalsy();
-    expect(getQueryOptions).toHaveBeenCalledTimes(1);
-  });
-
-  it('should call the queryFn N times, depending on how many hits we expect', async () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'text result',
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchParallelPages, {
-      initialProps: {
-        enabled: true,
-        getQueryOptions,
-        hits: 21,
-        perPage: 10,
-      },
-    });
-
-    expect(result.current.status).toBe('pending');
-    expect(result.current.isFetching).toBeTruthy();
-
-    // Wait for the query to resolve
-    await waitFor(() => expect(result.current.status).toBe('success'));
-    expect(result.current.isFetching).toBeFalsy();
-    expect(getQueryOptions).toHaveBeenCalledTimes(3);
-  });
-
-  it('should return a list of all pages that have been resolved', async () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'results starting at 0',
-      match: [MockApiClient.matchQuery({cursor: '0:0:0', per_page: 10})],
-    });
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'results starting at 10',
-      match: [MockApiClient.matchQuery({cursor: '0:10:0', per_page: 10})],
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchParallelPages, {
-      initialProps: {
-        enabled: true,
-        getQueryOptions,
-        hits: 13,
-        perPage: 10,
-      },
-    });
-
-    // Wait for the query to resolve
-    await waitFor(() => expect(result.current.status).toBe('success'));
-    expect(result.current.isFetching).toBeFalsy();
-    expect(result.current.pages).toEqual([
-      'results starting at 0',
-      'results starting at 10',
-    ]);
-    expect(result.current.error).toEqual([]);
-  });
-
-  it('should reduce isError and isFetching', async () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'text result',
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchParallelPages, {
-      initialProps: {
-        enabled: true,
-        getQueryOptions,
-        hits: 13,
-        perPage: 10,
-      },
-    });
-
-    // Wait for the query to resolve
-    await waitFor(() => expect(result.current.status).toBe('success'));
-    expect(result.current.isFetching).toBeFalsy();
-    expect(result.current.isError).toBeFalsy();
-  });
-
-  it('should return the final ResponseHeader that has been resolved', async () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'results starting at 0',
-      headers: {Link: 'next: 0:10:0'},
-      match: [MockApiClient.matchQuery({cursor: '0:0:0', per_page: 10})],
-    });
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'results starting at 10',
-      headers: {Link: 'next: 0:20:0'},
-      match: [MockApiClient.matchQuery({cursor: '0:10:0', per_page: 10})],
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchParallelPages, {
-      initialProps: {
-        enabled: true,
-        getQueryOptions,
-        hits: 13,
-        perPage: 10,
-      },
-    });
-
-    // Wait for the query to resolve
-    await waitFor(() => expect(result.current.status).toBe('success'));
-    expect(result.current.isFetching).toBeFalsy();
-    expect(result.current.lastResponseHeaders?.Link).toBe('next: 0:20:0');
-  });
-
-  it('should have isFetching=true as long as something is outstanding', async () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'results starting at 0',
-      match: [MockApiClient.matchQuery({cursor: '0:0:0', per_page: 10})],
-      asyncDelay: 200,
-    });
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'results starting at 10',
-      match: [MockApiClient.matchQuery({cursor: '0:10:0', per_page: 10})],
-      asyncDelay: 500,
-    });
-
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchParallelPages, {
-      initialProps: {
-        enabled: true,
-        getQueryOptions,
-        hits: 13,
-        perPage: 10,
-      },
-    });
-
-    // No responses have resolved
-    expect(result.current.status).toBe('pending');
-    expect(result.current.isFetching).toBeTruthy();
-
-    // Both responses have resolved
-    await waitFor(() => expect(result.current.status).toBe('success'));
-    expect(result.current.isFetching).toBeFalsy();
-    expect(result.current.pages).toEqual([
-      'results starting at 0',
-      'results starting at 10',
-    ]);
-  });
-});
diff --git a/static/app/utils/api/useFetchParallelPages.stories.tsx b/static/app/utils/api/useFetchParallelPages.stories.tsx
deleted file mode 100644
index 636bb837533bdd..00000000000000
--- a/static/app/utils/api/useFetchParallelPages.stories.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import {Fragment, useCallback} from 'react';
-
-import {StructuredEventData} from 'sentry/components/structuredEventData';
-import * as Storybook from 'sentry/stories';
-import {apiOptions} from 'sentry/utils/api/apiOptions';
-import {useFetchParallelPages} from 'sentry/utils/api/useFetchParallelPages';
-import {useOrganization} from 'sentry/utils/useOrganization';
-
-export default Storybook.story('useFetchParallelPages', story => {
-  story('WARNING!', () => (
-    <Fragment>
-      <p>
-        Using this hook might not be a good idea!
-        <br />
-        Pagination is a good strategy to limit the amount of data that a server needs to
-        fetch at a given time; it also limits the amount of data that the browser needs to
-        hold in memory. Loading all data with this hook could cause rate-limiting, memory
-        exhaustion, slow rendering, and other problems.
-      </p>
-      <p>
-        Before implementing a parallel-fetch you should first think about building new api
-        endpoints that return just the data you need (in a paginated way), or look at the
-        feature design itself and make adjustments.
-      </p>
-    </Fragment>
-  ));
-
-  story('useFetchParallelPages', () => {
-    const organization = useOrganization();
-
-    const hits = 200; // the maximum number of items we expect to fetch
-
-    const {pages, isFetching} = useFetchParallelPages<{data: unknown}>({
-      enabled: true,
-      hits,
-      getQueryOptions: useCallback(
-        ({cursor, per_page}) =>
-          apiOptions.as<{data: unknown}>()(
-            '/organizations/$organizationIdOrSlug/projects/',
-            {
-              path: {organizationIdOrSlug: organization.slug},
-              query: {cursor, per_page},
-              staleTime: Infinity,
-            }
-          ),
-        [organization.slug]
-      ),
-      perPage: 20,
-    });
-
-    return (
-      <Fragment>
-        <p>
-          <code>useFetchParallelPages</code> will fetch all pages of data for a given
-          query. The return value of the hook will update as requests complete, meaning
-          that the UI can update incrementally.
-        </p>
-        <p>
-          Note that you need to set <code>hits</code> and <code>perPage</code> so the
-          helper can know how many requests to make. If you don't already know how many
-          results to expect then it can be helpful to manually request the first full page
-          of results, check the <code>X-Hits</code> response header, then use the hook to
-          fetch the complete list of results. Use the same <code>perPage</code> value in
-          both callsites to leverage the query cache.
-        </p>
-        <p>
-          Note that <code>getQueryOptions</code> needs to be a stable reference, so wrap
-          it with <code>useCallback</code>.
-        </p>
-        <StructuredEventData data={{pages: pages.length, isFetching}} />
-      </Fragment>
-    );
-  });
-});
diff --git a/static/app/utils/api/useFetchParallelPages.tsx b/static/app/utils/api/useFetchParallelPages.tsx
deleted file mode 100644
index 19bfaf3ae0d932..00000000000000
--- a/static/app/utils/api/useFetchParallelPages.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-import {useCallback, useEffect, useMemo, useRef, useState} from 'react';
-import type {UseQueryOptions} from '@tanstack/react-query';
-import {useQueryClient} from '@tanstack/react-query';
-
-import {defined} from 'sentry/utils';
-import type {ApiResponse} from 'sentry/utils/api/apiFetch';
-import type {ApiQueryKey} from 'sentry/utils/api/apiQueryKey';
-
-interface Props<Data> {
-  /**
-   * Whether or not to start fetched when the hook is mounted
-   */
-  enabled: boolean;
-
-  /**
-   * Generate the queryOptions to use, given the pagination params
-   */
-  getQueryOptions: (pagination: {
-    cursor: string;
-    per_page: number;
-  }) => UseQueryOptions<ApiResponse<Data>, Error, Data, ApiQueryKey>;
-
-  /**
-   * The total number of records within the dataset
-   *
-   * This, combined with `perPage`, determines the number of fetches to make
-   */
-  hits: number;
-  /**
-   * The size of each page to fetch
-   *
-   * This, combined with `hits`, determines the number of fetches to make
-   */
-  perPage: number;
-}
-
-interface ResponsePage<Data> {
-  data: undefined | Data;
-  error: Error | undefined;
-  headers: ApiResponse['headers'] | undefined;
-  isError: boolean;
-  isFetching: boolean;
-  status: 'pending' | 'error' | 'success';
-}
-
-interface State<Data> {
-  error: Error[] | undefined;
-  isError: boolean;
-  isFetching: boolean;
-  lastResponseHeaders: ApiResponse['headers'] | undefined;
-  pages: Data[];
-  status: 'pending' | 'error' | 'success';
-}
-
-/**
- * A query hook to fetch a fixed number of list pages all at once.
- *
- * See also: `useFetchSequentialPages()`
- *
- * <WARNING>
- *   Using this hook might not be a good idea!
- *   Pagination is a good strategy to limit the amount of data that a server
- *   needs to fetch at a given time, it also limits the amount of data that the
- *   browser needs to hold in memory. Loading all data with this hook could
- *   cause rate-limiting, memory exhaustion, slow rendering, and other problems.
- *
- *   Before implementing a parallel-fetch you should first think about
- *   building new api endpoints that return just the data you need (in a
- *   paginated way), or look at the feature design itself and make adjustments.
- * </WARNING>
- *
- * EXAMPLE: You want to fetch 100 items to show in a list, but the max-page-size
- * is set to only 50.
- *   In the well-behaved case this might seem fine, but in the pathological
- *   case (in the extreme) there could be too many users to do this safely!
- * Knowing that you have to make
- *
- * | Request        | Waterfall     |
- * | -------------- | ------------- |
- * | ?cursor=0:0:0  | ==========    |
- * | ?cursor=0:50:0 | =======       |
- * |                | ^      ^  ^   |
- * |                | t=0    t=1    |
- * |                |           t=2 |
- *
- * At t=0 the hook will return `data=Array(0)` because no records are fetched yet.
- * - Both requests will start at the same time, but are not guaranteed to end at
- *   the same time, or in order.
- * - If the network saturated with many requests (which can happen during
- *   pageload) then some requests might still need to wait before starting.
- * - Each response (in this case 2) will cause a re-render.
- * - Responses will return out of order (in this case items 50 to 100 return
- *   before items 0 to 50) which could cause layout shift.
- */
-export function useFetchParallelPages<Data>({
-  enabled,
-  hits,
-  getQueryOptions,
-  perPage,
-}: Props<Data>): State<Data> {
-  const queryClient = useQueryClient();
-
-  const responsePages = useRef(new Map<string, ResponsePage<Data>>());
-
-  const cursors = useMemo(
-    () =>
-      Array.from({length: Math.ceil(hits / perPage)})
-        .fill(0)
-        .map((_, i) => `0:${perPage * i}:0`),
-    [hits, perPage]
-  );
-
-  const [state, setState] = useState<State<Data>>({
-    pages: [],
-    error: undefined,
-    lastResponseHeaders: undefined,
-    status: enabled ? (cursors.length ? 'pending' : 'success') : 'pending',
-    isError: false,
-    isFetching: enabled && Boolean(cursors.length),
-  });
-
-  const fetch = useCallback(async () => {
-    await Promise.allSettled(
-      cursors.map(async cursor => {
-        try {
-          responsePages.current.set(cursor, {
-            data: undefined,
-            error: undefined,
-            headers: undefined,
-            status: 'pending',
-            isError: false,
-            isFetching: true,
-          });
-
-          const response = await queryClient.fetchQuery(
-            getQueryOptions({cursor, per_page: perPage})
-          );
-
-          responsePages.current.set(cursor, {
-            data: response.json,
-            error: undefined,
-            headers: response.headers,
-            status: 'success',
-            isError: false,
-            isFetching: false,
-          });
-        } catch (error) {
-          responsePages.current.set(cursor, {
-            data: undefined,
-            error: error as Error,
-            headers: undefined,
-            status: 'error',
-            isError: true,
-            isFetching: false,
-          });
-        } finally {
-          const values = Array.from(responsePages.current.values());
-          setState({
-            pages: values.map(value => value.data).filter(defined),
-            error: values.map(value => value.error).filter(defined),
-            lastResponseHeaders: values.at(-1)?.headers,
-            status: values.some(value => value.status === 'error')
-              ? 'error'
-              : values.some(value => value.status === 'pending')
-                ? 'pending'
-                : 'success',
-            isError: values.map(value => value.isError).some(Boolean),
-            isFetching: values.map(value => value.isFetching).some(Boolean),
-          });
-        }
-      })
-    );
-  }, [cursors, getQueryOptions, perPage, queryClient]);
-
-  useEffect(() => {
-    if (enabled) {
-      if (cursors.length) {
-        setState(prev => ({...prev, status: 'pending', isFetching: true}));
-        fetch();
-      } else {
-        setState(prev => ({...prev, status: 'success', isFetching: false}));
-      }
-    } else {
-      setState(prev => ({...prev, status: 'pending', isFetching: false}));
-    }
-  }, [cursors, enabled, fetch]);
-
-  return state;
-}
diff --git a/static/app/utils/api/useFetchSequentialPages.spec.tsx b/static/app/utils/api/useFetchSequentialPages.spec.tsx
deleted file mode 100644
index c95b5438425e00..00000000000000
--- a/static/app/utils/api/useFetchSequentialPages.spec.tsx
+++ /dev/null
@@ -1,228 +0,0 @@
-import {renderHookWithProviders, waitFor} from 'sentry-test/reactTestingLibrary';
-
-import {apiOptions} from 'sentry/utils/api/apiOptions';
-import {useFetchSequentialPages} from 'sentry/utils/api/useFetchSequentialPages';
-import {getPaginationPageLink} from 'sentry/views/organizationStats/utils';
-
-const MOCK_API_ENDPOINT = '/api-tokens/';
-
-function getQueryOptionsFactory() {
-  return jest.fn().mockImplementation(({cursor, per_page}) =>
-    apiOptions.as<string>()(MOCK_API_ENDPOINT, {
-      query: {cursor, per_page},
-      staleTime: Infinity,
-    })
-  );
-}
-
-describe('useFetchSequentialPages', () => {
-  it('should not call the queryFn when enabled is false', () => {
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchSequentialPages, {
-      initialProps: {
-        enabled: false,
-        getQueryOptions,
-        perPage: 10,
-      },
-    });
-
-    expect(result.current.isFetching).toBeFalsy();
-    expect(getQueryOptions).not.toHaveBeenCalled();
-  });
-
-  it('should immediatly swith to isFetching=true when the enabled prop is changed', async () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'text result',
-      headers: {Link: getPaginationPageLink({numRows: 0, pageSize: 100, offset: 0})},
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result, rerender} = renderHookWithProviders(useFetchSequentialPages, {
-      initialProps: {
-        enabled: false,
-        getQueryOptions,
-        perPage: 10,
-      },
-    });
-
-    expect(result.current.status).toBe('pending');
-    expect(result.current.isFetching).toBeFalsy();
-    expect(getQueryOptions).not.toHaveBeenCalled();
-
-    rerender({enabled: true, getQueryOptions, perPage: 10});
-
-    expect(result.current.status).toBe('pending');
-    expect(result.current.isFetching).toBeTruthy();
-    expect(getQueryOptions).toHaveBeenCalled();
-
-    await waitFor(() => expect(result.current.status).toBe('success'));
-    expect(result.current.isFetching).toBeFalsy();
-  });
-
-  it('should call the queryFn 1 times when the response has no pagination header', async () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'text result',
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchSequentialPages, {
-      initialProps: {
-        enabled: true,
-        getQueryOptions,
-        perPage: 10,
-      },
-    });
-
-    expect(result.current.status).toBe('pending');
-    expect(result.current.isFetching).toBeTruthy();
-
-    await waitFor(() => expect(result.current.status).toBe('success'));
-    expect(result.current.isFetching).toBeFalsy();
-    expect(getQueryOptions).toHaveBeenCalledTimes(1);
-  });
-
-  it('should call the queryFn 1 times when the first response has no next page', async () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'text result',
-      headers: {Link: getPaginationPageLink({numRows: 0, pageSize: 10, offset: 0})},
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchSequentialPages, {
-      initialProps: {
-        enabled: true,
-        getQueryOptions,
-        perPage: 10,
-      },
-    });
-
-    expect(result.current.status).toBe('pending');
-    expect(result.current.isFetching).toBeTruthy();
-
-    await waitFor(() => expect(result.current.status).toBe('success'));
-    expect(result.current.isFetching).toBeFalsy();
-    expect(getQueryOptions).toHaveBeenCalledTimes(1);
-  });
-
-  it('should call the queryFn N times, until the response has no next page', async () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'results starting at 0',
-      match: [MockApiClient.matchQuery({cursor: '0:0:0', per_page: 10})],
-      headers: {Link: getPaginationPageLink({numRows: 13, pageSize: 10, offset: 0})},
-    });
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'results starting at 10',
-      match: [MockApiClient.matchQuery({cursor: '0:10:0', per_page: 10})],
-      headers: {Link: getPaginationPageLink({numRows: 13, pageSize: 10, offset: 10})},
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchSequentialPages, {
-      initialProps: {
-        enabled: true,
-        getQueryOptions,
-        perPage: 10,
-      },
-    });
-
-    expect(result.current.status).toBe('pending');
-    expect(result.current.isFetching).toBeTruthy();
-
-    await waitFor(() => expect(result.current.status).toBe('success'));
-    expect(result.current.isFetching).toBeFalsy();
-    expect(getQueryOptions).toHaveBeenCalledTimes(2);
-  });
-
-  it('should return a list of all pages that have been resolved', async () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'results starting at 0',
-      match: [MockApiClient.matchQuery({cursor: '0:0:0', per_page: 10})],
-      headers: {Link: getPaginationPageLink({numRows: 13, pageSize: 10, offset: 0})},
-    });
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'results starting at 10',
-      match: [MockApiClient.matchQuery({cursor: '0:10:0', per_page: 10})],
-      headers: {Link: getPaginationPageLink({numRows: 13, pageSize: 10, offset: 10})},
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchSequentialPages, {
-      initialProps: {
-        enabled: true,
-        getQueryOptions,
-        perPage: 10,
-      },
-    });
-
-    await waitFor(() => expect(result.current.status).toBe('success'));
-    expect(result.current.isFetching).toBeFalsy();
-    expect(result.current.pages).toEqual([
-      'results starting at 0',
-      'results starting at 10',
-    ]);
-    expect(result.current.error).toBeUndefined();
-  });
-
-  it('should stop fetching if there is an error', async () => {
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      statusCode: 429,
-      match: [MockApiClient.matchQuery({cursor: '0:0:0', per_page: 10})],
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchSequentialPages, {
-      initialProps: {
-        enabled: true,
-        getQueryOptions,
-        perPage: 10,
-      },
-    });
-
-    await waitFor(() => expect(result.current.status).toBe('error'));
-    expect(result.current.isFetching).toBeFalsy();
-    expect(result.current.isError).toBeTruthy();
-    expect(result.current.error).toEqual(expect.objectContaining({status: 429}));
-  });
-
-  it('should return the final ResponseHeader that was resolved', async () => {
-    const secondLinkHeader = getPaginationPageLink({
-      numRows: 13,
-      pageSize: 10,
-      offset: 10,
-    });
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'results starting at 0',
-      headers: {Link: getPaginationPageLink({numRows: 13, pageSize: 10, offset: 0})},
-      match: [MockApiClient.matchQuery({cursor: '0:0:0', per_page: 10})],
-    });
-    MockApiClient.addMockResponse({
-      url: MOCK_API_ENDPOINT,
-      body: 'results starting at 10',
-      headers: {Link: secondLinkHeader},
-      match: [MockApiClient.matchQuery({cursor: '0:10:0', per_page: 10})],
-    });
-    const getQueryOptions = getQueryOptionsFactory();
-
-    const {result} = renderHookWithProviders(useFetchSequentialPages, {
-      initialProps: {
-        enabled: true,
-        getQueryOptions,
-        perPage: 10,
-      },
-    });
-
-    await waitFor(() => expect(result.current.status).toBe('success'));
-    expect(result.current.isFetching).toBeFalsy();
-    expect(result.current.lastResponseHeaders?.Link).toBe(secondLinkHeader);
-  });
-});
diff --git a/static/app/utils/api/useFetchSequentialPages.stories.tsx b/static/app/utils/api/useFetchSequentialPages.stories.tsx
deleted file mode 100644
index 1be92267e74abd..00000000000000
--- a/static/app/utils/api/useFetchSequentialPages.stories.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import {Fragment, useCallback, useRef} from 'react';
-
-import {InlineCode} from '@sentry/scraps/code';
-
-import {StructuredEventData} from 'sentry/components/structuredEventData';
-import * as Storybook from 'sentry/stories';
-import {apiOptions} from 'sentry/utils/api/apiOptions';
-import {useFetchSequentialPages} from 'sentry/utils/api/useFetchSequentialPages';
-import {useOrganization} from 'sentry/utils/useOrganization';
-
-export default Storybook.story('useFetchSequentialPages', story => {
-  story('WARNING!', () => (
-    <Fragment>
-      <p>
-        Using this hook might not be a good idea!
-        <br />
-        Pagination is a good strategy to limit the amount of data that a server needs to
-        fetch at a given time, it also limits the amount of data that the browser needs to
-        hold in memory. Loading all data with this hook could cause rate-limiting, memory
-        exhaustion, slow rendering, and other problems.
-      </p>
-      <p>
-        Before implementing a sequential-fetch you should first think about building new
-        api endpoints that return just the data you need (in a paginated way), or look at
-        the feature design itself and make adjustments.
-      </p>
-    </Fragment>
-  ));
-
-  story('useFetchSequentialPages', () => {
-    const organization = useOrganization();
-    const {pages, isFetching} = useFetchSequentialPages<{data: unknown}>({
-      enabled: true,
-      initialCursor: undefined,
-      getQueryOptions: useCallback(
-        ({cursor, per_page}) =>
-          apiOptions.as<{data: unknown}>()(
-            '/organizations/$organizationIdOrSlug/projects/',
-            {
-              path: {organizationIdOrSlug: organization.slug},
-              query: {cursor, per_page},
-              staleTime: Infinity,
-            }
-          ),
-        [organization.slug]
-      ),
-      perPage: 20,
-    });
-
-    return (
-      <Fragment>
-        <p>
-          <code>useFetchSequentialPages</code> will fetch all pages of data for a given
-          query. After all pages are fetched the full list of responses is returned as
-          `pages`. The UI doesn't incrementally render as data is coming in.
-        </p>
-        <p>
-          Note that <code>getQueryOptions</code> needs to be a stable reference, so wrap
-          it with <code>useCallback</code>.
-        </p>
-        <StructuredEventData data={{pages: pages.length, isFetching}} />
-      </Fragment>
-    );
-  });
-
-  story('Interrupt a sequential series', () => {
-    const organization = useOrganization();
-    const pagesFetched = useRef(0);
-
-    const {pages, isFetching} = useFetchSequentialPages<{data: unknown}>({
-      enabled: true,
-      initialCursor: undefined,
-      getQueryOptions: useCallback(
-        ({cursor, per_page}) => {
-          pagesFetched.current++;
-          if (pagesFetched.current > 2) {
-            return;
-          }
-
-          return apiOptions.as<{data: unknown}>()(
-            '/organizations/$organizationIdOrSlug/projects/',
-            {
-              path: {organizationIdOrSlug: organization.slug},
-              query: {cursor, per_page},
-              staleTime: Infinity,
-            }
-          );
-        },
-        [organization.slug]
-      ),
-      perPage: 1,
-    });
-
-    return (
-      <Fragment>
-        <p>
-          You can stop a series of requests from continuing by returning a{' '}
-          <InlineCode>undefined</InlineCode> from the{' '}
-          <InlineCode>getQueryOptions</InlineCode> callback.
-        </p>
-        <p>Here we limit the number of pages to 2</p>
-        <StructuredEventData data={{pages: pages.length, isFetching}} />
-      </Fragment>
-    );
-  });
-});
diff --git a/static/app/utils/api/useFetchSequentialPages.tsx b/static/app/utils/api/useFetchSequentialPages.tsx
deleted file mode 100644
index 5b436a3171561c..00000000000000
--- a/static/app/utils/api/useFetchSequentialPages.tsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import {useCallback, useEffect, useRef, useState} from 'react';
-import type {UseQueryOptions} from '@tanstack/react-query';
-import {useQueryClient} from '@tanstack/react-query';
-
-import {defined} from 'sentry/utils';
-import type {ApiResponse} from 'sentry/utils/api/apiFetch';
-import type {ApiQueryKey} from 'sentry/utils/api/apiQueryKey';
-import {parseLinkHeader, type ParsedHeader} from 'sentry/utils/parseLinkHeader';
-
-interface Props<Data> {
-  /**
-   * Whether or not to start fetching when the hook is mounted
-   */
-  enabled: boolean;
-
-  /**
-   * Generate the queryOptions to use, given the pagination params.
-   * If `undefined` is returned iteration will not continue.
-   */
-  getQueryOptions: (pagination: {
-    cursor: string;
-    per_page: number;
-  }) => undefined | UseQueryOptions<ApiResponse<Data>, Error, Data, ApiQueryKey>;
-
-  /**
-   * You must set the page size to be used.
-   *
-   * This will be passed back as an argument into getQueryOptions
-   */
-  perPage: number;
-
-  /**
-   * The initial cursor to use when fetching.
-   *
-   * Default: `0:0:0`
-   */
-  initialCursor?: undefined | string;
-}
-
-interface ResponsePage<Data> {
-  data: undefined | Data;
-  error: unknown;
-  headers: ApiResponse['headers'] | undefined;
-  isError: boolean;
-  isFetching: boolean;
-  status: 'pending' | 'error' | 'success';
-}
-
-interface State<Data> {
-  error: unknown;
-  isError: boolean;
-  isFetching: boolean;
-  lastResponseHeaders: ApiResponse['headers'] | undefined;
-  pages: Data[];
-  status: 'pending' | 'error' | 'success';
-}
-
-/**
- * A query hook that fetches multiple pages of data from the same endpoint, one-by-one.
- *
- * See also: `useFetchParallelPages()`
- *
- * `useFetchSequentialPages` is an iterator for fetch calls. It makes it possible
- * to fetch ALL data from an api endpoint.
- *
- * <WARNING>
- *   Using this hook might not be a good idea!
- *   Pagination is a good stratergy to limit the amount of data that a server
- *   needs to fetch at a given time, it also limits the amount of data that the
- *   browser needs to hold in memory. Loading all data with this hook could
- *   cause rate-limiting, memory exhaustion, slow rendering, and other problems.
- *
- *   Before implementing a sequential-fetch you should first think about
- *   building new api endpoints that return just the data you need (in a
- *   paginated way), or look at the feature design itself and make adjustments.
- * </WARNING>
- *
- * EXAMPLE: you want to make a request for all user's within a project...
- *   In the well-behaved case this might seem fine, but in the pathological
- *   case (in the extreme) there could be too many users to do this safely!
- * If there are 64 users in the project, but the max page-size is only 50, then
- * you can expect two calls to be made. The network waterfall would look like:
- *
- * | Request        | Waterfall           |
- * | -------------- | ------------------- |
- * | ?cursor=0:0:0  | ========            |
- * | ?cursor=0:50:0 |         ========    |
- * |                | ^       ^       ^   |
- * |                | t=0     t=1     t=2 |
- *
- * At t=0 the hook will return `data=Array(0)` because no records are fetched yet.
- * At t=1 the hook will return `data=Array(50)` and will has `isFetching=true`
- * Finally at t=2 all data will be fetched and combined: `data=Array(64)`
- */
-export function useFetchSequentialPages<Data>({
-  enabled,
-  getQueryOptions,
-  initialCursor,
-  perPage,
-}: Props<Data>): State<Data> {
-  const queryClient = useQueryClient();
-
-  const responsePages = useRef(new Map<string, ResponsePage<Data>>());
-  const [state, setState] = useState<State<Data>>({
-    pages: [],
-    error: undefined,
-    lastResponseHeaders: undefined,
-    status: 'pending',
-    isError: false,
-    isFetching: enabled,
-  });
-
-  const fetch = useCallback(
-    async function recursiveFetch() {
-      let parsedHeader: ParsedHeader | undefined = {
-        cursor: initialCursor ?? '0:0:0',
-        href: '',
-        results: true,
-      };
-      try {
-        while (parsedHeader?.results) {
-          const cursor = parsedHeader.cursor;
-          const queryOptions = getQueryOptions({cursor, per_page: perPage});
-          if (!queryOptions) {
-            break;
-          }
-          const response = await queryClient.fetchQuery(queryOptions);
-
-          responsePages.current.set(cursor, {
-            data: response.json,
-            error: undefined,
-            headers: response.headers,
-            status: 'success',
-            isError: false,
-            isFetching: false,
-          });
-
-          parsedHeader = parseLinkHeader(response.headers.Link ?? null)?.next;
-        }
-      } catch (error) {
-        responsePages.current.set(parsedHeader?.cursor!, {
-          data: undefined,
-          error,
-          headers: undefined,
-          status: 'error',
-          isError: true,
-          isFetching: false,
-        });
-      } finally {
-        const values = Array.from(responsePages.current.values());
-        setState({
-          pages: values.map(value => value.data).filter(defined),
-          error: values.map(value => value.error).at(0),
-          lastResponseHeaders: values.at(-1)?.headers,
-          status: values.some(value => value.status === 'error')
-            ? 'error'
-            : values.some(value => value.status === 'pending')
-              ? 'pending'
-              : 'success',
-          isError: values.map(value => value.isError).some(Boolean),
-          isFetching: values.map(value => value.isFetching).every(Boolean),
-        });
-      }
-    },
-    [initialCursor, getQueryOptions, perPage, queryClient]
-  );
-
-  useEffect(() => {
-    if (!enabled) {
-      return;
-    }
-
-    setState(prev => ({
-      ...prev,
-      status: 'pending',
-      isFetching: true,
-    }));
-
-    fetch();
-  }, [enabled, fetch]);
-
-  return state;
-}
diff --git a/static/app/utils/array/segmentSequentialBy.tsx b/static/app/utils/array/segmentSequentialBy.tsx
index a42b1ab3e89b17..ae136cf7958654 100644
--- a/static/app/utils/array/segmentSequentialBy.tsx
+++ b/static/app/utils/array/segmentSequentialBy.tsx
@@ -16,7 +16,9 @@ export function segmentSequentialBy<T>(
   data: T[],
   predicate: Predicate<T>
 ): Array<Partition<T>> {
-  if (!data.length) return [];
+  if (!data.length) {
+    return [];
+  }
 
   const firstDatum: T = data.at(0)!;
   let previousPredicateValue = predicate(firstDatum);
diff --git a/static/app/utils/discover/fieldRenderers.tsx b/static/app/utils/discover/fieldRenderers.tsx
index 01f1516794da10..4ba014cf7e6d37 100644
--- a/static/app/utils/discover/fieldRenderers.tsx
+++ b/static/app/utils/discover/fieldRenderers.tsx
@@ -1101,7 +1101,9 @@ const getContextIcon = (value: string) => {
  */
 const dropVersion = (value: string) => {
   const valueArray = value.split(' ');
-  if (valueArray.length > 1) valueArray.pop();
+  if (valueArray.length > 1) {
+    valueArray.pop();
+  }
   return valueArray.join(' ');
 };
 
diff --git a/static/app/utils/replays/hooks/useReplayData.spec.tsx b/static/app/utils/replays/hooks/useReplayData.spec.tsx
index 339237f68be583..b89f2d0b3ec5b4 100644
--- a/static/app/utils/replays/hooks/useReplayData.spec.tsx
+++ b/static/app/utils/replays/hooks/useReplayData.spec.tsx
@@ -45,7 +45,9 @@ describe('useReplayData', () => {
   });
 
   afterEach(() => {
-    jest.runOnlyPendingTimers();
+    act(() => {
+      jest.runOnlyPendingTimers();
+    });
     jest.useRealTimers();
   });
 
@@ -370,10 +372,12 @@ describe('useReplayData', () => {
 
     await act(() => jest.advanceTimersByTimeAsync(0));
 
-    await waitFor(() => expect(mockedErrorEventsMetaCall1).toHaveBeenCalledTimes(1));
-    expect(mockedErrorEventsMetaCall2).toHaveBeenCalledTimes(1);
-    expect(mockedIssuePlatformEventsMetaCall1).toHaveBeenCalledTimes(1);
-    expect(mockedIssuePlatformEventsMetaCall2).toHaveBeenCalledTimes(1);
+    await waitFor(() => {
+      expect(mockedErrorEventsMetaCall1).toHaveBeenCalledTimes(1);
+      expect(mockedErrorEventsMetaCall2).toHaveBeenCalledTimes(1);
+      expect(mockedIssuePlatformEventsMetaCall1).toHaveBeenCalledTimes(1);
+      expect(mockedIssuePlatformEventsMetaCall2).toHaveBeenCalledTimes(1);
+    });
 
     await waitFor(() => {
       expect(result.current).toStrictEqual(
@@ -448,16 +452,17 @@ describe('useReplayData', () => {
     });
 
     const expectedReplayData = {
+      attachmentError: undefined,
       attachments: [],
       errors: [],
       feedbackEvents: [],
       fetchError: undefined,
-      isError: true,
+      isError: false,
       isPending: true,
       onRetry: expect.any(Function),
       projectSlug: null,
       replayRecord: undefined,
-      status: 'error',
+      status: 'pending',
     } as Record<string, unknown>;
 
     // Immediately we will see the replay call is made
@@ -566,15 +571,16 @@ describe('useReplayData', () => {
       expect(mockedErrorEventsMetaCall).toHaveBeenCalledTimes(2);
     });
 
-    result.current.onRetry();
-
-    await act(() => jest.advanceTimersByTimeAsync(0));
+    await act(async () => {
+      result.current.onRetry();
+      await jest.runAllTimersAsync();
+    });
 
     await waitFor(() => {
       expect(mockedReplayCall).toHaveBeenCalledTimes(2);
     });
     await waitFor(() => {
-      expect(mockedErrorEventsMetaCall).toHaveBeenCalledTimes(2);
+      expect(mockedErrorEventsMetaCall).toHaveBeenCalledTimes(4);
     });
   });
 });
diff --git a/static/app/utils/replays/hooks/useReplayData.tsx b/static/app/utils/replays/hooks/useReplayData.tsx
index 7ddda09ce62267..cdf37ee03709cc 100644
--- a/static/app/utils/replays/hooks/useReplayData.tsx
+++ b/static/app/utils/replays/hooks/useReplayData.tsx
@@ -1,12 +1,19 @@
 import {useCallback, useMemo} from 'react';
-import {skipToken, useQuery, useQueryClient} from '@tanstack/react-query';
+import {
+  queryOptions,
+  skipToken,
+  useInfiniteQuery,
+  useQueries,
+  useQuery,
+  useQueryClient,
+} from '@tanstack/react-query';
 
 import {ALL_ACCESS_PROJECTS} from 'sentry/components/pageFilters/constants';
-import {apiOptions} from 'sentry/utils/api/apiOptions';
+import {defined} from 'sentry/utils';
+import {useFetchAllPages} from 'sentry/utils/api/apiFetch';
+import {apiOptions, selectJsonWithHeaders} from 'sentry/utils/api/apiOptions';
 import {safeParseQueryKey} from 'sentry/utils/api/apiQueryKey';
 import {getApiUrl} from 'sentry/utils/api/getApiUrl';
-import {useFetchParallelPages} from 'sentry/utils/api/useFetchParallelPages';
-import {useFetchSequentialPages} from 'sentry/utils/api/useFetchSequentialPages';
 import {DiscoverDatasets} from 'sentry/utils/discover/types';
 import type {FeedbackEvent} from 'sentry/utils/feedback/types';
 import {parseLinkHeader} from 'sentry/utils/parseLinkHeader';
@@ -92,6 +99,8 @@ const REPLAY_ERROR_FIELDS = [
   'title',
 ] as const;
 
+const EMPTY_PAGES: Array<{data: RawReplayError[]}> = [];
+
 interface Result {
   attachmentError: undefined | Error[];
   attachments: unknown[];
@@ -174,15 +183,30 @@ export function useReplayData({
     Boolean(projectSlug) &&
     Boolean(replayRecord);
 
+  const attachmentCursors = Array.from(
+    {length: Math.ceil((replayRecord?.count_segments ?? 0) / segmentsPerPage)},
+    (_, i) => `0:${segmentsPerPage * i}:0`
+  );
+
   const {
     pages: attachmentPages,
     status: fetchAttachmentsStatus,
-    error: fetchAttachmentsError,
-  } = useFetchParallelPages({
-    enabled: enableAttachments,
-    getQueryOptions: getAttachmentsQueryOptions,
-    hits: replayRecord?.count_segments ?? 0,
-    perPage: segmentsPerPage,
+    errors: fetchAttachmentsError,
+  } = useQueries({
+    queries: enableAttachments
+      ? attachmentCursors.map(cursor =>
+          getAttachmentsQueryOptions({cursor, per_page: segmentsPerPage})
+        )
+      : [],
+    combine: results => ({
+      pages: results.map(r => r.data).filter(defined),
+      status: results.some(r => r.status === 'error')
+        ? 'error'
+        : results.some(r => r.status === 'pending')
+          ? 'pending'
+          : 'success',
+      errors: results.map(r => r.error).filter(defined),
+    }),
   });
 
   const getErrorsQueryOptions = useCallback(
@@ -215,64 +239,95 @@ export function useReplayData({
     [orgSlug, replayRecord]
   );
 
-  const getPlatformErrorsQueryOptions = useCallback(
-    ({cursor, per_page}: {cursor: string; per_page: number}) => {
-      const finishedAtClone = new Date(replayRecord?.finished_at ?? '');
-      finishedAtClone.setSeconds(finishedAtClone.getSeconds() + 1);
-
-      return apiOptions.as<{data: RawReplayError[]}>()(
-        '/organizations/$organizationIdOrSlug/events/',
-        {
-          path: {organizationIdOrSlug: orgSlug},
-          query: {
-            referrer: 'replay_details',
-            dataset: DiscoverDatasets.ISSUE_PLATFORM,
-            field: REPLAY_ERROR_FIELDS,
-            start: replayRecord?.started_at?.toISOString() ?? '',
-            end: finishedAtClone.toISOString(),
-            project: ALL_ACCESS_PROJECTS,
-            query: `replayId:[${replayRecord?.id}]`,
-            per_page,
-            cursor,
-          },
-          staleTime: Infinity,
-        }
-      );
-    },
-    [orgSlug, replayRecord]
+  const errorCursors = Array.from(
+    {length: Math.ceil((replayRecord?.count_errors ?? 0) / errorsPerPage)},
+    (_, i) => `0:${errorsPerPage * i}:0`
   );
 
   const enableErrors = Boolean(replayRecord) && Boolean(projectSlug);
   const {
     pages: errorPages,
     status: fetchErrorsStatus,
-    lastResponseHeaders: lastErrorsResponseHeaders,
-  } = useFetchParallelPages<{data: RawReplayError[]}>({
-    enabled: enableErrors,
-    hits: replayRecord?.count_errors ?? 0,
-    getQueryOptions: getErrorsQueryOptions,
-    perPage: errorsPerPage,
+    lastLinkHeader,
+  } = useQueries({
+    queries: enableErrors
+      ? errorCursors.map(cursor =>
+          queryOptions({
+            ...getErrorsQueryOptions({
+              cursor,
+              per_page: errorsPerPage,
+            }),
+            select: selectJsonWithHeaders,
+          })
+        )
+      : [],
+    combine: results => ({
+      pages: results.map(r => r.data?.json).filter(defined),
+      status: results.some(r => r.status === 'error')
+        ? 'error'
+        : results.some(r => r.status === 'pending')
+          ? 'pending'
+          : 'success',
+      lastLinkHeader: parseLinkHeader(results.at(-1)?.data?.headers.Link ?? null),
+    }),
   });
 
-  const links = parseLinkHeader(lastErrorsResponseHeaders?.Link ?? null);
   const enableExtraErrors =
     Boolean(replayRecord) &&
-    (!replayRecord?.count_errors || Boolean(links.next?.results)) &&
+    (!replayRecord?.count_errors || Boolean(lastLinkHeader.next?.results)) &&
     fetchErrorsStatus === 'success';
-  const {pages: extraErrorPages, status: fetchExtraErrorsStatus} =
-    useFetchSequentialPages<{data: RawReplayError[]}>({
-      enabled: enableExtraErrors,
-      initialCursor: links.next?.cursor,
-      getQueryOptions: getErrorsQueryOptions,
-      perPage: errorsPerPage,
-    });
 
-  const {pages: platformErrorPages, status: fetchPlatformErrorsStatus} =
-    useFetchSequentialPages<{data: RawReplayError[]}>({
-      enabled: true,
-      getQueryOptions: getPlatformErrorsQueryOptions,
-      perPage: errorsPerPage,
-    });
+  const replayEnd = getReplayEndTimestamp(replayRecord);
+
+  const extraErrorsResult = useInfiniteQuery({
+    ...apiOptions.asInfinite<{data: RawReplayError[]}>()(
+      '/organizations/$organizationIdOrSlug/events/',
+      {
+        path: enableExtraErrors ? {organizationIdOrSlug: orgSlug} : skipToken,
+        query: {
+          referrer: 'replay_details',
+          dataset: DiscoverDatasets.ERRORS,
+          field: REPLAY_ERROR_FIELDS,
+          start: replayRecord?.started_at?.toISOString() ?? '',
+          end: replayEnd,
+          project: ALL_ACCESS_PROJECTS,
+          query: `replayId:[${replayRecord?.id}]`,
+          per_page: errorsPerPage,
+          cursor: lastLinkHeader.next?.cursor ?? '0:0:0',
+        },
+        staleTime: Infinity,
+      }
+    ),
+    select: data => data.pages.map(p => p.json),
+  });
+  useFetchAllPages({result: extraErrorsResult});
+  const extraErrorPages = extraErrorsResult.data ?? EMPTY_PAGES;
+  const fetchExtraErrorsStatus = extraErrorsResult.status;
+
+  const platformErrorsResult = useInfiniteQuery({
+    ...apiOptions.asInfinite<{data: RawReplayError[]}>()(
+      '/organizations/$organizationIdOrSlug/events/',
+      {
+        path: replayRecord ? {organizationIdOrSlug: orgSlug} : skipToken,
+        query: {
+          referrer: 'replay_details',
+          dataset: DiscoverDatasets.ISSUE_PLATFORM,
+          field: REPLAY_ERROR_FIELDS,
+          start: replayRecord?.started_at?.toISOString() ?? '',
+          end: replayEnd,
+          project: ALL_ACCESS_PROJECTS,
+          query: `replayId:[${replayRecord?.id}]`,
+          per_page: errorsPerPage,
+          cursor: '0:0:0',
+        },
+        staleTime: Infinity,
+      }
+    ),
+    select: data => data.pages.map(p => p.json),
+  });
+  useFetchAllPages({result: platformErrorsResult});
+  const platformErrorPages = platformErrorsResult.data ?? EMPTY_PAGES;
+  const fetchPlatformErrorsStatus = platformErrorsResult.status;
 
   const clearQueryCache = useCallback(() => {
     if (!replayId) {
@@ -311,10 +366,9 @@ export function useReplayData({
   }, [orgSlug, replayId, projectSlug, queryClient]);
 
   const {allErrors, feedbackEventIds} = useMemo(() => {
-    const errors = errorPages
-      .concat(extraErrorPages)
-      .concat(platformErrorPages)
-      .flatMap(page => page.data);
+    const errors = [...errorPages, ...extraErrorPages, ...platformErrorPages].flatMap(
+      page => page.data
+    );
 
     const feedbackIds = errors
       ?.filter(error => error?.title.includes('User Feedback'))
@@ -346,7 +400,7 @@ export function useReplayData({
     enableAttachments ? fetchAttachmentsStatus : undefined,
     enableErrors ? fetchErrorsStatus : undefined,
     enableExtraErrors ? fetchExtraErrorsStatus : undefined,
-    fetchPlatformErrorsStatus,
+    replayRecord ? fetchPlatformErrorsStatus : undefined,
   ];
 
   const isError = allStatuses.includes('error') || feedbackEventsError;
@@ -358,7 +412,7 @@ export function useReplayData({
       attachments: attachmentPages.flat(2),
       errors: allErrors,
       fetchError: fetchReplayError ?? undefined,
-      attachmentError: fetchAttachmentsError ?? undefined,
+      attachmentError: fetchAttachmentsError?.length ? fetchAttachmentsError : undefined,
       feedbackEvents,
       isError,
       isPending,
@@ -381,3 +435,12 @@ export function useReplayData({
     allErrors,
   ]);
 }
+
+function getReplayEndTimestamp(replayRecord: ReplayRecord | undefined): string {
+  if (!replayRecord?.finished_at) {
+    return '';
+  }
+  const d = new Date(replayRecord.finished_at);
+  d.setSeconds(d.getSeconds() + 1);
+  return d.toISOString();
+}
diff --git a/static/app/utils/string/ellipsize.tsx b/static/app/utils/string/ellipsize.tsx
index 587d1b29ecf5db..6d9c632c6e106e 100644
--- a/static/app/utils/string/ellipsize.tsx
+++ b/static/app/utils/string/ellipsize.tsx
@@ -10,16 +10,21 @@ import {ELLIPSIS} from 'sentry/utils/string/unicode';
  * ellipsize('short', 10) // returns 'short'
  */
 export function ellipsize(str: string, length: number): string {
-  if (length < 0 || isNaN(length))
+  if (length < 0 || isNaN(length)) {
     throw new TypeError(
       `Invalid string length argument value of ${length} provided to ellipsize`
     );
+  }
 
-  if (str.length <= length) return str;
+  if (str.length <= length) {
+    return str;
+  }
 
   // If the string is only whitespace, skip `trimRight` since trimming will completely erase the string. If the string was a long sequence of whitespace characters, that would return a loose ellipsis
   const trimmed = str.trim();
-  if (trimmed.length === 0) return `${str.slice(0, length)}${ELLIPSIS}`;
+  if (trimmed.length === 0) {
+    return `${str.slice(0, length)}${ELLIPSIS}`;
+  }
 
   // Otherwise, trim normally
   return `${str.slice(0, length).trimEnd()}${ELLIPSIS}`;
diff --git a/static/app/utils/string/looksLikeAJSONArray.tsx b/static/app/utils/string/looksLikeAJSONArray.tsx
index 859b07882d997b..1edc98a1a36062 100644
--- a/static/app/utils/string/looksLikeAJSONArray.tsx
+++ b/static/app/utils/string/looksLikeAJSONArray.tsx
@@ -11,6 +11,8 @@ export function looksLikeAJSONArray(value: string) {
   const trimmedValue = value.trim();
 
   // The string '[Filtered]' looks array-like, but it's actually a Relay special string
-  if (trimmedValue === '[Filtered]') return false;
+  if (trimmedValue === '[Filtered]') {
+    return false;
+  }
   return trimmedValue.startsWith('[') && trimmedValue.endsWith(']');
 }
diff --git a/static/app/utils/url/testUtils.tsx b/static/app/utils/url/testUtils.tsx
index 3aa3f3f399f0cb..6b9b8af1cdbce4 100644
--- a/static/app/utils/url/testUtils.tsx
+++ b/static/app/utils/url/testUtils.tsx
@@ -5,16 +5,22 @@ export function testableDebounce(callback: () => void, delay?: number) {
   let timeoutId: ReturnType<typeof setTimeout> | null = null;
 
   const debounced = () => {
-    if (timeoutId) clearTimeout(timeoutId);
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
     timeoutId = setTimeout(() => callback(), delay);
   };
 
   const cancel = () => {
-    if (timeoutId) clearTimeout(timeoutId);
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
   };
 
   const flush = () => {
-    if (timeoutId) clearTimeout(timeoutId);
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
     callback();
   };
 
diff --git a/static/app/utils/url/useQueryParamState.tsx b/static/app/utils/url/useQueryParamState.tsx
index a5224a5f7fb276..7b7e536285a987 100644
--- a/static/app/utils/url/useQueryParamState.tsx
+++ b/static/app/utils/url/useQueryParamState.tsx
@@ -83,7 +83,9 @@ export function useQueryParamState<T = string>({
 
   // Sync local state when URL query params change (e.g., browser back/forward navigation)
   useEffect(() => {
-    if (!syncStateWithUrl) return;
+    if (!syncStateWithUrl) {
+      return;
+    }
 
     setLocalState(deserializeValue());
   }, [deserializeValue, syncStateWithUrl]);
diff --git a/static/app/utils/useResizable.tsx b/static/app/utils/useResizable.tsx
index 954eb2cbc88d3e..539992bd57b8ab 100644
--- a/static/app/utils/useResizable.tsx
+++ b/static/app/utils/useResizable.tsx
@@ -106,7 +106,9 @@ export const useResizable = ({
 
   const handleMouseMove = useCallback(
     (e: MouseEvent) => {
-      if (!isDraggingRef.current) return;
+      if (!isDraggingRef.current) {
+        return;
+      }
 
       const deltaX = e.clientX - startXRef.current;
       const newWidth = Math.max(
diff --git a/static/app/views/alerts/rules/uptime/assertions/utils.tsx b/static/app/views/alerts/rules/uptime/assertions/utils.tsx
index aa08b23dd36b49..b2cb46613c86e9 100644
--- a/static/app/views/alerts/rules/uptime/assertions/utils.tsx
+++ b/static/app/views/alerts/rules/uptime/assertions/utils.tsx
@@ -370,7 +370,9 @@ export const isLeafOp = (op: UptimeOp) =>
   op.op === UptimeOpType.HEADER_CHECK;
 
 export function leafOpsMatchByValue(a: UptimeOp, b: UptimeOp): boolean {
-  if (a.op !== b.op) return false;
+  if (a.op !== b.op) {
+    return false;
+  }
 
   if (
     a.op === UptimeOpType.STATUS_CODE_CHECK &&
diff --git a/static/app/views/alerts/rules/uptime/formErrors.spec.tsx b/static/app/views/alerts/rules/uptime/formErrors.spec.tsx
index 44f4f39f491bfd..4c8b058b48ca8b 100644
--- a/static/app/views/alerts/rules/uptime/formErrors.spec.tsx
+++ b/static/app/views/alerts/rules/uptime/formErrors.spec.tsx
@@ -194,10 +194,12 @@ describe('AssertionFormError', () => {
     function Setter() {
       const previewCheckResult = usePreviewCheckResult();
       useEffect(() => {
-        if ('data' in initial)
+        if ('data' in initial) {
           previewCheckResult?.setPreviewCheckData(initial.data ?? null);
-        if ('error' in initial)
+        }
+        if ('error' in initial) {
           previewCheckResult?.setPreviewCheckError(initial.error ?? null);
+        }
         // eslint-disable-next-line react-hooks/exhaustive-deps
       }, []);
       return null;
diff --git a/static/app/views/alerts/rules/uptime/formErrors.tsx b/static/app/views/alerts/rules/uptime/formErrors.tsx
index 3f363fa00ee7ff..f618c18ae6ba0a 100644
--- a/static/app/views/alerts/rules/uptime/formErrors.tsx
+++ b/static/app/views/alerts/rules/uptime/formErrors.tsx
@@ -24,7 +24,9 @@ import {usePreviewCheckResult} from './previewCheckContext';
 export function mapPreviewCheckErrorToMessage(
   error: PreviewCheckError | null
 ): string | null {
-  if (!error) return null;
+  if (!error) {
+    return null;
+  }
 
   return error.assertion.error === PreviewCheckErrorKind.COMPILATION_ERROR
     ? t('Assertion Compilation Error')
@@ -112,7 +114,9 @@ export function mapPreviewCheckResultToMessage(
   response: PreviewCheckResult
 ): string | null {
   const result = response.check_result;
-  if (!result) return null;
+  if (!result) {
+    return null;
+  }
 
   if (result.assertion_failure_data) {
     return t('Assertion Failure');
@@ -137,14 +141,18 @@ function matchAssertionFailureDataLeafOp(
     (assertionOp.op === UptimeOpType.AND || assertionOp.op === UptimeOpType.OR)
   ) {
     const [failingChild] = failureDataOp.children;
-    if (!failingChild) return null;
+    if (!failingChild) {
+      return null;
+    }
     // For leaves, also match by value to distinguish siblings of the same op type.
     const match = assertionOp.children.find(
       c =>
         c.op === failingChild.op &&
         (isLeafOp(failingChild) ? leafOpsMatchByValue(failingChild, c) : true)
     );
-    if (!match) return null;
+    if (!match) {
+      return null;
+    }
     return matchAssertionFailureDataLeafOp(failingChild, match);
   }
 
@@ -174,12 +182,16 @@ function resolveErroredOpFromAssertPath(
 
   for (const segment of assertPath.slice(1)) {
     const index = Number.parseInt(segment, 10);
-    if (isNaN(index)) return null;
+    if (isNaN(index)) {
+      return null;
+    }
 
     if (current.op === UptimeOpType.AND || current.op === UptimeOpType.OR) {
       // eslint-disable-next-line @sentry/no-unnecessary-type-annotation
       const next: UptimeOp | undefined = current.children[index];
-      if (!next) return null;
+      if (!next) {
+        return null;
+      }
       current = next;
     } else if (current.op === UptimeOpType.NOT) {
       current = current.operand;
@@ -200,12 +212,16 @@ export function resolveErroredAssertionOp(
   previewCheckResult: ReturnType<typeof usePreviewCheckResult>,
   rootOp: UptimeAndOp
 ): UptimeOp | null {
-  if (!previewCheckResult) return null;
+  if (!previewCheckResult) {
+    return null;
+  }
   const {data, error} = previewCheckResult;
 
   if (data) {
     const result = data.check_result;
-    if (!result) return null;
+    if (!result) {
+      return null;
+    }
 
     if (result.assertion_failure_data) {
       return resolveErroredOpFromAssertionFailureData(
@@ -246,12 +262,16 @@ const ASSERTION_ERROR_TYPE_LABELS: Partial<Record<string, string>> = {
 function getFormAssertionErrorMessage(
   previewCheckResult: ReturnType<typeof usePreviewCheckResult>
 ): string | null {
-  if (!previewCheckResult) return null;
+  if (!previewCheckResult) {
+    return null;
+  }
   const {data, error} = previewCheckResult;
 
   if (data) {
     const result = data.check_result;
-    if (!result) return null;
+    if (!result) {
+      return null;
+    }
 
     if (result.assertion_failure_data) {
       return t('Assertion Failed');
diff --git a/static/app/views/automations/components/actions/ticketActionSettingsButton.tsx b/static/app/views/automations/components/actions/ticketActionSettingsButton.tsx
index 650f90384884db..03adfd926bb3ac 100644
--- a/static/app/views/automations/components/actions/ticketActionSettingsButton.tsx
+++ b/static/app/views/automations/components/actions/ticketActionSettingsButton.tsx
@@ -51,11 +51,15 @@ export function TicketActionSettingsButton() {
 
   // Find saved action data from the API response
   const savedActionData = useMemo(() => {
-    if (!automation) return;
+    if (!automation) {
+      return;
+    }
 
     for (const af of automation.actionFilters) {
       const found = af.actions?.find(a => a.id === action.id);
-      if (found) return found.data;
+      if (found) {
+        return found.data;
+      }
     }
 
     return;
diff --git a/static/app/views/dashboards/dashboardRevisionsDiff.ts b/static/app/views/dashboards/dashboardRevisionsDiff.ts
index 4ecc60f3908ba1..32d188f563ed9f 100644
--- a/static/app/views/dashboards/dashboardRevisionsDiff.ts
+++ b/static/app/views/dashboards/dashboardRevisionsDiff.ts
@@ -13,7 +13,9 @@ type FieldChange = {after: string; before: string; field: string};
 type FilterChange = {after: string; before: string; label: string};
 
 function formatTime(d: DashboardDetails): string | null {
-  if (d.period) return getRelativeSummary(d.period);
+  if (d.period) {
+    return getRelativeSummary(d.period);
+  }
   if (d.start && d.end) {
     const fmt = (s: string) => getFormattedDate(s, 'MMM D, YYYY', {local: !d.utc});
     return `${fmt(d.start)} – ${fmt(d.end)}`;
@@ -30,8 +32,12 @@ export function formatProjectIds(
   ids: number[] | undefined,
   resolveId: (id: number) => string | undefined
 ): string {
-  if (!ids?.length) return t('My Projects');
-  if (ids.includes(ALL_ACCESS_PROJECTS)) return t('All Projects');
+  if (!ids?.length) {
+    return t('My Projects');
+  }
+  if (ids.includes(ALL_ACCESS_PROJECTS)) {
+    return t('All Projects');
+  }
   return ids.map(id => resolveId(id) ?? String(id)).join(', ');
 }
 
@@ -90,8 +96,12 @@ export function diffFilters(
 }
 
 function truncateDescription(value: string): string {
-  if (!value) return t('(empty)');
-  if (value.length <= DESCRIPTION_PREVIEW_MAX_LENGTH) return value;
+  if (!value) {
+    return t('(empty)');
+  }
+  if (value.length <= DESCRIPTION_PREVIEW_MAX_LENGTH) {
+    return value;
+  }
   return value.slice(0, DESCRIPTION_PREVIEW_MAX_LENGTH) + '…';
 }
 
@@ -177,7 +187,9 @@ export function diffWidgets(
   const titleCounts = new Map<string, number>();
   const fingerprintCounts = new Map<string, number>();
   for (const w of base.widgets) {
-    if (w.id) baseById.set(w.id, w);
+    if (w.id) {
+      baseById.set(w.id, w);
+    }
     titleCounts.set(w.title, (titleCounts.get(w.title) ?? 0) + 1);
     const fp = makeWidgetFingerprint(w);
     fingerprintCounts.set(fp, (fingerprintCounts.get(fp) ?? 0) + 1);
diff --git a/static/app/views/dashboards/globalFilter/addFilter.tsx b/static/app/views/dashboards/globalFilter/addFilter.tsx
index e9971cdf0646f1..cfacb5765dba49 100644
--- a/static/app/views/dashboards/globalFilter/addFilter.tsx
+++ b/static/app/views/dashboards/globalFilter/addFilter.tsx
@@ -160,7 +160,9 @@ export function AddFilter({
                   <MenuComponents.ApplyButton
                     disabled={!selectedFilterKey}
                     onClick={() => {
-                      if (!selectedFilterKey || !selectedDataset) return;
+                      if (!selectedFilterKey || !selectedDataset) {
+                        return;
+                      }
 
                       let defaultFilterValue = '';
                       const fieldDefinition =
diff --git a/static/app/views/dashboards/globalFilter/numericFilterSelector.tsx b/static/app/views/dashboards/globalFilter/numericFilterSelector.tsx
index 879d859727bd92..40fc8c5a8ca6e9 100644
--- a/static/app/views/dashboards/globalFilter/numericFilterSelector.tsx
+++ b/static/app/views/dashboards/globalFilter/numericFilterSelector.tsx
@@ -124,7 +124,9 @@ function useNativeOperatorFilter(
     isValidNumericFilterValue(stagedFilterValue, globalFilterToken, globalFilter);
 
   const buildFilterQuery = () => {
-    if (!globalFilterToken) return '';
+    if (!globalFilterToken) {
+      return '';
+    }
 
     return newNumericFilterQuery(
       stagedFilterValue,
diff --git a/static/app/views/dashboards/globalFilter/utils.tsx b/static/app/views/dashboards/globalFilter/utils.tsx
index 2d23e8152e653b..736c2255c3ed02 100644
--- a/static/app/views/dashboards/globalFilter/utils.tsx
+++ b/static/app/views/dashboards/globalFilter/utils.tsx
@@ -140,7 +140,9 @@ export function newNumericFilterQuery(
     valueType,
     token: filterToken,
   });
-  if (!cleanedValue) return '';
+  if (!cleanedValue) {
+    return '';
+  }
   const newFilterValue = modifyFilterValue(filterToken.text, filterToken, cleanedValue);
 
   const newFilterTokens = parseFilterValue(newFilterValue, globalFilter);
diff --git a/static/app/views/dashboards/revisionListItem.tsx b/static/app/views/dashboards/revisionListItem.tsx
index d8d405f56ed0d5..9d6c01f71b5f0e 100644
--- a/static/app/views/dashboards/revisionListItem.tsx
+++ b/static/app/views/dashboards/revisionListItem.tsx
@@ -36,8 +36,12 @@ interface RevisionListItemProps {
 }
 
 function formatRevisionSource(source: DashboardRevision['source']): string {
-  if (source === 'pre-restore') return t('Revert Dashboard');
-  if (source === 'edit-with-agent') return t('Edit with Seer');
+  if (source === 'pre-restore') {
+    return t('Revert Dashboard');
+  }
+  if (source === 'edit-with-agent') {
+    return t('Edit with Seer');
+  }
   return t('Edit');
 }
 
@@ -155,7 +159,9 @@ export function RevisionDiffBody({
   isLoading: boolean;
   snapshot: DashboardDetails | undefined;
 }) {
-  if (isLoading) return <LoadingIndicator />;
+  if (isLoading) {
+    return <LoadingIndicator />;
+  }
   if (isError) {
     return (
       <Text size="sm" variant="muted">
@@ -163,7 +169,9 @@ export function RevisionDiffBody({
       </Text>
     );
   }
-  if (!snapshot) return null;
+  if (!snapshot) {
+    return null;
+  }
   if (baseRevisionId === null) {
     return (
       <Text size="sm" variant="muted">
diff --git a/static/app/views/dashboards/sortableWidget.tsx b/static/app/views/dashboards/sortableWidget.tsx
index a555465088826e..48df1ad674d3da 100644
--- a/static/app/views/dashboards/sortableWidget.tsx
+++ b/static/app/views/dashboards/sortableWidget.tsx
@@ -113,7 +113,9 @@ export function SortableWidget(props: Props) {
     const newOrderBy = `${sort.kind === 'desc' ? '-' : ''}${sort.field}`;
     // Override the widget queries to pass the temporary sort to the widget and expanded modal
     const widgetQueries = cloneDeep(widget.queries);
-    if (widgetQueries[0]) widgetQueries[0].orderby = newOrderBy;
+    if (widgetQueries[0]) {
+      widgetQueries[0].orderby = newOrderBy;
+    }
     setQueries(widgetQueries);
   };
 
diff --git a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx
index 22502a896d4dc0..5c64fe3f927df7 100644
--- a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.spec.tsx
@@ -386,7 +386,9 @@ function makeContextCapture() {
   return {
     ContextCapture,
     getSnapshot: () => {
-      if (!ref.current) throw new Error('ContextCapture not mounted');
+      if (!ref.current) {
+        throw new Error('ContextCapture not mounted');
+      }
       return ref.current();
     },
   };
diff --git a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
index 44b94d51c0da67..74956b9529d75c 100644
--- a/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
+++ b/static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx
@@ -94,7 +94,9 @@ export function WidgetBuilderV2({
   const navigationElementRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
-    if (navigationElementRef.current) return;
+    if (navigationElementRef.current) {
+      return;
+    }
 
     const navigationElement = document.querySelector(
       'nav[aria-label="Primary Navigation"]'
diff --git a/static/app/views/dashboards/widgetBuilder/utils/trackEngagementAnalytics.tsx b/static/app/views/dashboards/widgetBuilder/utils/trackEngagementAnalytics.tsx
index 9e6b380922f6c9..d08af8f1ac2ea7 100644
--- a/static/app/views/dashboards/widgetBuilder/utils/trackEngagementAnalytics.tsx
+++ b/static/app/views/dashboards/widgetBuilder/utils/trackEngagementAnalytics.tsx
@@ -10,7 +10,9 @@ export function trackEngagementAnalytics(
   isSentryBuilt: boolean
 ) {
   // Handle edge-case of dashboard with no widgets.
-  if (!widgets.length) return;
+  if (!widgets.length) {
+    return;
+  }
 
   // For attributing engagement metrics initially track the ratio
   // of widgets reading from Transactions, Spans, Errors, and Issues, and Logs.
diff --git a/static/app/views/dashboards/widgetBuilder/utils/transformPerformanceScoreBreakdownSeries.tsx b/static/app/views/dashboards/widgetBuilder/utils/transformPerformanceScoreBreakdownSeries.tsx
index 6c6a51c10de2fb..70539d3947c010 100644
--- a/static/app/views/dashboards/widgetBuilder/utils/transformPerformanceScoreBreakdownSeries.tsx
+++ b/static/app/views/dashboards/widgetBuilder/utils/transformPerformanceScoreBreakdownSeries.tsx
@@ -16,7 +16,9 @@ export function transformPerformanceScoreBreakdownSeries(
       : `performance_score(measurements.score.${webVital})`;
     const series = multiSeries[key];
 
-    if (!series?.data) return false;
+    if (!series?.data) {
+      return false;
+    }
 
     return series.data.some(([_timestamp, values]) =>
       values.some(v => (v.count || 0) > 0)
diff --git a/static/app/views/dashboards/widgetCard/index.tsx b/static/app/views/dashboards/widgetCard/index.tsx
index 458aa36ab8cfec..412fdbe62bdf9e 100644
--- a/static/app/views/dashboards/widgetCard/index.tsx
+++ b/static/app/views/dashboards/widgetCard/index.tsx
@@ -575,7 +575,9 @@ function useConflictingFilterWarning({
   widget: TWidget;
 }) {
   const conflictingFilterKeys = useMemo(() => {
-    if (!dashboardFilters) return [];
+    if (!dashboardFilters) {
+      return [];
+    }
 
     const widgetFilterKeys = widget.queries.flatMap(query => {
       const parseResult = parseQueryBuilderValue(query.conditions, getFieldDefinition);
diff --git a/static/app/views/dashboards/widgets/tableWidget/tableWidgetVisualization.stories.tsx b/static/app/views/dashboards/widgets/tableWidget/tableWidgetVisualization.stories.tsx
index 1bfcf58e048709..ac904173b0ab8f 100644
--- a/static/app/views/dashboards/widgets/tableWidget/tableWidgetVisualization.stories.tsx
+++ b/static/app/views/dashboards/widgets/tableWidget/tableWidgetVisualization.stories.tsx
@@ -126,8 +126,12 @@ ${JSON.stringify(aliases)}
           const bField = b?.[newSort.field] ?? 0;
           const value = newSort.kind === 'asc' ? 1 : -1;
 
-          if (aField < bField) return -value;
-          if (aField > bField) return value;
+          if (aField < bField) {
+            return -value;
+          }
+          if (aField > bField) {
+            return value;
+          }
           return 0;
         })
         .map(result => result[1]);
@@ -362,7 +366,9 @@ function onChangeSort(newSort: Sort) {
           onTriggerCellAction={(actions: Actions, value: string | number) => {
             switch (actions) {
               case Actions.ADD:
-                if (!filter.includes(value)) setFilter([...filter, value]);
+                if (!filter.includes(value)) {
+                  setFilter([...filter, value]);
+                }
                 break;
               case Actions.EXCLUDE:
                 setFilter(filter.filter(_value => _value !== value));
diff --git a/static/app/views/dashboards/widgets/tableWidget/tableWidgetVisualization.tsx b/static/app/views/dashboards/widgets/tableWidget/tableWidgetVisualization.tsx
index ec5bbed2315f40..d77b67f4bcef59 100644
--- a/static/app/views/dashboards/widgets/tableWidget/tableWidgetVisualization.tsx
+++ b/static/app/views/dashboards/widgets/tableWidget/tableWidgetVisualization.tsx
@@ -261,7 +261,9 @@ export function TableWidgetVisualization(props: TableWidgetVisualizationProps) {
               canSort={column.sortable ?? false}
               title={<StyledTooltip title={tooltipTitle}>{name}</StyledTooltip>}
               onClick={e => {
-                if (!onChangeSort) return;
+                if (!onChangeSort) {
+                  return;
+                }
                 e.preventDefault();
                 const nextDirection = direction === 'desc' ? 'asc' : 'desc';
                 onChangeSort({
@@ -384,7 +386,9 @@ TableWidgetVisualization.LoadingPlaceholder = function ({
       resizable={false}
       grid={{
         renderHeadCell: (_tableColumn, columnIndex) => {
-          if (!columns) return null;
+          if (!columns) {
+            return null;
+          }
           const column = columns[columnIndex]!;
           const isStarredColumn = column.key === SpanFields.IS_STARRED_TRANSACTION;
           const hasAlias = !!aliases?.[column.key];
diff --git a/static/app/views/detectors/hooks/useFilteredAnomalyThresholdSeries.tsx b/static/app/views/detectors/hooks/useFilteredAnomalyThresholdSeries.tsx
index e27abe5763f7b4..9db4211ca5beef 100644
--- a/static/app/views/detectors/hooks/useFilteredAnomalyThresholdSeries.tsx
+++ b/static/app/views/detectors/hooks/useFilteredAnomalyThresholdSeries.tsx
@@ -62,9 +62,15 @@ export function useFilteredAnomalyThresholdSeries({
     const [upperThreshold, lowerThreshold, seerValue] = anomalyThresholdSeries;
 
     const filtered = [];
-    if (thresholdType !== AlertRuleThresholdType.BELOW) filtered.push(upperThreshold);
-    if (thresholdType !== AlertRuleThresholdType.ABOVE) filtered.push(lowerThreshold);
-    if (seerValue) filtered.push(seerValue);
+    if (thresholdType !== AlertRuleThresholdType.BELOW) {
+      filtered.push(upperThreshold);
+    }
+    if (thresholdType !== AlertRuleThresholdType.ABOVE) {
+      filtered.push(lowerThreshold);
+    }
+    if (seerValue) {
+      filtered.push(seerValue);
+    }
 
     return filtered.filter((s): s is NonNullable<typeof s> => !!s);
   }, [anomalyThresholdSeries, detector, isAnomalyDetection, directThresholdType]);
diff --git a/static/app/views/discover/eventDetails.tsx b/static/app/views/discover/eventDetails.tsx
index c51e684696025f..e83774eb21bcc6 100644
--- a/static/app/views/discover/eventDetails.tsx
+++ b/static/app/views/discover/eventDetails.tsx
@@ -48,7 +48,9 @@ export default function EventDetails() {
   );
 
   useEffect(() => {
-    if (!event) return;
+    if (!event) {
+      return;
+    }
 
     if (event.groupID && event.eventID) {
       navigate({
diff --git a/static/app/views/discover/results/issueListSeerComboBox.tsx b/static/app/views/discover/results/issueListSeerComboBox.tsx
index 8fc68a88f1ffbc..60812a4621b653 100644
--- a/static/app/views/discover/results/issueListSeerComboBox.tsx
+++ b/static/app/views/discover/results/issueListSeerComboBox.tsx
@@ -180,7 +180,9 @@ export function IssueListSeerComboBox({onSearch}: IssueListSeerComboBoxProps) {
 
   const applySeerSearchQuery = useCallback(
     (result: AskSeerSearchQuery, runId?: number) => {
-      if (!result) return;
+      if (!result) {
+        return;
+      }
       const {
         query: queryToUse,
         sort,
diff --git a/static/app/views/discover/table/cellAction.tsx b/static/app/views/discover/table/cellAction.tsx
index 5dbc0d89dbfa3f..8992d4355966b8 100644
--- a/static/app/views/discover/table/cellAction.tsx
+++ b/static/app/views/discover/table/cellAction.tsx
@@ -178,7 +178,9 @@ export function excludeFromFilter(
  */
 export function copyToClipboard(value: string | number | string[]) {
   function stringifyValue(val: string | number | string[]): string {
-    if (!val) return '';
+    if (!val) {
+      return '';
+    }
     if (typeof val !== 'object') {
       return val.toString();
     }
@@ -278,7 +280,9 @@ function makeCellActions({
     addMenuItem(Actions.OPEN_ROW_IN_EXPLORE, t('View span samples'));
   }
 
-  if (value) addMenuItem(Actions.COPY_TO_CLIPBOARD, t('Copy to clipboard'));
+  if (value) {
+    addMenuItem(Actions.COPY_TO_CLIPBOARD, t('Copy to clipboard'));
+  }
 
   if (allowActions) {
     addMenuItem(Actions.COPY_LINK, t('Copy link'));
diff --git a/static/app/views/explore/components/attributeBreakdowns/attributeDistributionChart.tsx b/static/app/views/explore/components/attributeBreakdowns/attributeDistributionChart.tsx
index ce17b1c2409c92..47bcde19001bee 100644
--- a/static/app/views/explore/components/attributeBreakdowns/attributeDistributionChart.tsx
+++ b/static/app/views/explore/components/attributeBreakdowns/attributeDistributionChart.tsx
@@ -69,7 +69,9 @@ export function Chart({
   useLayoutEffect(() => {
     const chartInstance = chartRef.current?.getEchartsInstance();
 
-    if (!chartInstance) return;
+    if (!chartInstance) {
+      return;
+    }
 
     const width = chartInstance.getDom().offsetWidth;
 
diff --git a/static/app/views/explore/components/attributeBreakdowns/attributeDistributionContent.tsx b/static/app/views/explore/components/attributeBreakdowns/attributeDistributionContent.tsx
index 02f5ee0790589f..ec4f1fa5bd8d4a 100644
--- a/static/app/views/explore/components/attributeBreakdowns/attributeDistributionContent.tsx
+++ b/static/app/views/explore/components/attributeBreakdowns/attributeDistributionContent.tsx
@@ -130,7 +130,9 @@ export function AttributeDistribution() {
   const parsedLinks = parseLinkHeader(attributeBreakdownsPageLinks);
 
   const uniqueAttributeDistribution = useMemo(() => {
-    if (!attributeBreakdownsData) return [];
+    if (!attributeBreakdownsData) {
+      return [];
+    }
 
     const seen = new Set<string>();
     const filtered = Object.entries(
diff --git a/static/app/views/explore/components/attributeBreakdowns/cohortComparisonChart.tsx b/static/app/views/explore/components/attributeBreakdowns/cohortComparisonChart.tsx
index 5973e29d2ea430..d00136d18b823a 100644
--- a/static/app/views/explore/components/attributeBreakdowns/cohortComparisonChart.tsx
+++ b/static/app/views/explore/components/attributeBreakdowns/cohortComparisonChart.tsx
@@ -103,7 +103,9 @@ export function Chart({
   useLayoutEffect(() => {
     const chartInstance = chartRef.current?.getEchartsInstance();
 
-    if (!chartInstance) return;
+    if (!chartInstance) {
+      return;
+    }
 
     const width = chartInstance.getDom().offsetWidth;
 
diff --git a/static/app/views/explore/components/attributeBreakdowns/floatingTrigger.tsx b/static/app/views/explore/components/attributeBreakdowns/floatingTrigger.tsx
index 08d27c55ada873..a06089df37cdb2 100644
--- a/static/app/views/explore/components/attributeBreakdowns/floatingTrigger.tsx
+++ b/static/app/views/explore/components/attributeBreakdowns/floatingTrigger.tsx
@@ -22,7 +22,9 @@ export function FloatingTrigger({chartIndex, params}: Props) {
   const {selectionState, setSelectionState, clearSelection} = params;
 
   const handleZoomIn = useCallback(() => {
-    if (!selectionState) return;
+    if (!selectionState) {
+      return;
+    }
 
     trackAnalytics('explore.floating_trigger.zoom_in', {organization});
 
@@ -55,7 +57,9 @@ export function FloatingTrigger({chartIndex, params}: Props) {
   }, [clearSelection, selectionState, location, navigate, organization]);
 
   const handleFindAttributeBreakdowns = useCallback(() => {
-    if (!selectionState) return;
+    if (!selectionState) {
+      return;
+    }
 
     trackAnalytics('explore.floating_trigger.compare_attribute_breakdowns', {
       organization,
diff --git a/static/app/views/explore/components/attributeBreakdowns/utils.tsx b/static/app/views/explore/components/attributeBreakdowns/utils.tsx
index 65088727cd1f53..997e944c9ff1f5 100644
--- a/static/app/views/explore/components/attributeBreakdowns/utils.tsx
+++ b/static/app/views/explore/components/attributeBreakdowns/utils.tsx
@@ -13,7 +13,9 @@ export function calculateAttributePopulationPercentage(
   }>,
   cohortTotal: number
 ): number {
-  if (cohortTotal === 0) return 0;
+  if (cohortTotal === 0) {
+    return 0;
+  }
 
   const populatedCount = values.reduce((acc, curr) => acc + curr.value, 0);
   return (populatedCount / cohortTotal) * 100;
@@ -53,7 +55,9 @@ export function formatChartXAxisLabel(
   const maxChars = Math.floor(pixelsPerLabel / pixelsPerCharacter);
 
   // If value fits, return it as-is
-  if (value.length <= maxChars) return value;
+  if (value.length <= maxChars) {
+    return value;
+  }
 
   // Otherwise, truncate and append '…'
   const truncatedLength = Math.max(1, maxChars - 2); // leaving space for (ellipsis)
@@ -86,7 +90,9 @@ export function tooltipActionsHtmlRenderer(
   attributeName: string,
   theme: Theme
 ): string {
-  if (!value) return '';
+  if (!value) {
+    return '';
+  }
 
   const escapedAttributeName = escape(attributeName);
   const escapedValue = escape(value);
diff --git a/static/app/views/explore/conversations/components/toolTags.tsx b/static/app/views/explore/conversations/components/toolTags.tsx
index 4b572e6359bcaa..30dc0e725a18bb 100644
--- a/static/app/views/explore/conversations/components/toolTags.tsx
+++ b/static/app/views/explore/conversations/components/toolTags.tsx
@@ -1,9 +1,8 @@
 import {useEffect, useRef, useState} from 'react';
-import styled from '@emotion/styled';
 
 import {Tag} from '@sentry/scraps/badge';
 import {Button} from '@sentry/scraps/button';
-import {Flex} from '@sentry/scraps/layout';
+import {Container, Flex} from '@sentry/scraps/layout';
 
 import {t} from 'sentry/locale';
 
@@ -59,7 +58,16 @@ export function ToolTags({toolNames}: ToolTagsProps) {
   }, [toolNames, expanded, hiddenCount]);
 
   return (
-    <ToolTagsContainer ref={containerRef} expanded={expanded}>
+    <Flex
+      ref={containerRef}
+      align="center"
+      gap="sm"
+      wrap="wrap"
+      overflow="hidden"
+      position="relative"
+      maxHeight={expanded ? '500px' : `${TWO_ROW_HEIGHT}px`}
+      style={{transition: 'max-height 0.2s ease-in-out'}}
+    >
       {toolNames.map((toolName, index) => (
         <Tag
           key={toolName}
@@ -77,47 +85,28 @@ export function ToolTags({toolNames}: ToolTagsProps) {
         </Tag>
       ))}
       {hiddenCount > 0 && !expanded && (
-        <ToggleButtonWrapper ref={toggleButtonRef}>
-          <ToggleButton
-            variant="link"
-            size="xs"
-            onClick={() => setExpanded(prev => !prev)}
-          >
+        <Flex
+          ref={toggleButtonRef}
+          align="center"
+          position="absolute"
+          right="0"
+          bottom="4px"
+          height="22px"
+          background="primary"
+          paddingLeft="sm"
+        >
+          <Button variant="link" size="xs" onClick={() => setExpanded(prev => !prev)}>
             {t('+%s more', hiddenCount)}
-          </ToggleButton>
-        </ToggleButtonWrapper>
+          </Button>
+        </Flex>
       )}
       {expanded && (
-        <ToggleButton variant="link" size="xs" onClick={() => setExpanded(prev => !prev)}>
-          {t('Show less')}
-        </ToggleButton>
+        <Container flexShrink={0}>
+          <Button variant="link" size="xs" onClick={() => setExpanded(prev => !prev)}>
+            {t('Show less')}
+          </Button>
+        </Container>
       )}
-    </ToolTagsContainer>
+    </Flex>
   );
 }
-
-const ToolTagsContainer = styled(Flex)<{expanded: boolean}>`
-  align-items: center;
-  flex-direction: row;
-  gap: ${p => p.theme.space.sm};
-  flex-wrap: wrap;
-  overflow: hidden;
-  position: relative;
-  max-height: ${p => (p.expanded ? '500px' : `${TWO_ROW_HEIGHT}px`)};
-  transition: max-height 0.2s ease-in-out;
-`;
-
-const ToggleButtonWrapper = styled('div')`
-  position: absolute;
-  right: 0;
-  bottom: 4px;
-  display: flex;
-  align-items: center;
-  height: 22px;
-  background: ${p => p.theme.tokens.background.primary};
-  padding-left: ${p => p.theme.space.sm};
-`;
-
-const ToggleButton = styled(Button)`
-  flex-shrink: 0;
-`;
diff --git a/static/app/views/explore/hooks/useAttributeBreakdownsTooltip.tsx b/static/app/views/explore/hooks/useAttributeBreakdownsTooltip.tsx
index 011b06e0ed7ec0..7c2b462142a9fb 100644
--- a/static/app/views/explore/hooks/useAttributeBreakdownsTooltip.tsx
+++ b/static/app/views/explore/hooks/useAttributeBreakdownsTooltip.tsx
@@ -91,7 +91,9 @@ export function useAttributeBreakdownsTooltip({
   // - Sets up the listener for clicks anywhere on the chart to toggle the frozen tooltip state.
   useEffect(() => {
     const chartInstance = chartRef.current?.getEchartsInstance();
-    if (!chartInstance) return;
+    if (!chartInstance) {
+      return;
+    }
 
     if (frozenPosition) {
       chartInstance.dispatchAction({
@@ -146,7 +148,9 @@ export function useAttributeBreakdownsTooltip({
   // This effect sets up the on click listeners for the tooltip actions.
   // e-charts tooltips do not support actions out of the box, so we need to handle them manually.
   useEffect(() => {
-    if (!frozenPosition) return;
+    if (!frozenPosition) {
+      return;
+    }
 
     const handleClickActions = (event: MouseEvent) => {
       event.preventDefault();
diff --git a/static/app/views/explore/hooks/useFilteredRankedAttributes.ts b/static/app/views/explore/hooks/useFilteredRankedAttributes.ts
index 64d59267f7acb2..1c08c08700d7d7 100644
--- a/static/app/views/explore/hooks/useFilteredRankedAttributes.ts
+++ b/static/app/views/explore/hooks/useFilteredRankedAttributes.ts
@@ -31,9 +31,15 @@ export function useFilteredRankedAttributes({
     return [...filtered].sort((a, b) => {
       const aOrder = a.order.rrr;
       const bOrder = b.order.rrr;
-      if (aOrder === null && bOrder === null) return 0;
-      if (aOrder === null) return 1;
-      if (bOrder === null) return -1;
+      if (aOrder === null && bOrder === null) {
+        return 0;
+      }
+      if (aOrder === null) {
+        return 1;
+      }
+      if (bOrder === null) {
+        return -1;
+      }
       return aOrder - bOrder;
     });
   }, [rankedAttributes, searchQuery]);
diff --git a/static/app/views/explore/hooks/useGroupByFields.tsx b/static/app/views/explore/hooks/useGroupByFields.tsx
index 38e2a1c6956abb..b6abdc891ec502 100644
--- a/static/app/views/explore/hooks/useGroupByFields.tsx
+++ b/static/app/views/explore/hooks/useGroupByFields.tsx
@@ -43,7 +43,9 @@ export function useGroupByFields({
       extraColumnKind: FieldKind.TAG,
     })
       .filter(option => {
-        if (seen.has(option.value)) return false;
+        if (seen.has(option.value)) {
+          return false;
+        }
         seen.add(option.value);
         return true;
       })
diff --git a/static/app/views/explore/hooks/useTraceExploreAiQuerySetup.tsx b/static/app/views/explore/hooks/useTraceExploreAiQuerySetup.tsx
index 1d602c83875a65..988aa2e860b9ca 100644
--- a/static/app/views/explore/hooks/useTraceExploreAiQuerySetup.tsx
+++ b/static/app/views/explore/hooks/useTraceExploreAiQuerySetup.tsx
@@ -24,7 +24,9 @@ export function useTraceExploreAiQuerySetup({
   const memberProjects = projects.filter(p => p.isMember);
 
   useEffect(() => {
-    if (!enableAISearch) return;
+    if (!enableAISearch) {
+      return;
+    }
 
     const selectedProjects =
       pageFilters.selection.projects &&
@@ -40,7 +42,9 @@ export function useTraceExploreAiQuerySetup({
       const projectsChanged =
         prevSet.size !== currentSet.size || ![...prevSet].every(id => currentSet.has(id));
 
-      if (!projectsChanged) return;
+      if (!projectsChanged) {
+        return;
+      }
     }
 
     previousProjects.current = selectedProjects.map(Number);
diff --git a/static/app/views/explore/hooks/useVisualizeFields.tsx b/static/app/views/explore/hooks/useVisualizeFields.tsx
index 180bc918b8ecbb..54a197af3e4dbc 100644
--- a/static/app/views/explore/hooks/useVisualizeFields.tsx
+++ b/static/app/views/explore/hooks/useVisualizeFields.tsx
@@ -64,7 +64,9 @@ export function useVisualizeFields({
       .filter(option => {
         // Filtering by value here, so it's based off of explicit tags i.e. `key`
         // or `tags[<key>, <boolean | number | string>]
-        if (seen.has(option.value)) return false;
+        if (seen.has(option.value)) {
+          return false;
+        }
         seen.add(option.value);
         return true;
       })
diff --git a/static/app/views/explore/logs/exports/generateLogExportRowCountOptions.ts b/static/app/views/explore/logs/exports/generateLogExportRowCountOptions.ts
index 97fb5fa4a64893..10c56ed6654e0e 100644
--- a/static/app/views/explore/logs/exports/generateLogExportRowCountOptions.ts
+++ b/static/app/views/explore/logs/exports/generateLogExportRowCountOptions.ts
@@ -16,8 +16,6 @@ const ROW_COUNT_VALUES = [
   ROW_COUNT_VALUE_DEFAULT,
   ROW_COUNT_VALUE_SYNC_LIMIT,
   10_000,
-  50_000,
-  100_000,
 ];
 
 export function generateLogExportRowCountOptions(estimatedRowCount: number) {
diff --git a/static/app/views/explore/logs/logsTab.tsx b/static/app/views/explore/logs/logsTab.tsx
index fb02b65a6898f2..71e5c5b7b16d45 100644
--- a/static/app/views/explore/logs/logsTab.tsx
+++ b/static/app/views/explore/logs/logsTab.tsx
@@ -539,7 +539,6 @@ function LogsTabContentInner({datePageFilterProps}: LogsTabProps) {
               {tableTab === 'logs' ? (
                 <LogsInfiniteTable
                   analyticsPageSource={LogsAnalyticsPageSource.EXPLORE_LOGS}
-                  expanded
                   booleanAttributes={booleanAttributes}
                   stringAttributes={stringAttributes}
                   numberAttributes={numberAttributes}
diff --git a/static/app/views/explore/logs/logsTabSeerComboBox.tsx b/static/app/views/explore/logs/logsTabSeerComboBox.tsx
index 557e1114232e95..a011615f242ca1 100644
--- a/static/app/views/explore/logs/logsTabSeerComboBox.tsx
+++ b/static/app/views/explore/logs/logsTabSeerComboBox.tsx
@@ -137,7 +137,9 @@ export function LogsTabSeerComboBox() {
 
   const applySeerSearchQuery = useCallback(
     (result: AskSeerSearchQuery, runId?: number) => {
-      if (!result) return;
+      if (!result) {
+        return;
+      }
       const {
         query: queryToUse,
         groupBys,
diff --git a/static/app/views/explore/logs/logsToolbar.tsx b/static/app/views/explore/logs/logsToolbar.tsx
index 7475d6523cf7f0..ca2b048c8ac33b 100644
--- a/static/app/views/explore/logs/logsToolbar.tsx
+++ b/static/app/views/explore/logs/logsToolbar.tsx
@@ -274,7 +274,9 @@ function VisualizeDropdown({
           .filter(option => {
             // Filtering by value here, so it's based off of explicit tags i.e. `key`
             // or `tags[<key>, <boolean | number | string>]
-            if (seen.has(option.value)) return false;
+            if (seen.has(option.value)) {
+              return false;
+            }
             seen.add(option.value);
             return true;
           })
diff --git a/static/app/views/explore/logs/styles.tsx b/static/app/views/explore/logs/styles.tsx
index 8f695a5878de7c..2ada936b13af93 100644
--- a/static/app/views/explore/logs/styles.tsx
+++ b/static/app/views/explore/logs/styles.tsx
@@ -163,7 +163,6 @@ export const LogTable = styled(ContentsTable)<{minWidth: string}>`
 
 export const LogTableBody = styled(TableBody)<{
   disableBodyPadding?: boolean;
-  expanded?: boolean;
   showHeader?: boolean;
 }>`
   ${p =>
@@ -181,15 +180,6 @@ export const LogTableBody = styled(TableBody)<{
 
   /* If a parent renderer bails out, the element might default to 0px: which causes Tanstack Virtual to stay at 0. */
   min-height: 1px;
-
-  ${p =>
-    p.expanded === undefined
-      ? ''
-      : `
-    overflow-y: auto;
-    flex: 1;
-    min-height: 0;
-    `}
 `;
 
 export const LogDetailTableBodyCell = styled(TableBodyCell)`
diff --git a/static/app/views/explore/logs/tables/logsInfiniteTable.tsx b/static/app/views/explore/logs/tables/logsInfiniteTable.tsx
index 322328bd2590a1..1ee096a891ee73 100644
--- a/static/app/views/explore/logs/tables/logsInfiniteTable.tsx
+++ b/static/app/views/explore/logs/tables/logsInfiniteTable.tsx
@@ -12,7 +12,7 @@ import {
 import styled from '@emotion/styled';
 import * as Sentry from '@sentry/react';
 import type {Virtualizer} from '@tanstack/react-virtual';
-import {useVirtualizer, useWindowVirtualizer} from '@tanstack/react-virtual';
+import {useVirtualizer} from '@tanstack/react-virtual';
 
 import {Button} from '@sentry/scraps/button';
 import {Flex, Stack} from '@sentry/scraps/layout';
@@ -104,7 +104,6 @@ type LogsTableProps = {
     showVerticalScrollbar?: boolean;
   };
   emptyRenderer?: () => React.ReactNode;
-  expanded?: boolean;
   localOnlyItemFilters?: {
     filterText: string;
     filteredItems: OurLogsResponseItem[];
@@ -121,7 +120,6 @@ const LOGS_GRID_SCROLL_PIXEL_REVERSE_THRESHOLD = LOGS_GRID_BODY_ROW_HEIGHT * 2;
 
 export function LogsInfiniteTable({
   embedded = false,
-  expanded,
   localOnlyItemFilters,
   emptyRenderer,
   analyticsPageSource,
@@ -276,29 +274,17 @@ export function LogsInfiniteTable({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [searchString, localOnlyItemFilters?.filterText]);
 
-  const isContainedVirtualizer = expanded !== undefined;
-
-  const windowVirtualizer = useWindowVirtualizer({
-    count: isContainedVirtualizer ? 0 : (data?.length ?? 0),
-    estimateSize,
-    overscan: 50,
-    getItemKey: (index: number) => data?.[index]?.[OurLogKnownFieldKey.ID] ?? index,
-    scrollMargin: tableBodyRef.current?.offsetTop ?? 0,
-  });
-
-  const containerVirtualizer = useVirtualizer<HTMLElement, Element>({
-    count: isContainedVirtualizer ? (data?.length ?? 0) : 0,
+  const virtualizer = useVirtualizer<HTMLElement, Element>({
+    count: data?.length ?? 0,
     estimateSize,
-    overscan: expanded ? 50 : 25,
+    overscan: 35,
     getScrollElement: () => tableBodyRef?.current,
     getItemKey: (index: number) => data?.[index]?.[OurLogKnownFieldKey.ID] ?? index,
   });
 
-  const virtualizer = isContainedVirtualizer ? containerVirtualizer : windowVirtualizer;
-
   useLayoutEffect(() => {
     virtualizer.measure();
-  }, [expanded, virtualizer]);
+  }, [virtualizer]);
 
   const virtualItems = virtualizer.getVirtualItems();
 
@@ -544,7 +530,6 @@ export function LogsInfiniteTable({
           showHeader={!embedded}
           ref={tableBodyRef}
           disableBodyPadding={embeddedStyling?.disableBodyPadding}
-          expanded={expanded}
         >
           {paddingTop > 0 && (
             <TableRow>
@@ -625,7 +610,7 @@ export function LogsInfiniteTable({
         </LogTableBody>
       </LogTable>
       <FloatingBackToTopContainer
-        position={expanded === undefined ? 'fixed' : 'absolute'}
+        position="absolute"
         inReplay={!!embeddedOptions?.replay}
         tableWidth={tableWidth}
       >
diff --git a/static/app/views/explore/metrics/hooks/useSortableMetricQueries.tsx b/static/app/views/explore/metrics/hooks/useSortableMetricQueries.tsx
index 3113fb68b4b1ac..75be6f798313be 100644
--- a/static/app/views/explore/metrics/hooks/useSortableMetricQueries.tsx
+++ b/static/app/views/explore/metrics/hooks/useSortableMetricQueries.tsx
@@ -53,7 +53,9 @@ export function useSortableMetricQueries({
         const oldIndex = sortableItems.find(({id}) => id === active.id)?.index;
         const newIndex = sortableItems.find(({id}) => id === over?.id)?.index;
 
-        if (oldIndex === undefined || newIndex === undefined) return;
+        if (oldIndex === undefined || newIndex === undefined) {
+          return;
+        }
 
         reorderMetricQueries(
           arrayMove([...metricQueries], oldIndex, newIndex),
diff --git a/static/app/views/explore/metrics/metricsTabSeerComboBox.tsx b/static/app/views/explore/metrics/metricsTabSeerComboBox.tsx
index 5915b0fcabb030..442acdded38c6d 100644
--- a/static/app/views/explore/metrics/metricsTabSeerComboBox.tsx
+++ b/static/app/views/explore/metrics/metricsTabSeerComboBox.tsx
@@ -172,7 +172,9 @@ export function MetricsTabSeerComboBox({traceMetric}: MetricsTabSeerComboBoxProp
 
   const applySeerSearchQuery = useCallback(
     (result: AskSeerSearchQuery, runId?: number) => {
-      if (!result) return;
+      if (!result) {
+        return;
+      }
       const {
         query: queryToUse,
         groupBys,
diff --git a/static/app/views/explore/replays/detail/ourlogs/index.tsx b/static/app/views/explore/replays/detail/ourlogs/index.tsx
index 919b7ec6f37fdd..4c465a43a26af5 100644
--- a/static/app/views/explore/replays/detail/ourlogs/index.tsx
+++ b/static/app/views/explore/replays/detail/ourlogs/index.tsx
@@ -132,7 +132,6 @@ function OurLogsContent({replayId, startTimestampMs}: OurLogsContentProps) {
             allowPagination
             embedded
             embeddedOptions={embeddedOptions}
-            expanded
             localOnlyItemFilters={{
               filteredItems: filteredLogItems,
               filterText: filterProps.searchTerm,
diff --git a/static/app/views/explore/spans/charts/index.tsx b/static/app/views/explore/spans/charts/index.tsx
index 5e0897d7b40210..dbb8968e0e03f4 100644
--- a/static/app/views/explore/spans/charts/index.tsx
+++ b/static/app/views/explore/spans/charts/index.tsx
@@ -281,7 +281,9 @@ function Chart({
                   }
                 },
                 onInsideSelectionClick: params => {
-                  if (!params.selectionState) return;
+                  if (!params.selectionState) {
+                    return;
+                  }
 
                   params.setSelectionState({
                     ...params.selectionState,
@@ -289,7 +291,9 @@ function Chart({
                   });
                 },
                 onOutsideSelectionClick: params => {
-                  if (!params.selectionState?.isActionMenuVisible) return;
+                  if (!params.selectionState?.isActionMenuVisible) {
+                    return;
+                  }
 
                   params.setSelectionState({
                     ...params.selectionState,
diff --git a/static/app/views/explore/spans/crossEvents/crossEventMetricsSearchBar.tsx b/static/app/views/explore/spans/crossEvents/crossEventMetricsSearchBar.tsx
index e05dc73cac1c17..845233eaff98ca 100644
--- a/static/app/views/explore/spans/crossEvents/crossEventMetricsSearchBar.tsx
+++ b/static/app/views/explore/spans/crossEvents/crossEventMetricsSearchBar.tsx
@@ -64,10 +64,14 @@ export const SpansTabCrossEventMetricsSearchBar = memo(
 
     const onMetricChange = useCallback(
       (newMetric: TraceMetric) => {
-        if (!crossEvents) return;
+        if (!crossEvents) {
+          return;
+        }
         setCrossEvents?.(
           crossEvents.map((c, i) => {
-            if (i === index) return {type: 'metrics', query, metric: newMetric};
+            if (i === index) {
+              return {type: 'metrics', query, metric: newMetric};
+            }
             return c;
           })
         );
@@ -81,10 +85,14 @@ export const SpansTabCrossEventMetricsSearchBar = memo(
       () => ({
         initialQuery: query,
         onSearch: (newQuery: string) => {
-          if (!crossEvents) return;
+          if (!crossEvents) {
+            return;
+          }
           setCrossEvents?.(
             crossEvents.map((c, i) => {
-              if (i === index) return {type: 'metrics', query: newQuery, metric};
+              if (i === index) {
+                return {type: 'metrics', query: newQuery, metric};
+              }
               return c;
             })
           );
diff --git a/static/app/views/explore/spans/crossEvents/crossEventSearchBar.tsx b/static/app/views/explore/spans/crossEvents/crossEventSearchBar.tsx
index dc544af1e1cd07..7951ff6a5400d1 100644
--- a/static/app/views/explore/spans/crossEvents/crossEventSearchBar.tsx
+++ b/static/app/views/explore/spans/crossEvents/crossEventSearchBar.tsx
@@ -50,11 +50,15 @@ export const SpansTabCrossEventSearchBar = memo(
       () => ({
         initialQuery: query,
         onSearch: (newQuery: string) => {
-          if (!crossEvents) return;
+          if (!crossEvents) {
+            return;
+          }
 
           setCrossEvents?.(
             crossEvents.map((c, i) => {
-              if (i === index) return {query: newQuery, type};
+              if (i === index) {
+                return {query: newQuery, type};
+              }
               return c;
             })
           );
diff --git a/static/app/views/explore/spans/crossEvents/crossEventSearchBars.tsx b/static/app/views/explore/spans/crossEvents/crossEventSearchBars.tsx
index e7194c61586c48..a048d923909f92 100644
--- a/static/app/views/explore/spans/crossEvents/crossEventSearchBars.tsx
+++ b/static/app/views/explore/spans/crossEvents/crossEventSearchBars.tsx
@@ -102,7 +102,9 @@ export function SpansTabCrossEventSearchBars({
               )}
               options={getCrossEventDatasetOptions(crossEventDatasetAvailability)}
               onChange={({value: newValue}) => {
-                if (!isCrossEventType(newValue)) return;
+                if (!isCrossEventType(newValue)) {
+                  return;
+                }
 
                 trackAnalytics('trace.explorer.cross_event_changed', {
                   organization,
@@ -112,7 +114,9 @@ export function SpansTabCrossEventSearchBars({
 
                 setCrossEvents(
                   crossEvents.map((c, i) => {
-                    if (i === index) return makeCrossEvent(newValue);
+                    if (i === index) {
+                      return makeCrossEvent(newValue);
+                    }
                     return c;
                   })
                 );
diff --git a/static/app/views/explore/spans/spansTabSeerComboBox.tsx b/static/app/views/explore/spans/spansTabSeerComboBox.tsx
index cf47b47ba701bb..5b0ba14570dbea 100644
--- a/static/app/views/explore/spans/spansTabSeerComboBox.tsx
+++ b/static/app/views/explore/spans/spansTabSeerComboBox.tsx
@@ -191,7 +191,9 @@ export function SpansTabSeerComboBox() {
 
   const applySeerSearchQuery = useCallback(
     (result: AskSeerSearchQuery, runId?: number) => {
-      if (!result) return;
+      if (!result) {
+        return;
+      }
       const {
         query: queryToUse,
         visualizations,
diff --git a/static/app/views/explore/tables/aggregateColumnEditorModal.tsx b/static/app/views/explore/tables/aggregateColumnEditorModal.tsx
index 53b39c7f89ee2b..fde9b71274c769 100644
--- a/static/app/views/explore/tables/aggregateColumnEditorModal.tsx
+++ b/static/app/views/explore/tables/aggregateColumnEditorModal.tsx
@@ -340,10 +340,14 @@ function GroupBySelector({
   // synchronously while the user types. Merge in any server-only matches once
   // the debounced search returns.
   const options = useMemo(() => {
-    if (!hasSearch || searchedOptions.length === 0) return baseOptions;
+    if (!hasSearch || searchedOptions.length === 0) {
+      return baseOptions;
+    }
     const baseValues = new Set(baseOptions.map(o => o.value));
     const additions = searchedOptions.filter(o => !baseValues.has(o.value));
-    if (additions.length === 0) return baseOptions;
+    if (additions.length === 0) {
+      return baseOptions;
+    }
     return [...baseOptions, ...additions];
   }, [hasSearch, baseOptions, searchedOptions]);
 
@@ -583,10 +587,14 @@ function AttributeArgumentSelect({
   // synchronously while the user types. Merge in any server-only matches once
   // the debounced search returns.
   const options = useMemo(() => {
-    if (!hasSearch || searchedOptions.length === 0) return baseOptions;
+    if (!hasSearch || searchedOptions.length === 0) {
+      return baseOptions;
+    }
     const baseValues = new Set(baseOptions.map(o => o.value));
     const additions = searchedOptions.filter(o => !baseValues.has(o.value));
-    if (additions.length === 0) return baseOptions;
+    if (additions.length === 0) {
+      return baseOptions;
+    }
     return [...baseOptions, ...additions];
   }, [hasSearch, baseOptions, searchedOptions]);
 
@@ -644,12 +652,19 @@ type AttributeKind = 'string' | 'number' | 'boolean';
 function getSupportedAttributeKinds(
   functionName: string | undefined
 ): readonly AttributeKind[] {
-  if (!functionName) return ['number'];
+  if (!functionName) {
+    return ['number'];
+  }
   // COUNT renders a fixed SPAN_DURATION option and ignores tag collections.
-  if (functionName === AggregationKey.COUNT) return [];
-  if (NO_ARGUMENT_SPAN_AGGREGATES.includes(functionName as AggregationKey)) return [];
-  if (functionName === AggregationKey.COUNT_UNIQUE)
+  if (functionName === AggregationKey.COUNT) {
+    return [];
+  }
+  if (NO_ARGUMENT_SPAN_AGGREGATES.includes(functionName as AggregationKey)) {
+    return [];
+  }
+  if (functionName === AggregationKey.COUNT_UNIQUE) {
     return ['string', 'number', 'boolean'];
+  }
   return ['number'];
 }
 
diff --git a/static/app/views/explore/tables/columnEditorModal.tsx b/static/app/views/explore/tables/columnEditorModal.tsx
index 0b27d64626ef24..19b5ab51badaeb 100644
--- a/static/app/views/explore/tables/columnEditorModal.tsx
+++ b/static/app/views/explore/tables/columnEditorModal.tsx
@@ -230,7 +230,9 @@ function ColumnEditorRow({
   // returns, merge in any attributes baseOptions doesn't already cover so the
   // user can still pick keys that weren't in the initial fetch.
   const options = useMemo(() => {
-    if (!hasSearch) return baseOptions;
+    if (!hasSearch) {
+      return baseOptions;
+    }
     const searched = buildColumnOptions({
       columns: [],
       stringTags: searchedStringTags,
@@ -239,10 +241,14 @@ function ColumnEditorRow({
       hiddenKeys,
       traceItemType,
     });
-    if (searched.length === 0) return baseOptions;
+    if (searched.length === 0) {
+      return baseOptions;
+    }
     const baseValues = new Set(baseOptions.map(o => o.value));
     const additions = searched.filter(o => !baseValues.has(o.value));
-    if (additions.length === 0) return baseOptions;
+    if (additions.length === 0) {
+      return baseOptions;
+    }
     return [...baseOptions, ...additions];
   }, [
     hasSearch,
@@ -365,8 +371,12 @@ function buildColumnOptions({
   })
     .filter(option => {
       const hidden = hiddenKeys ?? [];
-      if (hidden.includes(option.value)) return false;
-      if (typeof option.label === 'string' && hidden.includes(option.label)) return false;
+      if (hidden.includes(option.value)) {
+        return false;
+      }
+      if (typeof option.label === 'string' && hidden.includes(option.label)) {
+        return false;
+      }
       return true;
     })
     .toSorted((a, b) => sortKnownAttributes(a, b, traceItemType));
diff --git a/static/app/views/explore/utils/sortSearchedAttributes.tsx b/static/app/views/explore/utils/sortSearchedAttributes.tsx
index d3d758954fba03..52826d71e5c635 100644
--- a/static/app/views/explore/utils/sortSearchedAttributes.tsx
+++ b/static/app/views/explore/utils/sortSearchedAttributes.tsx
@@ -93,7 +93,9 @@ export function sortKnownAttributes<Value extends SelectOption<string>>(
     getFieldDefinition(a.value, getFieldDefinitionType(traceItemType)) !== null;
   const bKnown =
     getFieldDefinition(b.value, getFieldDefinitionType(traceItemType)) !== null;
-  if (aKnown !== bKnown) return aKnown ? -1 : 1;
+  if (aKnown !== bKnown) {
+    return aKnown ? -1 : 1;
+  }
   const aLabel = typeof a.label === 'string' ? a.label : (a.textValue ?? '');
   const bLabel = typeof b.label === 'string' ? b.label : (b.textValue ?? '');
   return aLabel.localeCompare(bLabel);
diff --git a/static/app/views/insights/pages/agents/components/aiSpanList.tsx b/static/app/views/insights/pages/agents/components/aiSpanList.tsx
index 59f364795e6120..1343f99208071d 100644
--- a/static/app/views/insights/pages/agents/components/aiSpanList.tsx
+++ b/static/app/views/insights/pages/agents/components/aiSpanList.tsx
@@ -48,14 +48,17 @@ function getNodeTimeBounds(node: AITraceSpanNode | AITraceSpanNode[]) {
     startTime = totalStartAndEndTime.startTime;
     endTime = totalStartAndEndTime.endTime;
   } else {
-    if (!node.startTimestamp || !node.endTimestamp)
+    if (!node.startTimestamp || !node.endTimestamp) {
       return {startTime: 0, endTime: 0, duration: 0};
+    }
 
     startTime = node.startTimestamp;
     endTime = node.endTimestamp;
   }
 
-  if (endTime === 0) return {startTime: 0, endTime: 0, duration: 0};
+  if (endTime === 0) {
+    return {startTime: 0, endTime: 0, duration: 0};
+  }
 
   return {
     startTime,
@@ -379,7 +382,9 @@ function calculateRelativeTiming(
   traceBounds: TraceBounds,
   compressedStartByNodeId?: Map<string, number>
 ): {leftPercent: number; widthPercent: number} {
-  if (!node.value) return {leftPercent: 0, widthPercent: 0};
+  if (!node.value) {
+    return {leftPercent: 0, widthPercent: 0};
+  }
 
   let startTime: number, endTime: number;
 
@@ -390,7 +395,9 @@ function calculateRelativeTiming(
     return {leftPercent: 0, widthPercent: 0};
   }
 
-  if (traceBounds.duration === 0) return {leftPercent: 0, widthPercent: 0};
+  if (traceBounds.duration === 0) {
+    return {leftPercent: 0, widthPercent: 0};
+  }
 
   // Look up the pre-computed compressed start time for this node.
   // The span duration stays the same - only gaps between spans are compressed.
diff --git a/static/app/views/insights/pages/agents/components/tracesTable.tsx b/static/app/views/insights/pages/agents/components/tracesTable.tsx
index 6b7d43bba484b9..0db6a66986db9b 100644
--- a/static/app/views/insights/pages/agents/components/tracesTable.tsx
+++ b/static/app/views/insights/pages/agents/components/tracesTable.tsx
@@ -449,12 +449,16 @@ function AgentTags({agents}: {agents: string[]}) {
   const handleShowAll = () => {
     setShowAll(!showAll);
 
-    if (!containerRef.current) return;
+    if (!containerRef.current) {
+      return;
+    }
     // While the all tags are visible, observe the container to see if it displays more than one line (22px)
     // so we can reset the show all state accordingly
     const observer = new ResizeObserver(entries => {
       const containerElement = entries[0]?.target;
-      if (!containerElement || containerElement.clientHeight > 22) return;
+      if (!containerElement || containerElement.clientHeight > 22) {
+        return;
+      }
       setShowToggle(false);
       setShowAll(false);
       resizeObserverRef.current?.disconnect();
diff --git a/static/app/views/issueDetails/streamline/sidebar/participantList.tsx b/static/app/views/issueDetails/streamline/sidebar/participantList.tsx
index 341d3d4b1a137c..bb5680f821d6fc 100644
--- a/static/app/views/issueDetails/streamline/sidebar/participantList.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/participantList.tsx
@@ -4,6 +4,7 @@ import styled from '@emotion/styled';
 
 import {AvatarList, TeamAvatar, UserAvatar} from '@sentry/scraps/avatar';
 import {Button} from '@sentry/scraps/button';
+import {Flex} from '@sentry/scraps/layout';
 
 import {DateTime} from 'sentry/components/dateTime';
 import {Overlay, PositionWrapper} from 'sentry/components/overlay';
@@ -30,7 +31,7 @@ export function ParticipantList({users, teams, hideTimestamp}: DropdownListProps
   const showHeaders = users.length > 0 && teams && teams.length > 0;
 
   return (
-    <div>
+    <Flex>
       <Button variant="transparent" size="zero" {...triggerProps}>
         <StyledAvatarList
           teams={teams}
@@ -87,7 +88,7 @@ export function ParticipantList({users, teams, hideTimestamp}: DropdownListProps
           </StyledOverlay>
         </PositionWrapper>
       )}
-    </div>
+    </Flex>
   );
 }
 
diff --git a/static/app/views/issueDetails/streamline/sidebar/peopleSection.tsx b/static/app/views/issueDetails/streamline/sidebar/peopleSection.tsx
index bb18e446037323..de0d38a39f81c5 100644
--- a/static/app/views/issueDetails/streamline/sidebar/peopleSection.tsx
+++ b/static/app/views/issueDetails/streamline/sidebar/peopleSection.tsx
@@ -26,22 +26,24 @@ export function PeopleSection({
       title={<Title>{t('People')}</Title>}
       sectionKey={SectionKey.PEOPLE}
     >
-      {hasParticipants && (
-        <Flex gap="xs" align="center">
-          <ParticipantList
-            users={userParticipants}
-            teams={teamParticipants}
-            hideTimestamp
-          />
-          {t('participating')}
-        </Flex>
-      )}
-      {hasViewers && (
-        <Flex gap="xs" align="center">
-          <ParticipantList users={viewers} />
-          {t('viewed')}
-        </Flex>
-      )}
+      <Flex direction="column" gap="md">
+        {hasParticipants && (
+          <Flex gap="xs" align="center">
+            <ParticipantList
+              users={userParticipants}
+              teams={teamParticipants}
+              hideTimestamp
+            />
+            {t('participating')}
+          </Flex>
+        )}
+        {hasViewers && (
+          <Flex gap="xs" align="center">
+            <ParticipantList users={viewers} />
+            {t('viewed')}
+          </Flex>
+        )}
+      </Flex>
     </SidebarFoldSection>
   );
 }
diff --git a/static/app/views/issueList/issueListCommandPaletteActions.tsx b/static/app/views/issueList/issueListCommandPaletteActions.tsx
index 4005bc879d7421..63108087078693 100644
--- a/static/app/views/issueList/issueListCommandPaletteActions.tsx
+++ b/static/app/views/issueList/issueListCommandPaletteActions.tsx
@@ -65,8 +65,12 @@ interface IssueListCommandPaletteActionsProps {
  * child items under header groups).
  */
 function getTagValueStrings(tag: Tag): string[] {
-  if (!tag.values?.length) return [];
-  if (typeof tag.values[0] === 'string') return tag.values as string[];
+  if (!tag.values?.length) {
+    return [];
+  }
+  if (typeof tag.values[0] === 'string') {
+    return tag.values as string[];
+  }
 
   const groups = tag.values as SearchGroup[];
   return groups.flatMap(group => {
diff --git a/static/app/views/navigation/mobileNavigation.tsx b/static/app/views/navigation/mobileNavigation.tsx
index c10edcb3de0524..a872174c4caccc 100644
--- a/static/app/views/navigation/mobileNavigation.tsx
+++ b/static/app/views/navigation/mobileNavigation.tsx
@@ -228,7 +228,9 @@ export function MobilePageFrameNavigation() {
   }, [isOpen, view]);
 
   const handleClickOutside = useCallback((e: MouseEvent | TouchEvent) => {
-    if (toggleButtonRef.current?.contains(e.target as Node)) return;
+    if (toggleButtonRef.current?.contains(e.target as Node)) {
+      return;
+    }
     setIsOpen(false);
   }, []);
 
@@ -244,7 +246,9 @@ export function MobilePageFrameNavigation() {
           <Button
             ref={toggleButtonRef}
             onClick={() => {
-              if (!isOpen) setView('expanded');
+              if (!isOpen) {
+                setView('expanded');
+              }
               setIsOpen(v => !v);
             }}
             icon={<IconMenu aria-hidden="true" />}
diff --git a/static/app/views/navigation/primary/whatsNew.tsx b/static/app/views/navigation/primary/whatsNew.tsx
index 5a86dae8e525a2..7c37cb73bc1b7f 100644
--- a/static/app/views/navigation/primary/whatsNew.tsx
+++ b/static/app/views/navigation/primary/whatsNew.tsx
@@ -215,7 +215,9 @@ export function PrimaryNavigationWhatsNew() {
   const uniqueBroadcasts = useMemo(() => {
     const seenTitles = new Set<string>();
     return allBroadcasts.filter(item => {
-      if (seenTitles.has(item.title)) return false;
+      if (seenTitles.has(item.title)) {
+        return false;
+      }
       seenTitles.add(item.title);
       return true;
     });
diff --git a/static/app/views/navigation/useCollapsedNavigation.tsx b/static/app/views/navigation/useCollapsedNavigation.tsx
index fbb88423018d4e..7f26bf6d50eb8d 100644
--- a/static/app/views/navigation/useCollapsedNavigation.tsx
+++ b/static/app/views/navigation/useCollapsedNavigation.tsx
@@ -45,7 +45,9 @@ export function useCollapsedNavigation() {
   const navigationParentRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
-    if (navigationParentRef.current) return;
+    if (navigationParentRef.current) {
+      return;
+    }
     const navigationParentEl = document.querySelector(
       'nav[aria-label="Primary Navigation"]'
     )?.parentElement;
diff --git a/static/app/views/onboarding/onboarding.tsx b/static/app/views/onboarding/onboarding.tsx
index bd121064393a7f..e1b505706e6f34 100644
--- a/static/app/views/onboarding/onboarding.tsx
+++ b/static/app/views/onboarding/onboarding.tsx
@@ -107,7 +107,9 @@ const scmOnboardingSteps: StepDescriptor[] = [
 function WelcomeVariable(props: StepProps) {
   const hasNewWelcomeUI = useHasNewWelcomeUI();
 
-  if (hasNewWelcomeUI) return <NewWelcomeUI {...props} />;
+  if (hasNewWelcomeUI) {
+    return <NewWelcomeUI {...props} />;
+  }
 
   return <TargetedOnboardingWelcome {...props} />;
 }
diff --git a/static/app/views/onboarding/scmPlatformFeatures.tsx b/static/app/views/onboarding/scmPlatformFeatures.tsx
index 9a3112df1a4e7e..e88d935652ccf1 100644
--- a/static/app/views/onboarding/scmPlatformFeatures.tsx
+++ b/static/app/views/onboarding/scmPlatformFeatures.tsx
@@ -94,7 +94,9 @@ function shouldSuggestFramework(platformKey: PlatformKey): boolean {
 }
 
 function getPlatformName(platformKey: PlatformKey | undefined) {
-  if (!platformKey) return;
+  if (!platformKey) {
+    return;
+  }
   return getPlatformInfo(platformKey)?.name;
 }
 
diff --git a/static/app/views/performance/newTraceDetails/index.tsx b/static/app/views/performance/newTraceDetails/index.tsx
index 0aad15be68092f..69d0491586752f 100644
--- a/static/app/views/performance/newTraceDetails/index.tsx
+++ b/static/app/views/performance/newTraceDetails/index.tsx
@@ -1,14 +1,14 @@
 import {useEffect, useMemo, useRef} from 'react';
-import styled from '@emotion/styled';
 import * as Sentry from '@sentry/react';
 
-import {Flex, Stack, type FlexProps} from '@sentry/scraps/layout';
+import {Flex, type FlexProps} from '@sentry/scraps/layout';
 
 import {NoProjectMessage} from 'sentry/components/noProjectMessage';
 import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle';
 import {t} from 'sentry/locale';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
+import {ViewportConstrainedPage} from 'sentry/views/explore/components/viewportConstrainedPage';
 import {useLogsPageDataQueryResult} from 'sentry/views/explore/contexts/logs/logsPageData';
 import {isLogsEnabled} from 'sentry/views/explore/logs/isLogsEnabled';
 import type {OurLogsResponseItem} from 'sentry/views/explore/logs/types';
@@ -196,7 +196,7 @@ function TraceViewImplInner({traceSlug}: {traceSlug: string}) {
       orgSlug={organization.slug}
     >
       <NoProjectMessage organization={organization}>
-        <LayoutPageWithHiddenFooter flex={1}>
+        <ViewportConstrainedPage>
           <TraceMetaDataHeader
             rootEventResults={rootEventResults}
             tree={tree}
@@ -254,7 +254,7 @@ function TraceViewImplInner({traceSlug}: {traceSlug: string}) {
               <TraceAiTab traceSlug={traceSlug} />
             ) : null}
           </TraceInnerLayout>
-        </LayoutPageWithHiddenFooter>
+        </ViewportConstrainedPage>
       </NoProjectMessage>
     </SentryDocumentTitle>
   );
@@ -262,14 +262,6 @@ function TraceViewImplInner({traceSlug}: {traceSlug: string}) {
 
 const TraceViewImpl = registerLLMContext('trace', TraceViewImplInner);
 
-// @TODO(JonasBadalic): Remove this component once the page-frame feature is GA'd
-// When that feature is enabled, the footer is no longer rendered at the bottom of the page.
-const LayoutPageWithHiddenFooter = styled(Stack)`
-  ~ footer {
-    display: none;
-  }
-`;
-
 function TraceInnerLayout(props: FlexProps) {
   const hasPageFrame = useHasPageFrameFeature();
   return (
diff --git a/static/app/views/performance/newTraceDetails/traceApi/useTrace.tsx b/static/app/views/performance/newTraceDetails/traceApi/useTrace.tsx
index f8933a449d7ea7..a1ee6225e3b5c1 100644
--- a/static/app/views/performance/newTraceDetails/traceApi/useTrace.tsx
+++ b/static/app/views/performance/newTraceDetails/traceApi/useTrace.tsx
@@ -378,7 +378,9 @@ export function useTrace(options: UseTraceOptions): TraceQueryResult {
     }
   );
 
-  if (isDemoMode) return demoTrace;
+  if (isDemoMode) {
+    return demoTrace;
+  }
   if (isEAPEnabled) {
     return isInitialEAPTraceEmpty && canRetryWithWiderPeriod
       ? eapTraceFallbackQuery
diff --git a/static/app/views/performance/newTraceDetails/traceApi/useTraceMeta.tsx b/static/app/views/performance/newTraceDetails/traceApi/useTraceMeta.tsx
index c3c07d6cc467e6..2fdb2e046cc0cb 100644
--- a/static/app/views/performance/newTraceDetails/traceApi/useTraceMeta.tsx
+++ b/static/app/views/performance/newTraceDetails/traceApi/useTraceMeta.tsx
@@ -71,53 +71,75 @@ type MetaArg = TraceMeta | EAPTraceMeta | null | undefined;
 type ResponseMetaArg = ResponseTraceMeta | ResponseEAPTraceMeta | null | undefined;
 
 function isEAPTraceMeta(meta: MetaArg): meta is EAPTraceMeta {
-  if (!meta) return false;
+  if (!meta) {
+    return false;
+  }
   return 'uptimeCount' in meta && !('transactions' in meta);
 }
 
 function isResponseEAPTraceMeta(meta: ResponseMetaArg): meta is ResponseEAPTraceMeta {
-  if (!meta) return false;
+  if (!meta) {
+    return false;
+  }
   return 'spansCount' in meta;
 }
 
 export function getTraceMetaErrorCount(meta: MetaArg) {
-  if (!meta) return;
+  if (!meta) {
+    return;
+  }
   return isEAPTraceMeta(meta) ? meta.errorsCount : meta.errors;
 }
 
 export function getTraceMetaPerformanceIssueCount(meta: MetaArg) {
-  if (!meta) return;
+  if (!meta) {
+    return;
+  }
   return isEAPTraceMeta(meta) ? meta.performanceIssuesCount : meta.performance_issues;
 }
 
 export function getTraceMetaSpanCount(meta: MetaArg) {
-  if (!meta) return;
+  if (!meta) {
+    return;
+  }
   return isEAPTraceMeta(meta) ? meta.spansCount : meta.span_count;
 }
 
 export function getTraceMetaMetricsCount(meta: MetaArg) {
-  if (!meta) return;
+  if (!meta) {
+    return;
+  }
   return isEAPTraceMeta(meta) ? meta.metricsCount : undefined;
 }
 
 export function getTraceMetaLogsCount(meta: MetaArg) {
-  if (!meta) return;
+  if (!meta) {
+    return;
+  }
   return isEAPTraceMeta(meta) ? meta.logsCount : undefined;
 }
 
 export function getTraceMetaTransactionCount(meta: MetaArg) {
-  if (!meta) return;
+  if (!meta) {
+    return;
+  }
   return isEAPTraceMeta(meta) ? undefined : meta.transactions;
 }
 
 export function getTraceMetaUptimeCount(meta: MetaArg) {
-  if (!meta) return;
+  if (!meta) {
+    return;
+  }
   return isEAPTraceMeta(meta) ? meta.uptimeCount : undefined;
 }
 
 export function getTraceMetaAiSpanCount(meta: MetaArg) {
-  if (!meta) return;
-  if (!isEAPTraceMeta(meta)) return;
+  if (!meta) {
+    return;
+  }
+  if (!isEAPTraceMeta(meta)) {
+    return;
+  }
 
   return Object.entries(meta.spansCountMap).reduce((count, [op, opCount]) => {
     return op.startsWith('gen_ai') ? count + opCount : count;
@@ -125,7 +147,9 @@ export function getTraceMetaAiSpanCount(meta: MetaArg) {
 }
 
 export function getTraceMetaTransactionChildCountMap(meta: MetaArg) {
-  if (!meta) return;
+  if (!meta) {
+    return;
+  }
   return isEAPTraceMeta(meta)
     ? meta.transactionChildCountMap
     : meta.transaction_child_count_map;
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/attributes.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/attributes.tsx
index a6defa93a40ecb..2b8a67809b14cc 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/attributes.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/attributes.tsx
@@ -189,10 +189,15 @@ export function Attributes({
   // a JSON-encoded array. NOTE: This happens a lot because EAP doesn't support
   // array values, so SDKs often store array values as JSON-encoded strings.
   sortedAndFilteredAttributes.forEach(attribute => {
-    if (Object.hasOwn(customRenderers, attribute.name)) return;
-    if (attribute.type !== 'str') return;
-    if (!looksLikeAJSONArray(attribute.value) && !looksLikeAJSONObject(attribute.value))
+    if (Object.hasOwn(customRenderers, attribute.name)) {
       return;
+    }
+    if (attribute.type !== 'str') {
+      return;
+    }
+    if (!looksLikeAJSONArray(attribute.value) && !looksLikeAJSONObject(attribute.value)) {
+      return;
+    }
 
     customRenderers[attribute.name] = jsonRenderer;
   });
diff --git a/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/baseNode.spec.tsx b/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/baseNode.spec.tsx
index 711cf8a8ef8525..a1da23b0ba81f5 100644
--- a/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/baseNode.spec.tsx
+++ b/static/app/views/performance/newTraceDetails/traceModels/traceTreeNode/baseNode.spec.tsx
@@ -1010,7 +1010,9 @@ describe('BaseNode', () => {
 
         const visitedIds: string[] = [];
         parent.forEachChild(node => {
-          if (node.id) visitedIds.push(node.id);
+          if (node.id) {
+            visitedIds.push(node.id);
+          }
         });
 
         expect(visitedIds).toHaveLength(2);
@@ -1030,7 +1032,9 @@ describe('BaseNode', () => {
 
         const visitedIds: string[] = [];
         root.forEachChild(node => {
-          if (node.id) visitedIds.push(node.id);
+          if (node.id) {
+            visitedIds.push(node.id);
+          }
         });
 
         expect(visitedIds).toEqual(['sibling', 'level1', 'level2']);
@@ -1074,7 +1078,9 @@ describe('BaseNode', () => {
 
         const visitedIds: string[] = [];
         nodeA.forEachChild(node => {
-          if (node.id) visitedIds.push(node.id);
+          if (node.id) {
+            visitedIds.push(node.id);
+          }
         });
 
         // Should visit B but not A (A is the starting node, marked visited first)
@@ -1096,7 +1102,9 @@ describe('BaseNode', () => {
 
         const visitedIds: string[] = [];
         nodeA.forEachChild(node => {
-          if (node.id) visitedIds.push(node.id);
+          if (node.id) {
+            visitedIds.push(node.id);
+          }
         });
 
         // Should visit B and C but not A (A is the starting node, marked visited first)
diff --git a/static/app/views/performance/newTraceDetails/traceOurlogs.tsx b/static/app/views/performance/newTraceDetails/traceOurlogs.tsx
index 86566cbec127ff..f54529068e7abe 100644
--- a/static/app/views/performance/newTraceDetails/traceOurlogs.tsx
+++ b/static/app/views/performance/newTraceDetails/traceOurlogs.tsx
@@ -80,7 +80,6 @@ function LogsSectionContent() {
         <LogsInfiniteTable
           analyticsPageSource={LogsAnalyticsPageSource.TRACE_DETAILS}
           embedded
-          expanded
           showCellActions
           showExploreSimilarSpansLink
         />
diff --git a/static/app/views/preprod/buildComparison/main/insights/fileInsightDiffTable.tsx b/static/app/views/preprod/buildComparison/main/insights/fileInsightDiffTable.tsx
index f83b54627ffdfd..e07611c4a86b61 100644
--- a/static/app/views/preprod/buildComparison/main/insights/fileInsightDiffTable.tsx
+++ b/static/app/views/preprod/buildComparison/main/insights/fileInsightDiffTable.tsx
@@ -81,8 +81,12 @@ export function FileInsightItemDiffTable({fileDiffItems}: FileInsightItemDiffTab
         throw new Error(`Invalid field: ${field}`);
     }
 
-    if (aValue < bValue) return kind === 'asc' ? -1 : 1;
-    if (aValue > bValue) return kind === 'asc' ? 1 : -1;
+    if (aValue < bValue) {
+      return kind === 'asc' ? -1 : 1;
+    }
+    if (aValue > bValue) {
+      return kind === 'asc' ? 1 : -1;
+    }
     return 0;
   });
 
diff --git a/static/app/views/preprod/buildComparison/main/insights/groupInsightDiffTable.tsx b/static/app/views/preprod/buildComparison/main/insights/groupInsightDiffTable.tsx
index 290b580aeb5b17..c18bc9867ba617 100644
--- a/static/app/views/preprod/buildComparison/main/insights/groupInsightDiffTable.tsx
+++ b/static/app/views/preprod/buildComparison/main/insights/groupInsightDiffTable.tsx
@@ -84,8 +84,12 @@ export function GroupInsightItemDiffTable({
         throw new Error(`Invalid field: ${field}`);
     }
 
-    if (aValue < bValue) return kind === 'asc' ? -1 : 1;
-    if (aValue > bValue) return kind === 'asc' ? 1 : -1;
+    if (aValue < bValue) {
+      return kind === 'asc' ? -1 : 1;
+    }
+    if (aValue > bValue) {
+      return kind === 'asc' ? 1 : -1;
+    }
     return 0;
   });
 
diff --git a/static/app/views/preprod/buildComparison/main/sizeCompareItemDiffTable.tsx b/static/app/views/preprod/buildComparison/main/sizeCompareItemDiffTable.tsx
index db3a0cf63e75cb..df2cfc9cefd31f 100644
--- a/static/app/views/preprod/buildComparison/main/sizeCompareItemDiffTable.tsx
+++ b/static/app/views/preprod/buildComparison/main/sizeCompareItemDiffTable.tsx
@@ -105,8 +105,12 @@ export function SizeCompareItemDiffTable({
         throw new Error(`Invalid field: ${field}`);
     }
 
-    if (aValue < bValue) return kind === 'asc' ? -1 : 1;
-    if (aValue > bValue) return kind === 'asc' ? 1 : -1;
+    if (aValue < bValue) {
+      return kind === 'asc' ? -1 : 1;
+    }
+    if (aValue > bValue) {
+      return kind === 'asc' ? 1 : -1;
+    }
     return 0;
   });
 
diff --git a/static/app/views/preprod/components/visualizations/appSizeLegend.tsx b/static/app/views/preprod/components/visualizations/appSizeLegend.tsx
index 108b9f8be49408..2eb3048bf55079 100644
--- a/static/app/views/preprod/components/visualizations/appSizeLegend.tsx
+++ b/static/app/views/preprod/components/visualizations/appSizeLegend.tsx
@@ -100,7 +100,9 @@ export function AppSizeLegend({
 
     const resizeObserver = new ResizeObserver(entries => {
       const entry = entries[0];
-      if (!entry) return;
+      if (!entry) {
+        return;
+      }
 
       const currentWidth = entry.contentRect.width;
 
@@ -169,7 +171,9 @@ export function AppSizeLegend({
     }
   ) => {
     const categoryInfo = getCategoryInfo(categoryType);
-    if (!categoryInfo) return null;
+    if (!categoryInfo) {
+      return null;
+    }
 
     return (
       <LegendItem
diff --git a/static/app/views/preprod/snapshots/snapshots.tsx b/static/app/views/preprod/snapshots/snapshots.tsx
index 55d0afd17fba4c..3d1e321665c8a2 100644
--- a/static/app/views/preprod/snapshots/snapshots.tsx
+++ b/static/app/views/preprod/snapshots/snapshots.tsx
@@ -818,9 +818,15 @@ const DragHandle = styled('div')`
 
 function imageSearchKey(image: SnapshotImage): string {
   const parts: string[] = [];
-  if (image.display_name) parts.push(image.display_name);
-  if (image.image_file_name) parts.push(image.image_file_name);
-  if (image.group) parts.push(image.group);
+  if (image.display_name) {
+    parts.push(image.display_name);
+  }
+  if (image.image_file_name) {
+    parts.push(image.image_file_name);
+  }
+  if (image.group) {
+    parts.push(image.group);
+  }
   return parts.join('\n').toLowerCase();
 }
 
@@ -855,8 +861,12 @@ function narrowItemBySearch(
         allMatched = false;
       }
     }
-    if (kept.length === 0) return null;
-    if (allMatched) return item;
+    if (kept.length === 0) {
+      return null;
+    }
+    if (allMatched) {
+      return item;
+    }
     return {...item, pairs: kept};
   }
   const kept: SnapshotImage[] = [];
@@ -868,7 +878,11 @@ function narrowItemBySearch(
       allMatched = false;
     }
   }
-  if (kept.length === 0) return null;
-  if (allMatched) return item;
+  if (kept.length === 0) {
+    return null;
+  }
+  if (allMatched) {
+    return item;
+  }
   return {...item, images: kept};
 }
diff --git a/static/app/views/preprod/utils/treemapFiltering.ts b/static/app/views/preprod/utils/treemapFiltering.ts
index e9e2a32c0b352c..7906c52bfa8880 100644
--- a/static/app/views/preprod/utils/treemapFiltering.ts
+++ b/static/app/views/preprod/utils/treemapFiltering.ts
@@ -22,7 +22,9 @@ export function filterTreemapElement(
   const hasSearchFilter = !!ctx.term;
   const hasCategoryFilter = selectedCategories && selectedCategories.size > 0;
 
-  if (!hasSearchFilter && !hasCategoryFilter) return element;
+  if (!hasSearchFilter && !hasCategoryFilter) {
+    return element;
+  }
 
   // Root is a special case, only keep if children match.
   if (parentPath === '') {
@@ -56,7 +58,9 @@ function makeSearchCtx(searchQuery: string): SearchCtx {
 }
 
 function advancePathIdx(nodeNameLC: string, parts: string[], idx: number): number {
-  if (idx >= parts.length) return idx;
+  if (idx >= parts.length) {
+    return idx;
+  }
   return nodeNameLC.includes(parts[idx] ?? '') ? idx + 1 : idx;
 }
 
@@ -69,10 +73,16 @@ function currentNodeMatches(
   ctx: SearchCtx,
   pathIdx: number
 ): boolean {
-  if (!ctx.term) return true;
-  if (!ctx.hasPath) return nodeNameLC.includes(ctx.lcTerm);
+  if (!ctx.term) {
+    return true;
+  }
+  if (!ctx.hasPath) {
+    return nodeNameLC.includes(ctx.lcTerm);
+  }
 
-  if (pathIdx >= ctx.parts.length) return true; // already satisfied the whole path
+  if (pathIdx >= ctx.parts.length) {
+    return true;
+  } // already satisfied the whole path
   const needed = ctx.parts[pathIdx];
   return needed ? nodeNameLC.includes(needed) : false; // must advance to count as a match
 }
@@ -81,7 +91,9 @@ function categoryMatches(
   element: TreemapElement,
   selectedCategories?: Set<TreemapType>
 ): boolean {
-  if (!selectedCategories || selectedCategories.size === 0) return true;
+  if (!selectedCategories || selectedCategories.size === 0) {
+    return true;
+  }
   return selectedCategories.has(element.type);
 }
 
@@ -147,11 +159,15 @@ function filterChildren(
   pathIdx: number,
   selectedCategories?: Set<TreemapType>
 ): TreemapElement[] {
-  if (!children || children.length === 0) return [];
+  if (!children || children.length === 0) {
+    return [];
+  }
   const out: TreemapElement[] = [];
   for (const child of children) {
     const filtered = filterNode(child, ctx, pathIdx, selectedCategories);
-    if (filtered) out.push(filtered);
+    if (filtered) {
+      out.push(filtered);
+    }
   }
   return out;
 }
diff --git a/static/app/views/seerExplorer/components/chat/shared.tsx b/static/app/views/seerExplorer/components/chat/shared.tsx
index 5669504b89a700..647f130e844cb7 100644
--- a/static/app/views/seerExplorer/components/chat/shared.tsx
+++ b/static/app/views/seerExplorer/components/chat/shared.tsx
@@ -62,8 +62,12 @@ export function getBlockStatus(block: Block): BlockStatus {
     l => l.params?.is_error === true || l.params?.empty_results === true
   ).length;
 
-  if (failures === 0) return 'success';
-  if (failures === toolLinks.length) return 'failure';
+  if (failures === 0) {
+    return 'success';
+  }
+  if (failures === toolLinks.length) {
+    return 'failure';
+  }
   return 'mixed';
 }
 
@@ -86,7 +90,9 @@ function LinkifyIssueShortIds({children}: {children: string}): ReactNode {
   return (
     <Fragment>
       {parts.map((part, i) => {
-        if (!part) return null;
+        if (!part) {
+          return null;
+        }
         if (i % 2 === 1) {
           return (
             <Link key={i} to={`/issues/${part}/`}>
diff --git a/static/app/views/seerExplorer/components/drawer/explorerDrawerContent.tsx b/static/app/views/seerExplorer/components/drawer/explorerDrawerContent.tsx
index 39c8da376314e4..da7bd2ece02111 100644
--- a/static/app/views/seerExplorer/components/drawer/explorerDrawerContent.tsx
+++ b/static/app/views/seerExplorer/components/drawer/explorerDrawerContent.tsx
@@ -153,7 +153,9 @@ export function ExplorerDrawerContent({
   });
 
   const handleCopyLink = useCallback(async () => {
-    if (runId === null) return;
+    if (runId === null) {
+      return;
+    }
     try {
       const url = getExplorerUrl(runId);
       await navigator.clipboard.writeText(url);
diff --git a/static/app/views/seerExplorer/components/explorerMenu.tsx b/static/app/views/seerExplorer/components/explorerMenu.tsx
index 01b24da4506c0c..09cd7940a925af 100644
--- a/static/app/views/seerExplorer/components/explorerMenu.tsx
+++ b/static/app/views/seerExplorer/components/explorerMenu.tsx
@@ -149,7 +149,9 @@ export function useExplorerMenu({
   // Handle keyboard navigation with higher priority
   const handleKeyDown = useCallback(
     (e: KeyboardEvent) => {
-      if (!isVisible) return;
+      if (!isVisible) {
+        return;
+      }
 
       const isPrintableChar = e.key.length === 1 && !e.ctrlKey && !e.metaKey && !e.altKey;
 
diff --git a/static/app/views/seerExplorer/contexts/llmContext.spec.tsx b/static/app/views/seerExplorer/contexts/llmContext.spec.tsx
index 918a991cadd3c5..0319570ef02351 100644
--- a/static/app/views/seerExplorer/contexts/llmContext.spec.tsx
+++ b/static/app/views/seerExplorer/contexts/llmContext.spec.tsx
@@ -26,7 +26,9 @@ function makeContextCapture() {
   }
 
   function getSnapshot(componentOnly?: boolean): LLMContextSnapshot {
-    if (!ref.current) throw new Error('ContextCapture not mounted');
+    if (!ref.current) {
+      throw new Error('ContextCapture not mounted');
+    }
     return ref.current(componentOnly);
   }
 
@@ -420,7 +422,9 @@ describe('getLLMContext — full tree vs componentOnly', () => {
     // componentOnly snapshot should contain only the dashboard + its inner widget,
     // not the sibling dashboard
     await waitFor(() => {
-      if (!innerRef.current) throw new Error('not mounted');
+      if (!innerRef.current) {
+        throw new Error('not mounted');
+      }
       const snapshot = innerRef.current(true); // componentOnly
       expect(snapshot.nodes).toHaveLength(1);
       expect(snapshot.nodes[0]?.nodeType).toBe('dashboard');
diff --git a/static/app/views/seerExplorer/hooks/useAsciiSnapshot.tsx b/static/app/views/seerExplorer/hooks/useAsciiSnapshot.tsx
index 0dd0900230ed15..927bf464efde9c 100644
--- a/static/app/views/seerExplorer/hooks/useAsciiSnapshot.tsx
+++ b/static/app/views/seerExplorer/hooks/useAsciiSnapshot.tsx
@@ -51,13 +51,21 @@ export function createGridHelpers(rows: number, cols: number): GridHelpers {
   const grid = Array.from({length: rows}, () => Array.from({length: cols}, () => ' '));
 
   const setCell = (r: number, c: number, ch: string) => {
-    if (r < 0 || r >= grid.length) return;
+    if (r < 0 || r >= grid.length) {
+      return;
+    }
     const row = grid[r];
-    if (!row) return;
-    if (c < 0) return;
+    if (!row) {
+      return;
+    }
+    if (c < 0) {
+      return;
+    }
     if (c >= row.length) {
       const toAdd = c - row.length + 1;
-      for (let i = 0; i < toAdd; i++) row.push(' ');
+      for (let i = 0; i < toAdd; i++) {
+        row.push(' ');
+      }
     }
     if (row[c] === ' ') {
       row[c] = ch;
@@ -65,13 +73,21 @@ export function createGridHelpers(rows: number, cols: number): GridHelpers {
   };
 
   const writeOverlay = (r: number, c: number, text: string) => {
-    if (r < 0 || r >= grid.length) return;
+    if (r < 0 || r >= grid.length) {
+      return;
+    }
     const row = grid[r];
-    if (!row) return;
-    if (c < 0) return;
+    if (!row) {
+      return;
+    }
+    if (c < 0) {
+      return;
+    }
     if (c + text.length >= row.length) {
       const toAdd = c + text.length - row.length + 1;
-      for (let i = 0; i < toAdd; i++) row.push(' ');
+      for (let i = 0; i < toAdd; i++) {
+        row.push(' ');
+      }
     }
     for (let i = 0; i < text.length; i++) {
       row[c + i] = text.charAt(i);
@@ -79,11 +95,15 @@ export function createGridHelpers(rows: number, cols: number): GridHelpers {
   };
 
   const putText = (text: string, l: number, r: number, t: number, b: number) => {
-    if (t > b || l > r) return;
+    if (t > b || l > r) {
+      return;
+    }
     const targetRow = Math.min(Math.max(Math.floor((t + b) / 2), 0), rows - 1);
     const clean = text.replace(/\s+/g, ' ').trim();
     const row = grid[targetRow];
-    if (!row) return;
+    if (!row) {
+      return;
+    }
     const startCol = Math.max(0, l);
     for (let i = 0; i < clean.length; i++) {
       setCell(targetRow, startCol + i, clean.charAt(i));
@@ -106,7 +126,9 @@ function computeLeftShiftPx(viewportWidth: number): number {
       const rect = n.getBoundingClientRect();
       const intersects = !(rect.right <= 0 || rect.left >= viewportWidth);
       if (intersects && rect.width > 0 && rect.height > 0) {
-        if (rect.right > shift) shift = rect.right;
+        if (rect.right > shift) {
+          shift = rect.right;
+        }
       }
     }
     return Math.max(0, Math.floor(shift));
@@ -427,11 +449,15 @@ function processCharts(
 
     const instanceByDom = new Map<Element, any>();
     for (const el of candidates) {
-      if (context.isExcluded(el) || !context.isVisible(el)) continue;
+      if (context.isExcluded(el) || !context.isVisible(el)) {
+        continue;
+      }
 
       let container: Element | null = el;
       const nearest = el.closest('[data-ec], .echarts-for-react, .echarts');
-      if (nearest) container = nearest;
+      if (nearest) {
+        container = nearest;
+      }
 
       let inst: any = null;
       if (container) {
@@ -453,7 +479,9 @@ function processCharts(
     let timeseriesChartCount = 0;
     for (const [, inst] of instanceByDom) {
       const dom: Element = inst.getDom();
-      if (context.isExcluded(dom) || !context.isVisible(dom)) continue;
+      if (context.isExcluded(dom) || !context.isVisible(dom)) {
+        continue;
+      }
 
       const rect = dom.getBoundingClientRect();
       if (
@@ -467,11 +495,15 @@ function processCharts(
 
       const option = inst.getOption?.() || {};
       const series: any[] = Array.isArray(option.series) ? option.series : [];
-      if (!series.length) continue;
+      if (!series.length) {
+        continue;
+      }
 
       let hasTimeseriesData = false;
       for (const s of series) {
-        if (s?.show === false) continue;
+        if (s?.show === false) {
+          continue;
+        }
         const type = String(s?.type || '').toLowerCase();
         if (TIMESERIES_TYPES.has(type)) {
           const data: any[] = Array.isArray(s?.data) ? s.data : [];
@@ -491,7 +523,9 @@ function processCharts(
     let chartIndex = 0;
     for (const [, inst] of instanceByDom) {
       const dom: Element = inst.getDom();
-      if (context.isExcluded(dom) || !context.isVisible(dom)) continue;
+      if (context.isExcluded(dom) || !context.isVisible(dom)) {
+        continue;
+      }
 
       const rect = dom.getBoundingClientRect();
       if (
@@ -505,12 +539,16 @@ function processCharts(
 
       const option = inst.getOption?.() || {};
       const series: any[] = Array.isArray(option.series) ? option.series : [];
-      if (!series.length) continue;
+      if (!series.length) {
+        continue;
+      }
 
       const timeseriesData: SeriesData[] = [];
 
       for (const s of series) {
-        if (s?.show === false) continue;
+        if (s?.show === false) {
+          continue;
+        }
 
         const type = String(s?.type || '').toLowerCase();
         if (!TIMESERIES_TYPES.has(type)) {
@@ -536,7 +574,9 @@ function processCharts(
         }
 
         const data: any[] = Array.isArray(s?.data) ? s.data : [];
-        if (!data.length) continue;
+        if (!data.length) {
+          continue;
+        }
 
         const rawSeriesName =
           s?.name || s?.seriesName || `Series${timeseriesData.length + 1}`;
@@ -558,10 +598,14 @@ function processCharts(
         }
       }
 
-      if (timeseriesData.length === 0) continue;
+      if (timeseriesData.length === 0) {
+        continue;
+      }
 
       const nonEmptySeries = timeseriesData.filter(s => s.data.size > 0);
-      if (nonEmptySeries.length === 0) continue;
+      if (nonEmptySeries.length === 0) {
+        continue;
+      }
 
       const seenNames = new Set<string>();
       const uniqueSeries = nonEmptySeries.filter(s => {
@@ -572,7 +616,9 @@ function processCharts(
         return true;
       });
 
-      if (uniqueSeries.length === 0) continue;
+      if (uniqueSeries.length === 0) {
+        continue;
+      }
 
       chartIndex++;
       const chartNumber = chartIndex;
@@ -762,7 +808,9 @@ function renderTextNodes(
 
             const effLeftPx = Math.max(rect.left, clipRect.left);
             const effRightPx = Math.min(rect.right, clipRect.right);
-            if (effRightPx <= effLeftPx) return remaining;
+            if (effRightPx <= effLeftPx) {
+              return remaining;
+            }
 
             const left = Math.max(0, Math.floor((effLeftPx - leftShiftPx) / cellWidthPx));
             const right = Math.floor((effRightPx - leftShiftPx - 1) / cellWidthPx);
@@ -772,7 +820,9 @@ function renderTextNodes(
               Math.floor((rect.bottom - 1) / cellHeightPx)
             );
 
-            if (right <= left || bottom < top) return remaining;
+            if (right <= left || bottom < top) {
+              return remaining;
+            }
 
             const capacity = Math.max(1, right - left + 1);
             let segment = remaining.slice(0, capacity);
@@ -805,20 +855,26 @@ function renderTextNodes(
           if (singleLineEllipsize) {
             for (const rect of rects) {
               const remaining = renderRect(rect, raw, true);
-              if (!remaining || remaining === raw) break;
+              if (!remaining || remaining === raw) {
+                break;
+              }
             }
           } else if (lineClampActive) {
             let remaining = raw;
             for (let idx = 0; idx < rects.length; idx++) {
               const isLast = idx === rects.length - 1;
               remaining = renderRect(rects[idx]!, remaining, isLast);
-              if (!remaining) break;
+              if (!remaining) {
+                break;
+              }
             }
           } else {
             let remaining = raw;
             for (const rect of rects) {
               remaining = renderRect(rect, remaining, false);
-              if (!remaining) break;
+              if (!remaining) {
+                break;
+              }
             }
           }
         }
diff --git a/static/app/views/seerExplorer/utils.tsx b/static/app/views/seerExplorer/utils.tsx
index c07b92383079a6..f2be12fa617200 100644
--- a/static/app/views/seerExplorer/utils.tsx
+++ b/static/app/views/seerExplorer/utils.tsx
@@ -1074,7 +1074,9 @@ export function useSeerExplorerDeepLink({
   const navigate = useNavigate();
 
   useEffect(() => {
-    if (!enabled) return;
+    if (!enabled) {
+      return;
+    }
 
     const paramValue = location.query?.[RUN_ID_QUERY_PARAM];
     if (!paramValue || typeof paramValue !== 'string') {
diff --git a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.tsx b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.tsx
index ccff209b311908..b064ae847556cb 100644
--- a/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.tsx
+++ b/static/app/views/settings/organizationDeveloperSettings/sentryApplicationDetails.tsx
@@ -168,9 +168,13 @@ function mapScopeErrors(scopeErrors: unknown): ScopeErrors {
     return result;
   }
   for (const message of scopeErrors) {
-    if (typeof message !== 'string') continue;
+    if (typeof message !== 'string') {
+      continue;
+    }
     const match = message.match(/Requested permission of (\w+:\w+)/);
-    if (!match) continue;
+    if (!match) {
+      continue;
+    }
     const scope = match[1]!;
     if (scope === CONTINUOUS_INTEGRATION_SENTRY_APP_PERMISSION.scope) {
       result.continuousIntegration ??= message;
diff --git a/static/app/views/settings/organizationIntegrations/sentryAppExternalForm.new.tsx b/static/app/views/settings/organizationIntegrations/sentryAppExternalForm.new.tsx
index 6d967b88357769..73a0baa22b0aa1 100644
--- a/static/app/views/settings/organizationIntegrations/sentryAppExternalForm.new.tsx
+++ b/static/app/views/settings/organizationIntegrations/sentryAppExternalForm.new.tsx
@@ -120,8 +120,12 @@ function cloneSchemaFields(
       // would otherwise render unbounded. Honor schema-provided values when
       // present.
       if (nextField.type === 'textarea') {
-        if (nextField.maxRows === undefined) nextField.maxRows = 10;
-        if (nextField.autosize === undefined) nextField.autosize = true;
+        if (nextField.maxRows === undefined) {
+          nextField.maxRows = 10;
+        }
+        if (nextField.autosize === undefined) {
+          nextField.autosize = true;
+        }
       }
 
       if (nextField.default && getFieldDefault) {
@@ -484,13 +488,17 @@ export function SentryAppExternalFormNew({
 
       while (triggerQueue.length > 0) {
         const trigger = triggerQueue.shift()!;
-        if (processedTriggers.has(trigger)) continue;
+        if (processedTriggers.has(trigger)) {
+          continue;
+        }
         processedTriggers.add(trigger);
 
         const dependentFields = getAllSchemaFields(workingFieldGroups).filter(
           field => field.depends_on?.includes(trigger) && !fetchedFields.has(field.name)
         );
-        if (!dependentFields.length) continue;
+        if (!dependentFields.length) {
+          continue;
+        }
 
         for (const field of dependentFields) {
           fetchedFields.add(field.name);
@@ -516,21 +524,27 @@ export function SentryAppExternalFormNew({
           }))
         );
 
-        if (requestVersion !== dependentFetchVersionRef.current) return null;
+        if (requestVersion !== dependentFetchVersionRef.current) {
+          return null;
+        }
 
         const folded = foldChoiceResults(workingFieldGroups, workingDefaults, results);
         workingFieldGroups = folded.updatedFieldGroups;
         workingDefaults = folded.nextDefaultValues;
 
         for (const result of results) {
-          if (result.defaultValue === undefined) continue;
+          if (result.defaultValue === undefined) {
+            continue;
+          }
           // Preserve saved/user values: only apply a fetched defaultValue if
           // the field doesn't already have an effective value. Without this
           // check, the mount-time cascade clobbers a saved selection (e.g.
           // alert-rule-action settings round-tripping from the DB) with the
           // schema's default, and the next BFS iteration fetches its
           // dependents with the wrong parent value.
-          if (hasValue(workingValues[result.fieldName])) continue;
+          if (hasValue(workingValues[result.fieldName])) {
+            continue;
+          }
           workingValues = {...workingValues, [result.fieldName]: result.defaultValue};
           triggerQueue.push(result.fieldName);
         }
@@ -612,7 +626,9 @@ export function SentryAppExternalFormNew({
       }
     }
     const seedTriggers = Object.keys(initialFieldValues);
-    if (!seedTriggers.length) return;
+    if (!seedTriggers.length) {
+      return;
+    }
 
     const requestVersion = dependentFetchVersionRef.current + 1;
     dependentFetchVersionRef.current = requestVersion;
@@ -885,7 +901,9 @@ export function SentryAppExternalFormNew({
         directlyImpactedNames
       );
       const nextDefaultValues = {...externalDefaultValues};
-      for (const name of directlyImpactedNames) delete nextDefaultValues[name];
+      for (const name of directlyImpactedNames) {
+        delete nextDefaultValues[name];
+      }
 
       currentFormValuesRef.current = nextCurrentValues;
       setIsFetchingDependentFields(true);
@@ -899,7 +917,9 @@ export function SentryAppExternalFormNew({
           initialValues: nextCurrentValues,
           requestVersion,
         });
-        if (!cascadeResult) return;
+        if (!cascadeResult) {
+          return;
+        }
         allImpactedNames = cascadeResult.impactedNames;
 
         // Only apply newly-resolved defaults for the impacted fields.
diff --git a/static/app/views/settings/organizationRepositories/components/scmRepositoryTable.stories.tsx b/static/app/views/settings/organizationRepositories/components/scmRepositoryTable.stories.tsx
index cf61784af8826a..c91ef9d316da60 100644
--- a/static/app/views/settings/organizationRepositories/components/scmRepositoryTable.stories.tsx
+++ b/static/app/views/settings/organizationRepositories/components/scmRepositoryTable.stories.tsx
@@ -90,7 +90,9 @@ const REPO_NAMES = [
  * "many projects (with +N collapse)" rows without reshuffling on every render.
  */
 function pickSlugsForRepo(allSlugs: string[], repoIndex: number): string[] {
-  if (allSlugs.length === 0) return [];
+  if (allSlugs.length === 0) {
+    return [];
+  }
   const counts = [0, 1, 1, 3, 0, 5];
   const count = Math.min(counts[repoIndex % counts.length]!, allSlugs.length);
   const start = (repoIndex * 3) % allSlugs.length;
diff --git a/static/app/views/settings/organizationRepositories/hooks/useSyncRepositories.tsx b/static/app/views/settings/organizationRepositories/hooks/useSyncRepositories.tsx
index 8f362b160a36e9..462936adce6cf4 100644
--- a/static/app/views/settings/organizationRepositories/hooks/useSyncRepositories.tsx
+++ b/static/app/views/settings/organizationRepositories/hooks/useSyncRepositories.tsx
@@ -61,7 +61,9 @@ function usePhaseTimer(
   const scheduleRef = useRef<(idx: number) => void>(() => {});
   scheduleRef.current = (idx: number) => {
     const phase = configRef.current[idx];
-    if (!phase) return;
+    if (!phase) {
+      return;
+    }
 
     timerRef.current = window.setTimeout(() => {
       const nextIdx = idx + 1;
@@ -80,13 +82,17 @@ function usePhaseTimer(
   };
 
   function start() {
-    if (timerRef.current !== null) clearTimeout(timerRef.current);
+    if (timerRef.current !== null) {
+      clearTimeout(timerRef.current);
+    }
     setPhaseIndex(0);
     scheduleRef.current(0);
   }
 
   function cancel() {
-    if (timerRef.current !== null) clearTimeout(timerRef.current);
+    if (timerRef.current !== null) {
+      clearTimeout(timerRef.current);
+    }
     timerRef.current = null;
     setPhaseIndex(null);
   }
@@ -94,7 +100,9 @@ function usePhaseTimer(
   useEffect(() => {
     const timer = timerRef;
     return () => {
-      if (timer.current !== null) clearTimeout(timer.current);
+      if (timer.current !== null) {
+        clearTimeout(timer.current);
+      }
     };
   }, []);
 
@@ -206,7 +214,9 @@ export function useSyncRepositories(
 
   // Detect sync completion by comparing last_sync on each poll result.
   useEffect(() => {
-    if (!isSyncing || !query.data) return;
+    if (!isSyncing || !query.data) {
+      return;
+    }
 
     const currentLastSync = query.data.configData?.last_sync as string | undefined;
     if (currentLastSync !== lastSyncBefore) {
diff --git a/static/app/views/settings/projectGeneralSettings/index.tsx b/static/app/views/settings/projectGeneralSettings/index.tsx
index 79e43904fa1666..e247d96a07f455 100644
--- a/static/app/views/settings/projectGeneralSettings/index.tsx
+++ b/static/app/views/settings/projectGeneralSettings/index.tsx
@@ -321,7 +321,9 @@ export function ProjectGeneralSettings({project, onChangeSlug}: Props) {
     ...fields.platform,
     options: fields.platform.options.filter(({value}) => {
       // Always include the current project's platform to display its icon and label
-      if (project.platform === value) return true;
+      if (project.platform === value) {
+        return true;
+      }
       return isPlatformAllowed({isSelfHosted, organization, platform: value});
     }),
     isOptionDisabled: (option: SelectOptionWithKey<string>) => {
diff --git a/static/app/views/settings/settingsCommandPaletteActions.tsx b/static/app/views/settings/settingsCommandPaletteActions.tsx
index 3da8afbfced108..19647803ac8e3a 100644
--- a/static/app/views/settings/settingsCommandPaletteActions.tsx
+++ b/static/app/views/settings/settingsCommandPaletteActions.tsx
@@ -37,7 +37,9 @@ function titleFromRoute(route: string): string {
     .replace(/^account\//, '')
     .split('/')[0];
 
-  if (!segment) return 'Settings';
+  if (!segment) {
+    return 'Settings';
+  }
 
   return segment
     .split('-')
@@ -46,10 +48,18 @@ function titleFromRoute(route: string): string {
 }
 
 function isSettingsRoute(route: string): boolean {
-  if (!route.startsWith('/settings/')) return false;
-  if (route.includes(':projectId')) return false;
-  if (route.includes(':teamId')) return false;
-  if (route.includes(':appId')) return false;
+  if (!route.startsWith('/settings/')) {
+    return false;
+  }
+  if (route.includes(':projectId')) {
+    return false;
+  }
+  if (route.includes(':teamId')) {
+    return false;
+  }
+  if (route.includes(':appId')) {
+    return false;
+  }
   return true;
 }
 
@@ -79,8 +89,12 @@ function getSettingsFieldSections(orgSlug: string): SettingsFieldSection[] {
 
   const groups = new Map<string, Map<string, FormSearchField>>();
   for (const field of allFields) {
-    if (!isSettingsRoute(field.route)) continue;
-    if (typeof field.title !== 'string' || !field.title) continue;
+    if (!isSettingsRoute(field.route)) {
+      continue;
+    }
+    if (typeof field.title !== 'string' || !field.title) {
+      continue;
+    }
 
     const normalizedRoute = normalizeRouteForLookup(field.route);
     let routeFields = groups.get(normalizedRoute);
diff --git a/static/eslint/eslintPluginScraps/src/rules/no-core-import.ts b/static/eslint/eslintPluginScraps/src/rules/no-core-import.ts
index a73f64799abd5e..2a0a6a35efdf89 100644
--- a/static/eslint/eslintPluginScraps/src/rules/no-core-import.ts
+++ b/static/eslint/eslintPluginScraps/src/rules/no-core-import.ts
@@ -23,7 +23,9 @@ export const noCoreImport = ESLintUtils.RuleCreator.withoutDocs({
   create(context) {
     return {
       ImportDeclaration(node) {
-        if (node?.source.type !== 'Literal') return;
+        if (node?.source.type !== 'Literal') {
+          return;
+        }
 
         const importPath = node.source.value;
 
diff --git a/static/eslint/eslintPluginScraps/src/rules/no-token-import.ts b/static/eslint/eslintPluginScraps/src/rules/no-token-import.ts
index e884c72de75c53..e05dd7269ec637 100644
--- a/static/eslint/eslintPluginScraps/src/rules/no-token-import.ts
+++ b/static/eslint/eslintPluginScraps/src/rules/no-token-import.ts
@@ -16,7 +16,9 @@ const EXCEPT_DIR_NAME = 'static/app/utils/theme';
  * @returns {boolean}
  */
 function isForbiddenImportPath(importPath: string) {
-  if (typeof importPath !== 'string') return false;
+  if (typeof importPath !== 'string') {
+    return false;
+  }
 
   return importPath.includes(TOKEN_PATH);
 }
@@ -37,8 +39,12 @@ export const noTokenImport = ESLintUtils.RuleCreator.withoutDocs({
 
     return {
       ImportDeclaration(node) {
-        if (node?.source.type !== 'Literal') return;
-        if (importerIsInAllowedDir) return;
+        if (node?.source.type !== 'Literal') {
+          return;
+        }
+        if (importerIsInAllowedDir) {
+          return;
+        }
 
         const value = node.source.value;
 
diff --git a/static/eslint/eslintPluginScraps/src/rules/restrict-jsx-slot-children.ts b/static/eslint/eslintPluginScraps/src/rules/restrict-jsx-slot-children.ts
index d10f41d418cc2d..9ef267797e8dd9 100644
--- a/static/eslint/eslintPluginScraps/src/rules/restrict-jsx-slot-children.ts
+++ b/static/eslint/eslintPluginScraps/src/rules/restrict-jsx-slot-children.ts
@@ -276,7 +276,9 @@ export const restrictJsxSlotChildren = ESLintUtils.RuleCreator.withoutDocs<
       propName: string,
       state: State
     ) {
-      if (!expr) return;
+      if (!expr) {
+        return;
+      }
 
       if (expr.type === 'JSXElement') {
         checkSlotTree(expr, propName, state);
@@ -326,7 +328,9 @@ export const restrictJsxSlotChildren = ESLintUtils.RuleCreator.withoutDocs<
      */
     let allowedNamesResolved = false;
     function resolveAllowedNames() {
-      if (allowedNamesResolved) return;
+      if (allowedNamesResolved) {
+        return;
+      }
       allowedNamesResolved = true;
 
       for (const [, state] of slotState) {
@@ -359,10 +363,14 @@ export const restrictJsxSlotChildren = ESLintUtils.RuleCreator.withoutDocs<
         // any JSXAttribute nodes, so importTracker has all imports recorded.
         resolveAllowedNames();
         const propName = node.name.type === 'JSXIdentifier' ? node.name.name : null;
-        if (!propName) return;
+        if (!propName) {
+          return;
+        }
 
         const state = slotState.get(propName);
-        if (!state) return;
+        if (!state) {
+          return;
+        }
 
         if (state.componentNames.size > 0) {
           const nameNode = node.parent.name; // JSXAttribute → JSXOpeningElement
diff --git a/static/eslint/eslintPluginSentry/no-static-translations.ts b/static/eslint/eslintPluginSentry/no-static-translations.ts
index 4d68711eaffbcf..6b7865842338bd 100644
--- a/static/eslint/eslintPluginSentry/no-static-translations.ts
+++ b/static/eslint/eslintPluginSentry/no-static-translations.ts
@@ -18,12 +18,20 @@ export const noStaticTranslations = ESLintUtils.RuleCreator.withoutDocs({
     return {
       CallExpression(node) {
         const callee = node.callee;
-        if (callee?.type !== 'Identifier') return;
-        if (!DYNAMIC_TRANSLATION_FNS.includes(callee.name)) return;
-        if (node.arguments.length === 0) return;
+        if (callee?.type !== 'Identifier') {
+          return;
+        }
+        if (!DYNAMIC_TRANSLATION_FNS.includes(callee.name)) {
+          return;
+        }
+        if (node.arguments.length === 0) {
+          return;
+        }
 
         const translationArg = node.arguments?.[0];
-        if (!translationArg) return;
+        if (!translationArg) {
+          return;
+        }
 
         // Check if it's ATTRIBUTE_METADATA[...].brief
         if (translationArg.type === 'MemberExpression') {
diff --git a/static/gsApp/views/seerAutomation/components/seerAutomationProjectList.tsx b/static/gsApp/views/seerAutomation/components/seerAutomationProjectList.tsx
index e2e6f663bf86ca..8d7ae8531a68a7 100644
--- a/static/gsApp/views/seerAutomation/components/seerAutomationProjectList.tsx
+++ b/static/gsApp/views/seerAutomation/components/seerAutomationProjectList.tsx
@@ -229,7 +229,9 @@ export function SeerAutomationProjectList() {
         await Promise.all(
           batch.map(projectId => {
             const project = projects.find(p => p.id === projectId);
-            if (!project) return Promise.resolve();
+            if (!project) {
+              return Promise.resolve();
+            }
 
             const updateData: any = {autofixAutomationTuning: value};
             if (value !== 'off') {
@@ -249,7 +251,9 @@ export function SeerAutomationProjectList() {
     } finally {
       Array.from(selected).forEach(projectId => {
         const project = projects.find(p => p.id === projectId);
-        if (!project) return;
+        if (!project) {
+          return;
+        }
         queryClient.invalidateQueries({
           queryKey: makeDetailedProjectQueryKey({
             orgSlug: organization.slug,
@@ -271,7 +275,9 @@ export function SeerAutomationProjectList() {
         await Promise.all(
           batch.map(projectId => {
             const project = projects.find(p => p.id === projectId);
-            if (!project) return Promise.resolve();
+            if (!project) {
+              return Promise.resolve();
+            }
             return api.requestPromise(`/projects/${organization.slug}/${project.slug}/`, {
               method: 'PUT',
               data: {seerScannerAutomation: value},
@@ -285,7 +291,9 @@ export function SeerAutomationProjectList() {
     } finally {
       Array.from(selected).forEach(projectId => {
         const project = projects.find(p => p.id === projectId);
-        if (!project) return;
+        if (!project) {
+          return;
+        }
         queryClient.invalidateQueries({
           queryKey: makeDetailedProjectQueryKey({
             orgSlug: organization.slug,
diff --git a/static/gsApp/views/seerAutomation/onboarding/onboardingLegacy.tsx b/static/gsApp/views/seerAutomation/onboarding/onboardingLegacy.tsx
index 5bdecd30e2b71b..4f6c665b1b7444 100644
--- a/static/gsApp/views/seerAutomation/onboarding/onboardingLegacy.tsx
+++ b/static/gsApp/views/seerAutomation/onboarding/onboardingLegacy.tsx
@@ -128,7 +128,9 @@ function ProjectRowWithUpdate({
   const {mutate: updateProjectSeerPreferences} = useUpdateProjectSeerPreferences(project);
 
   const handleProjectClick = useCallback(() => {
-    if (!repositories) return;
+    if (!repositories) {
+      return;
+    }
 
     const currentPreference = projectStates[project.id]?.preference;
     const currentRepoIds =
@@ -300,13 +302,19 @@ function ProjectsWithoutRepos({
   }, [projects, projectStates]);
 
   const projectsWithoutRepos = useMemo(() => {
-    if (isLoading) return [];
+    if (isLoading) {
+      return [];
+    }
 
     const filtered = projects.filter(project => {
-      if (successfullyConnectedProjects.has(project.id)) return false;
+      if (successfullyConnectedProjects.has(project.id)) {
+        return false;
+      }
 
       const state = projectStates[project.id];
-      if (!state || state.isPending) return false;
+      if (!state || state.isPending) {
+        return false;
+      }
 
       let repoCount = state.preference?.repositories?.length || 0;
       if (repoCount === 0 && state.codeMappingRepos) {
@@ -316,7 +324,9 @@ function ProjectsWithoutRepos({
     });
 
     // Apply search filter
-    if (!searchQuery.trim()) return filtered;
+    if (!searchQuery.trim()) {
+      return filtered;
+    }
 
     const query = searchQuery.toLowerCase();
     return filtered.filter(
@@ -611,7 +621,9 @@ export function SeerAutomationOnboarding() {
   const projectsWithoutRepos = useMemo(() => {
     return filteredProjects.filter(project => {
       // Exclude projects that have been successfully connected this session
-      if (successfullyConnectedProjects.has(project.id)) return false;
+      if (successfullyConnectedProjects.has(project.id)) {
+        return false;
+      }
 
       // Exclude projects that already have repositories
       const state = projectStates[project.id];
diff --git a/tests/sentry/dashboards/endpoints/test_organization_dashboard_details.py b/tests/sentry/dashboards/endpoints/test_organization_dashboard_details.py
index b9cfc4cebc889c..fb900a01993c0c 100644
--- a/tests/sentry/dashboards/endpoints/test_organization_dashboard_details.py
+++ b/tests/sentry/dashboards/endpoints/test_organization_dashboard_details.py
@@ -1242,7 +1242,7 @@ def test_add_widget_description_exceeds_max_length(self) -> None:
                 {
                     "title": "Widget with long description",
                     "displayType": "line",
-                    "description": "x" * 256,
+                    "description": "x" * 351,
                     "interval": "5m",
                     "queries": [
                         {
@@ -1259,7 +1259,7 @@ def test_add_widget_description_exceeds_max_length(self) -> None:
         response = self.do_request("put", self.url(self.dashboard.id), data=data)
         assert response.status_code == 400, response.data
         assert response.data["widgets"][1]["description"] == [
-            "Ensure description has no more than 255 characters."
+            "Ensure description has no more than 350 characters."
         ]
 
     def test_add_text_widget_description_exceeds_max_length(self) -> None:
diff --git a/tests/sentry/data_export/endpoints/test_data_export.py b/tests/sentry/data_export/endpoints/test_data_export.py
index 09905c42b6f3ee..b7596490b50f6f 100644
--- a/tests/sentry/data_export/endpoints/test_data_export.py
+++ b/tests/sentry/data_export/endpoints/test_data_export.py
@@ -1,8 +1,17 @@
 from __future__ import annotations
 
 from typing import Any
-
+from unittest.mock import MagicMock
+
+from sentry.api.authentication import (
+    ApiKeyAuthentication,
+    OrgAuthTokenAuthentication,
+    SessionNoAuthTokenAuthentication,
+    UserAuthTokenAuthentication,
+    ViewerContextAuthentication,
+)
 from sentry.data_export.base import ExportQueryType, ExportStatus
+from sentry.data_export.endpoints.data_export import is_api_or_agent_request
 from sentry.data_export.models import ExportedData
 from sentry.data_export.writers import OutputMode
 from sentry.search.utils import parse_datetime_string
@@ -11,6 +20,26 @@
 from sentry.utils.snuba import MAX_FIELDS
 
 
+def test_is_api_or_agent_request() -> None:
+    """
+    Only session/cookie auth is UI; every other authenticator (including
+    `ViewerContextAuthentication`, which deliberately sets
+    `request.auth = None` to mimic session permissions) is an agent caller.
+    """
+
+    def req(authenticator: object) -> MagicMock:
+        r = MagicMock()
+        r.successful_authenticator = authenticator
+        return r
+
+    assert is_api_or_agent_request(req(SessionNoAuthTokenAuthentication())) is False
+    assert is_api_or_agent_request(req(UserAuthTokenAuthentication())) is True
+    assert is_api_or_agent_request(req(OrgAuthTokenAuthentication())) is True
+    assert is_api_or_agent_request(req(ApiKeyAuthentication())) is True
+    assert is_api_or_agent_request(req(ViewerContextAuthentication())) is True
+    assert is_api_or_agent_request(req(None)) is True
+
+
 class DataExportTest(APITestCase):
     endpoint = "sentry-api-0-organization-data-export"
     method = "post"
diff --git a/tests/sentry/integrations/data_forwarding/amazon_sqs/test_forwarder.py b/tests/sentry/integrations/data_forwarding/amazon_sqs/test_forwarder.py
index bc3fd9ca8b1d0f..7112c716ad3da9 100644
--- a/tests/sentry/integrations/data_forwarding/amazon_sqs/test_forwarder.py
+++ b/tests/sentry/integrations/data_forwarding/amazon_sqs/test_forwarder.py
@@ -4,11 +4,14 @@
 from botocore.exceptions import ClientError
 
 from sentry.api.serializers import serialize
-from sentry.integrations.data_forwarding.amazon_sqs.forwarder import AmazonSQSForwarder
+from sentry.integrations.data_forwarding.amazon_sqs.forwarder import (
+    AmazonSQSForwarder,
+)
 from sentry.integrations.models.data_forwarder import DataForwarder
 from sentry.integrations.models.data_forwarder_project import DataForwarderProject
 from sentry.integrations.types import DataForwarderProviderSlug
 from sentry.testutils.cases import TestCase
+from sentry.testutils.helpers.options import override_options
 
 
 class AmazonSQSDataForwarderTest(TestCase):
@@ -141,3 +144,40 @@ def test_use_s3_bucket(self, mock_client):
         expected_url = f"https://my_bucket.s3.us-east-1.amazonaws.com/{expected_key}"
         assert message_body["s3Url"] == expected_url
         assert "s3-" not in message_body["s3Url"]
+
+    def test_get_task_payload(self) -> None:
+        event = self.store_event(
+            data={"message": "test", "type": "error"},
+            project_id=self.project.id,
+        )
+
+        config = self.data_forwarder_project.get_config()
+        result = self.forwarder.get_task_payload(event, config)
+
+        assert result["event_id"] == event.event_id
+        assert result["project_slug"] == event.project.slug
+        assert result["date"] == event.datetime.strftime("%Y-%m-%d")
+
+    @patch("boto3.client")
+    @override_options({"data-forwarding.task-rollout-rate": 1.0})
+    def test_forward_event_from_task(self, mock_client) -> None:
+        self.data_forwarder.config["message_group_id"] = "my_group"
+        self.data_forwarder.config["s3_bucket"] = "my_bucket"
+        self.data_forwarder.save()
+
+        event = self.store_event(data={"message": "test"}, project_id=self.project.id)
+        with self.tasks():
+            self.forwarder.post_process(event, self.data_forwarder_project)
+
+        mock_client.return_value.put_object.assert_called_once()
+        put_args = mock_client.return_value.put_object.call_args[1]
+        assert put_args["Bucket"] == "my_bucket"
+        event_date = event.datetime.strftime("%Y-%m-%d")
+        assert put_args["Key"] == f"{self.project.slug}/{event_date}/{event.event_id}"
+
+        send_args = mock_client.return_value.send_message.call_args[1]
+        message_body = orjson.loads(send_args["MessageBody"])
+        assert message_body["eventID"] == event.event_id
+        assert send_args["MessageGroupId"] == "my_group"
+        assert "MessageDeduplicationId" in send_args
+        assert "s3Url" in message_body
diff --git a/tests/sentry/integrations/data_forwarding/segment/test_forwarder.py b/tests/sentry/integrations/data_forwarding/segment/test_forwarder.py
index 2ca18ce7a11579..bd2a997408f916 100644
--- a/tests/sentry/integrations/data_forwarding/segment/test_forwarder.py
+++ b/tests/sentry/integrations/data_forwarding/segment/test_forwarder.py
@@ -1,5 +1,7 @@
 import orjson
+import pytest
 import responses
+from requests.exceptions import HTTPError
 
 from sentry import VERSION
 from sentry.integrations.data_forwarding.segment.forwarder import SegmentForwarder
@@ -7,6 +9,7 @@
 from sentry.integrations.models.data_forwarder_project import DataForwarderProject
 from sentry.integrations.types import DataForwarderProviderSlug
 from sentry.testutils.cases import TestCase
+from sentry.testutils.helpers.options import override_options
 
 
 class SegmentDataForwarderTest(TestCase):
@@ -76,3 +79,67 @@ def test_forward_event_http_error(self) -> None:
         )
 
         self.forwarder.post_process(event, self.data_forwarder_project)
+
+    def test_get_task_payload(self) -> None:
+        config = self.data_forwarder_project.get_config()
+        event = self.store_event(
+            data={
+                "exception": {"type": "ValueError", "value": "foo bar"},
+                "user": {"id": "1"},
+                "type": "error",
+            },
+            project_id=self.project.id,
+        )
+        assert self.forwarder.get_task_payload(event, config) == {
+            "event_type": "error",
+            "has_user": True,
+        }
+
+        event = self.store_event(
+            data={
+                "user": {"email": "foo@example.com"},
+                "type": "feedback",
+            },
+            project_id=self.project.id,
+        )
+        assert self.forwarder.get_task_payload(event, config) == {
+            "event_type": "feedback",
+            "has_user": False,
+        }
+
+    @responses.activate
+    @override_options({"data-forwarding.task-rollout-rate": 1.0})
+    def test_forward_event_from_task(self) -> None:
+        responses.add(responses.POST, "https://api.segment.io/v1/track")
+
+        event = self.store_event(
+            data={
+                "exception": {"type": "ValueError", "value": "foo bar"},
+                "user": {"id": "1", "email": "foo@example.com"},
+                "type": "error",
+                "level": "warning",
+            },
+            project_id=self.project.id,
+        )
+
+        with self.tasks():
+            self.forwarder.post_process(event, self.data_forwarder_project)
+
+        assert len(responses.calls) == 1
+        request = responses.calls[0].request
+        payload = orjson.loads(request.body)
+        assert payload["userId"] == "1"
+        assert payload["event"] == "Error Captured"
+
+    @responses.activate
+    def test_forward_event_from_task_raises_on_http_error(self) -> None:
+        responses.add(responses.POST, "https://api.segment.io/v1/track", status=500)
+
+        config = self.data_forwarder_project.get_config()
+
+        with pytest.raises(HTTPError):
+            SegmentForwarder.forward_event_from_task(
+                config=config,
+                event_payload={"test": True},
+                task_payload={"event_type": "error", "has_user": True},
+            )
diff --git a/tests/sentry/integrations/data_forwarding/splunk/test_forwarder.py b/tests/sentry/integrations/data_forwarding/splunk/test_forwarder.py
index 29d1e080ef45bd..a9ce35ed844927 100644
--- a/tests/sentry/integrations/data_forwarding/splunk/test_forwarder.py
+++ b/tests/sentry/integrations/data_forwarding/splunk/test_forwarder.py
@@ -6,6 +6,7 @@
 from sentry.integrations.models.data_forwarder_project import DataForwarderProject
 from sentry.integrations.types import DataForwarderProviderSlug
 from sentry.testutils.cases import TestCase
+from sentry.testutils.helpers.options import override_options
 
 
 class SplunkDataForwarderTest(TestCase):
@@ -129,3 +130,44 @@ def test_user_payload(self) -> None:
         assert result["event"]["user_ip_trunc"] == "127.0.0.0"
         assert result["index"] == "main"
         assert result["source"] == "sentry"
+
+    def test_get_task_payload(self) -> None:
+        config = self.data_forwarder_project.get_config()
+        event = self.store_event(
+            data={"server_name": "web01.example.com"},
+            project_id=self.project.id,
+        )
+        self.forwarder.initialize_variables(event, config)
+        assert self.forwarder.get_task_payload(event, config) == {"host": "web01.example.com"}
+
+        event = self.store_event(
+            data={"user": {"ip_address": "127.0.0.1"}},
+            project_id=self.project.id,
+        )
+        self.forwarder.initialize_variables(event, config)
+        assert self.forwarder.get_task_payload(event, config) == {"host": "127.0.0.1"}
+
+        event = self.store_event(
+            data={"message": "no host info"},
+            project_id=self.project.id,
+        )
+        self.forwarder.initialize_variables(event, config)
+        assert self.forwarder.get_task_payload(event, config) == {"host": None}
+
+    @responses.activate
+    @override_options({"data-forwarding.task-rollout-rate": 1.0})
+    def test_forward_event_from_task(self) -> None:
+        responses.add(responses.POST, "https://splunk.example.com:8088/services/collector")
+
+        event = self.store_event(
+            data={"server_name": "web01.example.com"},
+            project_id=self.project.id,
+        )
+        with self.tasks():
+            self.forwarder.post_process(event, self.data_forwarder_project)
+
+        assert len(responses.calls) == 1
+        request = responses.calls[0].request
+        payload = orjson.loads(request.body)
+        assert payload["host"] == "web01.example.com"
+        assert request.headers["Authorization"] == "Splunk 12345678-1234-1234-1234-1234567890AB"
diff --git a/tests/sentry/integrations/data_forwarding/test_base.py b/tests/sentry/integrations/data_forwarding/test_base.py
new file mode 100644
index 00000000000000..298e49361cce1e
--- /dev/null
+++ b/tests/sentry/integrations/data_forwarding/test_base.py
@@ -0,0 +1,46 @@
+from unittest.mock import patch
+
+import responses
+
+from sentry.integrations.data_forwarding.segment.forwarder import SegmentForwarder
+from sentry.integrations.types import DataForwarderProviderSlug
+from sentry.testutils.cases import TestCase
+from sentry.testutils.helpers.options import override_options
+
+
+class BaseDataForwarderTest(TestCase):
+    def setUp(self) -> None:
+        self.data_forwarder = self.create_data_forwarder(
+            organization=self.organization,
+            provider=DataForwarderProviderSlug.SEGMENT,
+            config={"write_key": "secret-api-key"},
+            is_enabled=True,
+        )
+        self.data_forwarder_project = self.create_data_forwarder_project(
+            data_forwarder=self.data_forwarder,
+            project=self.project,
+            is_enabled=True,
+        )
+        self.forwarder = SegmentForwarder()
+        self.event = self.store_event(
+            data={
+                "exception": {"type": "ValueError", "value": "foo bar"},
+                "user": {"id": "1"},
+                "type": "error",
+            },
+            project_id=self.project.id,
+        )
+
+    @responses.activate
+    @override_options({"data-forwarding.task-rollout-rate": 1.0})
+    @patch("sentry.integrations.data_forwarding.tasks.forward_event")
+    def test_post_process_rollout_dispatches_to_task(self, mock_forward_event) -> None:
+        responses.add(responses.POST, "https://api.segment.io/v1/track")
+        self.forwarder.post_process(self.event, self.data_forwarder_project)
+        mock_forward_event.delay.assert_called_once()
+
+    @responses.activate
+    def test_post_process_rollout_forwards_directly(self) -> None:
+        responses.add(responses.POST, "https://api.segment.io/v1/track")
+        self.forwarder.post_process(self.event, self.data_forwarder_project)
+        assert len(responses.calls) == 1
diff --git a/tests/sentry/integrations/data_forwarding/test_tasks.py b/tests/sentry/integrations/data_forwarding/test_tasks.py
new file mode 100644
index 00000000000000..1aaa30e299f737
--- /dev/null
+++ b/tests/sentry/integrations/data_forwarding/test_tasks.py
@@ -0,0 +1,58 @@
+import responses
+
+from sentry.integrations.data_forwarding.segment.forwarder import SegmentForwarder
+from sentry.integrations.data_forwarding.tasks import forward_event
+from sentry.integrations.types import DataForwarderProviderSlug
+from sentry.testutils.cases import TestCase
+from sentry.testutils.helpers.options import override_options
+
+
+class ForwardEventTaskTest(TestCase):
+    def setUp(self) -> None:
+        self.data_forwarder = self.create_data_forwarder(
+            organization=self.organization,
+            provider=DataForwarderProviderSlug.SEGMENT,
+            config={"write_key": "secret-api-key"},
+            is_enabled=True,
+        )
+        self.data_forwarder_project = self.create_data_forwarder_project(
+            data_forwarder=self.data_forwarder,
+            project=self.project,
+            is_enabled=True,
+        )
+        self.forwarder = SegmentForwarder()
+        self.event = self.store_event(
+            data={
+                "exception": {"type": "ValueError", "value": "foo bar"},
+                "user": {"id": "1", "email": "foo@example.com"},
+                "type": "error",
+                "metadata": {"type": "ValueError", "value": "foo bar"},
+                "level": "warning",
+            },
+            project_id=self.project.id,
+        )
+
+    @responses.activate
+    def test_forwards_event(self) -> None:
+        responses.add(responses.POST, "https://api.segment.io/v1/track")
+        config = self.data_forwarder_project.get_config()
+        event_payload = self.forwarder.get_event_payload(event=self.event, config=config)
+        task_payload = self.forwarder.get_task_payload(event=self.event, config=config)
+        forward_event(
+            data_forwarder_project_id=self.data_forwarder_project.id,
+            event_payload=event_payload,
+            task_payload=task_payload,
+        )
+        assert len(responses.calls) == 1
+
+    @responses.activate
+    @override_options({"data-forwarding.task-rollout-rate": 1.0})
+    def test_post_process_dispatches_to_task(self) -> None:
+        responses.add(responses.POST, "https://api.segment.io/v1/track")
+        with self.tasks():
+            self.forwarder.post_process(self.event, self.data_forwarder_project)
+        assert len(responses.calls) == 1
+
+    def test_missing_data_forwarder_project(self) -> None:
+        result = forward_event(data_forwarder_project_id=-1, event_payload={}, task_payload={})
+        assert result is None
diff --git a/tests/sentry/issue_detection/test_file_io_on_main_thread_detector.py b/tests/sentry/issue_detection/test_file_io_on_main_thread_detector.py
index 7fdbdea4b620a8..b6b4db7321dbc8 100644
--- a/tests/sentry/issue_detection/test_file_io_on_main_thread_detector.py
+++ b/tests/sentry/issue_detection/test_file_io_on_main_thread_detector.py
@@ -112,6 +112,11 @@ def test_ignores_keyboard_files(self) -> None:
         event["spans"][0]["data"]["file.path"] = "somethins/stuff/blah/yup/KBLayout_iPhone.dat"
         assert self.find_problems(event) == []
 
+    def test_ignores_keyboard_files_plural(self) -> None:
+        event = get_event("file-io-on-main-thread/file-io-on-main-thread")
+        event["spans"][0]["data"]["file.path"] = "somethins/stuff/blah/yup/KBLayouts_iPhone.dat"
+        assert self.find_problems(event) == []
+
     def test_gives_problem_correct_title(self) -> None:
         event = get_event("file-io-on-main-thread/file-io-on-main-thread")
         event["spans"][0]["data"]["blocked_main_thread"] = True
diff --git a/tests/sentry/seer/endpoints/test_group_ai_autofix.py b/tests/sentry/seer/endpoints/test_group_ai_autofix.py
index 7c43111871a7a0..c0bf89e5a6dbed 100644
--- a/tests/sentry/seer/endpoints/test_group_ai_autofix.py
+++ b/tests/sentry/seer/endpoints/test_group_ai_autofix.py
@@ -1,17 +1,13 @@
-from datetime import datetime
 from unittest.mock import Mock, patch
 
 from sentry.seer.agent.client_models import SeerRunState
-from sentry.seer.autofix.autofix import TIMEOUT_SECONDS
 from sentry.seer.autofix.autofix_agent import AutofixStep, NoSeerQuotaException
-from sentry.seer.autofix.constants import AutofixReferrer, AutofixStatus
-from sentry.seer.autofix.utils import AutofixState, AutofixStoppingPoint, CodebaseState
-from sentry.seer.models import SeerPermissionError, SeerRepoDefinition
+from sentry.seer.autofix.constants import AutofixReferrer
+from sentry.seer.autofix.utils import AutofixStoppingPoint
+from sentry.seer.models import SeerPermissionError
 from sentry.testutils.cases import APITestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.helpers.features import with_feature
 from sentry.testutils.skips import requires_snuba
-from sentry.utils.samples import load_data
 
 # Note: Detailed tests for the implementation of functions in seer/autofix.py
 # have been moved to tests/sentry/seer/test_autofix.py
@@ -27,1103 +23,180 @@ def _get_url(self, group_id: int) -> str:
 
     def setUp(self) -> None:
         super().setUp()
-
         self.organization.update_option("sentry:gen_ai_consent_v2024_11_14", True)
+        self.organization.flags.allow_joinleave = True
+        self.organization.save()
 
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_autofix_state")
-    def test_ai_autofix_get_endpoint_with_autofix(self, mock_get_autofix_state):
-        group = self.create_group()
-        mock_get_autofix_state.return_value = AutofixState(
-            run_id=123,
-            request={
-                "project_id": 456,
-                "organization_id": group.organization.id,
-                "issue": {"id": 789, "title": "Test Issue"},
-                "repos": [],
-            },
-            updated_at=datetime.fromisoformat("2023-07-18T12:00:00Z"),
-            status=AutofixStatus.PROCESSING,
-        )
-
-        self.login_as(user=self.user)
-        response = self.client.get(self._get_url(group.id), format="json")
-
-        assert response.status_code == 200
-        assert response.data["autofix"] is not None
-        assert response.data["autofix"]["status"] == "PROCESSING"
-        assert "issue" not in response.data["autofix"]["request"]
-        assert "trace_tree" not in response.data["autofix"]["request"]
-        assert "profile" not in response.data["autofix"]["request"]
-        assert "issue_summary" not in response.data["autofix"]["request"]
-
-        mock_get_autofix_state.assert_called_once_with(
-            group_id=group.id,
-            check_repo_access=True,
-            is_user_fetching=False,
-            organization_id=group.organization.id,
-        )
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_autofix_state")
-    def test_ai_autofix_get_endpoint_without_autofix(self, mock_get_autofix_state):
-        group = self.create_group()
-        mock_get_autofix_state.return_value = None
-
-        self.login_as(user=self.user)
-        response = self.client.get(self._get_url(group.id), format="json")
-
-        assert response.status_code == 200
-        assert response.data["autofix"] is None
-
-        mock_get_autofix_state.assert_called_once_with(
-            group_id=group.id,
-            check_repo_access=True,
-            is_user_fetching=False,
-            organization_id=group.organization.id,
-        )
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_autofix_state")
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_sorted_code_mapping_configs")
-    def test_ai_autofix_get_endpoint_repositories(
-        self,
-        mock_get_sorted_code_mapping_configs,
-        mock_get_autofix_state,
-    ):
-        group = self.create_group()
-        autofix_state = AutofixState(
-            run_id=123,
-            request={
-                "project_id": 456,
-                "organization_id": group.organization.id,
-                "issue": {"id": 789, "title": "Test Issue"},
-                "repos": [],
-            },
-            updated_at=datetime.fromisoformat("2023-07-18T12:00:00Z"),
-            status=AutofixStatus.PROCESSING,
-            codebases={
-                "id123": CodebaseState(
-                    repo_external_id="id123",
-                    is_readable=True,
-                    is_writeable=True,
-                )
-            },
-        )
-        mock_get_autofix_state.return_value = autofix_state
-
-        class TestRepo:
-            def __init__(self):
-                self.url = "example.com"
-                self.external_id = "id123"
-                self.name = "test_repo"
-                self.provider = "github"
-                self.integration_id = 42
-
-        mock_get_sorted_code_mapping_configs.return_value = [
-            Mock(project_repository=Mock(repository=TestRepo()), default_branch="main"),
-        ]
-
-        self.login_as(user=self.user)
-        response = self.client.get(self._get_url(group.id), format="json")
-
-        assert response.status_code == 200
-        assert response.data["autofix"] is not None
-        assert len(response.data["autofix"]["repositories"]) == 1
-        repo = response.data["autofix"]["repositories"][0]
-        assert repo["default_branch"] == "main"
-        assert repo["name"] == "test_repo"
-        assert repo["provider"] == "github"
-        assert repo["external_id"] == "id123"
-        assert repo["url"] == "example.com"
-        assert repo["integration_id"] == 42
-        assert repo["is_readable"] is True
-        assert repo["is_writeable"] is True
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_autofix_state")
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_sorted_code_mapping_configs")
-    def test_ai_autofix_get_endpoint_multiple_repositories(
-        self,
-        mock_get_sorted_code_mapping_configs,
-        mock_get_autofix_state,
-    ):
-        group = self.create_group()
-        autofix_state = AutofixState(
-            run_id=123,
-            request={
-                "project_id": 456,
-                "organization_id": group.organization.id,
-                "issue": {"id": 789, "title": "Test Issue"},
-                "repos": [],
-            },
-            updated_at=datetime.fromisoformat("2023-07-18T12:00:00Z"),
-            status=AutofixStatus.PROCESSING,
-            codebases={
-                "id123": CodebaseState(
-                    repo_external_id="id123",
-                    is_readable=True,
-                    is_writeable=True,
-                ),
-                "id456": CodebaseState(
-                    repo_external_id="id456",
-                    is_readable=True,
-                    is_writeable=False,
-                ),
-            },
-        )
-        mock_get_autofix_state.return_value = autofix_state
-
-        class TestRepo:
-            def __init__(self, external_id, name, provider, url, integration_id):
-                self.url = url
-                self.external_id = external_id
-                self.name = name
-                self.provider = provider
-                self.integration_id = integration_id
-
-        repo1 = TestRepo("id123", "repo1", "github", "example.com/repo1", 42)
-        repo2 = TestRepo("id456", "repo2", "gitlab", "example.com/repo2", 43)
-
-        mock_get_sorted_code_mapping_configs.return_value = [
-            Mock(project_repository=Mock(repository=repo1), default_branch="main"),
-            Mock(project_repository=Mock(repository=repo2), default_branch="master"),
-        ]
-
-        self.login_as(user=self.user)
-        response = self.client.get(self._get_url(group.id), format="json")
-
-        assert response.status_code == 200
-        assert response.data["autofix"] is not None
-        assert len(response.data["autofix"]["repositories"]) == 2
-
-        repositories = sorted(
-            response.data["autofix"]["repositories"], key=lambda x: x["integration_id"]
-        )
-
-        # Check first repo
-        repo = repositories[0]
-        assert repo["default_branch"] == "main"
-        assert repo["name"] == "repo1"
-        assert repo["provider"] == "github"
-        assert repo["external_id"] == "id123"
-        assert repo["url"] == "example.com/repo1"
-        assert repo["integration_id"] == 42
-        assert repo["is_readable"] is True
-        assert repo["is_writeable"] is True
-
-        # Check second repo
-        repo = repositories[1]
-        assert repo["default_branch"] == "master"
-        assert repo["name"] == "repo2"
-        assert repo["provider"] == "gitlab"
-        assert repo["external_id"] == "id456"
-        assert repo["url"] == "example.com/repo2"
-        assert repo["integration_id"] == 43
-        assert repo["is_readable"] is True
-        assert repo["is_writeable"] is False
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_autofix_state")
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_sorted_code_mapping_configs")
-    def test_ai_autofix_get_endpoint_repository_not_in_codebase(
-        self,
-        mock_get_sorted_code_mapping_configs,
-        mock_get_autofix_state,
-    ):
+    @patch("sentry.seer.endpoints.group_ai_autofix.get_autofix_agent_state")
+    def test_get_returns_state(self, mock_get_explorer_state):
         group = self.create_group()
-        autofix_state = AutofixState(
-            run_id=123,
-            request={
-                "project_id": 456,
-                "organization_id": group.organization.id,
-                "issue": {"id": 789, "title": "Test Issue"},
-                "repos": [],
-            },
-            updated_at=datetime.fromisoformat("2023-07-18T12:00:00Z"),
-            status=AutofixStatus.PROCESSING,
-            codebases={
-                "id123": CodebaseState(
-                    repo_external_id="id123",
-                    is_readable=True,
-                    is_writeable=True,
-                )
-            },
-        )
-        mock_get_autofix_state.return_value = autofix_state
-
-        class TestRepo:
-            def __init__(self, external_id):
-                self.url = "example.com"
-                self.external_id = external_id
-                self.name = "test_repo"
-                self.provider = "github"
-                self.integration_id = 42
-
-        # Create a repo with a different external_id than what's in the codebase
-        mock_get_sorted_code_mapping_configs.return_value = [
-            Mock(
-                project_repository=Mock(repository=TestRepo("different_id")), default_branch="main"
-            ),
-        ]
+        mock_get_explorer_state.return_value = None
 
         self.login_as(user=self.user)
         response = self.client.get(self._get_url(group.id), format="json")
 
-        assert response.status_code == 200
-        assert response.data["autofix"] is not None
-        # No repositories should be included since the external_id doesn't match
-        assert len(response.data["autofix"]["repositories"]) == 0
+        assert response.status_code == 200, response.data
+        mock_get_explorer_state.assert_called_once_with(group.organization, group.id)
 
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_autofix_state")
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_sorted_code_mapping_configs")
-    def test_ai_autofix_get_endpoint_no_codebases(
-        self,
-        mock_get_sorted_code_mapping_configs,
-        mock_get_autofix_state,
-    ):
+    @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
+    @patch("sentry.seer.endpoints.group_ai_autofix.trigger_autofix_agent")
+    def test_post_triggers_autofix_agent(self, mock_trigger_explorer, _):
         group = self.create_group()
-        autofix_state = AutofixState(
-            run_id=123,
-            request={
-                "project_id": 456,
-                "organization_id": group.organization.id,
-                "issue": {"id": 789, "title": "Test Issue"},
-                "repos": [],
-            },
-            updated_at=datetime.fromisoformat("2023-07-18T12:00:00Z"),
-            status=AutofixStatus.PROCESSING,
-            # Empty codebases dictionary
-            codebases={},
-        )
-        mock_get_autofix_state.return_value = autofix_state
-
-        class TestRepo:
-            def __init__(self):
-                self.url = "example.com"
-                self.external_id = "id123"
-                self.name = "test_repo"
-                self.provider = "github"
-                self.integration_id = 42
-
-        mock_get_sorted_code_mapping_configs.return_value = [
-            Mock(project_repository=Mock(repository=TestRepo()), default_branch="main"),
-        ]
-
-        self.login_as(user=self.user)
-        response = self.client.get(self._get_url(group.id), format="json")
-
-        assert response.status_code == 200
-        assert response.data["autofix"] is not None
-        # Should have empty repositories list since there are no codebases
-        assert len(response.data["autofix"]["repositories"]) == 0
-
-    @patch("sentry.seer.agent.utils.get_from_profiling_service")
-    @patch("sentry.seer.autofix.autofix._get_profile_from_trace_tree")
-    @patch("sentry.seer.autofix.autofix._call_autofix")
-    @patch("sentry.seer.autofix.autofix._get_trace_tree_for_event")
-    @patch("sentry.tasks.seer.autofix.check_autofix_status.apply_async")
-    def test_ai_autofix_post_endpoint(
-        self,
-        mock_check_autofix_status,
-        mock_get_trace_tree,
-        mock_call,
-        mock_get_profile,
-        mock_get_from_profiling,
-    ):
-        # Set up mock return values
-        mock_get_trace_tree.return_value = None
-        mock_call.return_value = 123  # Mocking the run_id returned by _call_autofix
-
-        release = self.create_release(project=self.project, version="1.0.0")
-
-        repo = self.create_repo(
-            project=self.project,
-            provider="integrations:github",
-            external_id="123",
-            name="getsentry/sentry",
-        )
-        self.create_seer_project_repository(project=self.project, repository=repo)
-
-        data = load_data("python", timestamp=before_now(minutes=1))
-        event = self.store_event(
-            data={
-                **data,
-                "release": release.version,
-                "exception": {"values": [{"type": "exception", "data": {"values": []}}]},
-            },
-            project_id=self.project.id,
-        )
-
-        group = event.group
-
-        assert group is not None
-        group.save()
+        mock_trigger_explorer.return_value = 123
 
         self.login_as(user=self.user)
         response = self.client.post(
             self._get_url(group.id),
-            data={"instruction": "Yes", "event_id": event.event_id},
+            data={"step": "root_cause"},
             format="json",
         )
 
-        # Verify that _call_autofix was called once
-        mock_call.assert_called_once()
-
-        # Check individual parameters that we care about
-        call_kwargs = mock_call.call_args.kwargs
-        assert call_kwargs["group"].id == group.id  # Check that the group object matches
-
-        # Check that the preference's repositories contain the expected data
-        expected = SeerRepoDefinition(
-            provider="integrations:github",
-            owner="getsentry",
-            name="sentry",
-            external_id="123",
-        )
-        preference = call_kwargs["preference"]
-        assert any(
-            repo.provider == expected.provider
-            and repo.owner == expected.owner
-            and repo.name == expected.name
-            and repo.external_id == expected.external_id
-            for repo in preference.repositories
-        )
-
-        # Check that the instruction was passed correctly
-        assert call_kwargs["instruction"] == "Yes"
-
-        # Check other parameters
-        assert call_kwargs["timeout_secs"] == TIMEOUT_SECONDS
-
-        # Verify that the serialized event has an exception entry
-        serialized_event_arg = call_kwargs["serialized_event"]
-        assert any(
-            [entry.get("type") == "exception" for entry in serialized_event_arg.get("entries", [])]
-        )
-
-        assert response.status_code == 202
-
-        mock_check_autofix_status.assert_called_once_with(
-            args=[123, group.organization.id], countdown=900
-        )
-
-    @patch("sentry.seer.agent.utils.get_from_profiling_service")
-    @patch("sentry.seer.autofix.autofix._get_profile_from_trace_tree")
-    @patch("sentry.seer.autofix.autofix._call_autofix")
-    @patch("sentry.seer.autofix.autofix._get_trace_tree_for_event")
-    @patch("sentry.tasks.seer.autofix.check_autofix_status.apply_async")
-    def test_ai_autofix_post_without_code_mappings(
-        self,
-        mock_check_autofix_status,
-        mock_get_trace_tree,
-        mock_call,
-        mock_get_profile,
-        mock_get_from_profiling,
-    ):
-        # Set up mock return values
-        mock_get_trace_tree.return_value = None
-        mock_call.return_value = 123  # Mocking the run_id returned by _call_autofix
-
-        release = self.create_release(project=self.project, version="1.0.0")
-
-        data = load_data("python", timestamp=before_now(minutes=1))
-        event = self.store_event(
-            data={
-                **data,
-                "release": release.version,
-                "exception": {"values": [{"type": "exception", "data": {"values": []}}]},
-            },
-            project_id=self.project.id,
-        )
-
-        group = event.group
+        assert response.status_code == 202, response.data
+        assert response.data["run_id"] == 123
+        mock_trigger_explorer.assert_called_once()
 
-        assert group is not None
-        group.save()
+    @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=False)
+    def test_post_returns_409_without_connected_repos(self, _):
+        group = self.create_group()
 
         self.login_as(user=self.user)
         response = self.client.post(
             self._get_url(group.id),
-            data={"instruction": "Yes", "event_id": event.event_id},
+            data={"step": "root_cause"},
             format="json",
         )
 
-        # Verify that _call_autofix was called once
-        mock_call.assert_called_once()
-
-        # Check individual parameters that we care about
-        call_kwargs = mock_call.call_args.kwargs
-        assert call_kwargs["group"].id == group.id  # Check that the group object matches
-
-        # No SeerProjectRepository rows, so the preference's repositories are empty.
-        assert call_kwargs["preference"].repositories == []
-
-        # Check that the instruction was passed correctly
-        assert call_kwargs["instruction"] == "Yes"
-
-        # Check other parameters
-        assert call_kwargs["timeout_secs"] == TIMEOUT_SECONDS
-
-        # Verify that the serialized event has an exception entry
-        serialized_event_arg = call_kwargs["serialized_event"]
-        assert any(
-            [entry.get("type") == "exception" for entry in serialized_event_arg.get("entries", [])]
-        )
-
-        assert response.status_code == 202
-
-        mock_check_autofix_status.assert_called_once_with(
-            args=[123, group.organization.id], countdown=900
-        )
-
-    @patch("sentry.seer.agent.utils.get_from_profiling_service")
-    @patch("sentry.seer.autofix.autofix._get_profile_from_trace_tree")
-    @patch("sentry.seer.autofix.autofix._call_autofix")
-    @patch("sentry.seer.autofix.autofix._get_trace_tree_for_event")
-    @patch("sentry.tasks.seer.autofix.check_autofix_status.apply_async")
-    def test_ai_autofix_post_without_event_id(
-        self,
-        mock_check_autofix_status,
-        mock_get_trace_tree,
-        mock_call,
-        mock_get_profile,
-        mock_get_from_profiling,
-    ):
-        # Set up mock return values
-        mock_get_trace_tree.return_value = None
-        mock_call.return_value = 123  # Mocking the run_id returned by _call_autofix
-
-        release = self.create_release(project=self.project, version="1.0.0")
-
-        repo = self.create_repo(
-            project=self.project,
-            provider="integrations:github",
-            external_id="123",
-            name="getsentry/sentry",
-        )
-        self.create_seer_project_repository(project=self.project, repository=repo)
-
-        data = load_data("python", timestamp=before_now(minutes=1))
-        event = self.store_event(
-            data={
-                **data,
-                "release": release.version,
-                "exception": {"values": [{"type": "exception", "data": {"values": []}}]},
-            },
-            project_id=self.project.id,
-        )
-
-        group = event.group
-
-        assert group is not None
-        group.save()
-
-        self.login_as(user=self.user)
-        response = self.client.post(
-            self._get_url(group.id), data={"instruction": "Yes"}, format="json"
-        )
-
-        # Verify that _call_autofix was called once
-        mock_call.assert_called_once()
-
-        # Check individual parameters that we care about
-        call_kwargs = mock_call.call_args.kwargs
-        assert call_kwargs["group"].id == group.id  # Check that the group object matches
-
-        # Check that the preference's repositories contain the expected data
-        expected = SeerRepoDefinition(
-            provider="integrations:github",
-            owner="getsentry",
-            name="sentry",
-            external_id="123",
-        )
-        preference = call_kwargs["preference"]
-        assert any(
-            repo.provider == expected.provider
-            and repo.owner == expected.owner
-            and repo.name == expected.name
-            and repo.external_id == expected.external_id
-            for repo in preference.repositories
-        )
-
-        # Check that the instruction was passed correctly
-        assert call_kwargs["instruction"] == "Yes"
-
-        # Check other parameters
-        assert call_kwargs["timeout_secs"] == TIMEOUT_SECONDS
-
-        # Verify that the serialized event has an exception entry
-        serialized_event_arg = call_kwargs["serialized_event"]
-        assert any(
-            [entry.get("type") == "exception" for entry in serialized_event_arg.get("entries", [])]
-        )
-
-        assert response.status_code == 202
+        assert response.status_code == 409, response.data
+        assert response.data["detail"] == "SCM integration is not configured for this project."
 
-        mock_check_autofix_status.assert_called_once_with(
-            args=[123, group.organization.id], countdown=900
-        )
-
-    @patch("sentry.models.Group.get_recommended_event_for_environments", return_value=None)
-    @patch("sentry.seer.agent.utils.get_from_profiling_service")
-    @patch("sentry.seer.autofix.autofix._call_autofix")
-    @patch("sentry.seer.autofix.autofix._get_trace_tree_for_event")
-    @patch("sentry.tasks.seer.autofix.check_autofix_status.apply_async")
-    def test_ai_autofix_post_without_event_id_no_recommended_event(
-        self,
-        mock_check_autofix_status,
-        mock_get_trace_tree,
-        mock_call,
-        mock_get_profiling,
-        mock_event,
-    ):
-        # Set up mock return values
-        mock_get_trace_tree.return_value = None
-        mock_call.return_value = 123  # Mocking the run_id returned by _call_autofix
-
-        release = self.create_release(project=self.project, version="1.0.0")
-
-        repo = self.create_repo(
-            project=self.project,
-            provider="integrations:github",
-            external_id="123",
-            name="getsentry/sentry",
-        )
-        self.create_seer_project_repository(project=self.project, repository=repo)
-
-        data = load_data("python", timestamp=before_now(minutes=1))
-        event = self.store_event(
-            data={
-                **data,
-                "release": release.version,
-                "exception": {"values": [{"type": "exception", "data": {"values": []}}]},
-            },
-            project_id=self.project.id,
-        )
-
-        group = event.group
-
-        assert group is not None
-        group.save()
-
-        self.login_as(user=self.user)
-        response = self.client.post(
-            self._get_url(group.id), data={"instruction": "Yes"}, format="json"
-        )
-
-        # Verify that _call_autofix was called once
-        mock_call.assert_called_once()
-
-        # Check individual parameters that we care about
-        call_kwargs = mock_call.call_args.kwargs
-        assert call_kwargs["group"].id == group.id  # Check that the group object matches
-
-        # Check that the preference's repositories contain the expected data
-        expected = SeerRepoDefinition(
-            provider="integrations:github",
-            owner="getsentry",
-            name="sentry",
-            external_id="123",
-        )
-        preference = call_kwargs["preference"]
-        assert any(
-            repo.provider == expected.provider
-            and repo.owner == expected.owner
-            and repo.name == expected.name
-            and repo.external_id == expected.external_id
-            for repo in preference.repositories
-        )
-
-        # Check that the instruction was passed correctly
-        assert call_kwargs["instruction"] == "Yes"
-
-        # Check other parameters
-        assert call_kwargs["timeout_secs"] == TIMEOUT_SECONDS
-
-        # Verify that the serialized event has an exception entry
-        serialized_event_arg = call_kwargs["serialized_event"]
-        assert any(
-            [entry.get("type") == "exception" for entry in serialized_event_arg.get("entries", [])]
-        )
-
-        assert response.status_code == 202
-
-        mock_check_autofix_status.assert_called_once_with(
-            args=[123, group.organization.id], countdown=900
-        )
-
-    @patch("sentry.models.Group.get_recommended_event_for_environments", return_value=None)
-    @patch("sentry.models.Group.get_latest_event", return_value=None)
-    def test_ai_autofix_post_without_event_id_error(
-        self, mock_latest_event, mock_recommended_event
-    ):
-        release = self.create_release(project=self.project, version="1.0.0")
-
-        repo = self.create_repo(
-            project=self.project,
-            name="getsentry/sentry",
-            provider="integrations:github",
-            external_id="123",
-            integration_id=234,
-        )
-        self.create_code_mapping(project=self.project, repo=repo)
-
-        data = load_data("python", timestamp=before_now(minutes=1))
-        event = self.store_event(
-            data={
-                **data,
-                "release": release.version,
-                "exception": {"values": [{"type": "exception", "data": {"values": []}}]},
-            },
-            project_id=self.project.id,
-        )
-
-        group = event.group
-
-        assert group is not None
-        group.save()
+    @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
+    @patch("sentry.seer.endpoints.group_ai_autofix.trigger_autofix_agent")
+    def test_stopping_point(self, mock_trigger_explorer, _):
+        """Stopping point forces the step to be root_cause"""
+        group = self.create_group()
+        mock_trigger_explorer.return_value = 123
 
         self.login_as(user=self.user)
         response = self.client.post(
-            self._get_url(group.id), data={"instruction": "Yes"}, format="json"
-        )
-        assert response.status_code == 400
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_autofix_state")
-    @patch("sentry.seer.endpoints.group_ai_autofix.cache")
-    def test_ai_autofix_get_endpoint_cache_miss(self, mock_cache, mock_get_autofix_state):
-        """Test that repo access is checked when cache is empty"""
-        # Set up cache miss
-        mock_cache.get.return_value = None
-
-        # Set up mock autofix state
-        mock_get_autofix_state.return_value = None
-
-        url = self._get_url(self.group.id)
-        self.login_as(user=self.user)
-
-        response = self.client.get(url)
-
-        # Verify response
-        assert response.status_code == 200
-
-        # Verify cache behavior - cache miss should trigger repo access check
-        mock_cache.get.assert_called_once_with(f"autofix_access_check:{self.group.id}")
-        mock_get_autofix_state.assert_called_once_with(
-            group_id=self.group.id,
-            check_repo_access=True,
-            is_user_fetching=False,
-            organization_id=self.group.organization.id,
-        )
-
-        # Verify the cache was set with a 60-second timeout
-        mock_cache.set.assert_called_once_with(
-            f"autofix_access_check:{self.group.id}", True, timeout=60
-        )
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_autofix_state")
-    @patch("sentry.seer.endpoints.group_ai_autofix.cache")
-    def test_ai_autofix_get_endpoint_cache_hit(self, mock_cache, mock_get_autofix_state):
-        """Test that repo access is not checked when cache has a value"""
-        # Set up cache hit
-        mock_cache.get.return_value = True
-
-        # Set up mock autofix state
-        mock_get_autofix_state.return_value = None
-
-        url = self._get_url(self.group.id)
-        self.login_as(user=self.user)
-
-        response = self.client.get(url)
-
-        # Verify response
-        assert response.status_code == 200
-
-        # Verify cache behavior - cache hit should skip repo access check
-        mock_cache.get.assert_called_once_with(f"autofix_access_check:{self.group.id}")
-        mock_get_autofix_state.assert_called_once_with(
-            group_id=self.group.id,
-            check_repo_access=False,
-            is_user_fetching=False,
-            organization_id=self.group.organization.id,
-        )
-
-        # Verify the cache was not set again
-        mock_cache.set.assert_not_called()
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_autofix_state")
-    @patch("sentry.seer.endpoints.group_ai_autofix.cache")
-    def test_ai_autofix_get_endpoint_polling_behavior(self, mock_cache, mock_get_autofix_state):
-        """Test that polling the endpoint only performs repository access checks once per minute"""
-        group = self.create_group()
-        url = self._get_url(group.id)
-        self.login_as(user=self.user)
-
-        # Mock the autofix state
-        mock_get_autofix_state.return_value = AutofixState(
-            run_id=123,
-            request={
-                "project_id": 456,
-                "organization_id": group.organization.id,
-                "issue": {"id": 789, "title": "Test Issue"},
-                "repos": [],
-            },
-            updated_at=datetime.fromisoformat("2023-07-18T12:00:00Z"),
-            status=AutofixStatus.PROCESSING,
-        )
-
-        # Simulate first request (cache miss)
-        mock_cache.get.return_value = None
-
-        response1 = self.client.get(url)
-        assert response1.status_code == 200
-
-        # Verify first request behavior
-        mock_cache.get.assert_called_once_with(f"autofix_access_check:{group.id}")
-        mock_get_autofix_state.assert_called_once_with(
-            group_id=group.id,
-            check_repo_access=True,
-            is_user_fetching=False,
-            organization_id=group.organization.id,
-        )
-        mock_cache.set.assert_called_once_with(f"autofix_access_check:{group.id}", True, timeout=60)
-
-        # Reset mocks for second request
-        mock_cache.reset_mock()
-        mock_get_autofix_state.reset_mock()
-
-        # Simulate second request within the 1-minute window (cache hit)
-        mock_cache.get.return_value = True
-
-        response2 = self.client.get(url)
-        assert response2.status_code == 200
-
-        # Verify second request behavior
-        mock_cache.get.assert_called_once_with(f"autofix_access_check:{group.id}")
-        mock_get_autofix_state.assert_called_once_with(
-            group_id=group.id,
-            check_repo_access=False,
-            is_user_fetching=False,
-            organization_id=group.organization.id,
+            self._get_url(group.id),
+            data={"step": "coding_agent_handoff", "stopping_point": "code_changes"},
+            format="json",
         )
-        mock_cache.set.assert_not_called()
-
-        # Reset mocks for third request
-        mock_cache.reset_mock()
-        mock_get_autofix_state.reset_mock()
-
-        # Simulate third request after cache expiration (cache miss again)
-        mock_cache.get.return_value = None
 
-        response3 = self.client.get(url)
-        assert response3.status_code == 200
-
-        # Verify third request behavior - should be like the first request
-        mock_cache.get.assert_called_once_with(f"autofix_access_check:{group.id}")
-        mock_get_autofix_state.assert_called_once_with(
-            group_id=group.id,
-            check_repo_access=True,
-            is_user_fetching=False,
-            organization_id=group.organization.id,
+        assert response.status_code == 202, response.data
+        assert response.data["run_id"] == 123
+        mock_trigger_explorer.assert_called_once_with(
+            group=group,
+            step=AutofixStep.ROOT_CAUSE,
+            referrer=AutofixReferrer.GROUP_AUTOFIX_ENDPOINT,
+            stopping_point=AutofixStoppingPoint.CODE_CHANGES,
+            run_id=None,
+            intelligence_level="medium",
+            user_context=None,
+            insert_index=None,
         )
-        mock_cache.set.assert_called_once_with(f"autofix_access_check:{group.id}", True, timeout=60)
 
-    def test_ai_autofix_post_invalid_stopping_point_string(self) -> None:
+    @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
+    @patch("sentry.seer.endpoints.group_ai_autofix.trigger_autofix_agent")
+    def test_insert_index_passed_through(self, mock_trigger_explorer, _):
+        """POST passes insert_index to trigger_autofix_agent for retry-from-step."""
         group = self.create_group()
+        mock_trigger_explorer.return_value = 123
 
         self.login_as(user=self.user)
         response = self.client.post(
             self._get_url(group.id),
-            data={"instruction": "test", "stopping_point": "invalid"},
+            data={"step": "solution", "run_id": 42, "insert_index": 3},
             format="json",
         )
 
-        assert response.status_code == 400
-        assert "stoppingPoint" in response.data
-        assert "not a valid choice" in str(response.data["stoppingPoint"])
+        assert response.status_code == 202, response.data
+        mock_trigger_explorer.assert_called_once_with(
+            group=group,
+            step=AutofixStep.SOLUTION,
+            referrer=AutofixReferrer.GROUP_AUTOFIX_ENDPOINT,
+            stopping_point=None,
+            run_id=42,
+            intelligence_level="medium",
+            user_context=None,
+            insert_index=3,
+        )
 
-    def test_ai_autofix_post_invalid_stopping_point_type(self) -> None:
+    @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
+    @patch("sentry.seer.endpoints.group_ai_autofix.trigger_autofix_agent")
+    def test_post_continue_unknown_run_returns_404(self, mock_trigger_explorer, _):
+        mock_trigger_explorer.side_effect = SeerPermissionError("Unknown run id for group")
         group = self.create_group()
 
         self.login_as(user=self.user)
         response = self.client.post(
             self._get_url(group.id),
-            data={"instruction": "test", "stopping_point": 123},
+            data={"step": "solution", "run_id": 123},
             format="json",
         )
 
-        assert response.status_code == 400
-        assert "stoppingPoint" in response.data
-        assert "not a valid choice" in str(response.data["stoppingPoint"])
-
-
-EXPLORER_FLAGS = [
-    "organizations:seer-explorer",
-    "organizations:autofix-on-explorer",
-]
-
-
-@with_feature("organizations:gen-ai-features")
-class GroupAutofixEndpointExplorerRoutingTest(APITestCase, SnubaTestCase):
-    """Tests for feature flag routing to the agent-based autofix."""
-
-    def _get_url(self, group_id: int, mode: str | None = None) -> str:
-        url = f"/api/0/organizations/{self.organization.slug}/issues/{group_id}/autofix/"
-        if mode is not None:
-            url = f"{url}?mode={mode}"
-        return url
-
-    def setUp(self) -> None:
-        super().setUp()
-        self.organization.update_option("sentry:gen_ai_consent_v2024_11_14", True)
-        self.organization.flags.allow_joinleave = True
-        self.organization.save()
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_autofix_agent_state")
-    def test_get_routes_to_explorer_with_explorer_flag(self, mock_get_explorer_state):
-        """GET routes to explorer when any individual explorer flag is enabled."""
-        for flag in EXPLORER_FLAGS:
-            mock_get_explorer_state.reset_mock()
-            group = self.create_group()
-            mock_get_explorer_state.return_value = None
-
-            self.login_as(user=self.user)
-            with self.feature(flag):
-                response = self.client.get(self._get_url(group.id, mode="explorer"), format="json")
-
-            assert response.status_code == 200, f"Failed for {flag}: {response.data}"
-            mock_get_explorer_state.assert_called_once_with(group.organization, group.id)
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_autofix_state")
-    def test_get_routes_to_legacy_with_mode_param(self, mock_get_autofix_state):
-        """GET routes to legacy when no explorer flag is enabled."""
-        group = self.create_group()
-        mock_get_autofix_state.return_value = None
-
-        self.login_as(user=self.user)
-        response = self.client.get(self._get_url(group.id), format="json")
-
-        assert response.status_code == 200, response.data
-        mock_get_autofix_state.assert_called_once()
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
-    @patch("sentry.seer.endpoints.group_ai_autofix.trigger_autofix_agent")
-    def test_post_routes_to_explorer_with_explorer_flag(self, mock_trigger_explorer, _):
-        """POST routes to explorer when any individual explorer flag is enabled."""
-        for flag in EXPLORER_FLAGS:
-            mock_trigger_explorer.reset_mock()
-            group = self.create_group()
-            mock_trigger_explorer.return_value = 123
-
-            self.login_as(user=self.user)
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={"step": "root_cause"},
-                    format="json",
-                )
-
-            assert response.status_code == 202, f"Failed for {flag}: {response.data}"
-            assert response.data["run_id"] == 123
-            mock_trigger_explorer.assert_called_once()
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=False)
-    def test_post_returns_409_without_connected_repos(self, _):
-        """POST returns 409 when project has no connected repositories."""
-        for flag in EXPLORER_FLAGS:
-            group = self.create_group()
-
-            self.login_as(user=self.user)
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={"step": "root_cause"},
-                    format="json",
-                )
-
-            assert response.status_code == 409, f"Failed for {flag}: {response.data}"
-            assert response.data["detail"] == "SCM integration is not configured for this project."
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
-    @patch("sentry.seer.endpoints.group_ai_autofix.trigger_autofix_agent")
-    def test_stopping_point(self, mock_trigger_explorer, _):
-        """POST routes to explorer and stopping point forces the step to be root_cause"""
-        for flag in EXPLORER_FLAGS:
-            mock_trigger_explorer.reset_mock()
-            group = self.create_group()
-            mock_trigger_explorer.return_value = 123
-
-            self.login_as(user=self.user)
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={"step": "coding_agent_handoff", "stopping_point": "code_changes"},
-                    format="json",
-                )
-
-            assert response.status_code == 202, f"Failed for {flag}: {response.data}"
-            assert response.data["run_id"] == 123
-            mock_trigger_explorer.assert_called_once_with(
-                group=group,
-                step=AutofixStep.ROOT_CAUSE,
-                referrer=AutofixReferrer.GROUP_AUTOFIX_ENDPOINT,
-                stopping_point=AutofixStoppingPoint.CODE_CHANGES,
-                run_id=None,
-                intelligence_level="medium",
-                user_context=None,
-                insert_index=None,
-            )
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
-    @patch("sentry.seer.endpoints.group_ai_autofix.trigger_autofix_agent")
-    def test_insert_index_passed_through(self, mock_trigger_explorer, _):
-        """POST passes insert_index to trigger_autofix_agent for retry-from-step."""
-        for flag in EXPLORER_FLAGS:
-            mock_trigger_explorer.reset_mock()
-            group = self.create_group()
-            mock_trigger_explorer.return_value = 123
-
-            self.login_as(user=self.user)
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={"step": "solution", "run_id": 42, "insert_index": 3},
-                    format="json",
-                )
-
-            assert response.status_code == 202, f"Failed for {flag}: {response.data}"
-            mock_trigger_explorer.assert_called_once_with(
-                group=group,
-                step=AutofixStep.SOLUTION,
-                referrer=AutofixReferrer.GROUP_AUTOFIX_ENDPOINT,
-                stopping_point=None,
-                run_id=42,
-                intelligence_level="medium",
-                user_context=None,
-                insert_index=3,
-            )
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
-    @patch("sentry.seer.endpoints.group_ai_autofix.trigger_autofix_agent")
-    def test_post_continue_unknown_run_returns_404(self, mock_trigger_explorer, _):
-        for flag in EXPLORER_FLAGS:
-            mock_trigger_explorer.reset_mock()
-            mock_trigger_explorer.side_effect = SeerPermissionError("Unknown run id for group")
-            group = self.create_group()
-
-            self.login_as(user=self.user)
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={"step": "solution", "run_id": 123},
-                    format="json",
-                )
-
-            assert response.status_code == 404, f"Failed for {flag}: {response.data}"
-            mock_trigger_explorer.assert_called_once()
+        assert response.status_code == 404, response.data
+        mock_trigger_explorer.assert_called_once()
 
     @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
     @patch("sentry.seer.endpoints.group_ai_autofix.trigger_autofix_agent")
     def test_post_returns_402_when_no_seer_quota(self, mock_trigger_explorer, _):
         """POST returns 402 Payment Required when quota check fails."""
-        for flag in EXPLORER_FLAGS:
-            mock_trigger_explorer.reset_mock()
-            mock_trigger_explorer.side_effect = NoSeerQuotaException()
-            group = self.create_group()
-
-            self.login_as(user=self.user)
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={"step": "root_cause"},
-                    format="json",
-                )
-
-            assert response.status_code == 402, f"Failed for {flag}: {response.data}"
-            assert response.data == "No budget for Seer Autofix."
-
-    @patch("sentry.seer.autofix.autofix._call_autofix")
-    @patch("sentry.seer.autofix.autofix._get_trace_tree_for_event")
-    @patch("sentry.tasks.seer.autofix.check_autofix_status.apply_async")
-    def test_post_routes_to_legacy_with_mode_param(
-        self,
-        mock_check_autofix_status,
-        mock_get_trace_tree,
-        mock_call_autofix,
-    ):
-        """POST routes to legacy when mode=legacy is in query params even with both flags enabled."""
-        release = self.create_release(project=self.project, version="1.0.0")
-
-        data = load_data("python", timestamp=before_now(minutes=1))
-        event = self.store_event(
-            data={
-                **data,
-                "release": release.version,
-                "exception": {"values": [{"type": "exception", "data": {"values": []}}]},
-            },
-            project_id=self.project.id,
-        )
-
-        group = event.group
-
-        mock_get_trace_tree.return_value = None
-        mock_call_autofix.return_value = 123
+        mock_trigger_explorer.side_effect = NoSeerQuotaException()
+        group = self.create_group()
 
         self.login_as(user=self.user)
         response = self.client.post(
             self._get_url(group.id),
-            data={"instruction": "test"},
+            data={"step": "root_cause"},
             format="json",
         )
 
-        assert response.status_code == 202, response.data
-        mock_call_autofix.assert_called_once()
+        assert response.status_code == 402, response.data
+        assert response.data == "No budget for Seer Autofix."
 
     @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
     def test_post_coding_agent_handoff_errors_with_both_provider_and_integration_id(
         self, _
     ) -> None:
         """POST returns 400 when both provider and integration_id are specified for coding_agent_handoff."""
-        for flag in EXPLORER_FLAGS:
-            group = self.create_group()
+        group = self.create_group()
 
-            self.login_as(user=self.user)
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={
-                        "step": "coding_agent_handoff",
-                        "run_id": 123,
-                        "integration_id": 456,
-                        "provider": "github_copilot",
-                    },
-                    format="json",
-                )
+        self.login_as(user=self.user)
+        response = self.client.post(
+            self._get_url(group.id),
+            data={
+                "step": "coding_agent_handoff",
+                "run_id": 123,
+                "integration_id": 456,
+                "provider": "github_copilot",
+            },
+            format="json",
+        )
 
-            assert response.status_code == 400, f"Failed for {flag}: {response.data}"
-            assert response.data["detail"] == "Cannot specify both integration_id and provider"
+        assert response.status_code == 400, response.data
+        assert response.data["detail"] == "Cannot specify both integration_id and provider"
 
     @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
     @patch("sentry.seer.endpoints.group_ai_autofix.trigger_coding_agent_handoff")
     def test_post_coding_agent_handoff_unknown_run_returns_404(self, mock_handoff, _):
-        for flag in EXPLORER_FLAGS:
-            mock_handoff.reset_mock()
-            mock_handoff.side_effect = SeerPermissionError("Unknown run id for group")
-            group = self.create_group()
+        mock_handoff.side_effect = SeerPermissionError("Unknown run id for group")
+        group = self.create_group()
 
-            self.login_as(user=self.user)
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={
-                        "step": "coding_agent_handoff",
-                        "run_id": 123,
-                        "integration_id": 456,
-                    },
-                    format="json",
-                )
+        self.login_as(user=self.user)
+        response = self.client.post(
+            self._get_url(group.id),
+            data={
+                "step": "coding_agent_handoff",
+                "run_id": 123,
+                "integration_id": 456,
+            },
+            format="json",
+        )
 
-            assert response.status_code == 404, f"Failed for {flag}: {response.data}"
-            mock_handoff.assert_called_once()
-            assert (
-                mock_handoff.call_args.kwargs["referrer"] == AutofixReferrer.GROUP_AUTOFIX_ENDPOINT
-            )
+        assert response.status_code == 404, response.data
+        mock_handoff.assert_called_once()
+        assert mock_handoff.call_args.kwargs["referrer"] == AutofixReferrer.GROUP_AUTOFIX_ENDPOINT
 
     @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
     @patch("sentry.seer.endpoints.group_ai_autofix.trigger_coding_agent_handoff")
@@ -1132,16 +205,15 @@ def test_post_coding_agent_handoff_auto_creates_pr_by_default(self, mock_handoff
         group = self.create_group()
 
         self.login_as(user=self.user)
-        with self.feature(EXPLORER_FLAGS[0]):
-            response = self.client.post(
-                self._get_url(group.id, mode="explorer"),
-                data={
-                    "step": "coding_agent_handoff",
-                    "run_id": 123,
-                    "integration_id": 456,
-                },
-                format="json",
-            )
+        response = self.client.post(
+            self._get_url(group.id),
+            data={
+                "step": "coding_agent_handoff",
+                "run_id": 123,
+                "integration_id": 456,
+            },
+            format="json",
+        )
 
         assert response.status_code == 202, response.data
         mock_handoff.assert_called_once_with(
@@ -1182,19 +254,17 @@ def test_open_pr(self, mock_explorer_update_request, mock_explorer_state_request
         )
         mock_explorer_state_request.return_value = mock_explorer_state_response
 
-        for flag in EXPLORER_FLAGS:
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={
-                        "step": "open_pr",
-                        "run_id": 123,
-                    },
-                    format="json",
-                )
+        response = self.client.post(
+            self._get_url(group.id),
+            data={
+                "step": "open_pr",
+                "run_id": 123,
+            },
+            format="json",
+        )
 
-            assert response.status_code == 202, f"Failed for {flag}: {response.data}"
-            assert response.data == {"run_id": 123}
+        assert response.status_code == 202, response.data
+        assert response.data == {"run_id": 123}
 
     @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
     @patch("sentry.seer.agent.client_utils.make_agent_state_request")
@@ -1226,22 +296,20 @@ def test_open_pr_with_repo_name(
         )
         mock_explorer_state_request.return_value = mock_explorer_state_response
 
-        for flag in EXPLORER_FLAGS:
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={
-                        "step": "open_pr",
-                        "run_id": 123,
-                        "repo_name": "my-org/my-repo",
-                    },
-                    format="json",
-                )
+        response = self.client.post(
+            self._get_url(group.id),
+            data={
+                "step": "open_pr",
+                "run_id": 123,
+                "repo_name": "my-org/my-repo",
+            },
+            format="json",
+        )
 
-            assert response.status_code == 202, f"Failed for {flag}: {response.data}"
-            call_body = mock_explorer_update_request.call_args[0][0]
-            assert call_body["payload"]["type"] == "create_pr"
-            assert call_body["payload"]["repo_name"] == "my-org/my-repo"
+        assert response.status_code == 202, response.data
+        call_body = mock_explorer_update_request.call_args[0][0]
+        assert call_body["payload"]["type"] == "create_pr"
+        assert call_body["payload"]["repo_name"] == "my-org/my-repo"
 
     @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
     @patch("sentry.seer.agent.client_utils.make_agent_state_request")
@@ -1273,37 +341,33 @@ def test_open_pr_without_repo_name(
         )
         mock_explorer_state_request.return_value = mock_explorer_state_response
 
-        for flag in EXPLORER_FLAGS:
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={
-                        "step": "open_pr",
-                        "run_id": 123,
-                    },
-                    format="json",
-                )
+        response = self.client.post(
+            self._get_url(group.id),
+            data={
+                "step": "open_pr",
+                "run_id": 123,
+            },
+            format="json",
+        )
 
-            assert response.status_code == 202, f"Failed for {flag}: {response.data}"
-            call_body = mock_explorer_update_request.call_args[0][0]
-            assert call_body["payload"]["type"] == "create_pr"
-            assert "repo_name" not in call_body["payload"]
+        assert response.status_code == 202, response.data
+        call_body = mock_explorer_update_request.call_args[0][0]
+        assert call_body["payload"]["type"] == "create_pr"
+        assert "repo_name" not in call_body["payload"]
 
     @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
     def test_open_pr_no_run_id(self, _) -> None:
         self.login_as(user=self.user)
+        group = self.create_group()
 
-        for flag in EXPLORER_FLAGS:
-            group = self.create_group()
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={"step": "open_pr"},
-                    format="json",
-                )
+        response = self.client.post(
+            self._get_url(group.id),
+            data={"step": "open_pr"},
+            format="json",
+        )
 
-            assert response.status_code == 400, f"Failed for {flag}: {response.data}"
-            assert response.data["detail"] == "run_id is required for open_pr"
+        assert response.status_code == 400, response.data
+        assert response.data["detail"] == "run_id is required for open_pr"
 
     @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
     @patch("sentry.seer.agent.client_utils.make_agent_state_request")
@@ -1325,18 +389,16 @@ def test_open_pr_permission_error(self, mock_explorer_state_request, _):
         )
         mock_explorer_state_request.return_value = mock_explorer_state_response
 
-        for flag in EXPLORER_FLAGS:
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={
-                        "step": "open_pr",
-                        "run_id": 123,
-                    },
-                    format="json",
-                )
+        response = self.client.post(
+            self._get_url(group.id),
+            data={
+                "step": "open_pr",
+                "run_id": 123,
+            },
+            format="json",
+        )
 
-            assert response.status_code == 404, f"Failed for {flag}: {response.data}"
+        assert response.status_code == 404, response.data
 
     @patch("sentry.seer.endpoints.group_ai_autofix.has_project_connected_repos", return_value=True)
     def test_open_pr_coding_disabled(self, _):
@@ -1344,40 +406,13 @@ def test_open_pr_coding_disabled(self, _):
         group = self.create_group()
         self.organization.update_option("sentry:enable_seer_coding", False)
 
-        for flag in EXPLORER_FLAGS:
-            with self.feature(flag):
-                response = self.client.post(
-                    self._get_url(group.id, mode="explorer"),
-                    data={
-                        "step": "open_pr",
-                        "run_id": 123,
-                    },
-                    format="json",
-                )
-
-            assert response.status_code == 403, f"Failed for {flag}: {response.data}"
-
-
-@with_feature("organizations:gen-ai-features")
-@with_feature("organizations:seer-explorer")
-class GroupAutofixEndpointLegacyRoutingTest(APITestCase, SnubaTestCase):
-    """Tests that endpoint routes to legacy when autofix-on-explorer flag is missing."""
-
-    def _get_url(self, group_id: int) -> str:
-        return f"/api/0/organizations/{self.organization.slug}/issues/{group_id}/autofix/"
-
-    def setUp(self) -> None:
-        super().setUp()
-        self.organization.update_option("sentry:gen_ai_consent_v2024_11_14", True)
-
-    @patch("sentry.seer.endpoints.group_ai_autofix.get_autofix_state")
-    def test_get_routes_to_legacy_without_autofix_on_explorer_flag(self, mock_get_autofix_state):
-        """GET routes to legacy when autofix-on-explorer flag is missing."""
-        group = self.create_group()
-        mock_get_autofix_state.return_value = None
-
-        self.login_as(user=self.user)
-        response = self.client.get(self._get_url(group.id), format="json")
+        response = self.client.post(
+            self._get_url(group.id),
+            data={
+                "step": "open_pr",
+                "run_id": 123,
+            },
+            format="json",
+        )
 
-        assert response.status_code == 200, response.data
-        mock_get_autofix_state.assert_called_once()
+        assert response.status_code == 403, response.data
diff --git a/tests/sentry/spans/consumers/process_segments/test_bounded_lru_cache.py b/tests/sentry/spans/consumers/process_segments/test_bounded_lru_cache.py
new file mode 100644
index 00000000000000..56646c34cf0288
--- /dev/null
+++ b/tests/sentry/spans/consumers/process_segments/test_bounded_lru_cache.py
@@ -0,0 +1,78 @@
+from sentry.spans.consumers.process_segments.message import BoundedLRUCache
+
+
+class TestBoundedLRUCache:
+    def test_get_returns_none_on_miss(self):
+        cache = BoundedLRUCache(max_size=4)
+        assert cache.get("a") is None
+
+    def test_set_and_get(self):
+        cache = BoundedLRUCache(max_size=4)
+        cache.set("a", 100)
+        assert cache.get("a") == 100
+
+    def test_overwrite_existing_key(self):
+        cache = BoundedLRUCache(max_size=4)
+        cache.set("a", 100)
+        cache.set("a", 200)
+        assert cache.get("a") == 200
+        assert len(cache.cache) == 1
+
+    def test_evicts_lru_when_full(self):
+        cache = BoundedLRUCache(max_size=3)
+        cache.set("a", 1)
+        cache.set("b", 2)
+        cache.set("c", 3)
+        # Cache is at capacity. Adding a 4th key evicts "a" (least recently used).
+        cache.set("d", 4)
+        assert cache.get("a") is None
+        assert cache.get("b") == 2
+        assert cache.get("c") == 3
+        assert cache.get("d") == 4
+
+    def test_get_promotes_key_preventing_eviction(self):
+        cache = BoundedLRUCache(max_size=3)
+        cache.set("a", 1)
+        cache.set("b", 2)
+        cache.set("c", 3)
+        # Access "a" to promote it — "b" is now the LRU entry.
+        cache.get("a")
+        cache.set("d", 4)
+        assert cache.get("a") == 1
+        assert cache.get("b") is None
+
+    def test_set_promotes_key_preventing_eviction(self):
+        cache = BoundedLRUCache(max_size=3)
+        cache.set("a", 1)
+        cache.set("b", 2)
+        cache.set("c", 3)
+        # Overwrite "a" to promote it — "b" is now the LRU entry.
+        cache.set("a", 10)
+        cache.set("d", 4)
+        assert cache.get("a") == 10
+        assert cache.get("b") is None
+
+    def test_max_size_of_one(self):
+        cache = BoundedLRUCache(max_size=1)
+        cache.set("a", 1)
+        assert cache.get("a") == 1
+        cache.set("b", 2)
+        assert cache.get("a") is None
+        assert cache.get("b") == 2
+
+    def test_distinct_keys_do_not_collide(self):
+        cache = BoundedLRUCache(max_size=100)
+        cache.set("1:production:v1.0:", 100)
+        cache.set("1:production:v2.0:", 200)
+        assert cache.get("1:production:v1.0:") == 100
+        assert cache.get("1:production:v2.0:") == 200
+
+    def test_hash_key_is_deterministic(self):
+        cache = BoundedLRUCache(max_size=4)
+        h1 = cache._hash_key("some-key")
+        h2 = cache._hash_key("some-key")
+        assert h1 == h2
+
+    def test_hash_key_returns_int(self):
+        cache = BoundedLRUCache(max_size=4)
+        assert isinstance(cache._hash_key("key"), int)
diff --git a/tests/sentry/spans/consumers/process_segments/test_message.py b/tests/sentry/spans/consumers/process_segments/test_message.py
index 734866dd1cd7e3..3b66e61388a97c 100644
--- a/tests/sentry/spans/consumers/process_segments/test_message.py
+++ b/tests/sentry/spans/consumers/process_segments/test_message.py
@@ -8,6 +8,7 @@
 from sentry.issues.grouptype import PerformanceStreamedSpansGroupTypeExperimental
 from sentry.models.environment import Environment
 from sentry.models.release import Release
+from sentry.spans.consumers.process_segments import message as message_module
 from sentry.spans.consumers.process_segments.message import _verify_compatibility, process_segment
 from sentry.spans.consumers.process_segments.shim import build_shim_event_data
 from sentry.testutils.cases import TestCase
@@ -448,3 +449,155 @@ def test_drop_segment_by_org_id(self) -> None:
         ):
             processed_spans = process_segment([child_span, segment_span])
             assert len(processed_spans) == 0
+
+
+@exclude_experimental_detectors
+class TestProcessSegmentCaching(TestCase):
+    def setUp(self):
+        self.project = self.create_project()
+        self.base_ts = 1707953018.972  # Default `end_timestamp` generated by `build_mock_span`
+        message_module.cache = None
+
+    def tearDown(self):
+        message_module.cache = None
+
+    @mock.patch("sentry.spans.consumers.process_segments.message._bump_release_last_seen")
+    @mock.patch("sentry.spans.consumers.process_segments.message._create_models")
+    def test_first_segment_calls_create_models(self, mock_create, mock_bump):
+        segment = build_mock_span(project_id=self.project.id, is_segment=True)
+        process_segment([segment])
+
+        mock_create.assert_called_once()
+        mock_bump.assert_not_called()
+
+    @mock.patch("sentry.spans.consumers.process_segments.message._bump_release_last_seen")
+    @mock.patch("sentry.spans.consumers.process_segments.message._create_models")
+    def test_duplicate_segment_is_noop(self, mock_create, mock_bump):
+        segment = build_mock_span(project_id=self.project.id, is_segment=True)
+        process_segment([segment])
+        mock_create.reset_mock()
+
+        process_segment([segment])
+
+        mock_create.assert_not_called()
+        mock_bump.assert_not_called()
+
+    @mock.patch("sentry.spans.consumers.process_segments.message._bump_release_last_seen")
+    @mock.patch("sentry.spans.consumers.process_segments.message._create_models")
+    def test_segment_within_interval_is_noop(self, mock_create, mock_bump):
+        segment = build_mock_span(project_id=self.project.id, is_segment=True)
+        process_segment([segment])
+        mock_create.reset_mock()
+
+        later = build_mock_span(
+            project_id=self.project.id,
+            is_segment=True,
+            end_timestamp=self.base_ts + 59,
+        )
+        process_segment([later])
+
+        mock_create.assert_not_called()
+        mock_bump.assert_not_called()
+
+    @mock.patch("sentry.spans.consumers.process_segments.message._bump_release_last_seen")
+    @mock.patch("sentry.spans.consumers.process_segments.message._create_models")
+    def test_segment_exceeding_interval_calls_bump(self, mock_create, mock_bump):
+        segment = build_mock_span(project_id=self.project.id, is_segment=True)
+        process_segment([segment])
+        mock_create.reset_mock()
+
+        later = build_mock_span(
+            project_id=self.project.id,
+            is_segment=True,
+            end_timestamp=self.base_ts + 61,
+        )
+        process_segment([later])
+
+        mock_create.assert_not_called()
+        mock_bump.assert_called_once()
+
+    @mock.patch("sentry.spans.consumers.process_segments.message._bump_release_last_seen")
+    @mock.patch("sentry.spans.consumers.process_segments.message._create_models")
+    def test_bump_advances_cached_timestamp(self, mock_create, mock_bump):
+        segment = build_mock_span(project_id=self.project.id, is_segment=True)
+        process_segment([segment])
+        mock_create.reset_mock()
+
+        # Trigger a bump at T+61.
+        bump_ts = self.base_ts + 61
+        process_segment(
+            [build_mock_span(project_id=self.project.id, is_segment=True, end_timestamp=bump_ts)]
+        )
+        mock_bump.reset_mock()
+
+        # T+90 is only 29s after the bump — should be noop.
+        process_segment(
+            [
+                build_mock_span(
+                    project_id=self.project.id, is_segment=True, end_timestamp=self.base_ts + 90
+                )
+            ]
+        )
+        mock_create.assert_not_called()
+        mock_bump.assert_not_called()
+
+        # T+122 is 61s after the bump — should trigger another bump.
+        process_segment(
+            [
+                build_mock_span(
+                    project_id=self.project.id, is_segment=True, end_timestamp=bump_ts + 61
+                )
+            ]
+        )
+        mock_bump.assert_called_once()
+
+    @mock.patch("sentry.spans.consumers.process_segments.message._bump_release_last_seen")
+    @mock.patch("sentry.spans.consumers.process_segments.message._create_models")
+    def test_different_release_triggers_create_models(self, mock_create, mock_bump):
+        segment = build_mock_span(project_id=self.project.id, is_segment=True)
+        process_segment([segment])
+        mock_create.reset_mock()
+
+        segment = build_mock_span(
+            project_id=self.project.id,
+            is_segment=True,
+            attributes={"sentry.release": {"value": "v2.0.0", "type": "string"}},
+        )
+        process_segment([segment])
+
+        mock_create.assert_called_once()
+        mock_bump.assert_not_called()
+
+    @mock.patch("sentry.spans.consumers.process_segments.message._bump_release_last_seen")
+    @mock.patch("sentry.spans.consumers.process_segments.message._create_models")
+    def test_different_environment_triggers_create_models(self, mock_create, mock_bump):
+        segment = build_mock_span(project_id=self.project.id, is_segment=True)
+        process_segment([segment])
+        mock_create.reset_mock()
+
+        segment = build_mock_span(
+            project_id=self.project.id,
+            is_segment=True,
+            attributes={"sentry.environment": {"value": "production", "type": "string"}},
+        )
+        process_segment([segment])
+
+        mock_create.assert_called_once()
+        mock_bump.assert_not_called()
+
+    @mock.patch("sentry.spans.consumers.process_segments.message._bump_release_last_seen")
+    @mock.patch("sentry.spans.consumers.process_segments.message._create_models")
+    def test_out_of_order_old_event_is_noop(self, mock_create, mock_bump):
+        later = build_mock_span(
+            project_id=self.project.id,
+            is_segment=True,
+            end_timestamp=self.base_ts + 200,
+        )
+        process_segment([later])
+        mock_create.reset_mock()
+
+        earlier = build_mock_span(project_id=self.project.id, is_segment=True)
+        process_segment([earlier])
+
+        mock_create.assert_not_called()
+        mock_bump.assert_not_called()
diff --git a/tests/sentry/spans/test_buffer.py b/tests/sentry/spans/test_buffer.py
index 9653b344b89d38..8f8bc6825daf72 100644
--- a/tests/sentry/spans/test_buffer.py
+++ b/tests/sentry/spans/test_buffer.py
@@ -20,7 +20,12 @@
     OutputSpan,
     SpansBuffer,
 )
-from sentry.spans.buffer_types import EvalshaResult, InsertedSubsegment, Span, Subsegment
+from sentry.spans.buffer_types import (
+    EvalshaResult,
+    InsertedSubsegment,
+    Span,
+    Subsegment,
+)
 from sentry.spans.consumers.process.factory import SPANS_CODEC, validate_span_event
 from sentry.spans.consumers.process_segments.types import attribute_value
 from sentry.spans.segment_key import SegmentKey
@@ -2010,6 +2015,48 @@ def load_segment_buffer() -> Iterator[SpansBuffer]:
         yield buffer
 
 
+def test_load_payload_keys_from_distributed_keys(
+    load_segment_buffer: SpansBuffer,
+) -> None:
+    buffer = load_segment_buffer
+    trace_id = "a" * 32
+    segment_key = _segment_id(1, trace_id, "b" * 16)
+    first_salt = "1" * 32
+    second_salt = "2" * 32
+    first_payload_key = _payload_key(1, trace_id, first_salt)
+    second_payload_key = _payload_key(1, trace_id, second_salt)
+    buffer.client.sadd(buffer._get_payload_key_index(segment_key), first_salt, second_salt)
+
+    payload_keys = buffer._load_payload_keys([segment_key])
+
+    assert set(payload_keys[segment_key]) == {
+        first_payload_key,
+        second_payload_key,
+    }
+
+
+def test_load_payloads_from_keys_decompresses_payload_batches(
+    load_segment_buffer: SpansBuffer,
+) -> None:
+    buffer = load_segment_buffer
+    trace_id = "a" * 32
+    segment_key = _segment_id(1, trace_id, "b" * 16)
+    payload_key = _payload_key(1, trace_id, "1" * 32)
+    span_a = _payload("a" * 16)
+    span_b = _payload("b" * 16)
+    compressed = zstandard.ZstdCompressor(level=0).compress(b"\x00".join([span_a, span_b]))
+    buffer.client.sadd(payload_key, compressed)
+
+    payloads, decompress_latency_ms = buffer._load_payloads_from_keys(
+        [segment_key],
+        {segment_key: [payload_key]},
+        page_size=1,
+    )
+
+    assert set(payloads[segment_key]) == {span_a, span_b}
+    assert decompress_latency_ms >= 0
+
+
 def test_load_segment_data_reads_payloads_from_distributed_keys(
     load_segment_buffer: SpansBuffer,
 ) -> None:
@@ -2030,10 +2077,13 @@ def test_load_segment_data_reads_payloads_from_distributed_keys(
     buffer.client.set(b"span-buf:ic:" + segment_key, 3)
     buffer.client.set(b"span-buf:ibc:" + segment_key, len(span_a) + len(span_b) + len(span_c))
 
-    payloads, payload_keys_map = buffer._load_segment_data([segment_key], {}, now=0)
+    loaded_segment_data, _ = buffer._load_segment_data([segment_key])
 
-    assert set(payloads[segment_key]) == {span_a, span_b, span_c}
-    assert set(payload_keys_map[segment_key]) == {first_payload_key, second_payload_key}
+    assert set(loaded_segment_data.payloads[segment_key]) == {span_a, span_b, span_c}
+    assert set(loaded_segment_data.payload_keys[segment_key]) == {
+        first_payload_key,
+        second_payload_key,
+    }
 
 
 def test_load_segment_data_decompresses_payload_batches(
@@ -2052,13 +2102,16 @@ def test_load_segment_data_decompresses_payload_batches(
     buffer.client.sadd(payload_key, compressed)
     buffer.client.set(b"span-buf:ic:" + segment_key, 2)
 
-    payloads, payload_keys_map = buffer._load_segment_data([segment_key], {}, now=0)
+    loaded_segment_data, decompress_latency_ms = buffer._load_segment_data([segment_key])
 
-    assert set(payloads[segment_key]) == {span_a, span_b}
-    assert payload_keys_map[segment_key] == [payload_key]
+    assert set(loaded_segment_data.payloads[segment_key]) == {span_a, span_b}
+    assert loaded_segment_data.payload_keys[segment_key] == [payload_key]
+    assert decompress_latency_ms >= 0
 
 
-def test_load_segment_data_records_dropped_spans(load_segment_buffer: SpansBuffer) -> None:
+def test_record_segment_loss_metrics_records_dropped_spans(
+    load_segment_buffer: SpansBuffer,
+) -> None:
     buffer = load_segment_buffer
     trace_id = "a" * 32
     segment_key = _segment_id(1, trace_id, "b" * 16)
@@ -2077,10 +2130,16 @@ def test_load_segment_data_records_dropped_spans(load_segment_buffer: SpansBuffe
         mock.patch("sentry.spans.buffer.track_outcome") as track_outcome,
     ):
         project_model.objects.get_from_cache.return_value = mock_project
-        payloads, payload_keys_map = buffer._load_segment_data([segment_key], {}, now=0)
+        loaded_segment_data, _ = buffer._load_segment_data([segment_key])
+        buffer._record_segment_loss_metrics(
+            [segment_key],
+            {},
+            now=0,
+            payloads=loaded_segment_data.payloads,
+        )
 
-    assert payloads[segment_key] == [span_a]
-    assert payload_keys_map[segment_key] == [payload_key]
+    assert loaded_segment_data.payloads[segment_key] == [span_a]
+    assert loaded_segment_data.payload_keys[segment_key] == [payload_key]
     track_outcome.assert_called_once()
     outcome_kwargs = track_outcome.call_args.kwargs
     assert outcome_kwargs["org_id"] == 100
@@ -2109,7 +2168,7 @@ def test_load_segment_data_records_dropped_spans(load_segment_buffer: SpansBuffe
         ),
     ],
 )
-def test_load_segment_data_records_empty_expired_segments(
+def test_record_segment_loss_metrics_records_empty_expired_segments(
     load_segment_buffer: SpansBuffer, deadline: int, now: int, expected_expired: bool
 ) -> None:
     buffer = load_segment_buffer
@@ -2119,12 +2178,16 @@ def test_load_segment_data_records_empty_expired_segments(
     buffer.client.zadd(queue_key, {segment_key: deadline})
 
     with mock.patch("sentry.spans.buffer.metrics.incr") as metrics_incr:
-        payloads, payload_keys_map = buffer._load_segment_data(
-            [segment_key], {segment_key: queue_key}, now=now
+        loaded_segment_data, _ = buffer._load_segment_data([segment_key])
+        buffer._record_segment_loss_metrics(
+            [segment_key],
+            {segment_key: queue_key},
+            now=now,
+            payloads=loaded_segment_data.payloads,
         )
 
-    assert payloads[segment_key] == []
-    assert payload_keys_map[segment_key] == []
+    assert loaded_segment_data.payloads[segment_key] == []
+    assert loaded_segment_data.payload_keys[segment_key] == []
     incr_names = [call.args[0] for call in metrics_incr.call_args_list]
     assert ("spans.buffer.segment_expired_before_flush" in incr_names) is expected_expired
     assert "spans.buffer.empty_segments" in incr_names
diff --git a/tests/sentry/spans/test_buffer_logger.py b/tests/sentry/spans/test_buffer_logger.py
index 3696b6896cbe00..29600b0eaa0083 100644
--- a/tests/sentry/spans/test_buffer_logger.py
+++ b/tests/sentry/spans/test_buffer_logger.py
@@ -6,6 +6,7 @@
 from sentry.spans.buffer_logger import (
     BufferLogger,
     DeadlineUpdateLog,
+    FlusherAggregate,
     FlusherLogEntry,
     FlusherLogger,
     FlushSegmentLog,
@@ -301,7 +302,7 @@ def test_flusher_logger_accumulates_segments_and_spans(mock_time):
 
         flusher_logger = FlusherLogger()
 
-        flusher_logger.log(
+        flusher_logger._log_entries(
             [
                 FlusherLogEntry("project1:trace1", 10, 500),
                 FlusherLogEntry("project1:trace1", 20, 800),
@@ -324,7 +325,7 @@ def test_flusher_logger_accumulates_segments_and_spans(mock_time):
         assert flusher_logger._cumulative_load_data_latency_ms == 10
         assert flusher_logger._cumulative_decompress_latency_ms == 3
 
-        flusher_logger.log(
+        flusher_logger._log_entries(
             [FlusherLogEntry("project1:trace1", 15, 600)],
             load_ids_latency_ms=3,
             load_data_latency_ms=7,
@@ -340,6 +341,37 @@ def test_flusher_logger_accumulates_segments_and_spans(mock_time):
         assert flusher_logger._cumulative_decompress_latency_ms == 5
 
 
+@mock.patch("sentry.spans.buffer_logger.time")
+def test_flusher_logger_records_loaded_segments(mock_time):
+    with override_options({"spans.buffer.flusher-cumulative-logger-enabled": True}):
+        mock_time.time.return_value = 1000.0
+        flusher_logger = FlusherLogger()
+        first_segment_key = _segment_id(1, "a" * 32, "b" * 16)
+        second_segment_key = _segment_id(2, "c" * 32, "d" * 16)
+        empty_segment_key = _segment_id(3, "e" * 32, "f" * 16)
+
+        flusher_logger.log_loaded_segments(
+            [first_segment_key, empty_segment_key, second_segment_key],
+            {
+                first_segment_key: [b"first", b"second"],
+                empty_segment_key: [],
+                second_segment_key: [b"third"],
+            },
+            load_ids_latency_ms=5,
+            load_data_latency_ms=10,
+            decompress_latency_ms=3,
+        )
+
+        first_trace = flusher_logger._metrics_per_trace[f"1:{'a' * 32}"]
+        second_trace = flusher_logger._metrics_per_trace[f"2:{'c' * 32}"]
+        assert first_trace == FlusherAggregate(1, 2, len(b"first") + len(b"second"))
+        assert second_trace == FlusherAggregate(1, 1, len(b"third"))
+        assert f"3:{'e' * 32}" not in flusher_logger._metrics_per_trace
+        assert flusher_logger._cumulative_load_ids_latency_ms == 5
+        assert flusher_logger._cumulative_load_data_latency_ms == 10
+        assert flusher_logger._cumulative_decompress_latency_ms == 3
+
+
 @mock.patch("sentry.spans.buffer_logger.time")
 def test_flusher_logger_prunes_to_top_50_by_bytes(mock_time):
     """
@@ -352,7 +384,7 @@ def test_flusher_logger_prunes_to_top_50_by_bytes(mock_time):
         flusher_logger = FlusherLogger()
 
         entries = [FlusherLogEntry(f"project{i}:trace{i}", 10, 1000 - i) for i in range(500)]
-        flusher_logger.log(
+        flusher_logger._log_entries(
             entries, load_ids_latency_ms=20, load_data_latency_ms=30, decompress_latency_ms=10
         )
 
@@ -379,7 +411,7 @@ def test_flusher_logger_logs_and_resets_after_interval(mock_time, mock_logger):
 
         flusher_logger = FlusherLogger()
 
-        flusher_logger.log(
+        flusher_logger._log_entries(
             [
                 FlusherLogEntry("project1:trace1", 10, 500),
                 FlusherLogEntry("project2:trace2", 5, 200),
@@ -391,7 +423,7 @@ def test_flusher_logger_logs_and_resets_after_interval(mock_time, mock_logger):
 
         assert mock_logger.info.call_count == 0
 
-        flusher_logger.log(
+        flusher_logger._log_entries(
             [FlusherLogEntry("project1:trace1", 8, 400)],
             load_ids_latency_ms=10,
             load_data_latency_ms=20,
diff --git a/tests/sentry/spans/test_buffer_types.py b/tests/sentry/spans/test_buffer_types.py
index 0936e2db493317..554c287fa8bcda 100644
--- a/tests/sentry/spans/test_buffer_types.py
+++ b/tests/sentry/spans/test_buffer_types.py
@@ -2,8 +2,14 @@
 
 import orjson
 
-from sentry.spans.buffer_types import EvalshaResult, InsertedSubsegment, Span, Subsegment
-from sentry.spans.segment_key import SegmentKey
+from sentry.spans.buffer_types import (
+    EvalshaResult,
+    InsertedSubsegment,
+    LoadedSegmentData,
+    Span,
+    Subsegment,
+)
+from sentry.spans.segment_key import PayloadKey, SegmentKey
 
 
 def _segment_id(project_id: int, trace_id: str, span_id: str) -> SegmentKey:
@@ -127,3 +133,17 @@ def test_inserted_subsegment_exposes_queue_and_cleanup_metadata() -> None:
     assert inserted.queue_shard == 3
     assert not inserted.is_detached_segment
     assert detached.is_detached_segment
+
+
+def test_loaded_segment_data_exposes_payloads() -> None:
+    segment_key = _segment_id(1, "a" * 32, "b" * 16)
+    payload_key = PayloadKey(b"span-buf:s:{1:%s:salted}:salted" % (b"a" * 32))
+    payload = _payload("a" * 16)
+
+    loaded_segment_data = LoadedSegmentData(
+        payloads={segment_key: [payload]},
+        payload_keys={segment_key: [payload_key]},
+    )
+
+    assert loaded_segment_data.payloads[segment_key] == [payload]
+    assert loaded_segment_data.payload_keys[segment_key] == [payload_key]