diff --git a/src/sentry/features/temporary.py b/src/sentry/features/temporary.py index 80f0b1f0ca82..2dd909e5aa74 100644 --- a/src/sentry/features/temporary.py +++ b/src/sentry/features/temporary.py @@ -287,6 +287,8 @@ def register_temporary_features(manager: FeatureManager) -> None: manager.add("organizations:seer-explorer-context-engine-allow-fe-override", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True) # Enable frontend override UI component for context engine (only for AI/ML/Reasoning platform team) manager.add("organizations:seer-explorer-context-engine-fe-override-ui-flag", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True) + # Agent-created PRs in Ask Seer chat; overrides seer-explorer-chat-coding + manager.add("organizations:ask-seer-create-pr", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True) # Enable code editing tools in Seer Agent chat manager.add("organizations:seer-explorer-chat-coding", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True) # Accept a chat prompt ("Ask Seer" question) and its context alongside a Seer Agent chat message diff --git a/src/sentry/seer/endpoints/organization_seer_agent_chat.py b/src/sentry/seer/endpoints/organization_seer_agent_chat.py index 744668b005c6..f400089940c3 100644 --- a/src/sentry/seer/endpoints/organization_seer_agent_chat.py +++ b/src/sentry/seer/endpoints/organization_seer_agent_chat.py @@ -340,11 +340,15 @@ def post( resolved = result try: - enable_coding = organization.get_option( - "sentry:enable_seer_coding", False - ) and features.has( - "organizations:seer-explorer-chat-coding", organization, actor=request.user - ) + # ask-seer-create-pr turns off chat-coding's coding until agent-created PRs ship. + if features.has("organizations:ask-seer-create-pr", organization, actor=request.user): + enable_coding = False + else: + enable_coding = organization.get_option( + "sentry:enable_seer_coding", False + ) and features.has( + "organizations:seer-explorer-chat-coding", organization, actor=request.user + ) has_code_mode_feature = features.has( "organizations:seer-explorer-code-mode-tools", organization, actor=request.user diff --git a/tests/sentry/seer/endpoints/test_organization_seer_agent_chat.py b/tests/sentry/seer/endpoints/test_organization_seer_agent_chat.py index 6caf0faff635..f631e55ddd84 100644 --- a/tests/sentry/seer/endpoints/test_organization_seer_agent_chat.py +++ b/tests/sentry/seer/endpoints/test_organization_seer_agent_chat.py @@ -163,6 +163,19 @@ def test_no_code_mode_feature_stays_off(self, mock_client_class: MagicMock): assert response.status_code == 200 assert mock_client_class.call_args.kwargs["enable_code_mode_tools"] == "off" + @with_feature(["organizations:ask-seer-create-pr", "organizations:seer-explorer-chat-coding"]) + @patch("sentry.seer.endpoints.organization_seer_agent_chat.SeerAgentClient") + def test_create_pr_flag_turns_off_chat_coding(self, mock_client_class: MagicMock): + self.organization.update_option("sentry:enable_seer_coding", True) + mock_client = MagicMock() + mock_client.start_run.return_value = MagicMock(seer_run_state_id=456, uuid=uuid.uuid4()) + mock_client_class.return_value = mock_client + + response = self.client.post(self.url, {"query": "hi"}, format="json") + + assert response.status_code == 200 + assert mock_client_class.call_args.kwargs["enable_coding"] is False + @patch("sentry.seer.endpoints.organization_seer_agent_chat.SeerAgentClient") def test_post_new_conversation_calls_client(self, mock_client_class: MagicMock): run_uuid = uuid.uuid4()