feat(autofix): Add pr_iteration endpoint step and operator activity

src/sentry/seer/autofix/autofix_agent.py

@@ -3,7 +3,7 @@
 import logging
 import re
 from enum import StrEnum
-from typing import TYPE_CHECKING, Any, Literal, TypedDict, cast
+from typing import TYPE_CHECKING, Any, Literal, NotRequired, TypedDict, cast
 
 from django.utils import timezone
 from pydantic import BaseModel
@@ -71,6 +71,13 @@ class UserUIFeedbackSource(TypedDict):
     # use the same stable key (`user_id`) that `GroupSeen` uses to track which
     # users have viewed an issue.
     user_id: int
+    # The publicly serialized user, resolved at write time so the read path
+    # doesn't have to hydrate it. ``None`` if the user could not be serialized.
+    # This is serialized as an anonymous viewer (never as the requester) so the
+    # payload never includes the user's full email list, options, or flags: it
+    # is embedded in Seer prompt metadata and round-tripped back to any org
+    # member with group-read access.
+    user: NotRequired[Any]
 
 
 # Discriminated on ``type``. Add new TypedDict variants to this union as more
@@ -87,6 +94,14 @@ class NoSeerQuotaException(Exception):
     pass
 
 
+class PrIterationNoPullRequestException(Exception):
+    pass
+
+
+class PrIterationNotEnabledException(Exception):
+    pass
+
+
 class AutofixStep(StrEnum):
     """Available autofix steps."""
 
@@ -274,6 +289,11 @@ def get_autofix_agent_client(
     )
 
 
+def get_autofix_run_state(group: Group, run_id: int) -> SeerRunState:
+    client = get_autofix_agent_client(group)
+    return _get_group_run_state(client, group, run_id)
+
+
 def _validate_run_belongs_to_group(state: SeerRunState, group: Group) -> None:
     group_id = state.metadata.get("group_id") if state.metadata else None
     if group_id != group.id:
