Merge branch 'master' into ognjenbostjancic/tet-2206-prefer-gen_airesponsemodel-over-gen_airequestmodel

Author: obostjancic

.github/CODEOWNERS

@@ -692,7 +692,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /static/app/components/events/highlights/                   @getsentry/issue-workflow
 /static/app/components/issues/                              @getsentry/issue-workflow
 /static/app/components/stackTrace/                          @getsentry/issue-workflow
-/static/app/components/stream/supergroupRow.tsx             @getsentry/issue-detection-frontend
+/static/app/components/stream/supergroups/                  @getsentry/issue-detection-frontend
 /static/app/views/issueList/                                @getsentry/issue-workflow
 /static/app/views/issueList/issueListSeerComboBox.tsx       @getsentry/issue-workflow @getsentry/machine-learning-ai
 /static/app/views/issueList/pages/supergroups.tsx           @getsentry/issue-detection-frontend
@@ -832,6 +832,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /static/app/components/core/                          @getsentry/design-engineering
 /static/app/components/dnd/                           @getsentry/design-engineering
 /static/app/components/pageFilters/                   @getsentry/design-engineering
+/static/app/components/backendJsonFormAdapter/        @getsentry/design-engineering
 /static/app/icons/                                    @getsentry/design-engineering
 /static/app/stories/                                  @getsentry/design-engineering
 /static/app/components/commandPalette/                @getsentry/design-engineering

eslint.config.ts

@@ -405,6 +405,7 @@ export default typescript.config([
       'prefer-promise-reject-errors': 'off', // Disabled in favor of @typescript-eslint/prefer-promise-reject-errors
       'object-shorthand': ['error', 'properties'],
       'prefer-arrow-callback': ['error', {allowNamedFunctions: true}],
+      quotes: ['error', 'single', {avoidEscape: true, allowTemplateLiterals: false}],
       radix: 'error',
       'require-await': 'off', // Disabled in favor of @typescript-eslint/require-await
       'spaced-comment': [

fixtures/emails/invitation.txt

@@ -4,7 +4,7 @@ Your teammates at Example are using Sentry to catch errors, crush latency issues
 
 Looks like they need your help. You've been invited to join them:
 
-http://testserver/accept/1/None/
+http://testserver/accept/example/1/None/
 
 Heads up: this invite link is just for you. Don't share it unless you want random strangers fixing your bugs.
 

migrations_lockfile.txt

@@ -39,4 +39,4 @@ tempest: 0003_use_encrypted_char_field
 
 uptime: 0055_backfill_2xx_status_assertion
 
-workflow_engine: 0111_add_workflowfirehistory_date_added_index
+workflow_engine: 0112_drop_redundant_error_detector_workflows

scripts/analyze-styled.ts

@@ -422,7 +422,7 @@ if (!config.startDate) {
     if (config.targetFile) {
       logger.fatal(`❌ File not found: ${config.targetFile}`);
     } else {
-      logger.fatal(`❌ No .tsx files found in search directory`);
+      logger.fatal('❌ No .tsx files found in search directory');
     }
     process.exit(1);
   }

scripts/build-js-loader.ts

@@ -17,7 +17,7 @@ import * as ts from 'typescript';
  * then verify the build output of both generated `js.tmpl` files and check all three files in.
  */
 
-const header = `{% load sentry_helpers %}`;
+const header = '{% load sentry_helpers %}';
 const loaderScriptPath = './src/sentry/templates/sentry/js-sdk-loader.ts';
 const loaderTmplPath = './src/sentry/templates/sentry/js-sdk-loader.js.tmpl';
 const loaderMinTmplPath = './src/sentry/templates/sentry/js-sdk-loader.min.js.tmpl';

scripts/routes.ts

@@ -148,7 +148,7 @@ const useDefaults = (values.defaults as boolean) ?? false;
 if (!showAll && Object.keys(userParams).length === 0 && !useDefaults) {
   const bin = path.basename(process.argv[1] ?? '');
   console.error(`Usage: node ${bin} [OPTIONS] --<param> <value> [...]`);
-  console.error(`Run with --help for full usage.`);
+  console.error('Run with --help for full usage.');
   process.exit(1);
 }
 

scripts/type-coverage-diff.ts

@@ -529,7 +529,7 @@ async function main() {
 
     console.log(
       colors.dim(
-        `\n📝 Note: Only showing type issues on lines that were literally added (+) or removed (-) in git diff`
+        '\n📝 Note: Only showing type issues on lines that were literally added (+) or removed (-) in git diff'
       )
     );
 

src/sentry/analytics/events/autofix_events.py

@@ -71,7 +71,8 @@ class AiAutofixPrCreatedCompletedEvent(AiAutofixPhaseEvent):
 
 @analytics.eventclass("ai.autofix.agent_handoff")
 class AiAutofixAgentHandoffEvent(AiAutofixPhaseEvent):
-    pass
+    coding_agent: str | None
+    initiator: str | None = None
 
 
 analytics.register(AiAutofixRootCauseStartedEvent)

src/sentry/api/base.py

@@ -75,6 +75,7 @@
     "all_silo_endpoint",
     "internal_cell_silo_endpoint",
     "internal_all_silo_endpoint",
+    "internal_control_silo_endpoint",
 ]
 
 PAGINATION_DEFAULT_PER_PAGE = 100
@@ -723,6 +724,12 @@ def __call__(self, decorated_obj: Any) -> Any:
 mode 404s will be returned.
 """
 
+internal_control_silo_endpoint = EndpointSiloLimit(SiloMode.CONTROL, internal=True)
+"""
+Apply to endpoints that exist in CONTROL silo that
+should not be included in the frontend URL mapping
+"""
+
 cell_silo_endpoint = EndpointSiloLimit(SiloMode.CELL)
 """
 Apply to endpoints that exist in CELL silo.