confpub-cli 0.7.0__tar.gz → 0.8.0__tar.gz

{confpub_cli-0.7.0 → confpub_cli-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: confpub-cli
-Version: 0.7.0
+Version: 0.8.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-0.7.0 → confpub_cli-0.8.0}/confpub/__init__.py

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

{confpub_cli-0.7.0 → confpub_cli-0.8.0}/confpub/cli.py

@@ -231,15 +231,15 @@ def page_publish(
     """Publish a single Markdown file to Confluence."""
     from confpub.publish import derive_title
     resolved_title = derive_title(file, title)
-    if not page_id and not parent:
-        raise ConfpubError(
-            "ERR_VALIDATION_REQUIRED",
-            "Either --page-id or --parent is required",
-        )
     target = {"space": space, "title": resolved_title, "file": file}
     if page_id:
         target["page_id"] = page_id
     with command_context("page.publish", target=target) as ctx:
+        if not page_id and not parent:
+            raise ConfpubError(
+                "ERR_VALIDATION_REQUIRED",
+                "Either --page-id or --parent is required",
+            )
         from confpub.publish import publish_page
         result = publish_page(
             file=file,
@@ -546,3 +546,7 @@ def run() -> None:
         envelope = Envelope.failure("cli", [err])
         emit_stdout(envelope.to_json_bytes())
         sys.exit(10)
+    except ConfpubError as e:
+        envelope = Envelope.failure("cli", [e])
+        emit_stdout(envelope.to_json_bytes())
+        sys.exit(exit_code_for(e.code))

{confpub_cli-0.7.0 → confpub_cli-0.8.0}/confpub/confluence.py

@@ -64,6 +64,7 @@ class ConfluenceClient:
                 ERR_AUTH_FORBIDDEN,
                 f"Permission denied: {msg}",
                 suggested_action="escalate",
+                details={"note": "Confluence returns HTTP 403 for both forbidden and nonexistent resources. Verify the resource exists."},
             ) from exc
         if "timeout" in msg.lower() or "Timeout" in msg:
             raise ConfpubError(ERR_IO_TIMEOUT, f"Request timed out: {msg}") from exc
@@ -78,9 +79,9 @@ class ConfluenceClient:
             ) from exc
         # Not found (404 or explicit "not found")
         if "404" in msg or "not found" in msg.lower():
-            from confpub.errors import ERR_IO_FILE_NOT_FOUND
+            from confpub.errors import ERR_VALIDATION_NOT_FOUND
             raise ConfpubError(
-                ERR_IO_FILE_NOT_FOUND,
+                ERR_VALIDATION_NOT_FOUND,
                 f"Resource not found ({context}): {msg}",
             ) from exc
         raise ConfpubError(ERR_INTERNAL_SDK, f"Unexpected API error ({context}): {msg}") from exc
@@ -175,10 +176,11 @@ class ConfluenceClient:
         """Delete a page by space and title."""
         page = self.get_page(space, title)
         if not page:
-            from confpub.errors import ERR_IO_FILE_NOT_FOUND
+            from confpub.errors import ERR_VALIDATION_NOT_FOUND
             raise ConfpubError(
-                ERR_IO_FILE_NOT_FOUND,
+                ERR_VALIDATION_NOT_FOUND,
                 f"Page '{title}' not found in space '{space}'",
+                retryable=False,
             )
         page_id = str(page["id"])
         if cascade:
@@ -338,6 +340,9 @@ class ConfluenceClient:
         try:
             result = self._api.attach_file(filepath, page_id=page_id)
             if isinstance(result, dict):
+                # API returns {"results": [...]} wrapper — extract the attachment
+                if "results" in result and isinstance(result["results"], list) and result["results"]:
+                    return _slim_attachment(result["results"][0])
                 return _slim_attachment(result)
             return {"uploaded": True, "file": filepath}
         except Exception as exc:
