chore(seer): add short id to cursor prompt (#106344)

Addresses AIML-2267

Problem:
When seer RCA triggers the cursor integration to make a PR, we want it
to include the Sentry short-id so it links back.

Solution:
Tell cursor in the prompt to include the short id if auto_create_pr is
True

Testing:
Added unit tests to make sure the prompt is correct, but can only
complete E2E testing once it is live for proper github/cursor
integration.

Author: sehr-m

src/sentry/seer/autofix/coding_agent.py

@@ -248,7 +248,11 @@ def _launch_agents_for_repos(
             "There are no repos in the Seer state to launch coding agents with, make sure you have repos connected to Seer and rerun this Issue Fix."
         )
 
-    prompt = get_coding_agent_prompt(run_id, trigger_source, instruction)
+    short_id = None
+    if autofix_state and auto_create_pr:
+        short_id = autofix_state.request.issue.get("short_id")
+
+    prompt = get_coding_agent_prompt(run_id, trigger_source, instruction, short_id)
 
     if not prompt:
         raise APIException("Issue fetching prompt to send to coding agents.")

src/sentry/seer/autofix/utils.py

@@ -1,7 +1,7 @@
 import logging
 from datetime import UTC, datetime
 from enum import StrEnum
-from typing import TypedDict
+from typing import NotRequired, TypedDict
 
 import orjson
 import pydantic
@@ -39,6 +39,7 @@
 class AutofixIssue(TypedDict):
     id: int
     title: str
+    short_id: NotRequired[str | None]
 
 
 class AutofixStoppingPoint(StrEnum):
@@ -629,7 +630,10 @@ def get_autofix_prompt(run_id: int, include_root_cause: bool, include_solution:
 
 
 def get_coding_agent_prompt(
-    run_id: int, trigger_source: AutofixTriggerSource, instruction: str | None = None
+    run_id: int,
+    trigger_source: AutofixTriggerSource,
+    instruction: str | None = None,
+    short_id: str | None = None,
 ) -> str:
     """Get the coding agent prompt with prefix from Seer API."""
     include_root_cause = trigger_source in [
@@ -642,6 +646,11 @@ def get_coding_agent_prompt(
 
     base_prompt = "Please fix the following issue. Ensure that your fix is fully working."
 
+    if short_id:
+        base_prompt = (
+            f"{base_prompt}\n\nInclude 'Fixes {short_id}' in the pull request description."
+        )
+
     if instruction and instruction.strip():
         base_prompt = f"{base_prompt}\n\n{instruction.strip()}"
 

tests/sentry/integrations/api/endpoints/test_organization_coding_agents.py

@@ -593,7 +593,7 @@ def test_launches_coding_agent(
             assert response.data["failed_count"] >= 0
 
             # Verify prompt was called with default trigger_source and no instruction
-            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.SOLUTION, None)
+            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.SOLUTION, None, None)
 
     @patch("sentry.seer.autofix.coding_agent.get_coding_agent_providers")
     @patch("sentry.seer.autofix.coding_agent.get_autofix_state")
@@ -1012,7 +1012,7 @@ def test_root_cause_trigger_source(
             assert response.data["failed_count"] >= 0
 
             # Verify prompt was called with root_cause trigger_source and no instruction
-            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.ROOT_CAUSE, None)
+            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.ROOT_CAUSE, None, None)
 
     @patch("sentry.seer.autofix.coding_agent.get_coding_agent_providers")
     @patch("sentry.seer.autofix.coding_agent.get_autofix_state")
@@ -1090,7 +1090,7 @@ def test_root_cause_repos_extracted_and_deduped(
         ):
             response = self.get_success_response(self.organization.slug, method="post", **data)
             assert response.data["success"] is True
-            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.ROOT_CAUSE, None)
+            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.ROOT_CAUSE, None, None)
 
     @patch("sentry.seer.autofix.coding_agent.get_coding_agent_providers")
     @patch("sentry.seer.autofix.coding_agent.get_autofix_state")
@@ -1162,7 +1162,7 @@ def test_root_cause_without_relevant_repos_falls_back_to_request_repos(
             assert response.data["success"] is True
             assert response.data["launched_count"] >= 0
             assert response.data["failed_count"] >= 0
-            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.ROOT_CAUSE, None)
+            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.ROOT_CAUSE, None, None)
 
     @patch("sentry.seer.autofix.coding_agent.get_coding_agent_providers")
     @patch("sentry.seer.autofix.coding_agent.get_autofix_state")
@@ -1211,7 +1211,7 @@ def test_solution_trigger_source(
             assert response.data["failed_count"] >= 0
 
             # Verify prompt was called with solution trigger_source and no instruction
-            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.SOLUTION, None)
+            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.SOLUTION, None, None)
 
     @patch("sentry.seer.autofix.coding_agent.get_coding_agent_providers")
     @patch("sentry.seer.autofix.coding_agent.get_autofix_state")
