feat(notifications): Add suspect commits to workflow notification emails (#96152)

## Problem
Workflow notification emails (assignment, resolution, comments, etc.)
don't include suspect commit information, unlike issue alert emails.
This creates an inconsistent user experience where some notifications
show helpful commit context while others don't.

## Solution
This PR moves the suspect commit part of Issue Alert emails into a
reusable component that all Issue notifications can use.

### Changes Made
- **Backend**: 
- Modified `GroupActivityNotification.get_context()` to include suspect
commits
- added check for `enhanced_privacy` - when `enhanced_privacy` is set,
the email will not include suspect commit details
- **Templates**: Created shared template fragments:
  - `_suspect_commits.txt` for plain text emails  
  - `_suspect_commits.html` for HTML emails
- **Updated Templates**: All email templates now include suspect
commits:
- Issue alerts: `error.txt/html`, `performance.txt/html`,
`feedback.txt/html`, `generic.txt/html`
  - Workflow notifications: `activity/generic.txt/html`

### Screenshots
type: error alert, template source has changed but `Before` and `After`
should look identical
html:
<img width="4498" height="1132" alt="Screenshot 2025-08-12 at 2 38
27 PM"
src="https://github.com/user-attachments/assets/ffa24bd1-1f89-4f72-92b1-de06438ab608"
/>



txt:
<img width="3438" height="1340" alt="Screenshot 2025-08-12 at 2 40
33 PM"
src="https://github.com/user-attachments/assets/405b9a62-332c-4d15-ad73-a9653f4f662e"
/>



type: assigned, added suspect commit template
html:
<img width="3924" height="1032" alt="Screenshot 2025-08-12 at 2 43
49 PM"
src="https://github.com/user-attachments/assets/3b252535-3168-4354-9a4f-b6b84dbf211a"
/>



txt:
<img width="4020" height="568" alt="Screenshot 2025-08-12 at 2 46 14 PM"
src="https://github.com/user-attachments/assets/73fd4bc0-e398-43a1-860c-c11e17063920"
/>

Author: nora-shap

fixtures/emails/note.txt

@@ -11,4 +11,5 @@ goose smiling gobbler sterling feline
 
 http://testserver/organizations/organization/issues/1/activity/?referrer=note_activity-email&notification_uuid=6a372642-0ffc-43c6-b0d3-7ce2752f38a9
 
+
 Unsubscribe: javascript:alert("This is a preview page, what did you expect to happen?");

src/sentry/features/temporary.py

@@ -366,6 +366,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:feature-flag-distribution-flyout", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable suspect feature flags endpoint.
     manager.add("organizations:feature-flag-suspect-flags", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable suspect commit information in workflow notification emails
+    manager.add("organizations:suspect-commits-in-emails", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, default=False, api_expose=False)
     # Enable suspect feature tags endpoint.
     manager.add("organizations:issues-suspect-tags", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable suspect score display in distributions drawer (internal only)

src/sentry/notifications/notifications/activity/base.py

@@ -9,12 +9,13 @@
 from django.utils.html import format_html
 from django.utils.safestring import SafeString
 
+from sentry import features
 from sentry.db.models import Model
 from sentry.integrations.types import ExternalProviders
 from sentry.notifications.helpers import get_reason_context
 from sentry.notifications.notifications.base import ProjectNotification
 from sentry.notifications.types import NotificationSettingEnum, UnsubscribeContext
-from sentry.notifications.utils import send_activity_notification
+from sentry.notifications.utils import get_suspect_commits_by_group_id, send_activity_notification
 from sentry.notifications.utils.avatar import avatar_as_html
 from sentry.notifications.utils.participants import ParticipantMap, get_participants_for_group
 from sentry.types.actor import Actor
@@ -129,12 +130,25 @@ def get_context(self, provider: ExternalProviders | None = None) -> MutableMappi
         should_add_url = provider is not None
         text_description = self.description_as_text(text_template, params, should_add_url, provider)
         html_description = self.description_as_html(html_template or text_template, params)
-        return {
+        enhanced_privacy = self.group.organization.flags.enhanced_privacy
+
+        context = {
             **self.get_base_context(),
             "text_description": text_description,
             "html_description": html_description,
+            "enhanced_privacy": enhanced_privacy,
         }
 
+        if (
+            features.has("organizations:suspect-commits-in-emails", self.group.organization)
+            and self.group
+        ):
+            context["commits"] = get_suspect_commits_by_group_id(
+                project=self.project, group_id=self.group.id
+            )
+
+        return context
+
     def get_group_context(self) -> MutableMapping[str, Any]:
         group_link = self.get_group_link()
         parts = list(urlparse(group_link))

src/sentry/notifications/utils/__init__.py

@@ -8,6 +8,7 @@
 from typing import TYPE_CHECKING, Any, Optional, TypedDict, cast
 from urllib.parse import parse_qs, urlparse
 
+import sentry_sdk
 from django.db.models import Count
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
@@ -40,7 +41,11 @@
 from sentry.silo.base import region_silo_function
 from sentry.types.rules import NotificationRuleDetails
 from sentry.users.services.user import RpcUser
-from sentry.utils.committers import get_serialized_event_file_committers
+from sentry.utils.committers import (
+    AuthorCommitsSerialized,
+    get_serialized_committers,
+    get_serialized_event_file_committers,
+)
 from sentry.web.helpers import render_to_string
 
 if TYPE_CHECKING:
@@ -132,30 +137,71 @@ def get_rules(
     ]
 
 
+def process_serialized_committers(
+    committers: Sequence[AuthorCommitsSerialized], commits: MutableMapping[str, Mapping[str, Any]]
+) -> MutableMapping[str, Mapping[str, Any]]:
+    """
+    Transform committer data from nested structure to flat commit dictionary.
+
+    Args:
+        committers: List of {author, commits}
+        commits: Dict to store processed commits (modified in-place)
+
+    Returns:
+        Dict mapping commit IDs to enriched commit data with shortId, author, subject
+    """
+    for committer in committers:
+        for commit in committer["commits"]:
+            if commit["id"] not in commits:
+                commit_data = dict(commit)
+                commit_data["shortId"] = commit_data["id"][:7]
+                commit_data["author"] = committer["author"]
+                commit_data["subject"] = (
+                    commit_data["message"].split("\n", 1)[0] if commit_data["message"] else ""
+                )
+                if commit.get("pullRequest"):
+                    commit_data["pull_request"] = commit["pullRequest"]
+                commits[commit["id"]] = commit_data
+    return commits
+
+
+def get_suspect_commits_by_group_id(
+    project: Project,
+    group_id: int,
+) -> Sequence[Mapping[str, Any]]:
+    """
+    Get suspect commits for workflow notifications that only have a group ID (no Event).
+
+    Uses Commit Context (SCM integrations) only - no release-based fallback.
+    Returns commits sorted by recency, not suspicion score.
+    """
+    commits: MutableMapping[str, Mapping[str, Any]] = {}
+    try:
+        committers = get_serialized_committers(project, group_id)
+    except (Commit.DoesNotExist, Release.DoesNotExist):
+        pass
+    except Exception as exc:
+        sentry_sdk.capture_exception(exc)
+    else:
+        commits = process_serialized_committers(committers=committers, commits=commits)
+    return list(commits.values())
+
+
 def get_commits(project: Project, event: Event) -> Sequence[Mapping[str, Any]]:
-    # lets identify possibly suspect commits and owners
-    commits: MutableMapping[int, Mapping[str, Any]] = {}
+    # let's identify possible suspect commits and owners
+    commits: MutableMapping[str, Mapping[str, Any]] = {}
     try:
         committers = get_serialized_event_file_committers(project, event)
     except (Commit.DoesNotExist, Release.DoesNotExist):
         pass
     except Exception as exc:
         logging.exception(str(exc))
     else:
-        for committer in committers:
-            for commit in committer["commits"]:
-                if commit["id"] not in commits:
-                    commit_data = dict(commit)
-                    commit_data["shortId"] = commit_data["id"][:7]
-                    commit_data["author"] = committer["author"]
-                    commit_data["subject"] = (
-                        commit_data["message"].split("\n", 1)[0] if commit_data["message"] else ""
-                    )
-                    if commit.get("pullRequest"):
-                        commit_data["pull_request"] = commit["pullRequest"]
-                    commits[commit["id"]] = commit_data
+        commits = process_serialized_committers(committers=committers, commits=commits)
     # TODO(nisanthan): Once Commit Context is GA, no need to sort by "score"
     # commits from Commit Context dont have a "score" key
+    # keep this sort while release_based SuspectCommitStrategy is active.
+    # scm_based SuspectCommitStrategy does not use this scoring system.
     return sorted(commits.values(), key=lambda x: float(x.get("score", 0)), reverse=True)
 
 

src/sentry/templates/sentry/emails/_suspect_commits.html

@@ -0,0 +1,23 @@
+{% load sentry_avatars %}
+{% if commits and not enhanced_privacy %}
+<div class="committers">
+  <h3 class="title" style="margin-bottom: 10px">Suspect Commits</h3>
+  <table class="table commit-table">
+  {% for commit in commits %}
+    <tr>
+      <td style="padding:0;width:32px;">{% email_avatar commit.author.name commit.author.email 32 %}</td>
+      <td>
+        <h5 class="truncate">{{ commit.subject }}</h5>
+        <div><small>{{ commit.shortId }}&nbsp;&mdash;&nbsp;
+          {% if commit.author %}
+            <strong>{{ commit.author.name }}</strong>
+          {% else %}
+            <strong>Unknown Author</strong>
+          {% endif %}
+        </small></div>
+      </td>
+    </tr>
+  {% endfor %}
+  </table>
+</div>
+{% endif %}

src/sentry/templates/sentry/emails/_suspect_commits.txt

@@ -0,0 +1,7 @@
+{% if commits and not enhanced_privacy %}
+Suspect Commits
+---------------
+{% for commit in commits %}
+* {{ commit.subject }}
+  {{ commit.shortId }} - {% if commit.author %}{{ commit.author.name }}{% else %}Unknown Author{% endif %}
+{% endfor %}{% endif %}

src/sentry/templates/sentry/emails/activity/generic.html

@@ -2,6 +2,7 @@
 
 {% load sentry_helpers %}
 {% load sentry_assets %}
+{% load sentry_avatars %}
 
 {% block header %}
   {% block action %}
@@ -32,6 +33,8 @@ <h2>{{ title }}</h2>
     {% include "sentry/emails/group_header.html" %}
   {% endif %}
 
+  {% include "sentry/emails/_suspect_commits.html" %}
+
   {% if reason %}
     <p class="via">
       You are receiving this email because you {{ reason }}.

src/sentry/templates/sentry/emails/activity/generic.txt

@@ -10,8 +10,7 @@
 {{ group.title }}
 
 {{ link }}
-{% if unsubscribe_link %}
-
+{% include "sentry/emails/_suspect_commits.txt" %}{% if unsubscribe_link %}
 Unsubscribe: {{ unsubscribe_link }}{% endif %}
 
 {% endautoescape %}

src/sentry/templates/sentry/emails/activity/note.txt

@@ -12,7 +12,7 @@
 {{ group.title }}
 
 {{ activity_link }}
-
+{% include "sentry/emails/_suspect_commits.txt" %}
 Unsubscribe: {{ unsubscribe_link }}
 
 {% endautoescape %}

src/sentry/templates/sentry/emails/error.txt

@@ -14,14 +14,7 @@ Details
 
 {{ link }}
 
-{% if commits %}
-Suspect Commits
----------------
-{% for commit in commits %}
-* {{ commit.subject }}
-  {{ commit.shortId }} - {% if commit.author %}{{ commit.author.name }}{% else %}Unknown Author{% endif %}
-{% endfor %}{% endif %}
-
+{% include "sentry/emails/_suspect_commits.txt" %}
 Tags
 ----
 {% for tag_key, tag_value in tags %}