confluence-cli 2.2.0 → 2.3.1

package/README.md

@@ -694,8 +694,8 @@ confluence stats
 | `spaces` | List available spaces | `--limit <number>` |
 | `find <title>` | Find a page by its title | `--space <spaceKey>` |
 | `children <pageId>` | List child pages of a page | `--recursive`, `--max-depth <number>`, `--format <list\|tree\|json>`, `--show-url`, `--show-id` |
-| `create <title> <spaceKey>` | Create a new page | `--content <string>`, `--file <path>`, `--format <storage\|html\|markdown>`|
-| `create-child <title> <parentId>` | Create a child page | `--content <string>`, `--file <path>`, `--format <storage\|html\|markdown>` |
+| `create <title> <spaceKey>` | Create a new page or folder | `--content <string>`, `--file <path>`, `--format <storage\|html\|markdown>`, `--type <page\|folder>` |
+| `create-child <title> <parentId>` | Create a child page or folder | `--content <string>`, `--file <path>`, `--format <storage\|html\|markdown>`, `--type <page\|folder>` |
 | `copy-tree <sourcePageId> <targetParentId> [newTitle]` | Copy page tree with all children | `--max-depth <number>`, `--exclude <patterns>`, `--delay-ms <ms>`, `--copy-suffix <text>`, `--dry-run`, `--fail-on-error`, `--quiet` |
 | `update <pageId>` | Update a page's title or content | `--title <string>`, `--content <string>`, `--file <path>`, `--format <storage\|html\|markdown>` |
 | `move <pageId_or_url> <newParentId_or_url>` | Move a page to a new parent location | `--title <string>` |
@@ -752,6 +752,10 @@ confluence move 123456789 987654321 --title "New Title"
 confluence attachment-upload 123456789 --file ./report.pdf
 confluence attachment-delete 123456789 998877 --yes
 
+# Create a folder (no content body required)
+confluence create "Engineering Docs" MYSPACE --type folder
+confluence create-child "Sub-folder" 123456789 --type folder
+
 # View usage statistics
 confluence stats
 

package/bin/confluence.js

@@ -22,6 +22,20 @@ function assertNonEmpty(value, label) {
   }
 }
 
