Merge branch 'master' into leanderrodrigues/iswf-2529-allow-llm-proxy-to-generate-issue-title-and-description-when

Author: leeandher

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

@@ -750,7 +750,7 @@ onSubmit: ({value}) =>
 
 ```tsx
 <Flex gap="md" justify="end">
-  <Button onClick={() => form.reset()}>Reset</Button>
+  <form.ResetButton>Reset</form.ResetButton>
   <form.SubmitButton>Save Changes</form.SubmitButton>
 </Flex>
 ```

.agents/skills/generate-migration/SKILL.md

@@ -32,6 +32,8 @@ sentry django makemigrations <app_name> --empty
 3. Run `sentry django sqlmigrate <app_name> <migration_name>` to verify the SQL
 4. Apply the migration locally with `sentry django migrate <app_name>` — Sentry's migration framework runs its safety checks on apply, so this catches unsafe ops (missing `is_post_deployment`, unsafe column changes, etc.) before CI does.
 
+When editing a generated migration (e.g. swapping `DeleteModel` for `SafeDeleteModel`), **leave the auto-generated `is_post_deployment` comment block in place**. It documents a non-obvious flag with concrete guidance for future migration authors — useful context, not fluff. Only remove a comment if it's stale or contradicts the code.
+
 ## Guidelines
 
 ### Adding Columns
@@ -51,11 +53,20 @@ For large tables, set `is_post_deployment = True` on the migration as index crea
 3. Replace `RemoveField` with `SafeRemoveField(..., deletion_action=DeletionAction.MOVE_TO_PENDING)`
 4. Deploy, then create second migration with `SafeRemoveField(..., deletion_action=DeletionAction.DELETE)`
 
-### Deleting Tables
+### Removing a Model (and eventually its table)
+
+Two-phase process — the `historical_silo_assignments` entry must be added in phase 1.
+
+**Phase 1 — Remove the model class (`MOVE_TO_PENDING`)**
 
 1. Remove all code references
 2. Replace `DeleteModel` with `SafeDeleteModel(..., deletion_action=DeletionAction.MOVE_TO_PENDING)`
-3. Deploy, then create second migration with `SafeDeleteModel(..., deletion_action=DeletionAction.DELETE)`
+3. Add the table to `historical_silo_assignments` in `src/sentry/db/router.py` (or `getsentry/db/router.py` for getsentry models). Pick the silo the model used — usually `SiloMode.CELL`.
+4. Deploy
+
+**Phase 2 — Drop the table (`DELETE`)**
+
+After phase 1 has deployed, create a second migration with `SafeDeleteModel(..., deletion_action=DeletionAction.DELETE)`. Leave the historical entry in place — the table-drop migration relies on it to resolve the silo.
 
 ### Renaming Columns/Tables
 

.agents/skills/lint-new/SKILL.md

