pjdev-gitlab 5.1.13__tar.gz → 5.2.0__tar.gz

{pjdev_gitlab-5.1.13 → pjdev_gitlab-5.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: pjdev-gitlab
-Version: 5.1.13
+Version: 5.2.0
 Project-URL: Documentation, https://gitlab.purplejay.io/keystone/python/-/tree/main/pjdev-gitlab/README.md
 Project-URL: Issues, https://gitlab.purplejay.io/keystone/python/-/issues
 Project-URL: Source, https://gitlab.purplejay.io/keystone/python
@@ -192,6 +192,68 @@ asyncio.run(main())
 
 Run it: `op run --env-file=.env.op -- python my_script.py`.
 
+### Notes (comments) and replies
+
+`notes_service` reads and replies to comments on **both** issues and merge
+requests — they share the same endpoint shape, so one `Noteable` parameter
+selects which.
+
+GitLab only lets you reply to a *discussion* (a thread), never to a note id, so
+`reply_to_note` resolves the note to its containing thread for you:
+
+```python
+import asyncio
+from pjdev_gitlab import config_service, notes_service
+from pjdev_gitlab.notes_service import Noteable, QuickActionOnlyError
+
+async def main() -> None:
+    config_service.init()
+
+    # Fetch. Notes come back newest-first; pass sort="asc" to read in order.
+    notes = await notes_service.list_notes(
+        "my-group/my-project", Noteable.merge_request, 166,
+        include_system=False,   # drop "assigned to @x", "changed milestone", ...
+        sort="asc",
+    )
+
+    # Threads, when you need a discussion id to answer into.
+    threads = await notes_service.list_discussions(
+        "my-group/my-project", Noteable.merge_request, 166
+    )
+
+    # Reply, addressing the note you're answering.
+    await notes_service.reply_to_note(
+        "my-group/my-project", Noteable.merge_request, 166,
+        note_id=notes[0].id,
+        body="Good catch — fixed in the next push.",
+    )
+
+    # Or straight into a known thread.
+    await notes_service.reply_to_discussion(
+        "my-group/my-project", Noteable.issue, 730,
+        discussion_id=threads[0].id,
+        body="Verified on TEST1.",
+    )
+
+asyncio.run(main())
+```
+
+`list_merge_request_notes` / `list_issue_notes` remain as thin aliases for
+`list_notes`.
+
+A body made up of **only** quick actions (e.g. `/milestone %"v2.0.6"`) creates no
+note — GitLab runs the command and returns the commands it executed instead. The
+reply helpers raise `QuickActionOnlyError` for that case, carrying the outcome so
+you can confirm the side effect landed:
+
+```python
+try:
+    await notes_service.reply_to_discussion(..., body='/milestone %"v2.0.6"')
+except QuickActionOnlyError as exc:
+    print(exc.summary)           # ['Set milestone to %"v2.0.6".']
+    print(exc.commands_changes)  # {'milestone': {...}}
+```
+
 ### WorkItems (GraphQL)
 
 `workItem` is GitLab's unified replacement for the legacy `Issue` type — use

{pjdev_gitlab-5.1.13 → pjdev_gitlab-5.2.0}/README.md

@@ -164,6 +164,68 @@ asyncio.run(main())
 
 Run it: `op run --env-file=.env.op -- python my_script.py`.
 
+### Notes (comments) and replies
+
+`notes_service` reads and replies to comments on **both** issues and merge
+requests — they share the same endpoint shape, so one `Noteable` parameter
+selects which.
+
+GitLab only lets you reply to a *discussion* (a thread), never to a note id, so
+`reply_to_note` resolves the note to its containing thread for you:
+
+```python
+import asyncio
+from pjdev_gitlab import config_service, notes_service
+from pjdev_gitlab.notes_service import Noteable, QuickActionOnlyError
+
+async def main() -> None:
+    config_service.init()
+
+    # Fetch. Notes come back newest-first; pass sort="asc" to read in order.
+    notes = await notes_service.list_notes(
+        "my-group/my-project", Noteable.merge_request, 166,
+        include_system=False,   # drop "assigned to @x", "changed milestone", ...
+        sort="asc",
+    )
+
+    # Threads, when you need a discussion id to answer into.
+    threads = await notes_service.list_discussions(
+        "my-group/my-project", Noteable.merge_request, 166
+    )
+
+    # Reply, addressing the note you're answering.
+    await notes_service.reply_to_note(
+        "my-group/my-project", Noteable.merge_request, 166,
+        note_id=notes[0].id,
+        body="Good catch — fixed in the next push.",
+    )
+
+    # Or straight into a known thread.
+    await notes_service.reply_to_discussion(
+        "my-group/my-project", Noteable.issue, 730,
+        discussion_id=threads[0].id,
+        body="Verified on TEST1.",
+    )
+
+asyncio.run(main())
+```
+
+`list_merge_request_notes` / `list_issue_notes` remain as thin aliases for
+`list_notes`.
+
+A body made up of **only** quick actions (e.g. `/milestone %"v2.0.6"`) creates no
+note — GitLab runs the command and returns the commands it executed instead. The
+reply helpers raise `QuickActionOnlyError` for that case, carrying the outcome so
+you can confirm the side effect landed:
+
+```python
+try:
+    await notes_service.reply_to_discussion(..., body='/milestone %"v2.0.6"')
+except QuickActionOnlyError as exc:
+    print(exc.summary)           # ['Set milestone to %"v2.0.6".']
+    print(exc.commands_changes)  # {'milestone': {...}}
+```
+
 ### WorkItems (GraphQL)
 
 `workItem` is GitLab's unified replacement for the legacy `Issue` type — use

{pjdev_gitlab-5.1.13 → pjdev_gitlab-5.2.0}/src/pjdev_gitlab/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2026-present Chris O'Neill <chris@purplejay.io>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "5.1.13"
+__version__ = "5.2.0"

{pjdev_gitlab-5.1.13 → pjdev_gitlab-5.2.0}/src/pjdev_gitlab/__init__.py

@@ -12,6 +12,7 @@ __all__ = [
     "issues_service",
     "merge_requests_service",
     "models",
+    "notes_service",
     "oauth_cli",
     "oauth_service",
     "packages_service",

{pjdev_gitlab-5.1.13 → pjdev_gitlab-5.2.0}/src/pjdev_gitlab/issues_service.py

@@ -6,6 +6,7 @@ from typing import Any, Dict, List, Literal, Optional
 from httpx import AsyncClient
 from loguru import logger
 
+from pjdev_gitlab import notes_service
 from pjdev_gitlab.api_utilities import (
     async_retry_http,
     encode_path_segment,
@@ -227,6 +228,31 @@ async def comment_on_issue(
     return await _exec(client)
 
 
+async def list_issue_notes(
+    project_id: ProjectId,
+    issue_iid: int,
+    *,
+    include_system: bool = True,
+    page_size: int = 100,
+    client: Optional[AsyncClient] = None,
+) -> List[Note]:
+    """Fetch every note on an issue.
+
+    Thin alias for :func:`pjdev_gitlab.notes_service.list_notes`; see that module
+    for threads, single-note reads, and replying. Deliberately undecorated -- the
+    delegate already retries, and stacking the decorator would square the attempt
+    count.
+    """
+    return await notes_service.list_notes(
+        project_id,
+        notes_service.Noteable.issue,
+        issue_iid,
+        include_system=include_system,
+        page_size=page_size,
+        client=client,
+    )
+
+
 @async_retry_http(status_codes_to_ignore=_IGNORE_4XX)
 async def start_issue_discussion(
     project_id: ProjectId,

{pjdev_gitlab-5.1.13 → pjdev_gitlab-5.2.0}/src/pjdev_gitlab/merge_requests_service.py

@@ -2,6 +2,7 @@ from typing import Any, Dict, List, Optional
 
 from httpx import AsyncClient
 
+from pjdev_gitlab import notes_service
 from pjdev_gitlab.api_utilities import (
     async_retry_http,
     encode_path_segment,
@@ -181,24 +182,29 @@ async def comment_on_merge_request_diff(
     return await _exec(client)
 
 
-@async_retry_http(status_codes_to_ignore=_IGNORE_4XX)
 async def list_merge_request_notes(
     project_id: ProjectId,
     mr_iid: int,
     *,
+    include_system: bool = True,
     page_size: int = 100,
     client: Optional[AsyncClient] = None,
 ) -> List[Note]:
-    url = f"{_mr_base(project_id, mr_iid)}/notes"
+    """Fetch every note on a merge request.
 
-    async def _exec(_client: AsyncClient) -> List[Note]:
-        rows = await paginate(_client, url, params={}, page_size=page_size)
-        return [Note.model_validate(row) for row in rows]
-
-    if client is None:
-        async with http_client() as _client:
-            return await _exec(_client)
-    return await _exec(client)
+    Thin alias for :func:`pjdev_gitlab.notes_service.list_notes`; see that module
+    for threads, single-note reads, and replying. Deliberately undecorated -- the
+    delegate already retries, and stacking the decorator would square the attempt
+    count.
+    """
+    return await notes_service.list_notes(
+        project_id,
+        notes_service.Noteable.merge_request,
+        mr_iid,
+        include_system=include_system,
+        page_size=page_size,
+        client=client,
+    )
 
 
 @async_retry_http(status_codes_to_ignore=_IGNORE_4XX)

pjdev_gitlab-5.2.0/src/pjdev_gitlab/notes_service.py

@@ -0,0 +1,294 @@
+"""Read and reply to notes (comments) on issues and merge requests.
+
+GitLab exposes comments two ways over the same underlying data:
+
+* **notes** -- the flat list of individual comments on a noteable.
+* **discussions** -- those same notes grouped into threads.
+
+Replying is only possible against a *discussion*, never a note id, so the reply
+helpers here resolve a note to its containing thread first. That resolution is
+the whole reason this module exists: ``list_..._notes`` alone gives you no way
+to answer anybody.
+
+Both issues and merge requests use identical endpoint shapes, differing only in
+one path segment, so a single implementation serves both via :class:`Noteable`.
+Epics and snippets also support this API but are not wired up here.
+"""
+
+import enum
+from typing import Any, Dict, List, Literal, Optional
+
+from httpx import AsyncClient
+
+from pjdev_gitlab.api_utilities import (
+    async_retry_http,
+    encode_path_segment,
+    http_client,
+    paginate,
+)
+from pjdev_gitlab.models import Discussion, Note, ProjectId
+
+_IGNORE_4XX = [400, 401, 403, 404]
+
+
+class Noteable(enum.StrEnum):
+    """What a note is attached to. The value is the API path segment."""
+
+    issue = "issues"
+    merge_request = "merge_requests"
+
+
+NoteSort = Literal["asc", "desc"]
+NoteOrderBy = Literal["created_at", "updated_at"]
+
+
+class QuickActionOnlyError(RuntimeError):
+    """Raised when a posted body contained *only* quick actions.
+
+    GitLab executes the commands but creates no note, so the response carries
+    ``commands_changes``/``summary`` instead of the usual note fields and there
+    is nothing to return. The executed commands are exposed on
+    :attr:`commands_changes` so callers can confirm the side effect landed.
+
+    Without this the caller sees a bare pydantic "field required: id" error and
+    no indication that the action actually succeeded.
+    """
+
+    def __init__(self, payload: Dict[str, Any]) -> None:
+        self.commands_changes: Dict[str, Any] = payload.get("commands_changes") or {}
+        self.summary: List[str] = payload.get("summary") or []
+        detail = "; ".join(self.summary) if self.summary else str(self.commands_changes)
+        super().__init__(
+            "body contained only quick actions, so GitLab created no note "
+            f"({detail or 'no commands reported'})"
+        )
+
+
+def _noteable_url(project_id: ProjectId, noteable: Noteable, iid: int) -> str:
+    return f"/projects/{encode_path_segment(project_id)}/{noteable.value}/{iid}"
+
+
+def _as_note(payload: Dict[str, Any]) -> Note:
+    """Validate a note-creation response, distinguishing the no-note case."""
+    if "id" not in payload:
+        raise QuickActionOnlyError(payload)
+    return Note.model_validate(payload)
+
+
+@async_retry_http(status_codes_to_ignore=_IGNORE_4XX)
+async def list_notes(
+    project_id: ProjectId,
+    noteable: Noteable,
+    iid: int,
+    *,
+    sort: Optional[NoteSort] = None,
+    order_by: Optional[NoteOrderBy] = None,
+    include_system: bool = True,
+    page_size: int = 100,
+    client: Optional[AsyncClient] = None,
+) -> List[Note]:
+    """Fetch every note on an issue or merge request.
+
+    ``include_system=False`` drops GitLab's own bookkeeping notes ("changed
+    milestone to ...", "assigned to ..."), leaving only what people wrote. That
+    filter is applied client-side -- the API has no parameter for it.
+
+    Notes come back **newest first**: GitLab defaults to ``order_by=created_at``
+    with ``sort=desc``, so ``result[0]`` is the most recent comment and
+    ``result[-1]`` the oldest. Pass ``sort="asc"`` to read a conversation in the
+    order it happened. :func:`list_discussions` is unaffected -- notes within a
+    thread are always chronological.
+    """
+    url = f"{_noteable_url(project_id, noteable, iid)}/notes"
+    params: Dict[str, Any] = {}
+    if sort is not None:
+        params["sort"] = sort
+    if order_by is not None:
+        params["order_by"] = order_by
+
+    async def _exec(_client: AsyncClient) -> List[Note]:
+        rows = await paginate(_client, url, params=params, page_size=page_size)
+        notes = [Note.model_validate(row) for row in rows]
+        if not include_system:
+            notes = [n for n in notes if not n.system]
+        return notes
+
+    if client is None:
+        async with http_client() as _client:
+            return await _exec(_client)
+    return await _exec(client)
+
+
+@async_retry_http(status_codes_to_ignore=_IGNORE_4XX)
+async def get_note(
+    project_id: ProjectId,
+    noteable: Noteable,
+    iid: int,
+    note_id: int,
+    client: Optional[AsyncClient] = None,
+) -> Note:
+    """Fetch a single note by id."""
+    url = f"{_noteable_url(project_id, noteable, iid)}/notes/{note_id}"
+
+    async def _exec(_client: AsyncClient) -> Note:
+        r = await _client.get(url)
+        r.raise_for_status()
+        return Note.model_validate(r.json())
+
+    if client is None:
+        async with http_client() as _client:
+            return await _exec(_client)
+    return await _exec(client)
+
+
+@async_retry_http(status_codes_to_ignore=_IGNORE_4XX)
+async def list_discussions(
+    project_id: ProjectId,
+    noteable: Noteable,
+    iid: int,
+    *,
+    include_system: bool = True,
+    page_size: int = 100,
+    client: Optional[AsyncClient] = None,
+) -> List[Discussion]:
+    """Fetch the notes grouped into threads.
+
+    Use this rather than :func:`list_notes` when you need to reply, since only a
+    discussion has an id you can post back to.
+
+    ``include_system=False`` strips system notes from each thread and drops
+    threads left empty as a result.
+    """
+    url = f"{_noteable_url(project_id, noteable, iid)}/discussions"
+
+    async def _exec(_client: AsyncClient) -> List[Discussion]:
+        rows = await paginate(_client, url, params={}, page_size=page_size)
+        discussions = [Discussion.model_validate(row) for row in rows]
+        if not include_system:
+            kept: List[Discussion] = []
+            for discussion in discussions:
+                discussion.notes = [n for n in discussion.notes if not n.system]
+                if discussion.notes:
+                    kept.append(discussion)
+            discussions = kept
+        return discussions
+
+    if client is None:
+        async with http_client() as _client:
+            return await _exec(_client)
+    return await _exec(client)
+
+
+@async_retry_http(status_codes_to_ignore=_IGNORE_4XX)
+async def get_discussion(
+    project_id: ProjectId,
+    noteable: Noteable,
+    iid: int,
+    discussion_id: str,
+    client: Optional[AsyncClient] = None,
+) -> Discussion:
+    """Fetch a single thread by its discussion id."""
+    url = f"{_noteable_url(project_id, noteable, iid)}/discussions/{discussion_id}"
+
+    async def _exec(_client: AsyncClient) -> Discussion:
+        r = await _client.get(url)
+        r.raise_for_status()
+        return Discussion.model_validate(r.json())
+
+    if client is None:
+        async with http_client() as _client:
+            return await _exec(_client)
+    return await _exec(client)
+
+
+@async_retry_http(status_codes_to_ignore=_IGNORE_4XX)
+async def _post_note(
+    url: str,
+    body: str,
+    client: Optional[AsyncClient] = None,
+) -> Dict[str, Any]:
+    """POST a note body and return the raw payload.
+
+    Parsing is deliberately left to the caller, outside this retry boundary:
+    ``async_retry_http`` treats any exception as a failed attempt and re-raises
+    it inside an ``ExceptionGroup``, which would bury
+    :class:`QuickActionOnlyError` in the very noise it exists to prevent.
+    """
+
+    async def _exec(_client: AsyncClient) -> Dict[str, Any]:
+        r = await _client.post(url, json={"body": body})
+        r.raise_for_status()
+        return r.json()
+
+    if client is None:
+        async with http_client() as _client:
+            return await _exec(_client)
+    return await _exec(client)
+
+
+async def reply_to_discussion(
+    project_id: ProjectId,
+    noteable: Noteable,
+    iid: int,
+    discussion_id: str,
+    body: str,
+    *,
+    client: Optional[AsyncClient] = None,
+) -> Note:
+    """Append a note to an existing thread.
+
+    Raises :class:`QuickActionOnlyError` if ``body`` is nothing but quick
+    actions, since GitLab then creates no note to return.
+    """
+    url = f"{_noteable_url(project_id, noteable, iid)}/discussions/{discussion_id}/notes"
+    return _as_note(await _post_note(url, body, client))
+
+
+async def find_discussion_for_note(
+    project_id: ProjectId,
+    noteable: Noteable,
+    iid: int,
+    note_id: int,
+    *,
+    client: Optional[AsyncClient] = None,
+) -> Optional[Discussion]:
+    """Locate the thread containing ``note_id``, or ``None`` if it isn't there.
+
+    GitLab has no endpoint mapping a note back to its discussion, so this scans
+    the thread list.
+    """
+    discussions = await list_discussions(project_id, noteable, iid, client=client)
+    for discussion in discussions:
+        if any(note.id == note_id for note in discussion.notes):
+            return discussion
+    return None
+
+
+async def reply_to_note(
+    project_id: ProjectId,
+    noteable: Noteable,
+    iid: int,
+    note_id: int,
+    body: str,
+    *,
+    client: Optional[AsyncClient] = None,
+) -> Note:
+    """Reply to a specific note, addressing it by note id rather than thread id.
+
+    Resolves the note to its containing thread and appends there, so the reply
+    lands under the comment being answered. Replying to a standalone comment
+    turns it into a thread, which is GitLab's own behaviour.
+
+    Raises ``LookupError`` if no note with that id is on the noteable.
+    """
+    discussion = await find_discussion_for_note(
+        project_id, noteable, iid, note_id, client=client
+    )
+    if discussion is None:
+        raise LookupError(
+            f"note {note_id} was not found on {noteable.value} {iid} "
+            f"in project {project_id}"
+        )
+    return await reply_to_discussion(
+        project_id, noteable, iid, discussion.id, body, client=client
+    )

{pjdev_gitlab-5.1.13 → pjdev_gitlab-5.2.0}/test_report_pjdev-gitlab.txt

@@ -3,105 +3,121 @@ platform linux -- Python 3.12.3, pytest-9.1.1, pluggy-1.6.0 -- /venv/bin/python3
 cachedir: .pytest_cache
 rootdir: /builds/keystone/python/pjdev-gitlab
 configfile: pyproject.toml
-plugins: asyncio-1.4.0, anyio-4.14.2, respx-0.23.1
+plugins: anyio-4.14.2, respx-0.23.1, asyncio-1.4.0
 asyncio: mode=Mode.AUTO, debug=False, asyncio_default_fixture_loop_scope=None, asyncio_default_test_loop_scope=function
-collecting ... collected 96 items
+collecting ... collected 112 items
 
-tests/tests_for_api_utilities.py::test_build_auth_defaults_to_private_token PASSED [  1%]
-tests/tests_for_api_utilities.py::test_build_auth_selects_bearer_for_oauth PASSED [  2%]
-tests/tests_for_api_utilities.py::test_bearer_scheme_sends_authorization_header PASSED [  3%]
-tests/tests_for_api_utilities.py::test_encode_path_segment PASSED        [  4%]
-tests/tests_for_api_utilities.py::test_paginate_consumes_x_next_page PASSED [  5%]
-tests/tests_for_api_utilities.py::test_async_retry_http_aborts_on_ignored_status PASSED [  6%]
-tests/tests_for_api_utilities.py::test_async_retry_http_retries_on_5xx PASSED [  7%]
-tests/tests_for_api_utilities.py::test_upload_to_project_returns_markdown PASSED [  8%]
-tests/tests_for_git_sync_service.py::test_build_remote_url[https://gitlab.example.com-g/s/n-https://gitlab.example.com/g/s/n.git] PASSED [  9%]
-tests/tests_for_git_sync_service.py::test_build_remote_url[https://gitlab.example.com/-/g/n/-https://gitlab.example.com/g/n.git] PASSED [ 10%]
-tests/tests_for_git_sync_service.py::test_build_remote_url[https://gitlab.example.com-g/n.git-https://gitlab.example.com/g/n.git] PASSED [ 11%]
-tests/tests_for_git_sync_service.py::test_build_remote_url_empty_repo_errors PASSED [ 12%]
-tests/tests_for_git_sync_service.py::test_default_target_dir[developers/claude-skills-claude-skills] PASSED [ 13%]
-tests/tests_for_git_sync_service.py::test_default_target_dir[g/s/name.git-name] PASSED [ 14%]
-tests/tests_for_git_sync_service.py::test_default_target_dir[solo-solo] PASSED [ 15%]
-tests/tests_for_git_sync_service.py::test_clone_when_target_missing PASSED [ 16%]
-tests/tests_for_git_sync_service.py::test_clone_passes_token_via_askpass_env_only PASSED [ 17%]
-tests/tests_for_git_sync_service.py::test_clone_with_branch PASSED       [ 18%]
-tests/tests_for_git_sync_service.py::test_update_when_target_is_repo PASSED [ 19%]
-tests/tests_for_git_sync_service.py::test_update_with_existing_branch_checks_out_and_ff PASSED [ 20%]
-tests/tests_for_git_sync_service.py::test_update_with_new_branch_creates_from_fetch_head PASSED [ 21%]
-tests/tests_for_git_sync_service.py::test_update_adds_origin_when_absent PASSED [ 22%]
-tests/tests_for_git_sync_service.py::test_update_detached_head_errors PASSED [ 23%]
-tests/tests_for_git_sync_service.py::test_clone_failure_removes_partial_target PASSED [ 25%]
-tests/tests_for_git_sync_service.py::test_target_exists_but_not_a_repo_errors PASSED [ 26%]
-tests/tests_for_git_sync_service.py::test_missing_token_errors PASSED    [ 27%]
-tests/tests_for_git_sync_service.py::test_ff_only_failure_propagates PASSED [ 28%]
-tests/tests_for_issues_service.py::test_search_issues_paginates PASSED   [ 29%]
-tests/tests_for_issues_service.py::test_create_issue_with_image_uploads_first_then_creates PASSED [ 30%]
-tests/tests_for_issues_service.py::test_set_issue_state PASSED           [ 31%]
-tests/tests_for_issues_service.py::test_set_issue_labels_modes PASSED    [ 32%]
-tests/tests_for_issues_service.py::test_aggregate_issues_by_label PASSED [ 33%]
-tests/tests_for_issues_service.py::test_comment_on_issue PASSED          [ 34%]
-tests/tests_for_merge_requests_service.py::test_get_merge_request PASSED [ 35%]
-tests/tests_for_merge_requests_service.py::test_comment_on_merge_request PASSED [ 36%]
-tests/tests_for_merge_requests_service.py::test_inline_diff_comment_payload_shape PASSED [ 37%]
-tests/tests_for_merge_requests_service.py::test_approve_and_unapprove PASSED [ 38%]
-tests/tests_for_models.py::test_config_api_base_url_strips_trailing_slash PASSED [ 39%]
-tests/tests_for_models.py::test_issue_extra_fields_ignored PASSED        [ 40%]
-tests/tests_for_models.py::test_merge_request_basic PASSED               [ 41%]
-tests/tests_for_models.py::test_config_env_loading PASSED                [ 42%]
-tests/tests_for_oauth_cli.py::test_missing_client_id_errors PASSED       [ 43%]
-tests/tests_for_oauth_cli.py::test_success_prints_only_token PASSED      [ 44%]
-tests/tests_for_oauth_cli.py::test_reads_config_from_env PASSED          [ 45%]
-tests/tests_for_oauth_cli.py::test_bad_redirect_port_errors PASSED       [ 46%]
-tests/tests_for_oauth_cli.py::test_oauth_error_returns_one PASSED        [ 47%]
-tests/tests_for_oauth_service.py::test_make_pkce_challenge_is_s256_of_verifier PASSED [ 48%]
-tests/tests_for_oauth_service.py::test_cache_path_is_per_host_and_private PASSED [ 50%]
-tests/tests_for_oauth_service.py::test_token_if_valid_expiry PASSED      [ 51%]
-tests/tests_for_oauth_service.py::test_store_token_response_roundtrip PASSED [ 52%]
-tests/tests_for_oauth_service.py::test_store_token_response_requires_access_token PASSED [ 53%]
-tests/tests_for_oauth_service.py::test_refresh_access_token_success PASSED [ 54%]
-tests/tests_for_oauth_service.py::test_refresh_access_token_returns_none_on_error PASSED [ 55%]
-tests/tests_for_oauth_service.py::test_get_access_token_reuses_valid_cache PASSED [ 56%]
-tests/tests_for_oauth_service.py::test_get_access_token_refreshes_expired_cache PASSED [ 57%]
-tests/tests_for_oauth_service.py::test_get_access_token_requires_client_id PASSED [ 58%]
-tests/tests_for_packages_service.py::test_upload_generic_package_url_shape PASSED [ 59%]
-tests/tests_for_packages_service.py::test_download_generic_package PASSED [ 60%]
-tests/tests_for_packages_service.py::test_list_packages PASSED           [ 61%]
-tests/tests_for_repo_files_service.py::test_get_file_url_encoded PASSED  [ 62%]
-tests/tests_for_repo_files_service.py::test_download_file_writes_to_dest PASSED [ 63%]
-tests/tests_for_repo_files_service.py::test_download_directory_walks_tree PASSED [ 64%]
-tests/tests_for_sync_cli.py::test_missing_repo_errors PASSED             [ 65%]
-tests/tests_for_sync_cli.py::test_missing_client_id_errors PASSED        [ 66%]
-tests/tests_for_sync_cli.py::test_success_prints_path_and_forwards_args PASSED [ 67%]
-tests/tests_for_sync_cli.py::test_reads_config_from_env PASSED           [ 68%]
-tests/tests_for_sync_cli.py::test_oauth_error_returns_one PASSED         [ 69%]
-tests/tests_for_sync_cli.py::test_sync_error_returns_one PASSED          [ 70%]
-tests/tests_for_sync_cli.py::test_bad_redirect_port_errors PASSED        [ 71%]
-tests/tests_for_work_items_service.py::test_make_work_item_gid_passthrough_and_coerce PASSED [ 72%]
-tests/tests_for_work_items_service.py::test_work_item_from_node_flattens_widgets PASSED [ 73%]
-tests/tests_for_work_items_service.py::test_graphql_raises_on_errors PASSED [ 75%]
-tests/tests_for_work_items_service.py::test_paginate_graphql_follows_end_cursor PASSED [ 76%]
-tests/tests_for_work_items_service.py::test_get_work_item_by_global_id PASSED [ 77%]
-tests/tests_for_work_items_service.py::test_get_work_item_by_project_path_and_iid_uses_namespace_lookup PASSED [ 78%]
-tests/tests_for_work_items_service.py::test_get_work_item_omits_the_status_widget_by_default PASSED [ 79%]
-tests/tests_for_work_items_service.py::test_get_work_item_include_status_selects_the_widget_and_lifts_it PASSED [ 80%]
-tests/tests_for_work_items_service.py::test_get_work_item_missing_raises PASSED [ 81%]
-tests/tests_for_work_items_service.py::test_get_work_item_status_by_project_path_and_iid PASSED [ 82%]
-tests/tests_for_work_items_service.py::test_get_work_item_status_by_global_id_skips_the_iid_lookup PASSED [ 83%]
-tests/tests_for_work_items_service.py::test_get_work_item_status_returns_none_when_no_status_is_assigned PASSED [ 84%]
-tests/tests_for_work_items_service.py::test_get_work_item_status_missing_item_raises PASSED [ 85%]
-tests/tests_for_work_items_service.py::test_search_work_items_paginates_and_translates_state PASSED [ 86%]
-tests/tests_for_work_items_service.py::test_search_work_items_group_scope_uses_group_field PASSED [ 87%]
-tests/tests_for_work_items_service.py::test_search_work_items_include_status_selects_the_widget PASSED [ 88%]
-tests/tests_for_work_items_service.py::test_search_work_items_requires_one_scope PASSED [ 89%]
-tests/tests_for_work_items_service.py::test_set_work_item_state_closes_via_workItemUpdate PASSED [ 90%]
-tests/tests_for_work_items_service.py::test_set_work_item_state_mutation_errors_raise PASSED [ 91%]
-tests/tests_for_work_items_service.py::test_list_work_item_notes_filters_system_notes PASSED [ 92%]
-tests/tests_for_work_items_service.py::test_comment_on_work_item_creates_note PASSED [ 93%]
-tests/tests_for_work_items_service.py::test_reply_to_work_item_discussion_threads_via_discussion_id PASSED [ 94%]
-tests/tests_for_work_items_service.py::test_set_work_item_labels_add_passes_addLabelIds PASSED [ 95%]
-tests/tests_for_work_items_service.py::test_set_work_item_labels_remove_passes_removeLabelIds PASSED [ 96%]
-tests/tests_for_work_items_service.py::test_list_labels_for_project_includes_ancestor_groups PASSED [ 97%]
-tests/tests_for_work_items_service.py::test_create_label_passes_project_path_color_and_description PASSED [ 98%]
+tests/tests_for_api_utilities.py::test_build_auth_defaults_to_private_token PASSED [  0%]
+tests/tests_for_api_utilities.py::test_build_auth_selects_bearer_for_oauth PASSED [  1%]
+tests/tests_for_api_utilities.py::test_bearer_scheme_sends_authorization_header PASSED [  2%]
+tests/tests_for_api_utilities.py::test_encode_path_segment PASSED        [  3%]
+tests/tests_for_api_utilities.py::test_paginate_consumes_x_next_page PASSED [  4%]
+tests/tests_for_api_utilities.py::test_async_retry_http_aborts_on_ignored_status PASSED [  5%]
+tests/tests_for_api_utilities.py::test_async_retry_http_retries_on_5xx PASSED [  6%]
+tests/tests_for_api_utilities.py::test_upload_to_project_returns_markdown PASSED [  7%]
+tests/tests_for_git_sync_service.py::test_build_remote_url[https://gitlab.example.com-g/s/n-https://gitlab.example.com/g/s/n.git] PASSED [  8%]
+tests/tests_for_git_sync_service.py::test_build_remote_url[https://gitlab.example.com/-/g/n/-https://gitlab.example.com/g/n.git] PASSED [  8%]
+tests/tests_for_git_sync_service.py::test_build_remote_url[https://gitlab.example.com-g/n.git-https://gitlab.example.com/g/n.git] PASSED [  9%]
+tests/tests_for_git_sync_service.py::test_build_remote_url_empty_repo_errors PASSED [ 10%]
+tests/tests_for_git_sync_service.py::test_default_target_dir[developers/claude-skills-claude-skills] PASSED [ 11%]
+tests/tests_for_git_sync_service.py::test_default_target_dir[g/s/name.git-name] PASSED [ 12%]
+tests/tests_for_git_sync_service.py::test_default_target_dir[solo-solo] PASSED [ 13%]
+tests/tests_for_git_sync_service.py::test_clone_when_target_missing PASSED [ 14%]
+tests/tests_for_git_sync_service.py::test_clone_passes_token_via_askpass_env_only PASSED [ 15%]
+tests/tests_for_git_sync_service.py::test_clone_with_branch PASSED       [ 16%]
+tests/tests_for_git_sync_service.py::test_update_when_target_is_repo PASSED [ 16%]
+tests/tests_for_git_sync_service.py::test_update_with_existing_branch_checks_out_and_ff PASSED [ 17%]
+tests/tests_for_git_sync_service.py::test_update_with_new_branch_creates_from_fetch_head PASSED [ 18%]
+tests/tests_for_git_sync_service.py::test_update_adds_origin_when_absent PASSED [ 19%]
+tests/tests_for_git_sync_service.py::test_update_detached_head_errors PASSED [ 20%]
+tests/tests_for_git_sync_service.py::test_clone_failure_removes_partial_target PASSED [ 21%]
+tests/tests_for_git_sync_service.py::test_target_exists_but_not_a_repo_errors PASSED [ 22%]
+tests/tests_for_git_sync_service.py::test_missing_token_errors PASSED    [ 23%]
+tests/tests_for_git_sync_service.py::test_ff_only_failure_propagates PASSED [ 24%]
+tests/tests_for_issues_service.py::test_search_issues_paginates PASSED   [ 25%]
+tests/tests_for_issues_service.py::test_create_issue_with_image_uploads_first_then_creates PASSED [ 25%]
+tests/tests_for_issues_service.py::test_set_issue_state PASSED           [ 26%]
+tests/tests_for_issues_service.py::test_set_issue_labels_modes PASSED    [ 27%]
+tests/tests_for_issues_service.py::test_aggregate_issues_by_label PASSED [ 28%]
+tests/tests_for_issues_service.py::test_comment_on_issue PASSED          [ 29%]
+tests/tests_for_issues_service.py::test_list_issue_notes_delegates_to_notes_service PASSED [ 30%]
+tests/tests_for_merge_requests_service.py::test_get_merge_request PASSED [ 31%]
+tests/tests_for_merge_requests_service.py::test_comment_on_merge_request PASSED [ 32%]
+tests/tests_for_merge_requests_service.py::test_inline_diff_comment_payload_shape PASSED [ 33%]
+tests/tests_for_merge_requests_service.py::test_approve_and_unapprove PASSED [ 33%]
+tests/tests_for_merge_requests_service.py::test_list_merge_request_notes_delegates_to_notes_service PASSED [ 34%]
+tests/tests_for_models.py::test_config_api_base_url_strips_trailing_slash PASSED [ 35%]
+tests/tests_for_models.py::test_issue_extra_fields_ignored PASSED        [ 36%]
+tests/tests_for_models.py::test_merge_request_basic PASSED               [ 37%]
+tests/tests_for_models.py::test_config_env_loading PASSED                [ 38%]
+tests/tests_for_notes_service.py::test_list_notes_for_merge_request PASSED [ 39%]
+tests/tests_for_notes_service.py::test_list_notes_for_issue_uses_the_issue_path PASSED [ 40%]
+tests/tests_for_notes_service.py::test_list_notes_can_drop_system_notes PASSED [ 41%]
+tests/tests_for_notes_service.py::test_list_notes_forwards_sort_and_order_by PASSED [ 41%]
+tests/tests_for_notes_service.py::test_get_note PASSED                   [ 42%]
+tests/tests_for_notes_service.py::test_list_discussions_groups_notes_into_threads PASSED [ 43%]
+tests/tests_for_notes_service.py::test_list_discussions_dropping_system_notes_drops_emptied_threads PASSED [ 44%]
+tests/tests_for_notes_service.py::test_get_discussion PASSED             [ 45%]
+tests/tests_for_notes_service.py::test_reply_to_discussion_posts_to_the_thread PASSED [ 46%]
+tests/tests_for_notes_service.py::test_reply_to_note_resolves_the_containing_thread PASSED [ 47%]
+tests/tests_for_notes_service.py::test_reply_to_note_raises_when_the_note_is_not_there PASSED [ 48%]
+tests/tests_for_notes_service.py::test_find_discussion_for_note_returns_none_when_absent PASSED [ 49%]
+tests/tests_for_notes_service.py::test_quick_action_only_reply_raises_a_useful_error PASSED [ 50%]
+tests/tests_for_notes_service.py::test_notes_paginate_across_pages PASSED [ 50%]
+tests/tests_for_oauth_cli.py::test_missing_client_id_errors PASSED       [ 51%]
+tests/tests_for_oauth_cli.py::test_success_prints_only_token PASSED      [ 52%]
+tests/tests_for_oauth_cli.py::test_reads_config_from_env PASSED          [ 53%]
+tests/tests_for_oauth_cli.py::test_bad_redirect_port_errors PASSED       [ 54%]
+tests/tests_for_oauth_cli.py::test_oauth_error_returns_one PASSED        [ 55%]
+tests/tests_for_oauth_service.py::test_make_pkce_challenge_is_s256_of_verifier PASSED [ 56%]
+tests/tests_for_oauth_service.py::test_cache_path_is_per_host_and_private PASSED [ 57%]
+tests/tests_for_oauth_service.py::test_token_if_valid_expiry PASSED      [ 58%]
+tests/tests_for_oauth_service.py::test_store_token_response_roundtrip PASSED [ 58%]
+tests/tests_for_oauth_service.py::test_store_token_response_requires_access_token PASSED [ 59%]
+tests/tests_for_oauth_service.py::test_refresh_access_token_success PASSED [ 60%]
+tests/tests_for_oauth_service.py::test_refresh_access_token_returns_none_on_error PASSED [ 61%]
+tests/tests_for_oauth_service.py::test_get_access_token_reuses_valid_cache PASSED [ 62%]
+tests/tests_for_oauth_service.py::test_get_access_token_refreshes_expired_cache PASSED [ 63%]
+tests/tests_for_oauth_service.py::test_get_access_token_requires_client_id PASSED [ 64%]
+tests/tests_for_packages_service.py::test_upload_generic_package_url_shape PASSED [ 65%]
+tests/tests_for_packages_service.py::test_download_generic_package PASSED [ 66%]
+tests/tests_for_packages_service.py::test_list_packages PASSED           [ 66%]
+tests/tests_for_repo_files_service.py::test_get_file_url_encoded PASSED  [ 67%]
+tests/tests_for_repo_files_service.py::test_download_file_writes_to_dest PASSED [ 68%]
+tests/tests_for_repo_files_service.py::test_download_directory_walks_tree PASSED [ 69%]
+tests/tests_for_sync_cli.py::test_missing_repo_errors PASSED             [ 70%]
+tests/tests_for_sync_cli.py::test_missing_client_id_errors PASSED        [ 71%]
+tests/tests_for_sync_cli.py::test_success_prints_path_and_forwards_args PASSED [ 72%]
+tests/tests_for_sync_cli.py::test_reads_config_from_env PASSED           [ 73%]
+tests/tests_for_sync_cli.py::test_oauth_error_returns_one PASSED         [ 74%]
+tests/tests_for_sync_cli.py::test_sync_error_returns_one PASSED          [ 75%]
+tests/tests_for_sync_cli.py::test_bad_redirect_port_errors PASSED        [ 75%]
+tests/tests_for_work_items_service.py::test_make_work_item_gid_passthrough_and_coerce PASSED [ 76%]
+tests/tests_for_work_items_service.py::test_work_item_from_node_flattens_widgets PASSED [ 77%]
+tests/tests_for_work_items_service.py::test_graphql_raises_on_errors PASSED [ 78%]
+tests/tests_for_work_items_service.py::test_paginate_graphql_follows_end_cursor PASSED [ 79%]
+tests/tests_for_work_items_service.py::test_get_work_item_by_global_id PASSED [ 80%]
+tests/tests_for_work_items_service.py::test_get_work_item_by_project_path_and_iid_uses_namespace_lookup PASSED [ 81%]
+tests/tests_for_work_items_service.py::test_get_work_item_omits_the_status_widget_by_default PASSED [ 82%]
+tests/tests_for_work_items_service.py::test_get_work_item_include_status_selects_the_widget_and_lifts_it PASSED [ 83%]
+tests/tests_for_work_items_service.py::test_get_work_item_missing_raises PASSED [ 83%]
+tests/tests_for_work_items_service.py::test_get_work_item_status_by_project_path_and_iid PASSED [ 84%]
+tests/tests_for_work_items_service.py::test_get_work_item_status_by_global_id_skips_the_iid_lookup PASSED [ 85%]
+tests/tests_for_work_items_service.py::test_get_work_item_status_returns_none_when_no_status_is_assigned PASSED [ 86%]
+tests/tests_for_work_items_service.py::test_get_work_item_status_missing_item_raises PASSED [ 87%]
+tests/tests_for_work_items_service.py::test_search_work_items_paginates_and_translates_state PASSED [ 88%]
+tests/tests_for_work_items_service.py::test_search_work_items_group_scope_uses_group_field PASSED [ 89%]
+tests/tests_for_work_items_service.py::test_search_work_items_include_status_selects_the_widget PASSED [ 90%]
+tests/tests_for_work_items_service.py::test_search_work_items_requires_one_scope PASSED [ 91%]
+tests/tests_for_work_items_service.py::test_set_work_item_state_closes_via_workItemUpdate PASSED [ 91%]
+tests/tests_for_work_items_service.py::test_set_work_item_state_mutation_errors_raise PASSED [ 92%]
+tests/tests_for_work_items_service.py::test_list_work_item_notes_filters_system_notes PASSED [ 93%]
+tests/tests_for_work_items_service.py::test_comment_on_work_item_creates_note PASSED [ 94%]
+tests/tests_for_work_items_service.py::test_reply_to_work_item_discussion_threads_via_discussion_id PASSED [ 95%]
+tests/tests_for_work_items_service.py::test_set_work_item_labels_add_passes_addLabelIds PASSED [ 96%]
+tests/tests_for_work_items_service.py::test_set_work_item_labels_remove_passes_removeLabelIds PASSED [ 97%]
+tests/tests_for_work_items_service.py::test_list_labels_for_project_includes_ancestor_groups PASSED [ 98%]
+tests/tests_for_work_items_service.py::test_create_label_passes_project_path_color_and_description PASSED [ 99%]
 tests/tests_for_work_items_service.py::test_create_label_group_scope_passes_group_path PASSED [100%]
 
-============================== 96 passed in 1.91s ==============================
+============================= 112 passed in 2.66s ==============================

{pjdev_gitlab-5.1.13 → pjdev_gitlab-5.2.0}/tests/tests_for_issues_service.py

@@ -146,3 +146,24 @@ async def test_comment_on_issue():
     assert note.body == "/close"
     sent = json.loads(route.calls.last.request.content.decode())
     assert sent == {"body": "/close"}
+
+
+@respx.mock
+async def test_list_issue_notes_delegates_to_notes_service():
+    respx.get(
+        "https://gitlab.example.com/api/v4/projects/group%2Fproj/issues/42/notes"
+    ).mock(
+        return_value=httpx.Response(
+            200,
+            json=[
+                {"id": 1, "body": "changed the title", "system": True},
+                {"id": 2, "body": "reproduced on staging"},
+            ],
+        )
+    )
+
+    notes = await issues_service.list_issue_notes("group/proj", 42)
+    assert [n.id for n in notes] == [1, 2]
+
+    human = await issues_service.list_issue_notes("group/proj", 42, include_system=False)
+    assert [n.body for n in human] == ["reproduced on staging"]

{pjdev_gitlab-5.1.13 → pjdev_gitlab-5.2.0}/tests/tests_for_merge_requests_service.py

@@ -91,3 +91,26 @@ async def test_approve_and_unapprove():
 
     assert approve.called
     assert unapprove.called
+
+
+@respx.mock
+async def test_list_merge_request_notes_delegates_to_notes_service():
+    respx.get(
+        "https://gitlab.example.com/api/v4/projects/group%2Fproj/merge_requests/88/notes"
+    ).mock(
+        return_value=httpx.Response(
+            200,
+            json=[
+                {"id": 1, "body": "assigned to @x", "system": True},
+                {"id": 2, "body": "looks good"},
+            ],
+        )
+    )
+
+    notes = await merge_requests_service.list_merge_request_notes("group/proj", 88)
+    assert [n.id for n in notes] == [1, 2]
+
+    human = await merge_requests_service.list_merge_request_notes(
+        "group/proj", 88, include_system=False
+    )
+    assert [n.id for n in human] == [2]

pjdev_gitlab-5.2.0/tests/tests_for_notes_service.py

@@ -0,0 +1,250 @@
+import json
+
+import httpx
+import pytest
+import respx
+
+from pjdev_gitlab import notes_service
+from pjdev_gitlab.notes_service import Noteable, QuickActionOnlyError
+
+BASE = "https://gitlab.example.com/api/v4/projects/group%2Fproj"
+
+
+def _note(note_id: int, body: str, *, system: bool = False):
+    return {
+        "id": note_id,
+        "body": body,
+        "system": system,
+        "author": {"id": 3, "username": "dev"},
+    }
+
+
+@respx.mock
+async def test_list_notes_for_merge_request():
+    respx.get(f"{BASE}/merge_requests/88/notes").mock(
+        return_value=httpx.Response(200, json=[_note(1, "first"), _note(2, "second")])
+    )
+
+    notes = await notes_service.list_notes("group/proj", Noteable.merge_request, 88)
+    assert [n.id for n in notes] == [1, 2]
+    assert notes[0].author.username == "dev"
+
+
+@respx.mock
+async def test_list_notes_for_issue_uses_the_issue_path():
+    route = respx.get(f"{BASE}/issues/12/notes").mock(
+        return_value=httpx.Response(200, json=[_note(1, "hi")])
+    )
+
+    notes = await notes_service.list_notes("group/proj", Noteable.issue, 12)
+    assert [n.body for n in notes] == ["hi"]
+    assert route.called
+
+
+@respx.mock
+async def test_list_notes_can_drop_system_notes():
+    respx.get(f"{BASE}/merge_requests/88/notes").mock(
+        return_value=httpx.Response(
+            200,
+            json=[
+                _note(1, "changed milestone to %v2.0.6", system=True),
+                _note(2, "actual human comment"),
+            ],
+        )
+    )
+
+    everything = await notes_service.list_notes("group/proj", Noteable.merge_request, 88)
+    assert len(everything) == 2
+
+    human_only = await notes_service.list_notes(
+        "group/proj", Noteable.merge_request, 88, include_system=False
+    )
+    assert [n.id for n in human_only] == [2]
+
+
+@respx.mock
+async def test_list_notes_forwards_sort_and_order_by():
+    route = respx.get(f"{BASE}/merge_requests/88/notes").mock(
+        return_value=httpx.Response(200, json=[])
+    )
+
+    await notes_service.list_notes(
+        "group/proj", Noteable.merge_request, 88, sort="desc", order_by="updated_at"
+    )
+    params = route.calls.last.request.url.params
+    assert params["sort"] == "desc"
+    assert params["order_by"] == "updated_at"
+
+
+@respx.mock
+async def test_get_note():
+    respx.get(f"{BASE}/merge_requests/88/notes/42").mock(
+        return_value=httpx.Response(200, json=_note(42, "just this one"))
+    )
+
+    note = await notes_service.get_note("group/proj", Noteable.merge_request, 88, 42)
+    assert note.id == 42
+    assert note.body == "just this one"
+
+
+@respx.mock
+async def test_list_discussions_groups_notes_into_threads():
+    respx.get(f"{BASE}/merge_requests/88/discussions").mock(
+        return_value=httpx.Response(
+            200,
+            json=[
+                {
+                    "id": "abc123",
+                    "individual_note": False,
+                    "notes": [_note(1, "question"), _note(2, "answer")],
+                },
+                {"id": "def456", "individual_note": True, "notes": [_note(3, "aside")]},
+            ],
+        )
+    )
+
+    discussions = await notes_service.list_discussions(
+        "group/proj", Noteable.merge_request, 88
+    )
+    assert [d.id for d in discussions] == ["abc123", "def456"]
+    assert [n.id for n in discussions[0].notes] == [1, 2]
+
+
+@respx.mock
+async def test_list_discussions_dropping_system_notes_drops_emptied_threads():
+    respx.get(f"{BASE}/merge_requests/88/discussions").mock(
+        return_value=httpx.Response(
+            200,
+            json=[
+                {"id": "sys", "notes": [_note(1, "assigned to @x", system=True)]},
+                {
+                    "id": "mixed",
+                    "notes": [
+                        _note(2, "changed title", system=True),
+                        _note(3, "real comment"),
+                    ],
+                },
+            ],
+        )
+    )
+
+    discussions = await notes_service.list_discussions(
+        "group/proj", Noteable.merge_request, 88, include_system=False
+    )
+    # "sys" held nothing but a system note, so the whole thread goes.
+    assert [d.id for d in discussions] == ["mixed"]
+    assert [n.id for n in discussions[0].notes] == [3]
+
+
+@respx.mock
+async def test_get_discussion():
+    respx.get(f"{BASE}/issues/12/discussions/abc123").mock(
+        return_value=httpx.Response(
+            200, json={"id": "abc123", "notes": [_note(1, "thread start")]}
+        )
+    )
+
+    discussion = await notes_service.get_discussion(
+        "group/proj", Noteable.issue, 12, "abc123"
+    )
+    assert discussion.id == "abc123"
+    assert discussion.notes[0].body == "thread start"
+
+
+@respx.mock
+async def test_reply_to_discussion_posts_to_the_thread():
+    route = respx.post(f"{BASE}/merge_requests/88/discussions/abc123/notes").mock(
+        return_value=httpx.Response(201, json=_note(9, "good catch"))
+    )
+
+    note = await notes_service.reply_to_discussion(
+        "group/proj", Noteable.merge_request, 88, "abc123", "good catch"
+    )
+    assert note.id == 9
+    assert json.loads(route.calls.last.request.content.decode()) == {"body": "good catch"}
+
+
+@respx.mock
+async def test_reply_to_note_resolves_the_containing_thread():
+    respx.get(f"{BASE}/merge_requests/88/discussions").mock(
+        return_value=httpx.Response(
+            200,
+            json=[
+                {"id": "other", "notes": [_note(1, "unrelated")]},
+                {"id": "target", "notes": [_note(2, "a"), _note(7, "reply to me")]},
+            ],
+        )
+    )
+    route = respx.post(f"{BASE}/merge_requests/88/discussions/target/notes").mock(
+        return_value=httpx.Response(201, json=_note(10, "on it"))
+    )
+
+    note = await notes_service.reply_to_note(
+        "group/proj", Noteable.merge_request, 88, 7, "on it"
+    )
+    assert note.id == 10
+    # posted to the thread that actually held note 7, not the first one listed
+    assert route.called
+
+
+@respx.mock
+async def test_reply_to_note_raises_when_the_note_is_not_there():
+    respx.get(f"{BASE}/issues/12/discussions").mock(
+        return_value=httpx.Response(200, json=[{"id": "x", "notes": [_note(1, "a")]}])
+    )
+
+    with pytest.raises(LookupError, match="note 999 was not found"):
+        await notes_service.reply_to_note("group/proj", Noteable.issue, 12, 999, "hello")
+
+
+@respx.mock
+async def test_find_discussion_for_note_returns_none_when_absent():
+    respx.get(f"{BASE}/issues/12/discussions").mock(
+        return_value=httpx.Response(200, json=[{"id": "x", "notes": [_note(1, "a")]}])
+    )
+
+    found = await notes_service.find_discussion_for_note(
+        "group/proj", Noteable.issue, 12, 999
+    )
+    assert found is None
+
+
+@respx.mock
+async def test_quick_action_only_reply_raises_a_useful_error():
+    """GitLab runs the command but creates no note, so there is no id to parse.
+
+    The bare pydantic failure this replaces gave no hint that the action had in
+    fact succeeded.
+    """
+    respx.post(f"{BASE}/merge_requests/88/discussions/abc123/notes").mock(
+        return_value=httpx.Response(
+            201,
+            json={
+                "commands_changes": {"milestone": {"id": 302, "title": "v2.0.6"}},
+                "summary": ['Set milestone to %"v2.0.6".'],
+            },
+        )
+    )
+
+    with pytest.raises(QuickActionOnlyError) as excinfo:
+        await notes_service.reply_to_discussion(
+            "group/proj", Noteable.merge_request, 88, "abc123", '/milestone %"v2.0.6"'
+        )
+
+    err = excinfo.value
+    assert err.commands_changes["milestone"]["title"] == "v2.0.6"
+    assert err.summary == ['Set milestone to %"v2.0.6".']
+    assert "only quick actions" in str(err)
+
+
+@respx.mock
+async def test_notes_paginate_across_pages():
+    respx.get(f"{BASE}/merge_requests/88/notes").mock(
+        side_effect=[
+            httpx.Response(200, json=[_note(1, "p1")], headers={"X-Next-Page": "2"}),
+            httpx.Response(200, json=[_note(2, "p2")], headers={"X-Next-Page": ""}),
+        ]
+    )
+
+    notes = await notes_service.list_notes("group/proj", Noteable.merge_request, 88)
+    assert [n.id for n in notes] == [1, 2]