preserve original stopping point

Author: srest2021

src/sentry/seer/similarity/utils.py

@@ -23,7 +23,6 @@
 from sentry.models.project import Project
 from sentry.seer.autofix.constants import AutofixAutomationTuningSettings
 from sentry.seer.autofix.utils import (
-    AutofixStoppingPoint,
     is_seer_seat_based_tier_enabled,
     set_project_seer_preference,
     write_preference_to_sentry_db,
@@ -579,20 +578,14 @@ def set_default_project_auto_open_prs(organization: Organization, project: Proje
     Reads org options (default_automated_run_stopping_point, auto_open_prs, default_coding_agent,
     default_coding_agent_integration_id) and writes the corresponding project-level
     options (stopping point, handoff config).
-
-    When auto_open_prs is True, stopping_point is forced to open_pr regardless of
-    default_stopping_point.
     """
     if not is_seer_seat_based_tier_enabled(organization):
         return
 
     auto_open_prs = bool(organization.get_option("sentry:auto_open_prs", AUTO_OPEN_PRS_DEFAULT))
-    if auto_open_prs:
-        stopping_point = AutofixStoppingPoint.OPEN_PR
-    else:
-        stopping_point = organization.get_option(
-            "sentry:default_stopping_point", SEER_DEFAULT_AUTOMATED_RUN_STOPPING_POINT_DEFAULT
-        )
+    stopping_point = organization.get_option(
+        "sentry:default_stopping_point", SEER_DEFAULT_AUTOMATED_RUN_STOPPING_POINT_DEFAULT
+    )
 
     coding_agent = organization.get_option(
         "sentry:seer_default_coding_agent", SEER_DEFAULT_CODING_AGENT_DEFAULT

src/sentry/tasks/seer/autofix.py

@@ -245,12 +245,9 @@ def configure_seer_for_existing_org(organization_id: int) -> None:
             )
 
     auto_open_prs = bool(organization.get_option("sentry:auto_open_prs", AUTO_OPEN_PRS_DEFAULT))
-    if auto_open_prs:
-        default_stopping_point = "open_pr"
-    else:
-        default_stopping_point = organization.get_option(
-            "sentry:default_stopping_point", SEER_DEFAULT_AUTOMATED_RUN_STOPPING_POINT_DEFAULT
-        )
+    default_stopping_point = organization.get_option(
+        "sentry:default_stopping_point", SEER_DEFAULT_AUTOMATED_RUN_STOPPING_POINT_DEFAULT
+    )
 
     coding_agent = organization.get_option(
         "sentry:seer_default_coding_agent", SEER_DEFAULT_CODING_AGENT_DEFAULT

tests/sentry/seer/similarity/test_utils.py

@@ -1246,7 +1246,7 @@ def test_skips_when_tier_not_enabled(
     @patch("sentry.seer.similarity.utils.write_preference_to_sentry_db")
     @patch("sentry.seer.similarity.utils.set_project_seer_preference")
     @patch("sentry.seer.similarity.utils.is_seer_seat_based_tier_enabled", return_value=True)
-    def test_seer_agent_default_stopping_point(
+    def test_seer_agent_default(
         self, mock_tier: MagicMock, mock_set_pref: MagicMock, mock_dual_write: MagicMock
     ):
         """Seer agent, no auto_open_prs, default stopping point (code_changes)."""
@@ -1259,7 +1259,7 @@ def test_seer_agent_default_stopping_point(
     @patch("sentry.seer.similarity.utils.write_preference_to_sentry_db")
     @patch("sentry.seer.similarity.utils.set_project_seer_preference")
     @patch("sentry.seer.similarity.utils.is_seer_seat_based_tier_enabled", return_value=True)
-    def test_seer_agent_custom_stopping_point(
+    def test_seer_agent_with_custom_stopping_point(
         self, mock_tier: MagicMock, mock_set_pref: MagicMock, mock_dual_write: MagicMock
     ):
         """Seer agent, no auto_open_prs, custom stopping point (root_cause)."""
@@ -1277,20 +1277,20 @@ def test_seer_agent_custom_stopping_point(
     def test_seer_agent_with_auto_open_prs(
         self, mock_tier: MagicMock, mock_set_pref: MagicMock, mock_dual_write: MagicMock
     ):
-        """auto_open_prs=True forces stopping point to open_pr regardless of default."""
+        """auto_open_prs does not override stopping point."""
         self.organization.update_option("sentry:auto_open_prs", True)
         self.organization.update_option("sentry:default_stopping_point", "root_cause")
 
         set_default_project_auto_open_prs(self.organization, self.project)
 
         pref = mock_set_pref.call_args[0][0]
-        assert pref.automated_run_stopping_point == "open_pr"
+        assert pref.automated_run_stopping_point == "root_cause"
         assert pref.automation_handoff is None
 
     @patch("sentry.seer.similarity.utils.write_preference_to_sentry_db")
     @patch("sentry.seer.similarity.utils.set_project_seer_preference")
     @patch("sentry.seer.similarity.utils.is_seer_seat_based_tier_enabled", return_value=True)
-    def test_external_agent_no_auto_open_prs(
+    def test_external_agent_default(
         self, mock_tier: MagicMock, mock_set_pref: MagicMock, mock_dual_write: MagicMock
     ):
         agents = [
@@ -1321,8 +1321,9 @@ def test_external_agent_no_auto_open_prs(
     def test_external_agent_with_auto_open_prs(
         self, mock_tier: MagicMock, mock_set_pref: MagicMock, mock_dual_write: MagicMock
     ):
-        """auto_open_prs=True forces open_pr and sets auto_create_pr on handoff."""
+        """auto_open_prs sets auto_create_pr on handoff but does not override stopping point."""
         self.organization.update_option("sentry:auto_open_prs", True)
+        self.organization.update_option("sentry:default_stopping_point", "root_cause")
         agents = [
             ("cursor_background_agent", 1234),
             ("claude_code_agent", 5678),
@@ -1338,7 +1339,7 @@ def test_external_agent_with_auto_open_prs(
                 set_default_project_auto_open_prs(self.organization, self.project)
 
                 pref = mock_set_pref.call_args[0][0]
-                assert pref.automated_run_stopping_point == "open_pr"
+                assert pref.automated_run_stopping_point == "root_cause"
                 assert pref.automation_handoff is not None
                 assert pref.automation_handoff.target == agent
                 assert pref.automation_handoff.integration_id == integration_id