@@ -374,7 +394,11 @@ def trigger_autofix_agent(
         pr_iteration_enabled = run_state.metadata.get("pr_iteration_enabled", pr_iteration_enabled)
 
     iteration_index: int | None = None
-    if step == AutofixStep.PR_ITERATION and run_state is not None:
+    if step == AutofixStep.PR_ITERATION:
+        if not pr_iteration_enabled:
+            raise PrIterationNotEnabledException()
+        if run_state is None or not run_state.repo_pr_states:
+            raise PrIterationNoPullRequestException()
         if insert_index is not None:
             iteration_index = get_iteration_for_insert_index(run_state, insert_index)
         else:

src/sentry/seer/autofix/on_completion_hook.py

@@ -372,7 +372,11 @@ def _maybe_continue_pipeline(
                 group,
             )
             if decision is not None:
-                iteration_index = get_latest_iteration_index(state)
+                iteration_index = (
+                    get_latest_iteration_index(state)
+                    if current_step == AutofixStep.PR_ITERATION
+                    else None
+                )
                 analytics.record(
                     AiAutofixIntrospectionEvent(
                         organization_id=organization.id,

src/sentry/seer/endpoints/group_ai_autofix.py

@@ -42,7 +42,10 @@
 from sentry.seer.autofix.autofix_agent import (
     UNKNOWN_RUN_ID_FOR_GROUP,
     AutofixStep,
+    Feedback,
     NoSeerQuotaException,
+    PrIterationNoPullRequestException,
+    PrIterationNotEnabledException,
     get_autofix_agent_state,
     trigger_autofix_agent,
     trigger_coding_agent_handoff,
@@ -65,6 +68,7 @@
 from sentry.seer.endpoints.utils import get_seer_run, resolve_seer_run
 from sentry.seer.models import SeerPermissionError
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
+from sentry.users.services.user.service import user_service
 
 logger = logging.getLogger(__name__)
 
@@ -94,6 +98,7 @@
             "root_cause",
             "solution",
             "code_changes",
+            "pr_iteration",
             "open_pr",
             "coding_agent_handoff",
         ],
@@ -295,18 +300,52 @@
             }
             return Response(open_pr_body, status=status.HTTP_202_ACCEPTED)
 
+        if step == "pr_iteration":
+            if resolved_run_id is None:
+                return Response(
+                    {"detail": "run_id is required for pr_iteration"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
         # Handle all built-in Seer steps. A missing run_id means this call starts a new
         # autofix run (the kickoff); a provided run_id is advancing an existing run.
         is_autofix_kickoff = resolved_run_id is None
+        user_context = data.get("user_context")
+        feedback = None
+        if (
+            step == "pr_iteration"
+            and user_context is not None
+            and request.user
+            and request.user.is_authenticated
+        ):
+            # Serialize the user here on write so the read path (GET) doesn't have
+            # to hydrate it from the stored user_id on every fetch. Serialize as
+            # an anonymous viewer (no ``as_user``) so the result is the public
+            # user representation rather than the self representation, which would
+            # leak the user's full email list, options, and flags. This payload is
+            # embedded in Seer prompt metadata and readable by any org member with
+            # group-read access.
+            serialized_users = user_service.serialize_many(
+                filter={"user_ids": [request.user.id]},
+            )
+            feedback = Feedback(
+                message=user_context,
+                source={
+                    "type": "user-ui",
+                    "user_id": request.user.id,
+                    "user": serialized_users[0] if serialized_users else None,
+                },
+            )
         try:
             run_id = trigger_autofix_agent(
                 group=group,
                 step=AutofixStep(step),
                 referrer=_parse_autofix_referrer(data.get("referrer")),
                 stopping_point=AutofixStoppingPoint(stopping_point) if stopping_point else None,
                 run_id=resolved_run_id,
-                user_context=data.get("user_context"),
+                user_context=user_context,
                 insert_index=data.get("insert_index"),
+                feedback=feedback,
             )
             if is_autofix_kickoff:
                 # Record the trigger action only on kickoff, not on each subsequent
@@ -334,6 +373,16 @@
             return Response(kickoff_body, status=status.HTTP_202_ACCEPTED)
         except NoSeerQuotaException:
             return Response("No budget for Seer Autofix.", status=status.HTTP_402_PAYMENT_REQUIRED)
+        except PrIterationNotEnabledException:
+            return Response(
+                {"detail": "PR iteration is not enabled for this organization"},
+                status=status.HTTP_403_FORBIDDEN,
+            )
+        except PrIterationNoPullRequestException:
+            return Response(
+                {"detail": "Cannot iterate on a PR before one has been created"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
         except SeerPermissionError as e:
             if _is_unknown_run_id_error(e):
                 return Response(status=status.HTTP_404_NOT_FOUND)
@@ -393,13 +442,14 @@
                 )
 
         run = get_seer_run(state.run_id, group.organization)
+        blocks = [block.dict() for block in state.blocks]
         return Response(
             {
                 "autofix": {
                     "run_id": state.run_id,
                     "sentry_run_id": str(run.uuid) if run else None,
                     "status": state.status,
-                    "blocks": [block.dict() for block in state.blocks],
+                    "blocks": blocks,
                     "updated_at": state.updated_at,
                     "pending_user_input": (
                         state.pending_user_input.dict() if state.pending_user_input else None
@@ -410,6 +460,9 @@
                     "coding_agents": {
                         agent_id: agent.dict() for agent_id, agent in state.coding_agents.items()
                     },
+                    "pr_iteration_enabled": bool(
+                        state.metadata.get("pr_iteration_enabled") if state.metadata else False
+                    ),
                 }
             }
         )

src/sentry/seer/entrypoints/operator.py

@@ -587,6 +587,16 @@ def _create_seer_activity(
         pull_requests = event_payload.get("pull_requests", [])
         if pull_requests:
             activity_data["pull_requests"] = pull_requests
+    elif event_type == SentryAppEventType.SEER_ITERATION_COMPLETED:
+        pull_requests = event_payload.get("pull_requests", [])
+        if pull_requests:
+            activity_data["pull_requests"] = pull_requests
+        code_changes = event_payload.get("code_changes")
+        if code_changes:
+            activity_data["code_changes"] = code_changes
+        iteration_index = event_payload.get("iteration_index")
+        if iteration_index is not None:
+            activity_data["iteration_index"] = iteration_index
 
     Activity.objects.create_group_activity(
         group,

tests/sentry/seer/autofix/test_autofix_agent.py

@@ -15,6 +15,7 @@
     STEP_CONFIGS,
     AutofixStep,
     NoSeerQuotaException,
+    PrIterationNoPullRequestException,
     build_step_prompt,
     generate_autofix_handoff_prompt,
     get_iteration_for_insert_index,
@@ -256,12 +257,17 @@ def _iteration_block(iteration_index: int | None = None) -> MemoryBlock:
     )
 
 
-def _state_with_blocks(blocks: list[MemoryBlock], group_id: int | None = None) -> SeerRunState:
+def _state_with_blocks(
+    blocks: list[MemoryBlock],
+    group_id: int | None = None,
+    repo_pr_states: dict[str, RepoPRState] | None = None,
+) -> SeerRunState:
     return SeerRunState(
         run_id=67890,
         blocks=blocks,
         status="completed",
         updated_at="2024-01-01T00:00:00Z",
+        repo_pr_states=repo_pr_states or {},
         metadata={"group_id": group_id} if group_id is not None else None,
     )
 
@@ -459,21 +465,49 @@ def test_pr_iteration_continued_run_increments_iteration_index(
         mock_client = MagicMock()
         mock_client_class.return_value = mock_client
         mock_client.get_run.return_value = _state_with_blocks(
-            [_iteration_block(1)], group_id=self.group.id
+            [_iteration_block(1)],
+            group_id=self.group.id,
+            repo_pr_states={
+                "owner/repo": RepoPRState(
+                    repo_name="owner/repo", pr_url="https://example.com/pull/7"
+                )
+            },
         )
         mock_client.continue_run.return_value = 67890
 
-        trigger_autofix_agent(
-            group=self.group,
-            step=AutofixStep.PR_ITERATION,
-            referrer=AutofixReferrer.UNKNOWN,
-            run_id=67890,
-        )
+        with self.feature("organizations:autofix-pr-iteration"):
+            trigger_autofix_agent(
+                group=self.group,
+                step=AutofixStep.PR_ITERATION,
+                referrer=AutofixReferrer.UNKNOWN,
+                run_id=67890,
+            )
 
         call_kwargs = mock_broadcast.call_args.kwargs
         assert call_kwargs["event_name"] == SeerActionType.ITERATION_STARTED.value
         assert call_kwargs["payload"]["iteration_index"] == 2
 
+    @patch("sentry.seer.autofix.autofix_agent.broadcast_webhooks_for_organization.delay")
+    @patch("sentry.seer.autofix.autofix_agent.SeerAgentClient")
+    def test_pr_iteration_requires_existing_pr(self, mock_client_class, mock_broadcast):
+        mock_client = MagicMock()
+        mock_client_class.return_value = mock_client
+        mock_client.get_run.return_value = _state_with_blocks([], group_id=self.group.id)
+
+        with (
+            self.feature("organizations:autofix-pr-iteration"),
+            pytest.raises(PrIterationNoPullRequestException),
+        ):
+            trigger_autofix_agent(
+                group=self.group,
+                step=AutofixStep.PR_ITERATION,
+                referrer=AutofixReferrer.UNKNOWN,
+                run_id=67890,
+            )
+
+        mock_client.continue_run.assert_not_called()
+        mock_broadcast.assert_not_called()
+
     @patch("sentry.seer.autofix.autofix_agent.SeerAgentClient")
     @patch("sentry.quotas.backend.check_seer_quota", return_value=False)
     def test_when_no_quota(self, mock_check_quota, mock_client_class):