confluence-cli 2.0.1 → 2.1.0

package/README.md

@@ -809,6 +809,24 @@ A paragraph containing only `**ANCHOR: my-section**` becomes a Confluence anchor
 **ANCHOR: my-section**
 ```
 
+### `**EXPAND: title** … **EXPAND_END**` — collapsible expand macro
+
+Wrap a block of content between `**EXPAND: title**` and `**EXPAND_END**` markers (each on its own paragraph) to render it as a Confluence expand macro with a collapsible body:
+
+````markdown
+**EXPAND: Show generated code**
+
+```js
+const x = 1;
+```
+
+**EXPAND_END**
+````
+
+The body may contain any content that is converted earlier in the pipeline (code blocks, tables, callout blockquotes). The reverse direction emits the same `**EXPAND: title**` / `**EXPAND_END**` markers so the conversion round-trips.
+
+Inline markdown inside the title (`*em*`, backtick code, links, `~~strike~~`) is stripped at capture time — Confluence's storage normalizer treats macro titles as plain text and will silently truncate or reject HTML in a `<ac:parameter>`. Title-less expand macros created in the Confluence UI still convert to `<details>/<summary>` blocks.
+
 ### `[text](#id)` — same-page anchor link
 
 A standard markdown link whose href starts with `#` becomes an `ac:link` with `ac:anchor`, rendering as an in-page jump in Confluence:

package/lib/confluence-client.js

@@ -496,14 +496,23 @@ class ConfluenceClient {
       return { html, userMap: new Map() };
     }
 
-    // Fetch user info for all keys in parallel
-    const userPromises = Array.from(userKeys).map(key => this.getUserByKey(key));
-    const users = await Promise.all(userPromises);
+    // Fetch user info for all keys in parallel; isolate per-key failures so a
+    // single rejection doesn't drop display names for the rest of the page.
+    const keysArray = Array.from(userKeys);
+    const results = await Promise.allSettled(
+      keysArray.map(key => this.getUserByKey(key))
+    );
 
-    // Build userkey -> displayName map
+    // Build userkey -> displayName map. On rejection, fall back to the raw
+    // userkey (mirrors getUserByKey's own caught-error fallback).
     const userMap = new Map();
-    users.forEach(user => {
-      userMap.set(user.key, user.displayName);
+    results.forEach((result, i) => {
+      const key = keysArray[i];
+      if (result.status === 'fulfilled') {
+        userMap.set(result.value.key, result.value.displayName);
+      } else {
+        userMap.set(key, key);
+      }
     });
 
     // Replace userkey references with display names in HTML

package/lib/macro-converter.js

@@ -125,6 +125,20 @@ class MacroConverter {
       '<ac:structured-macro ac:name="anchor"><ac:parameter ac:name="">$1</ac:parameter></ac:structured-macro>'
     );
 
+    // **EXPAND: title** … **EXPAND_END** → Confluence expand macro. Runs
+    // after code/blockquote/table conversion so the body can contain those
+    // macros. Strips inline HTML from the title because Confluence's storage
+    // normalizer treats <ac:parameter> as text-only — it silently truncates
+    // at the first '<' and rejects <s> outright with HTTP 500. Entities
+    // (&amp;, &lt;) survive because the regex requires a literal '<'.
+    storage = storage.replace(
+      /<p><strong>EXPAND: (.*?)<\/strong><\/p>\s*([\s\S]*?)\s*<p><strong>EXPAND_END<\/strong><\/p>/g,
+      (_, title, body) => {
+        const cleanTitle = title.replace(/<[^>]+>/g, '').trim();
+        return `<ac:structured-macro ac:name="expand"><ac:parameter ac:name="title">${cleanTitle}</ac:parameter><ac:rich-text-body>${body.trim()}</ac:rich-text-body></ac:structured-macro>`;
+      }
+    );
+
     // Same-page anchor links (href="#id") → ac:link with ac:anchor. Must run
     // before the general link conversion below so the #id pattern is not
     // consumed by the generic <a href> replacement (and so it works under
@@ -235,6 +249,16 @@ class MacroConverter {
       return `\n\`\`\`mermaid\n${code.trim()}\n\`\`\`\n`;
     });
 
+    // Titled expand macros → **EXPAND: title** / **EXPAND_END** markers
+    // (round-trip with markdownToStorage). Must run before the generic
+    // <details> fallback below, which would otherwise drop the title.
+    markdown = markdown.replace(
+      /<ac:structured-macro ac:name="expand"[^>]*>[\s\S]*?<ac:parameter ac:name="title">([\s\S]*?)<\/ac:parameter>[\s\S]*?<ac:rich-text-body>([\s\S]*?)<\/ac:rich-text-body>[\s\S]*?<\/ac:structured-macro>/g,
+      '\n**EXPAND: $1**\n\n$2\n\n**EXPAND_END**\n'
+    );
+
+    // Title-less expand macros (e.g. created in the Confluence UI without a
+    // title) fall back to <details>/<summary> with a localized default label.
     markdown = markdown.replace(/<ac:structured-macro ac:name="expand"[^>]*>[\s\S]*?<ac:rich-text-body>([\s\S]*?)<\/ac:rich-text-body>[\s\S]*?<\/ac:structured-macro>/g, (_, content) => {
       return `\n<details>\n<summary>${labels.expandDetails}</summary>\n\n${content}\n\n</details>\n`;
     });

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "confluence-cli",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "confluence-cli",
-      "version": "2.0.1",
+      "version": "2.1.0",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.15.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "confluence-cli",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "A command-line interface for Atlassian Confluence with page creation and editing capabilities",
   "main": "index.js",
   "bin": {