From bbed8b5654633fc9c7e7d652da57b8c60c62a6ba Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Mon, 22 Jun 2026 13:21:17 +0000
Subject: [PATCH 1/8] Switch vectordb search from deprecated
 QdrantClient.search() to query_points()

search() was removed in qdrant-client 1.16.0. The dev deployment was
built from a standalone branch that pinned bugbug at git rev f8b31eb,
which had a loose qdrant-client>=1.15.1,<1.19.0 constraint. That let
the image resolve to 1.16+, causing REVIEWHELPER-API-25.

Fixes REVIEWHELPER-API-25
---
 bugbug/tools/code_review/database.py |  2 +-
 bugbug/vectordb.py                   | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bugbug/tools/code_review/database.py b/bugbug/tools/code_review/database.py
index 6320e26978..4f19b7c092 100644
--- a/bugbug/tools/code_review/database.py
+++ b/bugbug/tools/code_review/database.py
@@ -135,7 +135,7 @@ class EvaluationAction(enum.Enum):
 
 @dataclass
 class SuggestionFeedback:
-    id: int
+    id: int | str
     comment: str
     file_path: str
     action: Literal["APPROVE", "REJECT", "IGNORE"]
diff --git a/bugbug/vectordb.py b/bugbug/vectordb.py
index fa499166b5..f3882978d3 100644
--- a/bugbug/vectordb.py
+++ b/bugbug/vectordb.py
@@ -23,8 +23,8 @@ class VectorPoint:
 
 @dataclass(order=True)
 class PayloadScore:
-    score: int
-    id: int
+    score: float
+    id: int | str
     payload: dict
 
 
@@ -134,9 +134,10 @@ def search(
     ) -> Iterable[PayloadScore]:
         qdrant_filter = filter.to_qdrant_filter() if filter else None
 
-        for item in self.client.search(
-            self.collection_name, query, qdrant_filter, limit=limit
-        ):
+        response = self.client.query_points(
+            self.collection_name, query=query, query_filter=qdrant_filter, limit=limit
+        )
+        for item in response.points:
             yield PayloadScore(item.score, item.id, item.payload)
 
     def get_existing_ids(self) -> Iterable[int]:

From 59ca3b527071a3e9ab21efb66b8aa621ff322e67 Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Mon, 22 Jun 2026 13:21:22 +0000
Subject: [PATCH 2/8] Downgrade SearchfoxRequestError log level from error to
 warning

4xx responses from Searchfox (file not found, bad request) are handled
gracefully and returned as tool errors; they don't warrant Sentry events.
Unexpected exceptions (network failures, etc.) remain at error level.

Fixes REVIEWHELPER-API-21
---
 bugbug/tools/code_review/langchain_tools.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/bugbug/tools/code_review/langchain_tools.py b/bugbug/tools/code_review/langchain_tools.py
