confpub-cli 1.1.0__tar.gz → 1.2.0__tar.gz

{confpub_cli-1.1.0 → confpub_cli-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: confpub-cli
-Version: 1.1.0
+Version: 1.2.0
 Summary: Agent-first CLI to publish Markdown to Confluence
 Project-URL: Homepage, https://github.com/ThomasRohde/confpub-cli
 Project-URL: Repository, https://github.com/ThomasRohde/confpub-cli.git

{confpub_cli-1.1.0 → confpub_cli-1.2.0}/confpub/__init__.py

@@ -1,3 +1,3 @@
 """confpub — Agent-first CLI to publish Markdown to Confluence."""
 
-__version__ = "1.1.0"
+__version__ = "1.2.0"

{confpub_cli-1.1.0 → confpub_cli-1.2.0}/confpub/applier.py

@@ -13,7 +13,7 @@ from typing import Any
 
 from confpub.assets import AssetRef, discover_assets, rewrite_image_urls, upload_assets
 from confpub.config import load_config
-from confpub.confluence import ConfluenceClient
+from confpub.confluence import ConfluenceClient, build_page_url
 from confpub.converter import convert_markdown, fingerprint_content
 from confpub.errors import ERR_CONFLICT_FINGERPRINT, ERR_IO_FILE_NOT_FOUND, ConfpubError
 from confpub.lockfile import Lockfile, load_lockfile, save_lockfile, update_lockfile
@@ -113,6 +113,10 @@ def apply_plan(
                     new_version = new_version.get("number", 1)
                 change["after"]["page_id"] = new_id
                 change["after"]["version"] = new_version
+                change["after"]["webui"] = build_page_url(
+                    config.base_url or "", config.is_cloud,
+                    plan.space, new_id, page.title,
+                )
 
                 # Upload attachments
                 if assets:
@@ -167,6 +171,10 @@ def apply_plan(
                 if isinstance(new_version, dict):
                     new_version = new_version.get("number", (before_version or 0) + 1)
                 change["after"]["version"] = new_version
+                change["after"]["webui"] = build_page_url(
+                    config.base_url or "", config.is_cloud,
+                    plan.space, page.confluence_page_id, page.title,
+                )
 
                 # Upload attachments
                 if assets:

{confpub_cli-1.1.0 → confpub_cli-1.2.0}/confpub/cli.py

@@ -189,7 +189,7 @@ def page_list(
         from confpub.confluence import build_client, _slim_page
         client = build_client()
         pages = client.list_pages(space, start=start, limit=limit)
-        ctx.result = {"pages": [_slim_page(p, base_url=client._config.base_url.rstrip("/")) for p in pages]}
+        ctx.result = {"pages": [_slim_page(p, base_url=client._config.base_url.rstrip("/"), is_cloud=client._config.is_cloud) for p in pages]}
 
 
 @page_app.command("inspect")
@@ -217,7 +217,7 @@ def page_inspect(
         if raw:
             ctx.result = page
         else:
-            result = _slim_page(page, base_url=client._config.base_url.rstrip("/"))
+            result = _slim_page(page, base_url=client._config.base_url.rstrip("/"), is_cloud=client._config.is_cloud)
             if format == "markdown" and "body_storage" in result:
                 from confpub.reverse_converter import convert_storage_to_markdown
                 conversion = convert_storage_to_markdown(result["body_storage"])

{confpub_cli-1.1.0 → confpub_cli-1.2.0}/confpub/confluence.py

@@ -267,7 +267,8 @@ class ConfluenceClient:
                 raw = result
             else:
                 raw = []
-            return [_slim_space(s) for s in raw]
+            base_url = self._config.base_url.rstrip("/") if self._config.base_url else ""
+            return [_slim_space(s, base_url=base_url, is_cloud=self._config.is_cloud) for s in raw]
         except Exception as exc:
             self._handle_error(exc, "list_spaces")
             return []
@@ -407,7 +408,7 @@ class ConfluenceClient:
         api_limit = raw.get("limit", limit) if isinstance(raw, dict) else limit
 
         results = [
-            _slim_search_result(r, base_url=base_url, excerpt_length=excerpt_length)
+            _slim_search_result(r, base_url=base_url, is_cloud=self._config.is_cloud, excerpt_length=excerpt_length)
             for r in results_raw
         ]
         return {
@@ -433,7 +434,30 @@ class ConfluenceClient:
             return None
 
 
-def _slim_page(page: dict[str, Any], *, base_url: str = "") -> dict[str, Any]:
+def _webui_base(base_url: str, is_cloud: bool) -> str:
+    """Return the correct base URL for webui links.
+
+    Cloud instances need ``/wiki`` in the path; DC/Server do not.
+    Handles base_url configured with or without the ``/wiki`` suffix.
+    """
+    base = base_url.rstrip("/")
+    if is_cloud and not base.endswith("/wiki"):
+        base += "/wiki"
+    return base
+
+
+def build_page_url(
+    base_url: str, is_cloud: bool, space: str, page_id: str, title: str = "",
+) -> str:
+    """Construct a full webui URL for a Confluence page."""
+    base = _webui_base(base_url, is_cloud)
+    if title:
+        encoded_title = title.replace(" ", "+")
+        return f"{base}/spaces/{space}/pages/{page_id}/{encoded_title}"
+    return f"{base}/spaces/{space}/pages/{page_id}"
+
+
+def _slim_page(page: dict[str, Any], *, base_url: str = "", is_cloud: bool = False) -> dict[str, Any]:
     """Extract agent-relevant fields from a raw Confluence page object."""
     result: dict[str, Any] = {
         "id": page.get("id"),
@@ -456,12 +480,12 @@ def _slim_page(page: dict[str, Any], *, base_url: str = "") -> dict[str, Any]:
         result["parent_title"] = parent.get("title")
     links = page.get("_links", {})
     if "webui" in links:
-        base = base_url or links.get("base", "")
+        base = _webui_base(base_url, is_cloud) if base_url else links.get("base", "")
         result["webui"] = base + links["webui"]
     return result
 
 
-def _slim_space(space: dict[str, Any]) -> dict[str, Any]:
+def _slim_space(space: dict[str, Any], *, base_url: str = "", is_cloud: bool = False) -> dict[str, Any]:
     """Extract agent-relevant fields from a raw Confluence space object."""
     result: dict[str, Any] = {
         "id": space.get("id"),
@@ -478,7 +502,12 @@ def _slim_space(space: dict[str, Any]) -> dict[str, Any]:
                 result["description"] = value
     links = space.get("_links", {})
     if "webui" in links:
-        result["webui"] = links.get("webui", "")
+        webui_path = links.get("webui", "")
+        if base_url and webui_path:
+            base = _webui_base(base_url, is_cloud)
+            result["webui"] = base + webui_path
+        else:
+            result["webui"] = webui_path
     return result
 
 
@@ -511,6 +540,7 @@ def _slim_search_result(
     item: dict[str, Any],
     *,
     base_url: str = "",
+    is_cloud: bool = False,
     excerpt_length: int = 0,
 ) -> dict[str, Any]:
     """Extract agent-relevant fields from a raw Confluence search result.
@@ -536,7 +566,7 @@ def _slim_search_result(
 
         webui = content.get("_links", {}).get("webui", "")
         if webui:
-            _set("url", base_url + webui)
+            _set("url", _webui_base(base_url, is_cloud) + webui if base_url else webui)
 
         _set("space_key", content.get("space", {}).get("key"))
 

{confpub_cli-1.1.0 → confpub_cli-1.2.0}/confpub/publish.py

@@ -12,7 +12,7 @@ from typing import Any
 
 from confpub.assets import discover_assets, rewrite_image_urls, upload_assets
 from confpub.config import load_config
-from confpub.confluence import ConfluenceClient
+from confpub.confluence import ConfluenceClient, build_page_url
 from confpub.converter import convert_markdown, fingerprint_content
 from confpub.errors import (
     ERR_IO_FILE_NOT_FOUND,
@@ -202,7 +202,14 @@ def publish_page(
         "title": page_title,
         "confluence_page_id": page_id,
         "before": {"version": current_version} if current_version else None,
-        "after": {"version": new_version, "page_id": page_id},
+        "after": {
+            "version": new_version,
+            "page_id": page_id,
+            "webui": build_page_url(
+                config.base_url or "", config.is_cloud,
+                space, page_id, page_title,
+            ),
+        },
     }
     if backup_file_path:
         change["backup_path"] = backup_file_path

{confpub_cli-1.1.0 → confpub_cli-1.2.0}/tests/test_confluence.py

@@ -5,7 +5,7 @@ from unittest.mock import MagicMock, patch
 import pytest
 
 from confpub.config import ResolvedConfig
-from confpub.confluence import ConfluenceClient, _slim_page, _slim_search_result
+from confpub.confluence import ConfluenceClient, _slim_page, _slim_search_result, _webui_base, build_page_url
 from confpub.errors import (
     ERR_AUTH_FORBIDDEN,
     ERR_AUTH_REQUIRED,
@@ -313,6 +313,36 @@ class TestSlimPage:
         result = _slim_page(page)
         assert result["webui"] == "https://wiki.example.com/spaces/DEV/pages/1"
 
+    def test_cloud_webui_adds_wiki_prefix(self):
+        """Cloud URLs need /wiki between base and webui path."""
+        page = {
+            "id": "1",
+            "title": "T",
+            "_links": {"webui": "/spaces/SD/pages/98376/What+Works+Well"},
+        }
+        result = _slim_page(page, base_url="https://myorg.atlassian.net", is_cloud=True)
+        assert result["webui"] == "https://myorg.atlassian.net/wiki/spaces/SD/pages/98376/What+Works+Well"
+
+    def test_cloud_webui_no_double_wiki(self):
+        """If base_url already ends with /wiki, don't duplicate it."""
+        page = {
+            "id": "1",
+            "title": "T",
+            "_links": {"webui": "/spaces/SD/pages/1"},
+        }
+        result = _slim_page(page, base_url="https://myorg.atlassian.net/wiki", is_cloud=True)
+        assert result["webui"] == "https://myorg.atlassian.net/wiki/spaces/SD/pages/1"
+
+    def test_dc_webui_no_wiki_prefix(self):
+        """DC/Server URLs should NOT get /wiki prefix."""
+        page = {
+            "id": "1",
+            "title": "T",
+            "_links": {"webui": "/spaces/DEV/pages/1"},
+        }
+        result = _slim_page(page, base_url="https://confluence.corp.com", is_cloud=False)
+        assert result["webui"] == "https://confluence.corp.com/spaces/DEV/pages/1"
+
     def test_omits_missing_optional_fields(self):
         page = {"id": "1", "title": "T"}
         result = _slim_page(page)
@@ -496,3 +526,38 @@ class TestSlimSearchResult:
         result = _slim_search_result(item, excerpt_length=30)
         assert result["excerpt"].endswith("…")
         assert len(result["excerpt"]) <= 35
+
+
+class TestWebuiBase:
+    def test_cloud_without_wiki(self):
+        assert _webui_base("https://myorg.atlassian.net", True) == "https://myorg.atlassian.net/wiki"
+
+    def test_cloud_with_wiki(self):
+        assert _webui_base("https://myorg.atlassian.net/wiki", True) == "https://myorg.atlassian.net/wiki"
+
+    def test_cloud_trailing_slash(self):
+        assert _webui_base("https://myorg.atlassian.net/", True) == "https://myorg.atlassian.net/wiki"
+
+    def test_dc_plain(self):
+        assert _webui_base("https://confluence.corp.com", False) == "https://confluence.corp.com"
+
+    def test_dc_context_path(self):
+        assert _webui_base("https://corp.com/confluence", False) == "https://corp.com/confluence"
+
+
+class TestBuildPageUrl:
+    def test_cloud_with_title(self):
+        url = build_page_url("https://myorg.atlassian.net", True, "SD", "12345", "My Page")
+        assert url == "https://myorg.atlassian.net/wiki/spaces/SD/pages/12345/My+Page"
+
+    def test_cloud_without_title(self):
+        url = build_page_url("https://myorg.atlassian.net", True, "SD", "12345")
+        assert url == "https://myorg.atlassian.net/wiki/spaces/SD/pages/12345"
+
+    def test_dc_with_title(self):
+        url = build_page_url("https://confluence.corp.com", False, "DEV", "456", "Test Page")
+        assert url == "https://confluence.corp.com/spaces/DEV/pages/456/Test+Page"
+
+    def test_dc_without_title(self):
+        url = build_page_url("https://confluence.corp.com", False, "DEV", "456")
+        assert url == "https://confluence.corp.com/spaces/DEV/pages/456"