confpub-cli 1.16.0__tar.gz → 1.16.2__tar.gz

{confpub_cli-1.16.0 → confpub_cli-1.16.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: confpub-cli
-Version: 1.16.0
+Version: 1.16.2
 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
@@ -26,6 +26,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Requires-Dist: atlassian-python-api>=3.41
 Requires-Dist: beautifulsoup4>=4.12
+Requires-Dist: click>=8.0
 Requires-Dist: keyring>=24.0
 Requires-Dist: markdown-it-py[linkify,plugins]>=3.0
 Requires-Dist: markdownify>=0.14
@@ -505,6 +506,18 @@ Confluence strips `<style>`, `<script>`, `<iframe>`, and other tags from normal
 
 The macro name is selected from your Confluence type: `html` for Data Center/Server and `html-macro` as the Cloud fallback. Confluence Cloud HTML macro apps can register different macro keys, including `macro-html`, so override per publish with `--html-macro-name` or `html_macro_name` in front-matter when needed. To persist the setting, run `confpub config set html_macro_name macro-html` or set `CONFPUB_HTML_MACRO_NAME`.
 
+Forge-based Cloud HTML apps, such as Appfire "HTML for Confluence", use a different storage shape (`ac:adf-extension`) rather than the classic `ac:structured-macro`. For those sites, also set `--html-macro-format forge-adf-extension` and provide the Forge `extension-key` and `extension-id` copied from a working macro:
+
+```bash
+confpub config set html_macro_name macro-html
+confpub config set html_macro_format forge-adf-extension
+confpub config set html_macro_forge_extension_key "7dc8a3ac/.../static/macro-html"
+confpub config set html_macro_forge_extension_id "ari:cloud:ecosystem::extension/7dc8a3ac/.../static/macro-html"
+confpub config set html_macro_forge_cloud_id "CLOUD_ID"
+confpub config set html_macro_forge_context_ids "ari:cloud:confluence:site/CLOUD_ID"
+confpub config set html_macro_forge_account_id "ACCOUNT_ID"
+```
+
 ### Interactive JavaScript Applications
 
 `::: html` blocks can reference external JavaScript and CSS files. confpub automatically:
@@ -626,6 +639,12 @@ confpub guide --section commands       # Just commands
 | `CONFPUB_SPACE` | Default space key |
 | `CONFPUB_SSL_VERIFY` | SSL verification (`true`/`false` or CA bundle path) |
 | `CONFPUB_HTML_MACRO_NAME` | HTML macro key for `::: html` blocks, if your Confluence Cloud app differs from the built-in fallback |
+| `CONFPUB_HTML_MACRO_FORMAT` | HTML macro storage format: `classic` or `forge-adf-extension` |
+| `CONFPUB_HTML_MACRO_FORGE_EXTENSION_KEY` | Forge HTML macro `extension-key` copied from a working macro |
+| `CONFPUB_HTML_MACRO_FORGE_EXTENSION_ID` | Forge HTML macro `extension-id` copied from a working macro |
+| `CONFPUB_HTML_MACRO_FORGE_CLOUD_ID` | Optional Forge `cloud-id` copied from a working macro |
+| `CONFPUB_HTML_MACRO_FORGE_CONTEXT_IDS` | Optional Forge `context-ids` copied from a working macro |
+| `CONFPUB_HTML_MACRO_FORGE_ACCOUNT_ID` | Optional Forge `account-id` copied from a working macro |
 
 ---
 

{confpub_cli-1.16.0 → confpub_cli-1.16.2}/README.md

@@ -463,6 +463,18 @@ Confluence strips `<style>`, `<script>`, `<iframe>`, and other tags from normal
 
 The macro name is selected from your Confluence type: `html` for Data Center/Server and `html-macro` as the Cloud fallback. Confluence Cloud HTML macro apps can register different macro keys, including `macro-html`, so override per publish with `--html-macro-name` or `html_macro_name` in front-matter when needed. To persist the setting, run `confpub config set html_macro_name macro-html` or set `CONFPUB_HTML_MACRO_NAME`.
 
+Forge-based Cloud HTML apps, such as Appfire "HTML for Confluence", use a different storage shape (`ac:adf-extension`) rather than the classic `ac:structured-macro`. For those sites, also set `--html-macro-format forge-adf-extension` and provide the Forge `extension-key` and `extension-id` copied from a working macro:
+
+```bash
+confpub config set html_macro_name macro-html
+confpub config set html_macro_format forge-adf-extension
+confpub config set html_macro_forge_extension_key "7dc8a3ac/.../static/macro-html"
+confpub config set html_macro_forge_extension_id "ari:cloud:ecosystem::extension/7dc8a3ac/.../static/macro-html"
+confpub config set html_macro_forge_cloud_id "CLOUD_ID"
+confpub config set html_macro_forge_context_ids "ari:cloud:confluence:site/CLOUD_ID"
+confpub config set html_macro_forge_account_id "ACCOUNT_ID"
+```
+
 ### Interactive JavaScript Applications
 
 `::: html` blocks can reference external JavaScript and CSS files. confpub automatically:
@@ -584,6 +596,12 @@ confpub guide --section commands       # Just commands
 | `CONFPUB_SPACE` | Default space key |
 | `CONFPUB_SSL_VERIFY` | SSL verification (`true`/`false` or CA bundle path) |
 | `CONFPUB_HTML_MACRO_NAME` | HTML macro key for `::: html` blocks, if your Confluence Cloud app differs from the built-in fallback |
+| `CONFPUB_HTML_MACRO_FORMAT` | HTML macro storage format: `classic` or `forge-adf-extension` |
+| `CONFPUB_HTML_MACRO_FORGE_EXTENSION_KEY` | Forge HTML macro `extension-key` copied from a working macro |
+| `CONFPUB_HTML_MACRO_FORGE_EXTENSION_ID` | Forge HTML macro `extension-id` copied from a working macro |
+| `CONFPUB_HTML_MACRO_FORGE_CLOUD_ID` | Optional Forge `cloud-id` copied from a working macro |
+| `CONFPUB_HTML_MACRO_FORGE_CONTEXT_IDS` | Optional Forge `context-ids` copied from a working macro |
+| `CONFPUB_HTML_MACRO_FORGE_ACCOUNT_ID` | Optional Forge `account-id` copied from a working macro |
 
 ---
 

{confpub_cli-1.16.0 → confpub_cli-1.16.2}/confpub/__init__.py

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

{confpub_cli-1.16.0 → confpub_cli-1.16.2}/confpub/applier.py

@@ -12,7 +12,7 @@ from pathlib import Path
 from typing import Any
 
 from confpub.assets import AssetRef, discover_assets, rewrite_html_macro_urls, rewrite_image_urls, upload_assets
-from confpub.config import load_config, resolve_html_macro_name
+from confpub.config import load_config, resolve_html_macro_settings
 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
@@ -28,6 +28,13 @@ def apply_plan(
     skip_fingerprint_check: bool = False,
     cascade: bool = False,
     html_macro_name: str | None = None,
+    html_macro_format: str | None = None,
+    html_macro_forge_extension_key: str | None = None,
+    html_macro_forge_extension_id: str | None = None,
+    html_macro_forge_environment: str | None = None,
+    html_macro_forge_cloud_id: str | None = None,
+    html_macro_forge_context_ids: str | None = None,
+    html_macro_forge_account_id: str | None = None,
 ) -> dict[str, Any]:
     """Apply a plan to Confluence.
 
@@ -39,8 +46,18 @@ def apply_plan(
     config = load_config()
     client = ConfluenceClient(config)
 
-    # Resolve html_macro_name: explicit > config/env > platform default
-    effective_html_macro = resolve_html_macro_name(config, html_macro_name)
+    # Resolve HTML macro settings: explicit > config/env > platform default.
+    html_macro_settings = resolve_html_macro_settings(
+        config,
+        name_override=html_macro_name,
+        format_override=html_macro_format,
+        forge_extension_key_override=html_macro_forge_extension_key,
+        forge_extension_id_override=html_macro_forge_extension_id,
+        forge_environment_override=html_macro_forge_environment,
+        forge_cloud_id_override=html_macro_forge_cloud_id,
+        forge_context_ids_override=html_macro_forge_context_ids,
+        forge_account_id_override=html_macro_forge_account_id,
+    )
 
     # Load or create lockfile
     lockfile_path = plan_dir / "confpub.lock"
@@ -90,7 +107,17 @@ def apply_plan(
 
         # Read and convert
         md_text = source_path.read_text(encoding="utf-8")
-        storage = convert_markdown(md_text, html_macro_name=effective_html_macro)
+        storage = convert_markdown(
+            md_text,
+            html_macro_name=html_macro_settings.name,
+            html_macro_format=html_macro_settings.format,
+            html_macro_forge_extension_key=html_macro_settings.forge_extension_key,
+            html_macro_forge_extension_id=html_macro_settings.forge_extension_id,
+            html_macro_forge_environment=html_macro_settings.forge_environment,
+            html_macro_forge_cloud_id=html_macro_settings.forge_cloud_id,
+            html_macro_forge_context_ids=html_macro_settings.forge_context_ids,
+            html_macro_forge_account_id=html_macro_settings.forge_account_id,
+        )
 
         # Discover and process assets
         assets = discover_assets(md_text, source_path.parent, None)

{confpub_cli-1.16.0 → confpub_cli-1.16.2}/confpub/assets.py

@@ -9,6 +9,8 @@ from __future__ import annotations
 
 import glob
 import re
+from html import escape as html_escape
+from html import unescape as html_unescape
 from pathlib import Path
 from typing import Any
 
@@ -52,6 +54,10 @@ _LINK_HREF_RE = re.compile(r'<link\b[^>]*\bhref=["\']([^"\']+)["\']', re.IGNOREC
 
 # Regex to find local resource references in CDATA blocks (for rewriting)
 _CDATA_BLOCK_RE = re.compile(r"(<!\[CDATA\[)(.*?)(\]\]>)", re.DOTALL)
+_ADF_BODY_CONTENT_RE = re.compile(
+    r'(<ac:adf-parameter key="__body-content">)(.*?)(</ac:adf-parameter>)',
+    re.DOTALL,
+)
 
 
 def _is_local_path(src: str) -> bool:
@@ -215,10 +221,11 @@ def rewrite_html_macro_urls(
     is_cloud: bool,
     page_id: str,
 ) -> str:
-    """Rewrite local file references inside HTML macro CDATA blocks to attachment URLs.
+    """Rewrite local file references inside HTML macro bodies to attachment URLs.
 
     Transforms script src and link href pointing to local files into full
-    Confluence attachment download URLs.
+    Confluence attachment download URLs. Handles classic HTML macro CDATA
+    bodies and Forge ADF ``__body-content`` values.
     """
     if not uploaded_assets:
         return storage_format
@@ -236,11 +243,7 @@ def rewrite_html_macro_urls(
             asset = by_filename.get(Path(src).name)
         return asset
 
-    def _rewrite_cdata(match: re.Match) -> str:
-        prefix = match.group(1)  # <![CDATA[
-        content = match.group(2)
-        suffix = match.group(3)  # ]]>
-
+    def _rewrite_refs(content: str) -> str:
         def _rewrite_attr(attr_match: re.Match) -> str:
             full = attr_match.group(0)
             src = attr_match.group(1)
@@ -253,10 +256,23 @@ def rewrite_html_macro_urls(
             return full
 
         content = _SCRIPT_SRC_RE.sub(_rewrite_attr, content)
-        content = _LINK_HREF_RE.sub(_rewrite_attr, content)
+        return _LINK_HREF_RE.sub(_rewrite_attr, content)
+
+    def _rewrite_cdata(match: re.Match) -> str:
+        prefix = match.group(1)  # <![CDATA[
+        content = _rewrite_refs(match.group(2))
+        suffix = match.group(3)  # ]]>
         return prefix + content + suffix
 
-    return _CDATA_BLOCK_RE.sub(_rewrite_cdata, storage_format)
+    def _rewrite_adf_body(match: re.Match) -> str:
+        prefix = match.group(1)
+        content = html_unescape(match.group(2))
+        content = _rewrite_refs(content)
+        suffix = match.group(3)
+        return prefix + html_escape(content, quote=False) + suffix
+
+    storage_format = _CDATA_BLOCK_RE.sub(_rewrite_cdata, storage_format)
+    return _ADF_BODY_CONTENT_RE.sub(_rewrite_adf_body, storage_format)
 
 
 def upload_assets(

{confpub_cli-1.16.0 → confpub_cli-1.16.2}/confpub/cli.py

@@ -373,6 +373,13 @@ def page_publish(
     backup: bool = typer.Option(False, "--backup", help="Backup existing page before overwriting"),
     label: Optional[list[str]] = typer.Option(None, "--label", help="Label to apply (repeatable)"),
     html_macro_name: Optional[str] = typer.Option(None, "--html-macro-name", help="HTML macro name (html for DC; Cloud apps vary, default html-macro)"),
+    html_macro_format: Optional[str] = typer.Option(None, "--html-macro-format", help="HTML macro storage format: classic or forge-adf-extension"),
+    html_macro_forge_extension_key: Optional[str] = typer.Option(None, "--html-macro-forge-extension-key", help="Forge HTML macro extension-key copied from a working macro"),
+    html_macro_forge_extension_id: Optional[str] = typer.Option(None, "--html-macro-forge-extension-id", help="Forge HTML macro extension-id copied from a working macro"),
+    html_macro_forge_environment: Optional[str] = typer.Option(None, "--html-macro-forge-environment", help="Forge environment for the HTML macro (default PRODUCTION)"),
+    html_macro_forge_cloud_id: Optional[str] = typer.Option(None, "--html-macro-forge-cloud-id", help="Optional Forge cloud-id copied from a working macro"),
+    html_macro_forge_context_ids: Optional[str] = typer.Option(None, "--html-macro-forge-context-ids", help="Optional Forge context-ids copied from a working macro"),
+    html_macro_forge_account_id: Optional[str] = typer.Option(None, "--html-macro-forge-account-id", help="Optional Forge account-id copied from a working macro"),
 ) -> None:
     """Publish a single Markdown file to Confluence."""
     from pathlib import Path as _Path
@@ -439,6 +446,32 @@ def page_publish(
         # Resolve html_macro_name: CLI flag > front-matter > config/env/default in publish_page
         fm_html_macro = fm.html_macro_name if fm else None
         effective_html_macro = html_macro_name or fm_html_macro
+        fm_html_macro_format = fm.html_macro_format if fm else None
+        effective_html_macro_format = html_macro_format or fm_html_macro_format
+        fm_html_macro_forge_extension_key = fm.html_macro_forge_extension_key if fm else None
+        effective_html_macro_forge_extension_key = (
+            html_macro_forge_extension_key or fm_html_macro_forge_extension_key
+        )
+        fm_html_macro_forge_extension_id = fm.html_macro_forge_extension_id if fm else None
+        effective_html_macro_forge_extension_id = (
+            html_macro_forge_extension_id or fm_html_macro_forge_extension_id
+        )
+        fm_html_macro_forge_environment = fm.html_macro_forge_environment if fm else None
+        effective_html_macro_forge_environment = (
+            html_macro_forge_environment or fm_html_macro_forge_environment
+        )
+        fm_html_macro_forge_cloud_id = fm.html_macro_forge_cloud_id if fm else None
+        effective_html_macro_forge_cloud_id = (
+            html_macro_forge_cloud_id or fm_html_macro_forge_cloud_id
+        )
+        fm_html_macro_forge_context_ids = fm.html_macro_forge_context_ids if fm else None
+        effective_html_macro_forge_context_ids = (
+            html_macro_forge_context_ids or fm_html_macro_forge_context_ids
+        )
+        fm_html_macro_forge_account_id = fm.html_macro_forge_account_id if fm else None
+        effective_html_macro_forge_account_id = (
+            html_macro_forge_account_id or fm_html_macro_forge_account_id
+        )
 
         from confpub.publish import publish_page
         result = publish_page(
@@ -452,6 +485,13 @@ def page_publish(
             progress_callback=ctx,
             labels=merged_labels,
             html_macro_name=effective_html_macro,
+            html_macro_format=effective_html_macro_format,
+            html_macro_forge_extension_key=effective_html_macro_forge_extension_key,
+            html_macro_forge_extension_id=effective_html_macro_forge_extension_id,
+            html_macro_forge_environment=effective_html_macro_forge_environment,
+            html_macro_forge_cloud_id=effective_html_macro_forge_cloud_id,
+            html_macro_forge_context_ids=effective_html_macro_forge_context_ids,
+            html_macro_forge_account_id=effective_html_macro_forge_account_id,
         )
         ctx.result = result
         if not dry_run:
@@ -644,6 +684,13 @@ def plan_create(
     space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     parent: Optional[str] = typer.Option(None, "--parent", help="Override manifest parent"),
     html_macro_name: Optional[str] = typer.Option(None, "--html-macro-name", help="HTML macro name (html for DC; Cloud apps vary, default html-macro)"),
+    html_macro_format: Optional[str] = typer.Option(None, "--html-macro-format", help="HTML macro storage format: classic or forge-adf-extension"),
+    html_macro_forge_extension_key: Optional[str] = typer.Option(None, "--html-macro-forge-extension-key", help="Forge HTML macro extension-key copied from a working macro"),
+    html_macro_forge_extension_id: Optional[str] = typer.Option(None, "--html-macro-forge-extension-id", help="Forge HTML macro extension-id copied from a working macro"),
+    html_macro_forge_environment: Optional[str] = typer.Option(None, "--html-macro-forge-environment", help="Forge environment for the HTML macro (default PRODUCTION)"),
+    html_macro_forge_cloud_id: Optional[str] = typer.Option(None, "--html-macro-forge-cloud-id", help="Optional Forge cloud-id copied from a working macro"),
+    html_macro_forge_context_ids: Optional[str] = typer.Option(None, "--html-macro-forge-context-ids", help="Optional Forge context-ids copied from a working macro"),
+    html_macro_forge_account_id: Optional[str] = typer.Option(None, "--html-macro-forge-account-id", help="Optional Forge account-id copied from a working macro"),
 ) -> None:
     """Generate a plan artifact from a manifest."""
     with command_context("plan.create", target={"manifest": manifest}) as ctx:
@@ -655,6 +702,13 @@ def plan_create(
             space_override=space,
             parent_override=parent,
             html_macro_name=html_macro_name,
+            html_macro_format=html_macro_format,
+            html_macro_forge_extension_key=html_macro_forge_extension_key,
+            html_macro_forge_extension_id=html_macro_forge_extension_id,
+            html_macro_forge_environment=html_macro_forge_environment,
+            html_macro_forge_cloud_id=html_macro_forge_cloud_id,
+            html_macro_forge_context_ids=html_macro_forge_context_ids,
+            html_macro_forge_account_id=html_macro_forge_account_id,
         )
         ctx.result = result
 
@@ -678,6 +732,13 @@ def plan_apply(
     skip_fingerprint_check: bool = typer.Option(False, "--skip-fingerprint-check", help="Skip stale-state detection"),
     cascade: bool = typer.Option(False, "--cascade", help="Allow cascading deletes"),
     html_macro_name: Optional[str] = typer.Option(None, "--html-macro-name", help="HTML macro name (html for DC; Cloud apps vary, default html-macro)"),
+    html_macro_format: Optional[str] = typer.Option(None, "--html-macro-format", help="HTML macro storage format: classic or forge-adf-extension"),
+    html_macro_forge_extension_key: Optional[str] = typer.Option(None, "--html-macro-forge-extension-key", help="Forge HTML macro extension-key copied from a working macro"),
+    html_macro_forge_extension_id: Optional[str] = typer.Option(None, "--html-macro-forge-extension-id", help="Forge HTML macro extension-id copied from a working macro"),
+    html_macro_forge_environment: Optional[str] = typer.Option(None, "--html-macro-forge-environment", help="Forge environment for the HTML macro (default PRODUCTION)"),
+    html_macro_forge_cloud_id: Optional[str] = typer.Option(None, "--html-macro-forge-cloud-id", help="Optional Forge cloud-id copied from a working macro"),
+    html_macro_forge_context_ids: Optional[str] = typer.Option(None, "--html-macro-forge-context-ids", help="Optional Forge context-ids copied from a working macro"),
+    html_macro_forge_account_id: Optional[str] = typer.Option(None, "--html-macro-forge-account-id", help="Optional Forge account-id copied from a working macro"),
 ) -> None:
     """Apply a plan to Confluence."""
     with command_context("plan.apply", target={"plan": plan}) as ctx:
@@ -689,6 +750,13 @@ def plan_apply(
             skip_fingerprint_check=skip_fingerprint_check,
             cascade=cascade,
             html_macro_name=html_macro_name,
+            html_macro_format=html_macro_format,
+            html_macro_forge_extension_key=html_macro_forge_extension_key,
+            html_macro_forge_extension_id=html_macro_forge_extension_id,
+            html_macro_forge_environment=html_macro_forge_environment,
+            html_macro_forge_cloud_id=html_macro_forge_cloud_id,
+            html_macro_forge_context_ids=html_macro_forge_context_ids,
+            html_macro_forge_account_id=html_macro_forge_account_id,
         )
         ctx.result = result
 
@@ -718,7 +786,7 @@ def auth_inspect() -> None:
 
 @config_app.command("set")
 def config_set(
-    key: str = typer.Argument(..., help="Configuration key (base_url, user, token, ssl_verify, html_macro_name)"),
+    key: str = typer.Argument(..., help="Configuration key (base_url, user, token, ssl_verify, html_macro_name, html_macro_format, html_macro_forge_extension_key, html_macro_forge_extension_id, html_macro_forge_environment, html_macro_forge_cloud_id, html_macro_forge_context_ids, html_macro_forge_account_id)"),
     value: str = typer.Argument(..., help="Configuration value"),
 ) -> None:
     """Set a configuration value."""
@@ -856,11 +924,21 @@ def comment_add(
             md_text = text
 
         from confpub.config import load_config as _load_comment_config
-        from confpub.config import resolve_html_macro_name as _resolve_comment_html_macro_name
+        from confpub.config import resolve_html_macro_settings as _resolve_comment_html_macro_settings
         from confpub.converter import convert_markdown
         _comment_config = _load_comment_config()
-        _comment_html_macro = _resolve_comment_html_macro_name(_comment_config)
-        storage_body = convert_markdown(md_text, html_macro_name=_comment_html_macro)
+        _comment_html_macro = _resolve_comment_html_macro_settings(_comment_config)
+        storage_body = convert_markdown(
+            md_text,
+            html_macro_name=_comment_html_macro.name,
+            html_macro_format=_comment_html_macro.format,
+            html_macro_forge_extension_key=_comment_html_macro.forge_extension_key,
+            html_macro_forge_extension_id=_comment_html_macro.forge_extension_id,
+            html_macro_forge_environment=_comment_html_macro.forge_environment,
+            html_macro_forge_cloud_id=_comment_html_macro.forge_cloud_id,
+            html_macro_forge_context_ids=_comment_html_macro.forge_context_ids,
+            html_macro_forge_account_id=_comment_html_macro.forge_account_id,
+        )
 
         from confpub.confluence import build_client
         client = build_client()