From 2bc6bb0c3767388b3f64123b11bbb6dcf34ee0c8 Mon Sep 17 00:00:00 2001
From: sehr-m <58871345+sehr-m@users.noreply.github.com>
Date: Fri, 16 Jan 2026 10:07:53 -0800
Subject: [PATCH] always include short id

---
 src/sentry/seer/autofix/autofix_agent.py      |  4 +-
 .../sentry/seer/autofix/test_autofix_agent.py | 53 -------------------
 2 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/src/sentry/seer/autofix/autofix_agent.py b/src/sentry/seer/autofix/autofix_agent.py
index e59bcdca5c63b4..8d540096e0e8ae 100644
--- a/src/sentry/seer/autofix/autofix_agent.py
+++ b/src/sentry/seer/autofix/autofix_agent.py
@@ -337,9 +337,7 @@ def trigger_coding_agent_handoff(
     )
     state = client.get_run(run_id)
 
-    short_id = None
-    if auto_create_pr:
-        short_id = group.qualified_short_id
+    short_id = group.qualified_short_id
 
     prompt = generate_autofix_handoff_prompt(state, short_id=short_id)
 
diff --git a/tests/sentry/seer/autofix/test_autofix_agent.py b/tests/sentry/seer/autofix/test_autofix_agent.py
index 263350d50d2aeb..ed4ac7813ad048 100644
--- a/tests/sentry/seer/autofix/test_autofix_agent.py
+++ b/tests/sentry/seer/autofix/test_autofix_agent.py
@@ -543,56 +543,3 @@ def test_trigger_coding_agent_handoff_no_preferences_returns_failure(
         assert len(result["failures"]) == 1
         assert "No repositories configured" in result["failures"][0]["error_message"]
         mock_client.launch_coding_agents.assert_not_called()
-
-    @patch("sentry.seer.autofix.autofix_agent.get_project_seer_preferences")
-    @patch("sentry.seer.autofix.autofix_agent.SeerExplorerClient")
-    def test_trigger_coding_agent_handoff_includes_short_id_when_auto_create_pr_enabled(
-        self, mock_client_class, mock_get_prefs
-    ):
-        """Test that short_id is included in prompt when auto_create_pr is True."""
-        mock_client = MagicMock()
-        mock_client_class.return_value = mock_client
-        mock_client.get_run.return_value = self._make_run_state()
-        mock_client.launch_coding_agents.return_value = {"successes": [], "failures": []}
-
-        # Set up preferences with auto_create_pr=True
-        mock_get_prefs.return_value = self._make_preference_response(auto_create_pr=True)
-
-        trigger_coding_agent_handoff(
-            group=self.group,
-            run_id=123,
-            integration_id=456,
-        )
-
-        call_kwargs = mock_client.launch_coding_agents.call_args.kwargs
-        prompt = call_kwargs["prompt"]
-        # Prompt should contain "Fixes {short_id}" instruction
-        assert (
-            f"Include 'Fixes {self.group.qualified_short_id}' in the pull request description"
-            in prompt
-        )
-
-    @patch("sentry.seer.autofix.autofix_agent.get_project_seer_preferences")
-    @patch("sentry.seer.autofix.autofix_agent.SeerExplorerClient")
-    def test_trigger_coding_agent_handoff_excludes_short_id_when_auto_create_pr_disabled(
-        self, mock_client_class, mock_get_prefs
-    ):
-        """Test that short_id is NOT included in prompt when auto_create_pr is False."""
-        mock_client = MagicMock()
-        mock_client_class.return_value = mock_client
-        mock_client.get_run.return_value = self._make_run_state()
-        mock_client.launch_coding_agents.return_value = {"successes": [], "failures": []}
-
-        # Set up preferences with auto_create_pr=False (default)
-        mock_get_prefs.return_value = self._make_preference_response(auto_create_pr=False)
-
-        trigger_coding_agent_handoff(
-            group=self.group,
-            run_id=123,
-            integration_id=456,
-        )
-
-        call_kwargs = mock_client.launch_coding_agents.call_args.kwargs
-        prompt = call_kwargs["prompt"]
-        # Prompt should NOT contain "Fixes" instruction
-        assert "Fixes" not in prompt