@@ -1346,7 +1346,7 @@ def test_launch_with_custom_instruction(
 
             # Verify prompt was called with the instruction
             mock_get_prompt.assert_called_with(
-                123, AutofixTriggerSource.SOLUTION, "Use TypeScript instead of JavaScript"
+                123, AutofixTriggerSource.SOLUTION, "Use TypeScript instead of JavaScript", None
             )
 
     @patch("sentry.seer.autofix.coding_agent.get_coding_agent_providers")
@@ -1394,7 +1394,7 @@ def test_launch_with_blank_instruction(
             assert response.data["success"] is True
 
             # CharField trims whitespace by default, so blank instruction becomes empty string
-            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.SOLUTION, "")
+            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.SOLUTION, "", None)
 
     @patch("sentry.seer.autofix.coding_agent.get_coding_agent_providers")
     @patch("sentry.seer.autofix.coding_agent.get_autofix_state")
@@ -1441,7 +1441,7 @@ def test_launch_with_empty_instruction(
             assert response.data["success"] is True
 
             # Verify prompt was called with empty string instruction
-            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.SOLUTION, "")
+            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.SOLUTION, "", None)
 
     @patch("sentry.seer.autofix.coding_agent.get_coding_agent_providers")
     @patch("sentry.seer.autofix.coding_agent.get_autofix_state")