@@ -364,13 +369,13 @@ class ConfluenceClient:
         """
         self._call_count += 1
         try:
-            raw = self._api.cql(
-                cql,
-                start=start,
-                limit=limit,
-                excerpt="highlight",
-                include_archived_spaces=include_archived_spaces,
-            )
+            raw = self._api.get("rest/api/search", params={
+                "cql": cql,
+                "start": start,
+                "limit": limit,
+                "excerpt": "highlight",
+                "includeArchivedSpaces": include_archived_spaces,
+            })
         except Exception as exc:
             msg = str(exc)
             if "400" in msg or "cannot be parsed" in msg.lower():
@@ -386,6 +391,9 @@ class ConfluenceClient:
         results_raw = raw.get("results", []) if isinstance(raw, dict) else []
         total = raw.get("totalSize", 0) if isinstance(raw, dict) else 0
 
+        api_start = raw.get("start", start) if isinstance(raw, dict) else start
+        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)
             for r in results_raw
@@ -393,9 +401,9 @@ class ConfluenceClient:
         return {
             "results": results,
             "total": total,
-            "start": start,
-            "limit": limit,
-            "has_more": (start + limit) < total,
+            "start": api_start,
+            "limit": api_limit,
+            "has_more": (api_start + api_limit) < total,
         }
 
     # ------------------------------------------------------------------

{confpub_cli-0.7.0 → confpub_cli-0.8.0}/confpub/lockfile.py

@@ -21,6 +21,7 @@ class LockPageEntry(BaseModel):
 
     page_id: str
     version: int = 1
+    content_fingerprint: str | None = None
 
 
 class Lockfile(BaseModel):

{confpub_cli-0.7.0 → confpub_cli-0.8.0}/confpub/publish.py

@@ -109,9 +109,16 @@ def publish_page(
 
     # Detect noop — skip update when content is unchanged
     if operation == "update":
-        remote_fingerprint = client.fingerprint_page(existing_page_id)
-        if remote_fingerprint and remote_fingerprint == local_fingerprint:
-            operation = "noop"
+        # Check lockfile fingerprint first (avoids Confluence normalization mismatch)
+        if page_title in lockfile.pages:
+            entry = lockfile.pages[page_title]
+            if entry.content_fingerprint and entry.content_fingerprint == local_fingerprint:
+                operation = "noop"
+        # Fallback: compare against remote fingerprint
+        if operation == "update":
+            remote_fingerprint = client.fingerprint_page(existing_page_id)
+            if remote_fingerprint and remote_fingerprint == local_fingerprint:
+                operation = "noop"
 
     if dry_run:
         change: dict[str, Any] = {
@@ -186,7 +193,9 @@ def publish_page(
         uploaded_attachments = [a.source_path for a in assets]
 
     # Update lockfile
-    update_lockfile(lockfile, page_title, page_id, new_version if isinstance(new_version, int) else 1)
+    new_version_int = new_version if isinstance(new_version, int) else 1
+    update_lockfile(lockfile, page_title, page_id, new_version_int)
+    lockfile.pages[page_title].content_fingerprint = local_fingerprint
     save_lockfile(lockfile_path, lockfile)
 
     change = {

{confpub_cli-0.7.0 → confpub_cli-0.8.0}/confpub/puller.py

@@ -12,7 +12,7 @@ from pathlib import Path
 from typing import Any
 
 from confpub.confluence import ConfluenceClient, build_client
-from confpub.output import emit_stderr
+from confpub.output import emit_progress
 from confpub.errors import (
     ERR_CONFLICT_FILE_EXISTS,
     ERR_VALIDATION_NOT_FOUND,
@@ -47,7 +47,7 @@ def _collect_tree(
     def _walk(pid: str, parent_id: str | None) -> None:
         children = client.get_page_children_deep(pid)
         if children:
-            emit_stderr(f"Found {len(children)} child page(s) under {pid}")
+            emit_progress(0, 0, f"Found {len(children)} child page(s) under {pid}")
         for child in children:
             child_id = str(child["id"])
             pages.append({

{confpub_cli-0.7.0 → confpub_cli-0.8.0}/tests/test_confluence.py

@@ -12,6 +12,7 @@ from confpub.errors import (
     ERR_CONFLICT_PAGE_EXISTS,
     ERR_IO_CONNECTION,
     ERR_IO_FILE_NOT_FOUND,
+    ERR_VALIDATION_NOT_FOUND,
     ERR_INTERNAL_SDK,
     ERR_VALIDATION_REQUIRED,
     ConfpubError,
@@ -260,7 +261,7 @@ class TestErrorTranslation:
         client._mock_api.get_all_spaces.side_effect = Exception("404 Not Found")
         with pytest.raises(ConfpubError) as exc_info:
             client.list_spaces()
-        assert exc_info.value.code == ERR_IO_FILE_NOT_FOUND
+        assert exc_info.value.code == ERR_VALIDATION_NOT_FOUND
 
     def test_generic_error(self, client):
         client._mock_api.get_all_spaces.side_effect = Exception("Something weird happened")
@@ -322,7 +323,7 @@ class TestSlimPage:
 
 class TestSearch:
     def test_structured_results(self, client):
-        client._mock_api.cql.return_value = {
+        client._mock_api.get.return_value = {
             "results": [
                 {
                     "entityType": "content",
@@ -357,14 +358,14 @@ class TestSearch:
         assert r["container_title"] == "Development"
 
     def test_empty_results(self, client):
-        client._mock_api.cql.return_value = {"results": [], "totalSize": 0}
+        client._mock_api.get.return_value = {"results": [], "totalSize": 0}
         result = client.search('title = "nonexistent"')
         assert result["results"] == []
         assert result["total"] == 0
         assert result["has_more"] is False
 
     def test_has_more_pagination(self, client):
-        client._mock_api.cql.return_value = {
+        client._mock_api.get.return_value = {
             "results": [{"entityType": "content", "content": {"id": "1"}, "excerpt": ""}],
             "totalSize": 50,
         }
@@ -375,31 +376,34 @@ class TestSearch:
         assert result["limit"] == 10
 
     def test_invalid_cql_raises_validation(self, client):
-        client._mock_api.cql.side_effect = Exception("400 The query cannot be parsed")
+        client._mock_api.get.side_effect = Exception("400 The query cannot be parsed")
         with pytest.raises(ConfpubError) as exc_info:
             client.search("invalid!!")
         assert exc_info.value.code == ERR_VALIDATION_REQUIRED
 
     def test_auth_error(self, client):
-        client._mock_api.cql.side_effect = Exception("401 Unauthorized")
+        client._mock_api.get.side_effect = Exception("401 Unauthorized")
         with pytest.raises(ConfpubError) as exc_info:
             client.search("type = page")
         assert exc_info.value.code == ERR_AUTH_FORBIDDEN
 
     def test_include_archived_passthrough(self, client):
-        client._mock_api.cql.return_value = {"results": [], "totalSize": 0}
+        client._mock_api.get.return_value = {"results": [], "totalSize": 0}
         client.search("type = page", include_archived_spaces=True)
-        client._mock_api.cql.assert_called_once_with(
-            "type = page",
-            start=0,
-            limit=25,
-            excerpt="highlight",
-            include_archived_spaces=True,
+        client._mock_api.get.assert_called_once_with(
+            "rest/api/search",
+            params={
+                "cql": "type = page",
+                "start": 0,
+                "limit": 25,
+                "excerpt": "highlight",
+                "includeArchivedSpaces": True,
+            },
         )
 
     def test_excerpt_truncation(self, client):
         long_excerpt = "word " * 100  # 500 chars
-        client._mock_api.cql.return_value = {
+        client._mock_api.get.return_value = {
             "results": [{"entityType": "content", "content": {"id": "1"}, "excerpt": long_excerpt}],
             "totalSize": 1,
         }