@@ -97,7 +97,7 @@ ruleTester.run('$ARGUMENTS', $RULE_NAME, {
 Run tests:
 
 ```bash
-CI=true pnpm test "static/eslint/eslintPluginScraps/src/rules/$ARGUMENTS.spec.ts"
+pnpm test-ci "static/eslint/eslintPluginScraps/src/rules/$ARGUMENTS.spec.ts"
 ```
 
 ## Autofix Guidance
@@ -165,7 +165,7 @@ Add to `eslint.config.ts` inside the `name: 'plugin/@sentry/scraps'` block:
 ### 3. Verify
 
 ```bash
-CI=true pnpm test "static/eslint/eslintPluginScraps/src/rules/$ARGUMENTS.spec.ts"
+pnpm test-ci "static/eslint/eslintPluginScraps/src/rules/$ARGUMENTS.spec.ts"
 ```
 
 ## Extending an Existing Rule

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

@@ -483,7 +483,7 @@ function SlugForm({project}: {project: Project}) {
       </Alert>
 
       <Flex gap="sm" justify="end">
-        <Button onClick={() => form.reset()}>Cancel</Button>
+        <form.ResetButton>Reset</form.ResetButton>
         <form.SubmitButton>Save</form.SubmitButton>
       </Flex>
     </form.AppForm>

.github/actions/setup-devservices/action.yml

@@ -0,0 +1,41 @@
+name: 'Early Devservices'
+description: 'Starts devservices in the background so image pulls overlap with venv setup'
+inputs:
+  mode:
+    description: 'devservices mode (must match the mode passed to setup-sentry)'
+    required: true
+  timeout-minutes:
+    description: 'Maximum minutes for devservices up'
+    required: false
+    default: '10'
+
+runs:
+  using: 'composite'
+  steps:
+    - uses: astral-sh/setup-uv@884ad927a57e558e7a70b92f2bccf9198a4be546 # v6
+      with:
+        version: '0.9.28'
+        enable-cache: false
+
+    - name: Start devservices in background
+      shell: bash --noprofile --norc -euo pipefail {0}
+      env:
+        TIMEOUT_MINUTES: ${{ inputs.timeout-minutes }}
+        MODE: ${{ inputs.mode }}
+      run: |
+        DS_VERSION=$(python3 -c "
+        import tomllib
+        with open('uv.lock', 'rb') as f:
+            lock = tomllib.load(f)
+        for pkg in lock['package']:
+            if pkg['name'] == 'devservices':
+                print(pkg['version'])
+                break
+        ")
+        echo "Installing devservices==${DS_VERSION}"
+        uv venv /tmp/ds-venv --python python3 -q
+        uv pip install --python /tmp/ds-venv/bin/python -q \
+          --index-url https://pypi.devinfra.sentry.io/simple \
+          "devservices==${DS_VERSION}"
+        (set +e; timeout "${TIMEOUT_MINUTES}m" /tmp/ds-venv/bin/devservices up --mode "$MODE"; echo $? > /tmp/ds-exit) \
+          > /tmp/ds.log 2>&1 &

.github/actions/setup-devservices/wait.py

@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+"""Wait for the background devservices process started by the setup-devservices action.
+
+Usage: wait.py [timeout_seconds]
+
+Reads:  /tmp/ds-exit, /tmp/ds.log  (written by the setup-devservices action)
+Writes: $GITHUB_ENV  (DJANGO_LIVE_TEST_SERVER_ADDRESS)
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import subprocess
+import sys
+import time
+from pathlib import Path
+
+DS_EXIT = Path("/tmp/ds-exit")
+DS_LOG = Path("/tmp/ds.log")
+TIMEOUT = 300
+
+
+def log(msg: str) -> None:
+    print(msg, flush=True)
+
+
+def docker(*args: str) -> subprocess.CompletedProcess[str]:
+    return subprocess.run(["docker", *args], capture_output=True, text=True)
+
+
+def stream_log(pos: int) -> int:
+    """Print any new content written to DS_LOG since pos. Returns the new position."""
+    if not DS_LOG.exists():
+        return pos
+    with DS_LOG.open() as f:
+        f.seek(pos)
+        chunk = f.read()
+        if chunk:
+            sys.stdout.write(chunk)
+            sys.stdout.flush()
+        return f.tell()
+
+
+def container_inspect_dump() -> None:
+    ids = docker("ps", "-aq").stdout.split()
+    if not ids:
+        return
+
+    r = docker("inspect", *ids)
+    if r.returncode != 0:
+        return
+
+    containers = json.loads(r.stdout)
+    for c in containers:
+        name = c["Name"].lstrip("/")
+        status = c["State"]["Status"]
+        health = c["State"].get("Health")
+        health_status = health["Status"] if health else "n/a"
+        log(f"{name}  status={status}  health={health_status}")
+
+    log("")
+    for c in containers:
+        health = c["State"].get("Health")
+        if not health or health["Status"] == "healthy":
+            continue
+        name = c["Name"].lstrip("/")
+        log(f"--- {name} last health check ---")
+        for entry in health.get("Log", []):
+            log(f"  exit={entry['ExitCode']}  {entry['Output'].strip()}")
+
+
+def wait(timeout: int = TIMEOUT) -> None:
+    start = time.monotonic()
+    log_pos = 0
+
+    while not DS_EXIT.exists():
+        elapsed = time.monotonic() - start
+        if elapsed > timeout:
+            log_pos = stream_log(log_pos)
+            log(f"::error::Timed out waiting for devservices after {timeout}s")
+            log("--- container health on timeout ---")
+            container_inspect_dump()
+            sys.exit(1)
+        log_pos = stream_log(log_pos)
+        time.sleep(2)
+
+    # Drain any remaining log output.
+    stream_log(log_pos)
+
+    rc = int(DS_EXIT.read_text().strip())
+    if rc != 0:
+        log(f"::error::devservices up failed (exit {rc})")
+        log("--- container health on failure ---")
+        container_inspect_dump()
+        sys.exit(1)
+
+    r = docker(
+        "network",
+        "inspect",
+        "bridge",
+        "--format",
+        "{{(index .IPAM.Config 0).Gateway}}",
+    )
+    if r.returncode != 0:
+        log(f"::error::docker network inspect bridge failed: {r.stderr.strip()}")
+        sys.exit(1)
+    gateway = r.stdout.strip()
+    github_env = os.environ.get("GITHUB_ENV")
+    if github_env:
+        with open(github_env, "a") as f:
+            f.write(f"DJANGO_LIVE_TEST_SERVER_ADDRESS={gateway}\n")
+
+    r2 = docker("ps", "-a")
+    if r2.stdout.strip():
+        log(r2.stdout.strip())
+
+
+if __name__ == "__main__":
+    wait(int(sys.argv[1]) if len(sys.argv) > 1 else TIMEOUT)

.github/file-filters.yml

@@ -108,6 +108,12 @@ acceptance: &acceptance
   - '.github/workflows/acceptance.yml'
   - '.github/actions/collect-test-data/**'
 
+# Used in `getsentry-dispatch.js` to decide whether to run getsentry's
+# acceptance suite against a sentry PR. Scoped to gsApp and gsAdmin
+# frontend changes (both have acceptance tests in getsentry).
+gsapp: &gsapp
+  - added|deleted|modified: 'static/{gsApp,gsAdmin}/**/*.{ts,tsx}'
+
 api_docs: &api_docs
   - *backend_all
   - 'api-docs/**'