mkdocs2confluence 0.11.1__tar.gz → 0.12.2__tar.gz

{mkdocs2confluence-0.11.1/src/mkdocs2confluence.egg-info → mkdocs2confluence-0.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.11.1
+Version: 0.12.2
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later
@@ -25,6 +25,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML>=6.0.3
 Requires-Dist: httpx>=0.27
+Requires-Dist: idna>=3.15
 Requires-Dist: tinycss2>=1.5.1
 Provides-Extra: pdf
 Requires-Dist: weasyprint>=60.0; extra == "pdf"
@@ -181,7 +182,13 @@ mk2conf publish                                 # go live
 
 ![Architecture](https://raw.githubusercontent.com/jeckyl2010/mkdocs2confluence/main/docs/architecture.png)
 
-Pipeline stages: **loader → preprocess → IR → transforms → emitter → publisher**. The plan phase makes all API read calls; the execute phase makes all write calls in nav order so parent pages always exist before their children.
+Pipeline stages: **loader → preprocess → IR → transforms → emitter → publisher**.
+
+The publisher is split into two phases:
+- `planner.py` builds a nav-ordered publish plan, compiles pages, and makes the read-side API calls needed to decide create vs update vs skip.
+- `executor.py` applies that plan, performs the write-side API calls, uploads attachments, and wires parent/child relationships in nav order so parent pages always exist before their children.
+
+`publisher/pipeline.py` remains a compatibility facade that re-exports the public publish surface used by the CLI and tests.
 
 ---
 

{mkdocs2confluence-0.11.1 → mkdocs2confluence-0.12.2}/README.md

@@ -140,7 +140,13 @@ mk2conf publish                                 # go live
 
 ![Architecture](https://raw.githubusercontent.com/jeckyl2010/mkdocs2confluence/main/docs/architecture.png)
 
-Pipeline stages: **loader → preprocess → IR → transforms → emitter → publisher**. The plan phase makes all API read calls; the execute phase makes all write calls in nav order so parent pages always exist before their children.
+Pipeline stages: **loader → preprocess → IR → transforms → emitter → publisher**.
+
+The publisher is split into two phases:
+- `planner.py` builds a nav-ordered publish plan, compiles pages, and makes the read-side API calls needed to decide create vs update vs skip.
+- `executor.py` applies that plan, performs the write-side API calls, uploads attachments, and wires parent/child relationships in nav order so parent pages always exist before their children.
+
+`publisher/pipeline.py` remains a compatibility facade that re-exports the public publish surface used by the CLI and tests.
 
 ---
 

{mkdocs2confluence-0.11.1 → mkdocs2confluence-0.12.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mkdocs2confluence"
-version = "0.11.1"
+version = "0.12.2"
 description = "Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }
@@ -32,6 +32,7 @@ classifiers = [
 dependencies = [
   "PyYAML>=6.0.3",
   "httpx>=0.27",
+  "idna>=3.15",
   "tinycss2>=1.5.1",
 ]
 

{mkdocs2confluence-0.11.1 → mkdocs2confluence-0.12.2/src/mkdocs2confluence.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.11.1
+Version: 0.12.2
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later
@@ -25,6 +25,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML>=6.0.3
 Requires-Dist: httpx>=0.27
+Requires-Dist: idna>=3.15
 Requires-Dist: tinycss2>=1.5.1
 Provides-Extra: pdf
 Requires-Dist: weasyprint>=60.0; extra == "pdf"
@@ -181,7 +182,13 @@ mk2conf publish                                 # go live
 
 ![Architecture](https://raw.githubusercontent.com/jeckyl2010/mkdocs2confluence/main/docs/architecture.png)
 
-Pipeline stages: **loader → preprocess → IR → transforms → emitter → publisher**. The plan phase makes all API read calls; the execute phase makes all write calls in nav order so parent pages always exist before their children.
+Pipeline stages: **loader → preprocess → IR → transforms → emitter → publisher**.
+
+The publisher is split into two phases:
+- `planner.py` builds a nav-ordered publish plan, compiles pages, and makes the read-side API calls needed to decide create vs update vs skip.
+- `executor.py` applies that plan, performs the write-side API calls, uploads attachments, and wires parent/child relationships in nav order so parent pages always exist before their children.
+
+`publisher/pipeline.py` remains a compatibility facade that re-exports the public publish surface used by the CLI and tests.
 
 ---
 

{mkdocs2confluence-0.11.1 → mkdocs2confluence-0.12.2}/src/mkdocs2confluence.egg-info/SOURCES.txt

@@ -9,6 +9,9 @@ src/mkdocs2confluence.egg-info/requires.txt
 src/mkdocs2confluence.egg-info/top_level.txt
 src/mkdocs_to_confluence/__init__.py
 src/mkdocs_to_confluence/cli.py
+src/mkdocs_to_confluence/compiler/__init__.py
+src/mkdocs_to_confluence/compiler/models.py
+src/mkdocs_to_confluence/compiler/page.py
 src/mkdocs_to_confluence/emitter/__init__.py
 src/mkdocs_to_confluence/emitter/xhtml.py
 src/mkdocs_to_confluence/ir/__init__.py
@@ -37,7 +40,11 @@ src/mkdocs_to_confluence/preview/render.py
 src/mkdocs_to_confluence/preview/server.py
 src/mkdocs_to_confluence/publisher/__init__.py
 src/mkdocs_to_confluence/publisher/client.py
+src/mkdocs_to_confluence/publisher/executor.py
+src/mkdocs_to_confluence/publisher/http_retry.py
+src/mkdocs_to_confluence/publisher/models.py
 src/mkdocs_to_confluence/publisher/pipeline.py
+src/mkdocs_to_confluence/publisher/planner.py
 src/mkdocs_to_confluence/sync/__init__.py
 src/mkdocs_to_confluence/sync/anchoring.py
 src/mkdocs_to_confluence/sync/command.py

{mkdocs2confluence-0.11.1 → mkdocs2confluence-0.12.2}/src/mkdocs2confluence.egg-info/requires.txt

@@ -1,5 +1,6 @@
 PyYAML>=6.0.3
 httpx>=0.27
+idna>=3.15
 tinycss2>=1.5.1
 
 [dev]

mkdocs2confluence-0.12.2/src/mkdocs_to_confluence/compiler/__init__.py

@@ -0,0 +1,6 @@
+"""Compiler entry points for MkDocs-to-Confluence page compilation."""
+
+from mkdocs_to_confluence.compiler.models import CompileResult
+from mkdocs_to_confluence.compiler.page import compile_page
+
+__all__ = ["CompileResult", "compile_page"]

mkdocs2confluence-0.12.2/src/mkdocs_to_confluence/compiler/models.py

@@ -0,0 +1,17 @@
+"""Typed models for compiler outputs."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+from pathlib import Path
+
+
+@dataclass(frozen=True)
+class CompileResult:
+    """Result of compiling a single MkDocs page to Confluence storage XHTML."""
+
+    xhtml: str
+    attachments: list[Path] = field(default_factory=list)
+    labels: tuple[str, ...] = ()
+    confluence_status: str | None = None
+    version_message: str | None = None

mkdocs2confluence-0.12.2/src/mkdocs_to_confluence/compiler/page.py

@@ -0,0 +1,110 @@
+"""Page compilation pipeline for MkDocs-to-Confluence."""
+
+from __future__ import annotations
+
+from mkdocs_to_confluence.compiler.models import CompileResult
+from mkdocs_to_confluence.emitter.xhtml import emit
+from mkdocs_to_confluence.ir.nodes import ChildrenMacro, FrontMatter, SourceFooter
+from mkdocs_to_confluence.loader.config import MkDocsConfig
+from mkdocs_to_confluence.loader.nav import NavNode
+from mkdocs_to_confluence.loader.page import load_page
+from mkdocs_to_confluence.parser.markdown import parse
+from mkdocs_to_confluence.preprocess.abbrevs import (
+    extract_abbreviations,
+    strip_abbreviation_defs,
+)
+from mkdocs_to_confluence.preprocess.frontmatter import extract_front_matter
+from mkdocs_to_confluence.preprocess.icons import strip_icon_shortcodes
+from mkdocs_to_confluence.preprocess.includes import (
+    preprocess_includes,
+    strip_html_comments,
+    strip_unsupported_html,
+)
+from mkdocs_to_confluence.preprocess.linkdefs import (
+    collect_link_defs,
+    expand_link_refs,
+    strip_link_defs,
+)
+from mkdocs_to_confluence.transforms.abbrevs import apply_abbreviations
+from mkdocs_to_confluence.transforms.assets import resolve_local_assets
+from mkdocs_to_confluence.transforms.editlink import attach_source_url
+from mkdocs_to_confluence.transforms.footer import build_source_footer
+from mkdocs_to_confluence.transforms.internallinks import resolve_internal_links
+from mkdocs_to_confluence.transforms.mermaid import DEFAULT_KROKI_URL, render_mermaid_diagrams
+
+
+def compile_page(
+    node: NavNode,
+    config: MkDocsConfig,
+    link_map: dict[str, str] | None = None,
+    *,
+    is_section_index: bool = False,
+    quiet: bool = False,
+) -> CompileResult:
+    """Run the full compile pipeline for one page and return a typed result."""
+    if node.source_path is None:
+        return CompileResult(xhtml="")
+
+    raw = load_page(node)
+
+    preprocessed = preprocess_includes(
+        raw,
+        source_path=node.source_path,
+        docs_dir=config.docs_dir,
+    )
+    preprocessed = strip_unsupported_html(preprocessed)
+    preprocessed = strip_html_comments(preprocessed)
+    preprocessed = strip_icon_shortcodes(preprocessed)
+    front_matter, preprocessed = extract_front_matter(preprocessed)
+    abbrevs = extract_abbreviations(preprocessed)
+    preprocessed = strip_abbreviation_defs(preprocessed)
+    link_defs = collect_link_defs(preprocessed)
+    preprocessed = expand_link_refs(preprocessed, link_defs)
+    preprocessed = strip_link_defs(preprocessed)
+    ir_nodes = parse(preprocessed)
+    if is_section_index:
+        ir_nodes = ir_nodes + (ChildrenMacro(),)
+    ir_nodes = apply_abbreviations(ir_nodes, abbrevs, page_text=preprocessed)
+    ir_nodes, attachments = resolve_local_assets(
+        ir_nodes,
+        page_path=node.source_path,
+        docs_dir=config.docs_dir,
+    )
+    mermaid_render = config.confluence.mermaid_render if config.confluence else "kroki"
+    if mermaid_render != "none":
+        kroki_url = (
+            mermaid_render[len("kroki:"):] if mermaid_render.startswith("kroki:") else DEFAULT_KROKI_URL
+        )
+        ir_nodes, mermaid_attachments = render_mermaid_diagrams(ir_nodes, kroki_url, quiet=quiet)
+        attachments = attachments + mermaid_attachments
+    effective_link_map = link_map if link_map is not None else {}
+    if node.docs_path:
+        ir_nodes = resolve_internal_links(ir_nodes, effective_link_map, node.docs_path)
+    if front_matter is not None:
+        ir_nodes = (front_matter,) + ir_nodes
+    edit_url = config.page_edit_url(node.docs_path or "")
+    site_url = config.page_site_url(node.docs_path or "")
+    if site_url:
+        ir_nodes = attach_source_url(ir_nodes, "", site_url)
+    if edit_url:
+        abs_path = str(config.docs_dir / (node.docs_path or ""))
+        footer = build_source_footer(edit_url, abs_path)
+        ir_nodes = ir_nodes + (footer,)
+
+    labels: tuple[str, ...] = ()
+    confluence_status: str | None = None
+    version_message: str | None = None
+    for node_item in ir_nodes:
+        if isinstance(node_item, FrontMatter):
+            labels = node_item.labels
+            confluence_status = node_item.confluence_status
+        if isinstance(node_item, SourceFooter) and node_item.commit_sha and node_item.commit_summary:
+            version_message = f"{node_item.commit_sha}: {node_item.commit_summary}"
+
+    return CompileResult(
+        xhtml=emit(ir_nodes),
+        attachments=attachments,
+        labels=labels,
+        confluence_status=confluence_status,
+        version_message=version_message,
+    )

{mkdocs2confluence-0.11.1 → mkdocs2confluence-0.12.2}/src/mkdocs_to_confluence/loader/config.py

@@ -33,6 +33,7 @@ class ConfluenceConfig:
     github_repo: str | None = None          # "owner/repo" — required for sync-comments
     github_token: str | None = None         # GitHub PAT (falls back to GITHUB_TOKEN env var)
     github_base_branch: str = "main"        # base branch for review PRs
+    allow_any_host: bool = False  # set True to allow non-Atlassian Cloud base_url hosts
 
 
 @dataclass(frozen=True)
@@ -209,6 +210,29 @@ def load_config(mkdocs_yml: Path) -> MkDocsConfig:
         if not isinstance(base_url, str) or not base_url.strip():
             raise ConfigError("mkdocs.yml: 'confluence.base_url' is required and must be a non-empty string.")
 
+        # Security: require HTTPS so credentials are never sent in plaintext.
+        parsed_url = urlparse(base_url.strip())
+        if parsed_url.scheme != "https":
+            raise ConfigError(
+                "mkdocs.yml: 'confluence.base_url' must use HTTPS (got "
+                f"{parsed_url.scheme!r}). Plain HTTP would transmit credentials in "
+                "cleartext."
+            )
+
+        allow_any_host = bool(raw_conf.get("allow_any_host", False))
+
+        # Security: guard against a repo-controlled base_url redirecting credentials
+        # to an attacker host.  Non-Atlassian Cloud hosts require an explicit opt-in.
+        host = parsed_url.hostname or ""
+        _is_atlassian = host == "atlassian.net" or host.endswith(".atlassian.net")
+        if not _is_atlassian and not allow_any_host:
+            raise ConfigError(
+                f"mkdocs.yml: 'confluence.base_url' host {host!r} is not an "
+                "Atlassian Cloud domain (*.atlassian.net). If you are using a "
+                "self-hosted Confluence instance, add 'allow_any_host: true' under "
+                "the 'confluence:' block to acknowledge this."
+            )
+
         space_key: str | None = raw_conf.get("space_key") or None
         if space_key:
             space_key = space_key.strip() or None
@@ -248,6 +272,7 @@ def load_config(mkdocs_yml: Path) -> MkDocsConfig:
             github_token=(str(raw_conf["github_token"]) if raw_conf.get("github_token")
                           else os.environ.get("GITHUB_TOKEN") or None),
             github_base_branch=str(raw_conf.get("github_base_branch", "main")),
+            allow_any_host=allow_any_host,
         )
 
     # --- extra_css (optional) ---

{mkdocs2confluence-0.11.1 → mkdocs2confluence-0.12.2}/src/mkdocs_to_confluence/loader/nav.py

@@ -220,7 +220,14 @@ def _traverse(nav: list[Any], docs_dir: Path, level: int, nav_file: str = ".page
         elif isinstance(value, str):
             # Could be a page file or a directory reference (awesome-pages style)
             target = (docs_dir / value).resolve()
-            if target.is_dir():
+            docs_root = docs_dir.resolve()
+            if not target.is_relative_to(docs_root):
+                warnings.warn(
+                    f"Nav page '{title}' resolves outside docs_dir ('{target}') — "
+                    "it will be omitted from the resolved nav.",
+                    stacklevel=4,
+                )
+            elif target.is_dir():
                 children = _resolve_nav_dir(target, docs_dir, level + 1, nav_file)
                 nodes.append(
                     NavNode(

{mkdocs2confluence-0.11.1 → mkdocs2confluence-0.12.2}/src/mkdocs_to_confluence/publisher/client.py

@@ -7,9 +7,6 @@ Authentication is HTTP Basic with email + API token.
 from __future__ import annotations
 
 import base64
-import random
-import time
-from collections.abc import Callable
 from pathlib import Path
 from typing import Any, cast
 from urllib.parse import parse_qs, urlparse
@@ -17,9 +14,10 @@ from urllib.parse import parse_qs, urlparse
 import httpx
 
 from mkdocs_to_confluence.loader.config import ConfluenceConfig
+from mkdocs_to_confluence.publisher.http_retry import ConfluenceError, http_request_with_retry
 
-_MAX_RETRIES = 3
-_RETRY_AFTER_CAP = 60.0  # seconds — cap Retry-After to avoid indefinite stalls
+# Re-export so existing callers (`from publisher.client import ConfluenceError`) keep working.
+__all__ = ["ConfluenceClient", "ConfluenceError"]
 
 
 def _extract_cursor(next_url: str) -> str:
@@ -29,10 +27,6 @@ def _extract_cursor(next_url: str) -> str:
     return cursors[0] if cursors else ""
 
 
-class ConfluenceError(RuntimeError):
-    """Raised when the Confluence API returns an unexpected response."""
-
-
 class ConfluenceClient:
     """Thin HTTP wrapper around the Confluence Cloud REST API."""
 
@@ -92,35 +86,6 @@ class ConfluenceClient:
                 f"{context}: HTTP {response.status_code} — {response.text[:400]}"
             )
 
-    def _request(self, fn: Callable[[], httpx.Response], context: str) -> httpx.Response:
-        """Call *fn* and retry up to ``_MAX_RETRIES`` times on HTTP 429.
-
-        Respects the ``Retry-After`` response header (capped at
-        ``_RETRY_AFTER_CAP`` seconds).  Falls back to exponential backoff with
-        jitter when the header is absent or invalid.  Prints a warning on each
-        retry.  Raises :class:`ConfluenceError` if all retries are exhausted.
-        """
-        for attempt in range(_MAX_RETRIES + 1):
-            resp = fn()
-            if resp.status_code != 429:
-                return resp
-            if attempt == _MAX_RETRIES:
-                raise ConfluenceError(
-                    f"{context}: rate-limited after {_MAX_RETRIES} retries — giving up"
-                )
-            header = resp.headers.get("Retry-After", "")
-            try:
-                wait = min(float(header), _RETRY_AFTER_CAP)
-            except ValueError:
-                wait = min(2.0 ** attempt + random.uniform(0.0, 1.0), _RETRY_AFTER_CAP)
-            print(
-                f"  ⚠ rate-limited ({context}) — retrying in {wait:.1f}s"
-                f" (attempt {attempt + 1}/{_MAX_RETRIES})",
-                flush=True,
-            )
-            time.sleep(wait)
-        raise ConfluenceError(f"{context}: rate-limited")  # unreachable
-
     # ── Space ──────────────────────────────────────────────────────────────────
 
     def get_space_id(self, space_key: str) -> str:
@@ -228,7 +193,10 @@ class ConfluenceClient:
         payload: dict[str, Any] = {"spaceId": space_id, "title": title}
         if parent_id is not None:
             payload["parentId"] = parent_id
-        resp = self._request(lambda: self._http.post(self._v2("/folders"), json=payload), f"create_folder({title!r})")
+        resp = http_request_with_retry(
+            lambda: self._http.post(self._v2("/folders"), json=payload),
+            f"create_folder({title!r})",
+        )
         if resp.status_code == 400:
             body = resp.text
             if "folder exists with the same title" in body.lower() or "same title" in body.lower():
@@ -278,7 +246,10 @@ class ConfluenceClient:
         if parent_id is not None:
             payload["parentId"] = parent_id
 
-        resp = self._request(lambda: self._http.post(self._v2("/pages"), json=payload), f"create_page({title!r})")
+        resp = http_request_with_retry(
+            lambda: self._http.post(self._v2("/pages"), json=payload),
+            f"create_page({title!r})",
+        )
         self._raise_for_status(resp, f"create_page({title!r})")
         return resp.json()  # type: ignore[no-any-return]
 
@@ -315,7 +286,7 @@ class ConfluenceClient:
         }
         if parent_id is not None:
             payload["parentId"] = parent_id
-        resp = self._request(
+        resp = http_request_with_retry(
             lambda: self._http.put(self._v2(f"/pages/{page_id}"), json=payload),
             f"update_page({page_id!r})",
         )
@@ -335,7 +306,7 @@ class ConfluenceClient:
 
         if get_resp.status_code == 200:
             current_version = get_resp.json().get("version", {}).get("number", 1)
-            self._request(
+            http_request_with_retry(
                 lambda: self._http.put(
                     prop_url,
                     json={"key": key, "value": "full-width", "version": {"number": current_version + 1}},
@@ -343,7 +314,7 @@ class ConfluenceClient:
                 "set_page_full_width",
             )
         else:
-            self._request(
+            http_request_with_retry(
                 lambda: self._http.post(
                     self._v1(f"/content/{page_id}/property"),
                     json={"key": key, "value": "full-width", "version": {"number": 1}},
@@ -376,7 +347,7 @@ class ConfluenceClient:
         get_resp = self._http.get(prop_url)
         if get_resp.status_code == 200:
             current_version = get_resp.json().get("version", {}).get("number", 1)
-            self._request(
+            http_request_with_retry(
                 lambda: self._http.put(
                     prop_url,
                     json={"key": key, "value": hash_str, "version": {"number": current_version + 1}},
@@ -384,7 +355,7 @@ class ConfluenceClient:
                 "set_content_hash",
             )
         else:
-            self._request(
+            http_request_with_retry(
                 lambda: self._http.post(
                     self._v1(f"/content/{page_id}/property"),
                     json={"key": key, "value": hash_str, "version": {"number": 1}},
@@ -406,7 +377,7 @@ class ConfluenceClient:
             for lbl in existing_resp.json().get("results", []):
                 name = lbl.get("name", "")
                 if name:
-                    self._request(
+                    http_request_with_retry(
                         lambda: self._http.delete(label_url, params={"name": name}),
                         f"set_page_labels({page_id!r})",
                     )
@@ -414,7 +385,10 @@ class ConfluenceClient:
         # Apply new labels (if any)
         if labels:
             payload = [{"prefix": "global", "name": lbl} for lbl in labels]
-            resp = self._request(lambda: self._http.post(label_url, json=payload), f"set_page_labels({page_id!r})")
+            resp = http_request_with_retry(
+                lambda: self._http.post(label_url, json=payload),
+                f"set_page_labels({page_id!r})",
+            )
             self._raise_for_status(resp, f"set_page_labels({page_id!r})")
 
     def set_page_status(self, page_id: str, status_key: str, space_key: str | None = None) -> None:
@@ -461,7 +435,7 @@ class ConfluenceClient:
 
         # `status` query param tells the API which page version to target (current vs draft).
         url = self._v1(f"/content/{page_id}/state")
-        resp = self._request(
+        resp = http_request_with_retry(
             lambda: self._http.put(url, json=body, params={"status": "current"}),
             f"set_page_status({page_id!r}, {status_key!r})",
         )
@@ -533,7 +507,7 @@ class ConfluenceClient:
         else:
             url = self._v1(f"/content/{page_id}/child/attachment")
 
-        resp = self._request(
+        resp = http_request_with_retry(
             lambda: self._http.post(
                 url,
                 files={"file": (filename, content)},
@@ -559,7 +533,7 @@ class ConfluenceClient:
         get_resp = self._http.get(url)
         if get_resp.status_code == 200:
             return  # already stamped
-        self._request(
+        http_request_with_retry(
             lambda: self._http.post(
                 self._v2(f"/pages/{page_id}/properties"),
                 json={"key": "mk2conf-managed", "value": True},
@@ -599,7 +573,10 @@ class ConfluenceClient:
 
     def delete_page(self, page_id: str) -> None:
         """Permanently delete *page_id* from Confluence."""
-        resp = self._request(lambda: self._http.delete(self._v2(f"/pages/{page_id}")), f"delete_page({page_id!r})")
+        resp = http_request_with_retry(
+            lambda: self._http.delete(self._v2(f"/pages/{page_id}")),
+            f"delete_page({page_id!r})",
+        )
         self._raise_for_status(resp, f"delete_page({page_id!r})")
 
     # ── Comments ───────────────────────────────────────────────────────────────
@@ -641,7 +618,7 @@ class ConfluenceClient:
     def add_comment_reply(self, comment_id: str, reply_text: str) -> None:
         """Post a reply to *comment_id* using the v1 content API."""
         url = self._v1(f"/content/{comment_id}/child/comment")
-        resp = self._request(lambda: self._http.post(url, json={
+        resp = http_request_with_retry(lambda: self._http.post(url, json={
             "type": "comment",
             "body": {
                 "storage": {
@@ -660,7 +637,7 @@ class ConfluenceClient:
         data = get_resp.json()
         version = data.get("version", {}).get("number", 1)
         body_value = data.get("body", {}).get("storage", {}).get("value", "")
-        resp = self._request(lambda: self._http.put(url, json={
+        resp = http_request_with_retry(lambda: self._http.put(url, json={
             "version": {"number": version + 1},
             "resolved": True,
             "body": {"representation": "storage", "value": body_value},
@@ -675,7 +652,7 @@ class ConfluenceClient:
         data = get_resp.json()
         version = data.get("version", {}).get("number", 1)
         body_value = data.get("body", {}).get("storage", {}).get("value", "")
-        resp = self._request(lambda: self._http.put(url, json={
+        resp = http_request_with_retry(lambda: self._http.put(url, json={
             "version": {"number": version + 1},
             "resolved": True,
             "body": {"representation": "storage", "value": body_value},