confpub-cli 1.4.3__tar.gz → 1.5.0__tar.gz

{confpub_cli-1.4.3 → confpub_cli-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: confpub-cli
-Version: 1.4.3
+Version: 1.5.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
@@ -118,7 +118,7 @@ confpub plan apply --plan confpub-plan.json --dry-run
 
 - **Structured JSON output** — every command returns the same envelope shape on stdout
 - **Transactional workflow** — plan → validate → apply → verify with fingerprint-based conflict detection
-- **Markdown → Confluence** — code blocks become code macros, `> [!NOTE]` becomes Info panels, tables stay tables
+- **Markdown → Confluence** — code blocks become code macros, `> [!NOTE]` becomes Info panels, tables stay tables, task lists, math, definition lists, footnotes, panels, expand/collapse, and page layouts
 - **Asset handling** — images are uploaded as attachments and URLs are rewritten automatically
 - **Idempotent** — a lockfile tracks page IDs so re-publishing updates in place
 - **Agent-ready** — `confpub guide` returns the full CLI schema; `LLM=true` suppresses interactive behavior
@@ -344,6 +344,15 @@ confpub converts Markdown to Confluence Storage Format (and back via `page pull`
 | `![img](photo.png)` | Upload attachment + `<ac:image>` reference |
 | Tables | Standard XHTML `<table>` |
 | `~~strikethrough~~` | `<del>strikethrough</del>` |
+| `- [ ] task` / `- [x] done` | `<ac:task-list>` with task status |
+| `$E=mc^2$` | LaTeX math macro (inline) |
+| `$$...$$` | LaTeX math macro (block) |
+| `Term` + `: Definition` | `<dl><dt><dd>` definition list |
+| `[^1]` footnotes | Superscript links + numbered list |
+| `::: panel Title` | Confluence Panel macro |
+| `::: expand Title` | Confluence Expand macro |
+| `:::: layout two-equal` | Confluence page layout |
+| `---yaml---` front matter | Silently stripped |
 
 ---
 

{confpub_cli-1.4.3 → confpub_cli-1.5.0}/README.md

@@ -77,7 +77,7 @@ confpub plan apply --plan confpub-plan.json --dry-run
 
 - **Structured JSON output** — every command returns the same envelope shape on stdout
 - **Transactional workflow** — plan → validate → apply → verify with fingerprint-based conflict detection
-- **Markdown → Confluence** — code blocks become code macros, `> [!NOTE]` becomes Info panels, tables stay tables
+- **Markdown → Confluence** — code blocks become code macros, `> [!NOTE]` becomes Info panels, tables stay tables, task lists, math, definition lists, footnotes, panels, expand/collapse, and page layouts
 - **Asset handling** — images are uploaded as attachments and URLs are rewritten automatically
 - **Idempotent** — a lockfile tracks page IDs so re-publishing updates in place
 - **Agent-ready** — `confpub guide` returns the full CLI schema; `LLM=true` suppresses interactive behavior
@@ -303,6 +303,15 @@ confpub converts Markdown to Confluence Storage Format (and back via `page pull`
 | `![img](photo.png)` | Upload attachment + `<ac:image>` reference |
 | Tables | Standard XHTML `<table>` |
 | `~~strikethrough~~` | `<del>strikethrough</del>` |
+| `- [ ] task` / `- [x] done` | `<ac:task-list>` with task status |
+| `$E=mc^2$` | LaTeX math macro (inline) |
+| `$$...$$` | LaTeX math macro (block) |
+| `Term` + `: Definition` | `<dl><dt><dd>` definition list |
+| `[^1]` footnotes | Superscript links + numbered list |
+| `::: panel Title` | Confluence Panel macro |
+| `::: expand Title` | Confluence Expand macro |
+| `:::: layout two-equal` | Confluence page layout |
+| `---yaml---` front matter | Silently stripped |
 
 ---
 

{confpub_cli-1.4.3 → confpub_cli-1.5.0}/confpub/__init__.py

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

{confpub_cli-1.4.3 → confpub_cli-1.5.0}/confpub/cli.py

@@ -13,11 +13,30 @@ from typing import Any, Iterator, Optional
 
 import typer
 
+import os
+
 from confpub import __version__
 from confpub.envelope import Envelope
 from confpub.errors import ConfpubError, exit_code_for, ERR_INTERNAL_SDK
 from confpub.output import emit_stderr, emit_stdout, is_compact, is_verbose, set_compact, set_quiet, set_verbose
 
+
+def _resolve_space(cli_space: str | None, required: bool = False) -> str | None:
+    """Resolve space from CLI flag or CONFPUB_SPACE env var, with validation."""
+    from confpub.config import ENV_SPACE
+    from confpub.errors import validate_space_key
+
+    space = cli_space or os.environ.get(ENV_SPACE)
+    if space is not None:
+        validate_space_key(space)
+        return space
+    if required:
+        raise ConfpubError(
+            "ERR_VALIDATION_REQUIRED",
+            "Space key is required. Use --space or set CONFPUB_SPACE.",
+        )
+    return None
+
 # ---------------------------------------------------------------------------
 # Subcommand group apps
 # ---------------------------------------------------------------------------
@@ -197,12 +216,14 @@ def command_context(command_name: str, target: dict[str, Any] | None = None) ->
 
 @page_app.command("list")
 def page_list(
-    space: str = typer.Option(..., "--space", help="Confluence space key"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     limit: int = typer.Option(25, "--limit", help="Maximum number of pages to return"),
     start: int = typer.Option(0, "--start", help="Starting offset for pagination"),
 ) -> None:
     """List pages in a Confluence space."""
-    with command_context("page.list", target={"space": space}) as ctx:
+    with command_context("page.list") as ctx:
+        space = _resolve_space(space, required=True)
+        ctx.target = {"space": space}
         from confpub.confluence import build_client, _slim_page
         client = build_client()
         ctx.client = client
@@ -218,7 +239,7 @@ def page_list(
 
 @page_app.command("inspect")
 def page_inspect(
-    space: str = typer.Option(None, "--space", help="Confluence space key"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     title: str = typer.Option(None, "--title", help="Page title"),
     page_id: str = typer.Option(None, "--page-id", help="Confluence page ID"),
     raw: bool = typer.Option(False, "--raw", help="Return full raw API response"),
@@ -226,6 +247,7 @@ def page_inspect(
 ) -> None:
     """Inspect a Confluence page."""
     with command_context("page.inspect", target={"space": space, "title": title, "page_id": page_id}) as ctx:
+        space = _resolve_space(space)
         from confpub.confluence import build_client, _slim_page
         client = build_client()
         ctx.client = client
@@ -258,7 +280,7 @@ def page_inspect(
 @page_app.command("publish")
 def page_publish(
     file: str = typer.Argument(..., help="Markdown file to publish"),
-    space: str = typer.Option(..., "--space", help="Confluence space key"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     parent: Optional[str] = typer.Option(None, "--parent", help="Parent page title"),
     title: Optional[str] = typer.Option(None, "--title", help="Page title (defaults to filename stem, hyphen/underscore→spaces, title-cased)"),
     title_from_h1: bool = typer.Option(False, "--title-from-h1", help="Derive title from first H1 heading in the Markdown file"),
@@ -274,6 +296,8 @@ def page_publish(
     if page_id:
         target["page_id"] = page_id
     with command_context("page.publish", target=target) as ctx:
+        space = _resolve_space(space, required=True)
+        ctx.target["space"] = space
         if not page_id and not parent:
             raise ConfpubError(
                 "ERR_VALIDATION_REQUIRED",
@@ -296,7 +320,7 @@ def page_publish(
 
 @page_app.command("pull")
 def page_pull(
-    space: str = typer.Option(None, "--space", help="Confluence space key"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     title: str = typer.Option(None, "--title", help="Page title"),
     page_id: str = typer.Option(None, "--page-id", help="Confluence page ID"),
     output: str = typer.Option(".", "--output", "-o", help="Output directory"),
@@ -307,8 +331,8 @@ def page_pull(
     manifest: bool = typer.Option(False, "--manifest", help="Generate confpub.yaml manifest"),
 ) -> None:
     """Pull Confluence pages to local Markdown files."""
-    target = {"space": space, "title": title, "page_id": page_id}
-    with command_context("page.pull", target=target) as ctx:
+    with command_context("page.pull", target={"space": space, "title": title, "page_id": page_id}) as ctx:
+        space = _resolve_space(space)
         from confpub.errors import ERR_VALIDATION_REQUIRED
         if not page_id and not (space and title):
             raise ConfpubError(
@@ -333,13 +357,14 @@ def page_pull(
 
 @page_app.command("delete")
 def page_delete(
-    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     title: Optional[str] = typer.Option(None, "--title", help="Page title"),
     page_id: Optional[str] = typer.Option(None, "--page-id", help="Confluence page ID"),
     cascade: bool = typer.Option(False, "--cascade", help="Also delete child pages"),
 ) -> None:
     """Delete a Confluence page."""
     with command_context("page.delete", target={"space": space, "title": title, "page_id": page_id}) as ctx:
+        space = _resolve_space(space)
         if not page_id and not (space and title):
             raise ConfpubError(
                 "ERR_VALIDATION_REQUIRED",
@@ -384,12 +409,13 @@ def page_delete(
 def page_move(
     page_id: str = typer.Option(..., "--page-id", help="Confluence page ID to move"),
     target_parent: Optional[str] = typer.Option(None, "--target-parent", help="Title of the new parent page"),
-    space: Optional[str] = typer.Option(None, "--space", help="Space key (required with --target-parent)"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     target_parent_id: Optional[str] = typer.Option(None, "--target-parent-id", help="Page ID of the new parent"),
 ) -> None:
     """Move a page under a new parent."""
     target = {"page_id": page_id}
     with command_context("page.move", target=target) as ctx:
+        space = _resolve_space(space)
         if not target_parent and not target_parent_id:
             raise ConfpubError(
                 "ERR_VALIDATION_REQUIRED",
@@ -460,11 +486,12 @@ def attachment_upload(
 def plan_create(
     manifest: str = typer.Option(..., "--manifest", help="Path to confpub.yaml manifest"),
     output: Optional[str] = typer.Option(None, "--output", help="Output path for plan artifact"),
-    space: Optional[str] = typer.Option(None, "--space", help="Override manifest space"),
+    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"),
 ) -> None:
     """Generate a plan artifact from a manifest."""
     with command_context("plan.create", target={"manifest": manifest}) as ctx:
+        space = _resolve_space(space)
         from confpub.planner import create_plan
         result = create_plan(
             manifest_path=manifest,
@@ -668,7 +695,7 @@ def comment_add(
 @app.command("search")
 def search(
     cql: Optional[str] = typer.Option(None, "--cql", help="Raw CQL query"),
-    space: Optional[str] = typer.Option(None, "--space", help="Filter by space key"),
+    space: Optional[str] = typer.Option(None, "--space", help="Confluence space key (or CONFPUB_SPACE env var)"),
     title: Optional[str] = typer.Option(None, "--title", help="Search by page title (fuzzy match)"),
     content_type: Optional[str] = typer.Option(None, "--type", help="Filter by content type (page, blogpost, etc.)"),
     limit: int = typer.Option(25, "--limit", help="Maximum results to return"),
@@ -677,8 +704,8 @@ def search(
     excerpt_length: int = typer.Option(200, "--excerpt-length", help="Max excerpt chars (0 = unlimited)"),
 ) -> None:
     """Search Confluence content using CQL."""
-    target = {"cql": cql, "space": space, "title": title, "type": content_type}
-    with command_context("search", target=target) as ctx:
+    with command_context("search", target={"cql": cql, "space": space, "title": title, "type": content_type}) as ctx:
+        space = _resolve_space(space)
         # Build effective CQL from flags
         fragments: list[str] = []
         if space:

{confpub_cli-1.4.3 → confpub_cli-1.5.0}/confpub/config.py

@@ -23,6 +23,7 @@ ENV_URL = "CONFPUB_URL"
 ENV_TOKEN = "CONFPUB_TOKEN"
 ENV_USER = "CONFPUB_USER"
 ENV_SSL_VERIFY = "CONFPUB_SSL_VERIFY"
+ENV_SPACE = "CONFPUB_SPACE"
 
 
 class ConfigModel(BaseModel):

{confpub_cli-1.4.3 → confpub_cli-1.5.0}/confpub/converter.py

@@ -15,6 +15,12 @@ from typing import Any
 
 from markdown_it import MarkdownIt
 from markdown_it.token import Token
+from mdit_py_plugins.tasklists import tasklists_plugin
+from mdit_py_plugins.dollarmath import dollarmath_plugin
+from mdit_py_plugins.deflist import deflist_plugin
+from mdit_py_plugins.footnote import footnote_plugin
+from mdit_py_plugins.front_matter import front_matter_plugin
+from mdit_py_plugins.container import container_plugin
 
 # Admonition types mapping: GitHub [!TYPE] → Confluence macro name
 ADMONITION_MAP: dict[str, str] = {
@@ -34,12 +40,16 @@ class ConfluenceRenderer:
 
     def __init__(self) -> None:
         self._output: list[str] = []
-        self._list_stack: list[str] = []  # track nested ol/ul
+        self._list_stack: list[str] = []  # track nested ol/ul ("ol", "ul", "task-list")
+        self._task_id: int = 0  # incrementing counter for Confluence task IDs
+        self._footnote_refs: dict[int, int] = {}  # meta.id → display number
 
     def render(self, tokens: list[Token], options: dict[str, Any], env: dict[str, Any]) -> str:
         """Render a list of tokens to Confluence Storage Format."""
         self._output = []
         self._list_stack = []
+        self._task_id = 0
+        self._footnote_refs = {}
         i = 0
         while i < len(tokens):
             token = tokens[i]
@@ -71,10 +81,14 @@ class ConfluenceRenderer:
         return idx + 1
 
     def _render_paragraph_open(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        if self._list_stack and self._list_stack[-1] == "task-list":
+            return idx + 1  # suppress <p> inside task-body
         self._output.append("<p>")
         return idx + 1
 
     def _render_paragraph_close(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        if self._list_stack and self._list_stack[-1] == "task-list":
+            return idx + 1  # suppress </p> inside task-body
         self._output.append("</p>")
         return idx + 1
 
@@ -94,6 +108,10 @@ class ConfluenceRenderer:
             # Fallback for unknown inline types
             if token.type == "text":
                 self._output.append(escape(token.content))
+            elif token.type == "math_inline":
+                self._inline_math_inline(token)
+            elif token.type == "footnote_ref":
+                self._inline_footnote_ref(token)
 
     # ------------------------------------------------------------------
     # Inline tokens
@@ -253,24 +271,60 @@ class ConfluenceRenderer:
         return idx + 1
 
     def _render_bullet_list_open(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
-        self._output.append("<ul>")
-        self._list_stack.append("ul")
+        token = tokens[idx]
+        attrs = token.attrs or {}
+        if isinstance(attrs, dict) and attrs.get("class") == "contains-task-list":
+            self._output.append("<ac:task-list>")
+            self._list_stack.append("task-list")
+        else:
+            self._output.append("<ul>")
+            self._list_stack.append("ul")
         return idx + 1
 
     def _render_bullet_list_close(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
-        self._output.append("</ul>")
+        if self._list_stack and self._list_stack[-1] == "task-list":
+            self._output.append("</ac:task-list>")
+        else:
+            self._output.append("</ul>")
         if self._list_stack:
             self._list_stack.pop()
         return idx + 1
 
     def _render_list_item_open(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
-        self._output.append("<li>")
+        token = tokens[idx]
+        attrs = token.attrs or {}
+        if isinstance(attrs, dict) and attrs.get("class") == "task-list-item":
+            self._task_id += 1
+            checked = self._is_task_checked(tokens, idx)
+            status = "complete" if checked else "incomplete"
+            self._output.append("<ac:task>")
+            self._output.append(f"<ac:task-id>{self._task_id}</ac:task-id>")
+            self._output.append(f"<ac:task-status>{status}</ac:task-status>")
+            self._output.append("<ac:task-body>")
+        else:
+            self._output.append("<li>")
         return idx + 1
 
     def _render_list_item_close(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
-        self._output.append("</li>")
+        if self._list_stack and self._list_stack[-1] == "task-list":
+            self._output.append("</ac:task-body></ac:task>")
+        else:
+            self._output.append("</li>")
         return idx + 1
 
+    @staticmethod
+    def _is_task_checked(tokens: list[Token], list_item_idx: int) -> bool:
+        """Look ahead from list_item_open to find the checkbox html_inline and check state."""
+        for i in range(list_item_idx + 1, min(list_item_idx + 10, len(tokens))):
+            tok = tokens[i]
+            if tok.type == "list_item_close":
+                break
+            if tok.type == "inline" and tok.children:
+                for child in tok.children:
+                    if child.type == "html_inline" and "checkbox" in (child.content or ""):
+                        return 'checked="checked"' in child.content or "checked" in child.content.split()
+        return False
+
     # ------------------------------------------------------------------
     # Tables
     # ------------------------------------------------------------------
@@ -340,14 +394,186 @@ class ConfluenceRenderer:
         return idx + 1
 
     def _inline_html_inline(self, token: Token) -> None:
+        # Suppress task-list checkboxes (already handled by _render_list_item_open)
+        if "task-list-item-checkbox" in (token.content or ""):
+            return
         self._output.append(token.content)
 
+    # ------------------------------------------------------------------
+    # Dollar math (inline and block)
+    # ------------------------------------------------------------------
+
+    def _inline_math_inline(self, token: Token) -> None:
+        latex = token.content
+        self._output.append(
+            '<ac:structured-macro ac:name="mathinline">'
+            f"<ac:plain-text-body><![CDATA[{latex}]]></ac:plain-text-body>"
+            "</ac:structured-macro>"
+        )
+
+    def _render_math_block(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        latex = tokens[idx].content
+        self._output.append(
+            '<ac:structured-macro ac:name="mathblock">'
+            f"<ac:plain-text-body><![CDATA[{latex}]]></ac:plain-text-body>"
+            "</ac:structured-macro>"
+        )
+        return idx + 1
+
+    # ------------------------------------------------------------------
+    # Definition lists
+    # ------------------------------------------------------------------
+
+    def _render_dl_open(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("<dl>")
+        return idx + 1
+
+    def _render_dl_close(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("</dl>")
+        return idx + 1
+
+    def _render_dt_open(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("<dt>")
+        return idx + 1
+
+    def _render_dt_close(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("</dt>")
+        return idx + 1
+
+    def _render_dd_open(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("<dd>")
+        return idx + 1
+
+    def _render_dd_close(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("</dd>")
+        return idx + 1
+
+    # ------------------------------------------------------------------
+    # Footnotes
+    # ------------------------------------------------------------------
+
+    def _inline_footnote_ref(self, token: Token) -> None:
+        meta_id = token.meta.get("id", 0) if token.meta else 0
+        # Display number is 1-based
+        display_num = meta_id + 1
+        self._footnote_refs[meta_id] = display_num
+        self._output.append(
+            f'<sup><a id="footnote-ref-{display_num}" href="#footnote-{display_num}">'
+            f"[{display_num}]</a></sup>"
+        )
+
+    def _render_footnote_block_open(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("<hr /><ol>")
+        return idx + 1
+
+    def _render_footnote_block_close(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("</ol>")
+        return idx + 1
+
+    def _render_footnote_open(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        meta_id = tokens[idx].meta.get("id", 0) if tokens[idx].meta else 0
+        display_num = meta_id + 1
+        self._output.append(f'<li id="footnote-{display_num}">')
+        return idx + 1
+
+    def _render_footnote_close(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("</li>")
+        return idx + 1
+
+    def _render_footnote_anchor(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        meta_id = tokens[idx].meta.get("id", 0) if tokens[idx].meta else 0
+        display_num = meta_id + 1
+        self._output.append(
+            f' <a href="#footnote-ref-{display_num}">\u21a9</a>'
+        )
+        return idx + 1
+
+    # ------------------------------------------------------------------
+    # Front matter (silently stripped)
+    # ------------------------------------------------------------------
+
+    def _render_front_matter(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        return idx + 1  # no output
+
+    # ------------------------------------------------------------------
+    # Container: panel
+    # ------------------------------------------------------------------
+
+    def _render_container_panel_open(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        info = tokens[idx].info.strip() if tokens[idx].info else ""
+        # info is e.g. "panel My Title" — strip the container name prefix
+        title = info[len("panel"):].strip() if info.startswith("panel") else info
+        self._output.append('<ac:structured-macro ac:name="panel">')
+        if title:
+            self._output.append(f'<ac:parameter ac:name="title">{escape(title)}</ac:parameter>')
+        self._output.append("<ac:rich-text-body>")
+        return idx + 1
+
+    def _render_container_panel_close(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("</ac:rich-text-body></ac:structured-macro>")
+        return idx + 1
+
+    # ------------------------------------------------------------------
+    # Container: expand
+    # ------------------------------------------------------------------
+
+    def _render_container_expand_open(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        info = tokens[idx].info.strip() if tokens[idx].info else ""
+        title = info[len("expand"):].strip() if info.startswith("expand") else info
+        self._output.append('<ac:structured-macro ac:name="expand">')
+        if title:
+            self._output.append(f'<ac:parameter ac:name="title">{escape(title)}</ac:parameter>')
+        self._output.append("<ac:rich-text-body>")
+        return idx + 1
+
+    def _render_container_expand_close(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("</ac:rich-text-body></ac:structured-macro>")
+        return idx + 1
+
+    # ------------------------------------------------------------------
+    # Container: layout
+    # ------------------------------------------------------------------
+
+    def _render_container_layout_open(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        info = tokens[idx].info.strip() if tokens[idx].info else ""
+        layout_type = info[len("layout"):].strip() if info.startswith("layout") else info
+        # Convert hyphens to underscores for Confluence ac:type
+        layout_type = layout_type.replace("-", "_") if layout_type else "single"
+        self._output.append(f'<ac:layout><ac:layout-section ac:type="{escape(layout_type)}">')
+        return idx + 1
+
+    def _render_container_layout_close(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("</ac:layout-section></ac:layout>")
+        return idx + 1
+
+    # ------------------------------------------------------------------
+    # Container: cell
+    # ------------------------------------------------------------------
+
+    def _render_container_cell_open(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("<ac:layout-cell>")
+        return idx + 1
+
+    def _render_container_cell_close(self, tokens: list[Token], idx: int, _o: Any, _e: Any) -> int:
+        self._output.append("</ac:layout-cell>")
+        return idx + 1
+
 
 def _create_parser() -> MarkdownIt:
     """Create a configured markdown-it-py parser."""
     md = MarkdownIt("commonmark", {"html": True})
     md.enable("table")
     md.enable("strikethrough")
+    # mdit-py-plugins
+    tasklists_plugin(md)
+    dollarmath_plugin(md)
+    deflist_plugin(md)
+    footnote_plugin(md)
+    front_matter_plugin(md)
+    container_plugin(md, name="panel")
+    container_plugin(md, name="expand")
+    container_plugin(md, name="layout")
+    container_plugin(md, name="cell")
     return md
 
 

{confpub_cli-1.4.3 → confpub_cli-1.5.0}/confpub/errors.py

@@ -16,6 +16,7 @@ ERR_VALIDATION_ASSET_MISSING = "ERR_VALIDATION_ASSET_MISSING"
 ERR_VALIDATION_SPACE_MISMATCH = "ERR_VALIDATION_SPACE_MISMATCH"
 ERR_VALIDATION_NOT_FOUND = "ERR_VALIDATION_NOT_FOUND"
 ERR_VALIDATION_LABEL = "ERR_VALIDATION_LABEL"
+ERR_VALIDATION_SPACE_KEY = "ERR_VALIDATION_SPACE_KEY"
 
 # Auth (exit 20)
 ERR_AUTH_REQUIRED = "ERR_AUTH_REQUIRED"
@@ -169,6 +170,33 @@ def io_error(
     return ConfpubError(code, message, details=details if details else None)
 
 
+def validate_space_key(space: str | None) -> None:
+    """Reject space values that look like shell-expanded paths.
+
+    PowerShell expands unquoted ``~username`` to a Windows home path
+    (e.g. ``C:\\Users\\username``).  Catching this early gives the caller an
+    actionable error instead of a confusing Confluence API failure.
+    """
+    if space is None:
+        return
+    import re
+    if "\\" in space or "/" in space or re.match(r"^[A-Za-z]:", space):
+        raise ConfpubError(
+            ERR_VALIDATION_SPACE_KEY,
+            (
+                f"Space key '{space}' appears to be a shell-expanded path. "
+                "Quote the value: --space '~username' or set CONFPUB_SPACE=~username"
+            ),
+            details={
+                "fix_options": [
+                    "Quote the --space value: --space '~username'",
+                    "Set the CONFPUB_SPACE environment variable instead",
+                    "Use the space key without shell-expandable characters",
+                ],
+            },
+        )
+
+
 def internal_error(
     code: str = ERR_INTERNAL_CONVERTER,
     message: str = "Internal error",