+const VALID_TYPES = ['page', 'folder'];
+
+function assertValidType(type) {
+  if (!VALID_TYPES.includes(type)) {
+    throw new Error(`Invalid type "${type}". Valid: ${VALID_TYPES.join(', ')}`);
+  }
+}
+
+function assertNoBodyForFolder(type, options) {
+  if (type === 'folder' && (options.file || options.content)) {
+    throw new Error('--file/--content is not allowed with --type folder (folders have no body).');
+  }
+}
+
 function handleCommandError(analytics, commandName, error) {
   analytics.track(commandName, false);
   console.error(chalk.red('Error:'), error.message);
@@ -219,15 +233,18 @@ program
 // Create command
 program
   .command('create <title> <spaceKey>')
-  .description('Create a new Confluence page')
+  .description('Create a new Confluence page or folder')
   .option('-f, --file <file>', 'Read content from file')
   .option('-c, --content <content>', 'Page content as string')
   .option('--format <format>', 'Content format (storage, html, markdown)', 'storage')
+  .option('--type <type>', 'Content type (page, folder)', 'page')
   .action(async (title, spaceKey, options) => {
     const analytics = new Analytics();
     try {
       assertNonEmpty(title, 'title');
       assertNonEmpty(spaceKey, 'spaceKey');
+      assertValidType(options.type);
+      assertNoBodyForFolder(options.type, options);
 
       const config = getConfig(getProfileName());
       assertWritable(config);
@@ -243,13 +260,14 @@ program
         content = fs.readFileSync(options.file, 'utf8');
       } else if (options.content) {
         content = options.content;
-      } else {
+      } else if (options.type !== 'folder') {
         throw new Error('Either --file or --content option is required');
       }
 
-      const result = await client.createPage(title, spaceKey, content, options.format);
-      
-      console.log(chalk.green('✅ Page created successfully!'));
+      const result = await client.createPage(title, spaceKey, content, options.format, options.type);
+
+      const label = options.type === 'folder' ? 'Folder' : 'Page';
+      console.log(chalk.green(`✅ ${label} created successfully!`));
       console.log(`Title: ${chalk.blue(result.title)}`);
       console.log(`ID: ${chalk.blue(result.id)}`);
       console.log(`Space: ${chalk.blue(result.space.name)} (${result.space.key})`);
@@ -264,15 +282,18 @@ program
 // Create child page command
 program
   .command('create-child <title> <parentId>')
-  .description('Create a new Confluence page as a child of another page')
+  .description('Create a new Confluence page or folder as a child of another page')
   .option('-f, --file <file>', 'Read content from file')
   .option('-c, --content <content>', 'Page content as string')
   .option('--format <format>', 'Content format (storage, html, markdown)', 'storage')
+  .option('--type <type>', 'Content type (page, folder)', 'page')
   .action(async (title, parentId, options) => {
     const analytics = new Analytics();
     try {
       assertNonEmpty(title, 'title');
       assertNonEmpty(parentId, 'parentId');
+      assertValidType(options.type);
+      assertNoBodyForFolder(options.type, options);
 
       const config = getConfig(getProfileName());
       assertWritable(config);
@@ -281,9 +302,9 @@ program
       // Get parent page info to get space key
       const parentInfo = await client.getPageInfo(parentId);
       const spaceKey = parentInfo.space.key;
-      
+
       let content = '';
-      
+
       if (options.file) {
         const fs = require('fs');
         if (!fs.existsSync(options.file)) {
@@ -292,13 +313,14 @@ program
         content = fs.readFileSync(options.file, 'utf8');
       } else if (options.content) {
         content = options.content;
-      } else {
+      } else if (options.type !== 'folder') {
         throw new Error('Either --file or --content option is required');
       }
-      
-      const result = await client.createChildPage(title, spaceKey, parentId, content, options.format);
-      
-      console.log(chalk.green('✅ Child page created successfully!'));
+
+      const result = await client.createChildPage(title, spaceKey, parentId, content, options.format, options.type);
+
+      const label = options.type === 'folder' ? 'Folder' : 'Child page';
+      console.log(chalk.green(`✅ ${label} created successfully!`));
       console.log(`Title: ${chalk.blue(result.title)}`);
       console.log(`ID: ${chalk.blue(result.id)}`);
       console.log(`Parent: ${chalk.blue(parentInfo.title)} (${parentId})`);
@@ -2084,6 +2106,8 @@ module.exports = {
     sanitizeFilename,
     assertWritable,
     assertNonEmpty,
+    assertValidType,
+    assertNoBodyForFolder,
     handleCommandError,
   },
 };

package/lib/confluence-client.js

@@ -1207,29 +1207,32 @@ class ConfluenceClient {
   /**
    * Create a new Confluence page
    */
-  async createPage(title, spaceKey, content, format = 'storage') {
-    let storageContent = content;
-    
-    if (format === 'markdown') {
-      storageContent = this.markdownToStorage(content);
-    } else if (format === 'html') {
-      // Convert HTML directly to storage format (no macro wrapper)
-      storageContent = content;
-    }
-
+  async createPage(title, spaceKey, content, format = 'storage', type = 'page') {
     const pageData = {
-      type: 'page',
+      type: type,
       title: title,
       space: {
         key: spaceKey
-      },
-      body: {
+      }
+    };
+
+    if (type !== 'folder') {
+      let storageContent = content;
+
+      if (format === 'markdown') {
+        storageContent = this.markdownToStorage(content);
+      } else if (format === 'html') {
+        // Convert HTML directly to storage format (no macro wrapper)
+        storageContent = content;
+      }
+
+      pageData.body = {
         storage: {
           value: storageContent,
           representation: 'storage'
         }
-      }
-    };
+      };
+    }
 
     const response = await this.client.post('/content', pageData);
     return response.data;
@@ -1238,18 +1241,9 @@ class ConfluenceClient {
   /**
    * Create a new Confluence page as a child of another page
    */
-  async createChildPage(title, spaceKey, parentId, content, format = 'storage') {
-    let storageContent = content;
-    
-    if (format === 'markdown') {
-      storageContent = this.markdownToStorage(content);
-    } else if (format === 'html') {
-      // Convert HTML directly to storage format (no macro wrapper)
-      storageContent = content;
-    }
-
+  async createChildPage(title, spaceKey, parentId, content, format = 'storage', type = 'page') {
     const pageData = {
-      type: 'page',
+      type: type,
       title: title,
       space: {
         key: spaceKey
@@ -1258,14 +1252,26 @@ class ConfluenceClient {
         {
           id: parentId
         }
-      ],
-      body: {
+      ]
+    };
+
+    if (type !== 'folder') {
+      let storageContent = content;
+
+      if (format === 'markdown') {
+        storageContent = this.markdownToStorage(content);
+      } else if (format === 'html') {
+        // Convert HTML directly to storage format (no macro wrapper)
+        storageContent = content;
+      }
+
+      pageData.body = {
         storage: {
           value: storageContent,
           representation: 'storage'
         }
-      }
-    };
+      };
+    }
 
     const response = await this.client.post('/content', pageData);
     return response.data;

package/lib/macro-converter.js

@@ -9,6 +9,25 @@ const CALLOUT_MARKERS = ['info', 'warning', 'note'];
 // and survives editor / formatter / lint passes that strip invisible chars.
 const STASH_DELIM = '\uE000';
 
+// Inline HTML tags that markdown has no native syntax for. The walker emits
+// them as raw HTML on storage\u2192markdown, so they must round-trip back through
+// markdownToStorage; without this whitelist, MarkdownIt (html: false) escapes
+// them to literal `<...>` and the formatting is lost.
+//
+// The lookahead `(?=[\s/>])` after the tag name rejects strings that look
+// like markdown autolinks (e.g. `<u@example.com>`, `<sub:foo>`) \u2014 a plain
+// `\b` word boundary would let these through and break linkify.
+//
+// The body alternation `"[^"]*"|'[^']*'|[^>]` makes the match quote-aware
+// so a literal `>` inside a quoted attribute value (e.g.
+// `<mark title="1>0">`) does not terminate the tag prematurely.
+const PASSTHROUGH_TAG_RE = /<\/?(?:u|sub|sup|mark)(?=[\s/>])(?:"[^"]*"|'[^']*'|[^>])*>/gi;
+// Single-backtick inline code spans. Block-level code (fenced + indented) is
+// detected via MarkdownIt's tokenizer in `_findCodeRanges` because a regex
+// can't reliably distinguish a 4-space-indented code block from a list-item
+// continuation that happens to align to four spaces.
+const INLINE_CODE_RE = /`[^`\n]+`/g;
+
 class MacroConverter {
   constructor({ isCloud = false, webUrlPrefix = '', buildUrl = null, linkStyle = null } = {}) {
     this._isCloud = isCloud;
@@ -57,13 +76,79 @@ class MacroConverter {
   }
 
   markdownToStorage(markdown) {
-    const html = this.markdown.render(markdown);
-    return this.htmlToConfluenceStorage(html);
+    return this.htmlToConfluenceStorage(this._renderMarkdownToHtml(markdown));
   }
 
   markdownToNativeStorage(markdown) {
-    const html = this.markdown.render(markdown);
-    return this.htmlToConfluenceStorage(html);
+    return this.htmlToConfluenceStorage(this._renderMarkdownToHtml(markdown));
+  }
+
+  // Pre-stashes whitelisted inline HTML so MarkdownIt won't escape it, renders,
+  // then restores. Code regions (fenced, indented, and inline) are skipped so a
+  // literal `<u>` typed inside a code block survives MarkdownIt's escape and
+  // round-trips as text rather than as a real tag — which would otherwise be
+  // smuggled past the escape and dropped by `convertCodeBlock`'s text-only
+  // child collection in html-to-storage.
+  _renderMarkdownToHtml(markdown) {
+    const codeRanges = this._findCodeRanges(markdown);
+    const htmlStash = [];
+    const stashHtml = (text) => text.replace(PASSTHROUGH_TAG_RE, (m) => {
+      htmlStash.push(m);
+      return `${STASH_DELIM}H${htmlStash.length - 1}${STASH_DELIM}`;
+    });
+
+    let src = '';
+    let pos = 0;
+    for (const [start, end] of codeRanges) {
+      src += stashHtml(markdown.slice(pos, start));
+      src += markdown.slice(start, end);
+      pos = end;
+    }
+    src += stashHtml(markdown.slice(pos));
+
+    const html = this.markdown.render(src);
+    return html.replace(
+      new RegExp(`${STASH_DELIM}H(\\d+)${STASH_DELIM}`, 'g'),
+      (m, i) => htmlStash[+i] ?? m,
+    );
+  }
+
+  // Returns merged, sorted character ranges covering all code regions in the
+  // markdown source — fenced and indented blocks via MarkdownIt's tokenizer
+  // (which correctly distinguishes them from list-item continuations) and
+  // single-backtick inline spans via regex (MarkdownIt parses these into
+  // `code_inline` tokens but does not expose source positions for them).
+  _findCodeRanges(markdown) {
+    const tokens = this.markdown.parse(markdown, {});
+    const lineStarts = [0];
+    for (let i = 0; i < markdown.length; i++) {
+      if (markdown[i] === '\n') lineStarts.push(i + 1);
+    }
+    const lineToChar = (n) => (n < lineStarts.length ? lineStarts[n] : markdown.length);
+
+    const ranges = [];
+    for (const tok of tokens) {
+      if ((tok.type === 'code_block' || tok.type === 'fence') && tok.map) {
+        ranges.push([lineToChar(tok.map[0]), lineToChar(tok.map[1])]);
+      }
+    }
+    INLINE_CODE_RE.lastIndex = 0;
+    let m;
+    while ((m = INLINE_CODE_RE.exec(markdown)) !== null) {
+      ranges.push([m.index, m.index + m[0].length]);
+    }
+
+    ranges.sort((a, b) => a[0] - b[0] || a[1] - b[1]);
+    const merged = [];
+    for (const r of ranges) {
+      const last = merged[merged.length - 1];
+      if (last && r[0] <= last[1]) {
+        last[1] = Math.max(last[1], r[1]);
+      } else {
+        merged.push([r[0], r[1]]);
+      }
+    }
+    return merged;
   }
 
   htmlToConfluenceStorage(html) {

package/lib/storage-walker.js

@@ -200,6 +200,7 @@ class StorageWalker {
     case 'blockquote':
       return this.handleBlockquote(node);
     case 'details': case 'summary':
+    case 'u': case 'sub': case 'sup': case 'mark':
       return `<${tag}>` + this.walkNodes(node.children) + `</${tag}>`;
     case 'ac:structured-macro':
       return this.handleMacro(node);

package/npm-shrinkwrap.json

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

package/package.json

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

package/plugins/confluence/skills/confluence/SKILL.md

@@ -255,10 +255,10 @@ confluence children 123456789 --recursive --format tree --show-id
 
 ### `create <title> <spaceKey>`
 
-Create a new top-level page in a space.
+Create a new top-level page or folder in a space.
 
 ```sh
-confluence create <title> <spaceKey> [--content <string>] [--file <path>] [--format storage|html|markdown]
+confluence create <title> <spaceKey> [--content <string>] [--file <path>] [--format storage|html|markdown] [--type page|folder]
 ```
 
 | Option | Default | Description |
@@ -266,31 +266,34 @@ confluence create <title> <spaceKey> [--content <string>] [--file <path>] [--for
 | `--content` | — | Inline content string |
 | `--file` | — | Path to content file |
 | `--format` | `storage` | Content format |
+| `--type` | `page` | Content type — `page` (default) or `folder`. Folders have no body. |
 
-Either `--content` or `--file` is required.
+Either `--content` or `--file` is required for pages. Folders take no content — passing `--content` or `--file` with `--type folder` is rejected.
 
 ```sh
 confluence create "Project Overview" MYSPACE --content "# Hello" --format markdown
 confluence create "Release Notes" MYSPACE --file ./notes.md --format markdown
+confluence create "Engineering Docs" MYSPACE --type folder
 ```
 
-Outputs the new page ID and URL on success.
+Outputs the new page (or folder) ID and URL on success.
 
 ---
 
 ### `create-child <title> <parentId>`
 
-Create a child page under an existing page. Inherits the parent's space automatically.
+Create a child page or folder under an existing page. Inherits the parent's space automatically.
 
 ```sh
-confluence create-child <title> <parentId> [--content <string>] [--file <path>] [--format storage|html|markdown]
+confluence create-child <title> <parentId> [--content <string>] [--file <path>] [--format storage|html|markdown] [--type page|folder]
 ```
 
-Options are identical to `create`. Either `--content` or `--file` is required.
+Options are identical to `create`. Either `--content` or `--file` is required for pages; folders take no content.
 
 ```sh
 confluence create-child "Chapter 1" 123456789 --content "Content here" --format markdown
 confluence create-child "API Guide" 123456789 --file ./api.md --format markdown
+confluence create-child "Sub-folder" 123456789 --type folder
 ```
 
 ---