index a6b2b0bbc0..71985712c9 100644
--- a/bugbug/tools/code_review/langchain_tools.py
+++ b/bugbug/tools/code_review/langchain_tools.py
@@ -203,7 +203,7 @@ async def search_text(
     except SearchfoxNetworkError as e:
         return _tool_error(f"search failed: {e}")
     except SearchfoxRequestError as e:
-        logger.error(
+        logger.warning(
             "Bad request searching for %r (path=%r, langs=%r): %s",
             query,
             path_filter,
@@ -233,7 +233,7 @@ async def get_field_layout(
     except SearchfoxNetworkError as e:
         return _tool_error(f"field layout fetch failed: {e}")
     except SearchfoxRequestError as e:
-        logger.error("Bad request fetching field layout for %r: %s", class_name, e)
+        logger.warning("Bad request fetching field layout for %r: %s", class_name, e)
         return _tool_error(f"field layout fetch failed: {e}")
     except Exception as e:
         logger.error("Unexpected error fetching field layout for %r: %s", class_name, e)
@@ -265,7 +265,7 @@ async def get_blame(
     except SearchfoxNetworkError as e:
         return _tool_error(f"blame fetch failed: {e}")
     except SearchfoxRequestError as e:
-        logger.error(
+        logger.warning(
             "Bad request fetching blame for %r lines %r: %s", file_path, lines, e
         )
         return _tool_error(f"blame fetch failed: {e}")
@@ -304,7 +304,7 @@ async def check_can_gc(
     except SearchfoxNetworkError as e:
         return _tool_error(f"GC check failed: {e}")
     except SearchfoxRequestError as e:
-        logger.error("Bad request checking GC status for %r: %s", symbol, e)
+        logger.warning("Bad request checking GC status for %r: %s", symbol, e)
         return _tool_error(f"GC check failed: {e}")
     except Exception as e:
         logger.error("Unexpected error checking GC status for %r: %s", symbol, e)
@@ -333,7 +333,7 @@ async def find_definition(
     except SearchfoxNetworkError as e:
         return _tool_error(f"definition lookup failed: {e}")
     except SearchfoxRequestError as e:
-        logger.error(
+        logger.warning(
             "Bad request finding definition for %r (path=%r): %s", name, path_filter, e
         )
         return _tool_error(f"definition lookup failed: {e}")
@@ -376,7 +376,7 @@ async def search_identifier(
     except SearchfoxNetworkError as e:
         return _tool_error(f"identifier search failed: {e}")
     except SearchfoxRequestError as e:
-        logger.error(
+        logger.warning(
             "Bad request searching for identifier %r (path=%r, langs=%r): %s",
             identifier,
             path_filter,
@@ -408,7 +408,7 @@ async def calls_from(
     except SearchfoxNetworkError as e:
         return _tool_error(f"call graph fetch failed: {e}")
     except SearchfoxRequestError as e:
-        logger.error(
+        logger.warning(
             "Bad request fetching calls from %r (depth=%d): %s", symbol, depth, e
         )
         return _tool_error(f"call graph fetch failed: {e}")
@@ -436,7 +436,7 @@ async def calls_to(
     except SearchfoxNetworkError as e:
         return _tool_error(f"call graph fetch failed: {e}")
     except SearchfoxRequestError as e:
-        logger.error(
+        logger.warning(
             "Bad request fetching calls to %r (depth=%d): %s", symbol, depth, e
         )
         return _tool_error(f"call graph fetch failed: {e}")
@@ -468,7 +468,7 @@ async def calls_between(
     except SearchfoxNetworkError as e:
         return _tool_error(f"call graph fetch failed: {e}")
     except SearchfoxRequestError as e:
-        logger.error(
+        logger.warning(
             "Bad request fetching calls between %r and %r (depth=%d): %s",
             symbol_a,
             symbol_b,
@@ -508,7 +508,7 @@ async def get_function_at_line(
     except SearchfoxNetworkError as e:
         return _tool_error(f"function lookup failed: {e}")
     except SearchfoxRequestError as e:
-        logger.error(
+        logger.warning(
             "Bad request fetching function at line %d in %r: %s", line, file_path, e
         )
         return _tool_error(f"function lookup failed: {e}")

From 6f8de4225e9cc5e1192c309fd6b0da3c9ba57304 Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Mon, 22 Jun 2026 16:39:18 +0000
Subject: [PATCH 3/8] Don't log private/confidential bug and revision lookups
 to Sentry

Introduce BugNotFoundError and RevisionNotFoundError as distinct types
and add them to sentry_sdk ignore_errors. Requests for private security
bugs or restricted Phabricator revisions are expected operational
behaviour, not errors worth alerting on.

Improve the error message for bug lookups to mention the confidential
security bug case.

Fixes BUGBUG-MCP-2M
Fixes BUGBUG-MCP-2K
Fixes BUGBUG-MCP-2Q
Fixes BUGBUG-MCP-2P
---
 bugbug/tools/core/platforms/bugzilla.py   | 8 +++++++-
 services/mcp/src/bugbug_mcp/__init__.py   | 4 ++++
 services/mcp/src/bugbug_mcp/exceptions.py | 5 +++++
 services/mcp/src/bugbug_mcp/server.py     | 3 ++-
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 services/mcp/src/bugbug_mcp/exceptions.py

diff --git a/bugbug/tools/core/platforms/bugzilla.py b/bugbug/tools/core/platforms/bugzilla.py
index 7096d7c783..2b3936d459 100644
--- a/bugbug/tools/core/platforms/bugzilla.py
+++ b/bugbug/tools/core/platforms/bugzilla.py
@@ -18,6 +18,10 @@
 logger = logging.getLogger(__name__)
 
 EDITBUGS_GROUP_ID = 9
+
+
+class BugNotFoundError(ValueError):
+    pass
 TRUST_BEFORE_DATE = datetime(2022, 1, 1, tzinfo=timezone.utc)
 
 REDACTED_TITLE = "[Unvalidated bug title redacted for security]"
@@ -426,7 +430,9 @@ def get(cls, bug_id: int, allow_private: bool = False) -> "Bug":
         ).get_data().wait()
 
         if not bugs or (not allow_private and bugs[0]["groups"]):
-            raise ValueError(f"Bug {bug_id} not found")
+            raise BugNotFoundError(
+                f"Bug {bug_id} was not found. It may not exist or may be a confidential security bug."
+            )
 
         bug_data = bugs[0]
         assert bug_data["id"] == bug_id
diff --git a/services/mcp/src/bugbug_mcp/__init__.py b/services/mcp/src/bugbug_mcp/__init__.py
index 720ed0485c..bdbb31b292 100644
--- a/services/mcp/src/bugbug_mcp/__init__.py
+++ b/services/mcp/src/bugbug_mcp/__init__.py
@@ -3,6 +3,9 @@
 
 import sentry_sdk
 
+from bugbug.tools.core.platforms.bugzilla import BugNotFoundError
+from bugbug_mcp.exceptions import RevisionNotFoundError
+
 __version__ = "0.1.0"
 
 
@@ -15,4 +18,5 @@
     # Add data like request headers and IP for users,
     # see https://docs.sentry.io/platforms/python/data-management/data-collected/ for more info
     send_default_pii=True,
+    ignore_errors=[BugNotFoundError, RevisionNotFoundError],
 )
diff --git a/services/mcp/src/bugbug_mcp/exceptions.py b/services/mcp/src/bugbug_mcp/exceptions.py
new file mode 100644
index 0000000000..adec04e71a
--- /dev/null
+++ b/services/mcp/src/bugbug_mcp/exceptions.py
@@ -0,0 +1,5 @@
+from fastmcp.exceptions import ToolError
+
+
+class RevisionNotFoundError(ToolError):
+    pass
diff --git a/services/mcp/src/bugbug_mcp/server.py b/services/mcp/src/bugbug_mcp/server.py
index a61cf2f9a8..8ada91c59e 100644
--- a/services/mcp/src/bugbug_mcp/server.py
+++ b/services/mcp/src/bugbug_mcp/server.py
@@ -14,6 +14,7 @@
 
 from bugbug.tools.code_review.prompts import SYSTEM_PROMPT_TEMPLATE
 from bugbug.tools.core.platforms.bugzilla import SanitizedBug
+from bugbug_mcp.exceptions import RevisionNotFoundError
 from bugbug.tools.core.platforms.phabricator import (
     PhabricatorPatch,
     SanitizedPhabricatorPatch,
@@ -146,7 +147,7 @@ def bughandler(bug):
 def _get_revision_md(revision_id: int) -> str:
     patch = SanitizedPhabricatorPatch(revision_id=revision_id)
     if not patch.is_accessible() or not patch.is_public():
-        raise ToolError(
+        raise RevisionNotFoundError(
             f"Revision D{revision_id} was not found. It may not exist or may be private."
         )
     return patch.to_md()

From 664a8b28032475be48abcf9d6f5d2cfffdba9cfc Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 23 Jun 2026 11:12:32 +0000
Subject: [PATCH 4/8] Don't log Bugzilla API transport errors (5xx) to Sentry

Catch requests.HTTPError from the Bugzilla API in SanitizedBug.get()
and raise BugzillaAPIError instead. Add it to ignore_errors so transient
Bugzilla outages (502 Bad Gateway etc.) don't generate Sentry alerts.

Don't log Bugzilla 5xx errors to Sentry

Split BugzillaAPIError into BugzillaAPIError (4xx, remains visible) and
BugzillaTransientError (5xx, suppressed). 502/503 Bugzilla outages are
expected and don't need Sentry alerts; 4xx errors may indicate bugs in
our code and should stay visible.
---
 bugbug/tools/core/platforms/bugzilla.py | 31 ++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/bugbug/tools/core/platforms/bugzilla.py b/bugbug/tools/core/platforms/bugzilla.py
index 2b3936d459..c300bf303e 100644
--- a/bugbug/tools/core/platforms/bugzilla.py
+++ b/bugbug/tools/core/platforms/bugzilla.py
@@ -10,6 +10,7 @@
 from datetime import datetime, timezone
 from functools import cached_property
 
+import requests
 from libmozdata.bugzilla import Bugzilla, BugzillaBase, BugzillaUser
 from libmozdata.config import set_default_value
 
@@ -22,6 +23,17 @@
 
 class BugNotFoundError(ValueError):
     pass
+
+
+class BugzillaAPIError(IOError):
+    pass
+
+
+class BugzillaTransientError(BugzillaAPIError):
+    """Transient server-side error (5xx) from the Bugzilla API."""
+    pass
+
+
 TRUST_BEFORE_DATE = datetime(2022, 1, 1, tzinfo=timezone.utc)
 
 REDACTED_TITLE = "[Unvalidated bug title redacted for security]"
@@ -422,12 +434,19 @@ def __getattr__(self, name: str):
     @classmethod
     def get(cls, bug_id: int, allow_private: bool = False) -> "Bug":
         bugs: list[dict] = []
-        Bugzilla(
-            bug_id,
-            include_fields=["_default", "comments", "history"],
-            bughandler=lambda bug, data: data.append(bug),
-            bugdata=bugs,
-        ).get_data().wait()
+        try:
+            Bugzilla(
+                bug_id,
+                include_fields=["_default", "comments", "history"],
+                bughandler=lambda bug, data: data.append(bug),
+                bugdata=bugs,
+            ).get_data().wait()
+        except requests.HTTPError as e:
+            if e.response is not None and e.response.status_code >= 500:
+                raise BugzillaTransientError(
+                    f"Bugzilla API error for bug {bug_id}: {e}"
+                ) from e
+            raise BugzillaAPIError(f"Bugzilla API error for bug {bug_id}: {e}") from e
 
         if not bugs or (not allow_private and bugs[0]["groups"]):
             raise BugNotFoundError(

From a13ab0ec395c2fdd0c9d8b9881ff80e8eae1f2e0 Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 23 Jun 2026 13:21:30 +0000
Subject: [PATCH 5/8] Treat unexpected Bugzilla API response format as a
 transient error

A BMO outage can return a 200 with a non-standard body that lacks the
expected 'bugs' key, causing a KeyError in libmozdata's callback. Catch
it and raise BugzillaTransientError so it is suppressed in Sentry.

Fixes BUGBUG-MCP-2S
Fixes BUGBUG-MCP-2T
---
 bugbug/tools/core/platforms/bugzilla.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bugbug/tools/core/platforms/bugzilla.py b/bugbug/tools/core/platforms/bugzilla.py
index c300bf303e..bdd157eb78 100644
--- a/bugbug/tools/core/platforms/bugzilla.py
+++ b/bugbug/tools/core/platforms/bugzilla.py
@@ -30,7 +30,8 @@ class BugzillaAPIError(IOError):
 
 
 class BugzillaTransientError(BugzillaAPIError):
-    """Transient server-side error (5xx) from the Bugzilla API."""
+    """Transient error from the Bugzilla API (5xx or unexpected response format)."""
+
     pass
 
 
@@ -447,6 +448,10 @@ def get(cls, bug_id: int, allow_private: bool = False) -> "Bug":
                     f"Bugzilla API error for bug {bug_id}: {e}"
                 ) from e
             raise BugzillaAPIError(f"Bugzilla API error for bug {bug_id}: {e}") from e
+        except KeyError as e:
+            raise BugzillaTransientError(
+                f"Unexpected Bugzilla API response for bug {bug_id}: {e}"
+            ) from e
 
         if not bugs or (not allow_private and bugs[0]["groups"]):
             raise BugNotFoundError(

From 1e96d4a4b5ea6071c2c2b8f0c575dc8e4d80b87c Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 23 Jun 2026 13:21:31 +0000
Subject: [PATCH 6/8] Fix race condition creating duplicate review requests

Two concurrent requests for the same (revision_id, diff_id) could both
pass the SELECT check and both attempt INSERT, hitting the unique
constraint. Catch IntegrityError, rollback, and re-fetch the row
inserted by the winning request.

Fixes REVIEWHELPER-API-J
---
 services/reviewhelper-api/app/routers/request.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/services/reviewhelper-api/app/routers/request.py b/services/reviewhelper-api/app/routers/request.py
index e3ba4578b8..044050a534 100644
--- a/services/reviewhelper-api/app/routers/request.py
+++ b/services/reviewhelper-api/app/routers/request.py
@@ -5,6 +5,7 @@
 from fastapi import APIRouter, Depends, status
 from fastapi.responses import JSONResponse
 from sqlalchemy import select
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.auth import verify_external_api_key
@@ -80,7 +81,19 @@ async def create_or_get_review_request(
         status=ReviewStatus.PENDING,
     )
     db.add(review_request)
-    await db.commit()
+    try:
+        await db.commit()
+    except IntegrityError:
+        await db.rollback()
+        existing_request = await db.scalar(stmt)
+        if existing_request is None:
+            raise
+        return JSONResponse(
+            {
+                "status": existing_request.status.value,
+                "message": _build_response_message(existing_request),
+            }
+        )
 
     schedule_time = (
         request.revision_created_at + INITIAL_TASK_DELAY

From 6e6844a35535a2cb9b681786f14e4110c0cf3fdd Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 23 Jun 2026 16:56:48 +0200
Subject: [PATCH 7/8] fmt/lint

---
 services/mcp/src/bugbug_mcp/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/mcp/src/bugbug_mcp/server.py b/services/mcp/src/bugbug_mcp/server.py
index 8ada91c59e..e2f6481da0 100644
--- a/services/mcp/src/bugbug_mcp/server.py
+++ b/services/mcp/src/bugbug_mcp/server.py
@@ -14,11 +14,11 @@
 
 from bugbug.tools.code_review.prompts import SYSTEM_PROMPT_TEMPLATE
 from bugbug.tools.core.platforms.bugzilla import SanitizedBug
-from bugbug_mcp.exceptions import RevisionNotFoundError
 from bugbug.tools.core.platforms.phabricator import (
     PhabricatorPatch,
     SanitizedPhabricatorPatch,
 )
+from bugbug_mcp.exceptions import RevisionNotFoundError
 
 mcp = FastMCP("Firefox Development MCP Server")
 

From df524ba61595d3a4001b3ed91c89a9081c2144f4 Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 23 Jun 2026 17:19:00 +0000
Subject: [PATCH 8/8] Don't log invalid doc path errors to Sentry

Introduce InvalidDocPathError as a ToolError subclass for the
read_fx_doc_section tool and add it to ignore_errors. Models frequently
pass .html paths or non-existent paths; these are expected and don't
need Sentry alerts.

Fixes BUGBUG-MCP-2Y
Fixes BUGBUG-MCP-8
---
 services/mcp/src/bugbug_mcp/__init__.py   | 4 ++--
 services/mcp/src/bugbug_mcp/exceptions.py | 4 ++++
 services/mcp/src/bugbug_mcp/server.py     | 7 +++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/services/mcp/src/bugbug_mcp/__init__.py b/services/mcp/src/bugbug_mcp/__init__.py
index bdbb31b292..d17591d6d2 100644
--- a/services/mcp/src/bugbug_mcp/__init__.py
+++ b/services/mcp/src/bugbug_mcp/__init__.py
@@ -4,7 +4,7 @@
 import sentry_sdk
 
 from bugbug.tools.core.platforms.bugzilla import BugNotFoundError
-from bugbug_mcp.exceptions import RevisionNotFoundError
+from bugbug_mcp.exceptions import InvalidDocPathError, RevisionNotFoundError
 
 __version__ = "0.1.0"
 
@@ -18,5 +18,5 @@
     # Add data like request headers and IP for users,
     # see https://docs.sentry.io/platforms/python/data-management/data-collected/ for more info
     send_default_pii=True,
-    ignore_errors=[BugNotFoundError, RevisionNotFoundError],
+    ignore_errors=[BugNotFoundError, RevisionNotFoundError, InvalidDocPathError],
 )
diff --git a/services/mcp/src/bugbug_mcp/exceptions.py b/services/mcp/src/bugbug_mcp/exceptions.py
index adec04e71a..a00d8190e8 100644
--- a/services/mcp/src/bugbug_mcp/exceptions.py
+++ b/services/mcp/src/bugbug_mcp/exceptions.py
@@ -3,3 +3,7 @@
 
 class RevisionNotFoundError(ToolError):
     pass
+
+
+class InvalidDocPathError(ToolError):
+    pass
diff --git a/services/mcp/src/bugbug_mcp/server.py b/services/mcp/src/bugbug_mcp/server.py
index e2f6481da0..335a37f8ad 100644
--- a/services/mcp/src/bugbug_mcp/server.py
+++ b/services/mcp/src/bugbug_mcp/server.py
@@ -8,7 +8,6 @@
 
 import httpx
 from fastmcp import FastMCP
-from fastmcp.exceptions import ToolError
 from fastmcp.resources import FileResource
 from pydantic import Field
 
@@ -18,7 +17,7 @@
     PhabricatorPatch,
     SanitizedPhabricatorPatch,
 )
-from bugbug_mcp.exceptions import RevisionNotFoundError
+from bugbug_mcp.exceptions import InvalidDocPathError, RevisionNotFoundError
 
 mcp = FastMCP("Firefox Development MCP Server")
 
@@ -188,7 +187,7 @@ async def read_fx_doc_section(
 ) -> str:
     """Retrieve the content of a section from Firefox Source Tree Documentation."""
     if not doc_path.endswith(".md") and not doc_path.endswith(".rst"):
-        raise ToolError(
+        raise InvalidDocPathError(
             f"Invalid path: {doc_path}. Path must end with `.rst` or `.md`. Use the docs://llms.txt resource on this MCP to find valid paths."
         )
 
@@ -197,7 +196,7 @@ async def read_fx_doc_section(
     async with httpx.AsyncClient() as client:
         response = await client.get(url)
         if response.status_code == 404:
-            raise ToolError(
+            raise InvalidDocPathError(
                 f"Invalid path: {doc_path}. Use the docs://llms.txt resource on this MCP to find valid paths."
             )