@@ -1491,7 +1491,9 @@ def test_launch_with_max_length_instruction(
             assert response.data["success"] is True
 
             # Verify prompt was called with the long instruction
-            mock_get_prompt.assert_called_with(123, AutofixTriggerSource.SOLUTION, long_instruction)
+            mock_get_prompt.assert_called_with(
+                123, AutofixTriggerSource.SOLUTION, long_instruction, None
+            )
 
     @patch("sentry.seer.autofix.coding_agent.get_coding_agent_providers")
     @patch(
@@ -1574,5 +1576,5 @@ def test_launch_with_instruction_and_root_cause_trigger(
 
             # Verify prompt was called with both trigger_source and instruction
             mock_get_prompt.assert_called_with(
-                123, AutofixTriggerSource.ROOT_CAUSE, "Focus on the database queries"
+                123, AutofixTriggerSource.ROOT_CAUSE, "Focus on the database queries", None
             )

tests/sentry/seer/autofix/test_autofix_utils.py

@@ -178,6 +178,58 @@ def test_get_coding_agent_prompt_with_empty_instruction(self, mock_get_autofix_p
         assert result == expected
         mock_get_autofix_prompt.assert_called_once_with(12345, True, True)
 
+    @patch("sentry.seer.autofix.utils.get_autofix_prompt")
+    def test_get_coding_agent_prompt_with_short_id(self, mock_get_autofix_prompt):
+        """Test get_coding_agent_prompt includes Fixes line when short_id is provided."""
+        mock_get_autofix_prompt.return_value = "This is the autofix prompt"
+
+        result = get_coding_agent_prompt(
+            12345, AutofixTriggerSource.SOLUTION, None, short_id="AIML-2301"
+        )
+
+        assert "Fixes AIML-2301" in result
+        assert "Include 'Fixes AIML-2301' in the pull request description" in result
+        assert "Please fix the following issue" in result
+        assert "This is the autofix prompt" in result
+
+    @patch("sentry.seer.autofix.utils.get_autofix_prompt")
+    def test_get_coding_agent_prompt_without_short_id(self, mock_get_autofix_prompt):
+        """Test get_coding_agent_prompt does not include Fixes line when short_id is None."""
+        mock_get_autofix_prompt.return_value = "This is the autofix prompt"
+
+        result = get_coding_agent_prompt(12345, AutofixTriggerSource.SOLUTION, None, short_id=None)
+
+        assert "Fixes" not in result
+        assert "Please fix the following issue" in result
+        assert "This is the autofix prompt" in result
+
+    @patch("sentry.seer.autofix.utils.get_autofix_prompt")
+    def test_get_coding_agent_prompt_with_short_id_and_instruction(self, mock_get_autofix_prompt):
+        """Test get_coding_agent_prompt includes both Fixes line and instruction."""
+        mock_get_autofix_prompt.return_value = "This is the autofix prompt"
+
+        result = get_coding_agent_prompt(
+            12345,
+            AutofixTriggerSource.SOLUTION,
+            "Be careful with backwards compatibility",
+            short_id="PROJ-1234",
+        )
+
+        assert "Fixes PROJ-1234" in result
+        assert "Be careful with backwards compatibility" in result
+        assert "Please fix the following issue" in result
+        assert "This is the autofix prompt" in result
+
+    @patch("sentry.seer.autofix.utils.get_autofix_prompt")
+    def test_get_coding_agent_prompt_with_empty_short_id(self, mock_get_autofix_prompt):
+        """Test get_coding_agent_prompt does not include Fixes line when short_id is empty string."""
+        mock_get_autofix_prompt.return_value = "This is the autofix prompt"
+
+        result = get_coding_agent_prompt(12345, AutofixTriggerSource.SOLUTION, None, short_id="")
+
+        assert "Fixes" not in result
+        assert "Please fix the following issue" in result
+
 
 class TestAutofixStateParsing(TestCase):
     def test_autofix_state_validate_parses_nested_structures(self):

tests/sentry/seer/autofix/test_coding_agent.py

@@ -298,3 +298,102 @@ def test_api_error_non_401_includes_status_code(
         assert (
             error_message == "Failed to make request to coding agent. 500 Error: Some error message"
         )
+
+    @patch("sentry.seer.autofix.coding_agent.store_coding_agent_states_to_seer")
+    @patch("sentry.seer.autofix.coding_agent.get_coding_agent_prompt")
+    @patch("sentry.seer.autofix.coding_agent.get_project_seer_preferences")
+    def test_short_id_passed_to_prompt_when_auto_create_pr_enabled(
+        self, mock_get_preferences, mock_get_prompt, mock_store_states
+    ):
+        """Test that short_id is passed to get_coding_agent_prompt when auto_create_pr is True."""
+        from sentry.seer.models import (
+            AutofixHandoffPoint,
+            PreferenceResponse,
+            SeerAutomationHandoffConfiguration,
+            SeerProjectPreference,
+        )
+
+        # Add short_id to the autofix state
+        self.autofix_state.request.issue["short_id"] = "AIML-2301"
+
+        # Setup: Mock preferences with auto_create_pr=True
+        preference = SeerProjectPreference(
+            organization_id=self.organization.id,
+            project_id=self.project.id,
+            repositories=[
+                SeerRepoDefinition(
+                    provider="github",
+                    owner="getsentry",
+                    name="sentry",
+                    external_id="123456",
+                )
+            ],
+            automation_handoff=SeerAutomationHandoffConfiguration(
+                handoff_point=AutofixHandoffPoint.ROOT_CAUSE,
+                target="cursor_background_agent",
+                integration_id=123,
+                auto_create_pr=True,
+            ),
+        )
+        mock_get_preferences.return_value = PreferenceResponse(
+            preference=preference, code_mapping_repos=[]
+        )
+
+        mock_get_prompt.return_value = "Test prompt with Fixes AIML-2301"
+
+        mock_installation = MagicMock()
+        mock_installation.launch.return_value = {
+            "url": "https://example.com/agent",
+            "id": "agent-123",
+        }
+
+        _launch_agents_for_repos(
+            installation=mock_installation,
+            autofix_state=self.autofix_state,
+            run_id=self.run_id,
+            organization=self.organization,
+            trigger_source=AutofixTriggerSource.SOLUTION,
+        )
+
+        # Assert: Verify get_coding_agent_prompt was called with the short_id
+        mock_get_prompt.assert_called_once()
+        call_args = mock_get_prompt.call_args
+        assert call_args[0][3] == "AIML-2301"
+
+    @patch("sentry.seer.autofix.coding_agent.store_coding_agent_states_to_seer")
+    @patch("sentry.seer.autofix.coding_agent.get_coding_agent_prompt")
+    @patch("sentry.seer.autofix.coding_agent.get_project_seer_preferences")
+    def test_short_id_not_passed_when_auto_create_pr_disabled(
+        self, mock_get_preferences, mock_get_prompt, mock_store_states
+    ):
+        """Test that short_id is None when auto_create_pr is False."""
+        from sentry.seer.models import PreferenceResponse
+
+        # Add short_id to the autofix state
+        self.autofix_state.request.issue["short_id"] = "AIML-2301"
+
+        # Setup: Mock preferences with auto_create_pr=False (default)
+        mock_get_preferences.return_value = PreferenceResponse(
+            preference=None, code_mapping_repos=[]
+        )
+
+        mock_get_prompt.return_value = "Test prompt"
+
+        mock_installation = MagicMock()
+        mock_installation.launch.return_value = {
+            "url": "https://example.com/agent",
+            "id": "agent-123",
+        }
+
+        _launch_agents_for_repos(
+            installation=mock_installation,
+            autofix_state=self.autofix_state,
+            run_id=self.run_id,
+            organization=self.organization,
+            trigger_source=AutofixTriggerSource.SOLUTION,
+        )
+
+        # Assert: Verify get_coding_agent_prompt was called with short_id=None
+        mock_get_prompt.assert_called_once()
+        call_args = mock_get_prompt.call_args
+        assert call_args[0][3] is None  # Fourth positional arg is short_id