confluence-cli 1.27.4 → 1.27.6

package/.claude/skills/confluence/SKILL.md

@@ -197,16 +197,17 @@ confluence find "API Reference" --space MYSPACE
 Search pages using a keyword or CQL expression.
 
 ```sh
-confluence search <query> [--limit <number>]
+confluence search <query> [--limit <number>] [--cql]
 ```
 
 | Option | Default | Description |
 |---|---|---|
 | `--limit` | `10` | Maximum number of results |
+| `--cql` | false | Pass query as raw CQL instead of text search |
 
 ```sh
 confluence search "deployment pipeline"
-confluence search "type=page AND space=MYSPACE" --limit 50
+confluence search --cql 'siteSearch ~ "deployment pipeline" and space = "MYSPACE"' --limit 50
 ```
 
 ---
@@ -697,7 +698,7 @@ confluence children 123456789 --recursive --format json | jq '.[].id'
 ### Search and process results
 
 ```sh
-confluence search "release notes" --limit 20
+confluence search --cql 'siteSearch ~ "release notes" and space = "MYSPACE"' --limit 20
 ```
 
 ---

package/bin/confluence.js

@@ -8,11 +8,6 @@ const { getConfig, initConfig, listProfiles, setActiveProfile, deleteProfile, is
 const Analytics = require('../lib/analytics');
 const pkg = require('../package.json');
 
-function buildPageUrl(config, path) {
-  const protocol = config.protocol || 'https';
-  return `${protocol}://${config.domain}${path}`;
-}
-
 function assertWritable(config) {
   if (config.readOnly) {
     console.error(chalk.red('Error: This profile is in read-only mode. Write operations are not allowed.'));
@@ -240,8 +235,8 @@ program
       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})`);
-      console.log(`URL: ${chalk.gray(`${buildPageUrl(config, `/wiki${result._links.webui}`)}`)}`);
-      
+      console.log(`URL: ${chalk.gray(`${client.buildUrl(`${client.webUrlPrefix}${result._links.webui}`)}`)}`);
+
       analytics.track('create', true);
     } catch (error) {
       analytics.track('create', false);
@@ -289,8 +284,8 @@ program
       console.log(`ID: ${chalk.blue(result.id)}`);
       console.log(`Parent: ${chalk.blue(parentInfo.title)} (${parentId})`);
       console.log(`Space: ${chalk.blue(result.space.name)} (${result.space.key})`);
-      console.log(`URL: ${chalk.gray(`${buildPageUrl(config, `/wiki${result._links.webui}`)}`)}`);
-      
+      console.log(`URL: ${chalk.gray(`${client.buildUrl(`${client.webUrlPrefix}${result._links.webui}`)}`)}`);
+
       analytics.track('create_child', true);
     } catch (error) {
       analytics.track('create_child', false);
@@ -337,8 +332,8 @@ program
       console.log(`Title: ${chalk.blue(result.title)}`);
       console.log(`ID: ${chalk.blue(result.id)}`);
       console.log(`Version: ${chalk.blue(result.version.number)}`);
-      console.log(`URL: ${chalk.gray(`${buildPageUrl(config, `/wiki${result._links.webui}`)}`)}`);
-      
+      console.log(`URL: ${chalk.gray(`${client.buildUrl(`${client.webUrlPrefix}${result._links.webui}`)}`)}`);
+
       analytics.track('update', true);
     } catch (error) {
       analytics.track('update', false);
@@ -365,7 +360,7 @@ program
       console.log(`ID: ${chalk.blue(result.id)}`);
       console.log(`New Parent: ${chalk.blue(newParentId)}`);
       console.log(`Version: ${chalk.blue(result.version.number)}`);
-      console.log(`URL: ${chalk.gray(`${buildPageUrl(config, `/wiki${result._links.webui}`)}`)}`);
+      console.log(`URL: ${chalk.gray(`${client.buildUrl(`${client.webUrlPrefix}${result._links.webui}`)}`)}`);
 
       analytics.track('move', true);
     } catch (error) {
@@ -473,8 +468,8 @@ program
       console.log(`Title: ${chalk.green(pageInfo.title)}`);
       console.log(`ID: ${chalk.green(pageInfo.id)}`);
       console.log(`Space: ${chalk.green(pageInfo.space.name)} (${pageInfo.space.key})`);
-      console.log(`URL: ${chalk.gray(`${buildPageUrl(config, `/wiki${pageInfo.url}`)}`)}`);
-      
+      console.log(`URL: ${chalk.gray(`${client.buildUrl(`${client.webUrlPrefix}${pageInfo.url}`)}`)}`);
+
       analytics.track('find', true);
     } catch (error) {
       analytics.track('find', false);
@@ -1713,7 +1708,7 @@ program
           console.log(` - ...and ${result.failures.length - 10} more`);
         }
       }
-      console.log(`URL: ${chalk.gray(`${buildPageUrl(config, `/wiki${result.rootPage._links.webui}`)}`)}`);
+      console.log(`URL: ${chalk.gray(`${client.buildUrl(`${client.webUrlPrefix}${result.rootPage._links.webui}`)}`)}`);
       if (options.failOnError && result.failures?.length) {
         analytics.track('copy_tree', false);
         console.error(chalk.red('Completed with failures and --fail-on-error is set.'));
@@ -1775,7 +1770,7 @@ program
             type: page.type,
             status: page.status,
             spaceKey: page.space?.key,
-            url: `${buildPageUrl(config, `/wiki/spaces/${page.space?.key}/pages/${page.id}`)}`,
+            url: `${client.buildUrl(`${client.webUrlPrefix}/spaces/${page.space?.key}/pages/${page.id}`)}`,
             parentId: page.parentId || resolvedPageId
           }))
         };
@@ -1787,7 +1782,7 @@ program
         
         // Build tree structure
         const tree = buildTree(children, resolvedPageId);
-        printTree(tree, config, options, 1);
+        printTree(tree, client, config, options, 1);
         
         console.log('');
         console.log(chalk.gray(`Total: ${children.length} child page${children.length === 1 ? '' : 's'}`));
@@ -1804,7 +1799,7 @@ program
           }
           
           if (options.showUrl) {
-            const url = `${buildPageUrl(config, `/wiki/spaces/${page.space?.key}/pages/${page.id}`)}`;
+            const url = `${client.buildUrl(`${client.webUrlPrefix}/spaces/${page.space?.key}/pages/${page.id}`)}`;
             output += `\n   ${chalk.gray(url)}`;
           }
           
@@ -1856,7 +1851,7 @@ function buildTree(pages, rootId) {
 }
 
 // Helper function to print tree
-function printTree(nodes, config, options, depth = 1) {
+function printTree(nodes, client, config, options, depth = 1) {
   nodes.forEach((node, index) => {
     const isLast = index === nodes.length - 1;
     const indent = '  '.repeat(depth - 1);
@@ -1869,14 +1864,14 @@ function printTree(nodes, config, options, depth = 1) {
     }
     
     if (options.showUrl) {
-      const url = `${buildPageUrl(config, `/wiki/spaces/${node.space?.key}/pages/${node.id}`)}`;
+      const url = `${client.buildUrl(`${client.webUrlPrefix}/spaces/${node.space?.key}/pages/${node.id}`)}`;
       output += `\n${indent}${isLast ? '    ' : '│   '}${chalk.gray(url)}`;
     }
     
     console.log(output);
-    
+
     if (node.children && node.children.length > 0) {
-      printTree(node.children, config, options, depth + 1);
+      printTree(node.children, client, config, options, depth + 1);
     }
   });
 }

package/lib/confluence-client.js

@@ -35,6 +35,7 @@ class ConfluenceClient {
     this.email = config.email;
     this.authType = (config.authType || (this.email ? 'basic' : 'bearer')).toLowerCase();
     this.apiPath = this.sanitizeApiPath(config.apiPath);
+    this.webUrlPrefix = this.apiPath.startsWith('/wiki/') ? '/wiki' : '';
     this.baseURL = `${this.protocol}://${this.domain}${this.apiPath}`;
     this.markdown = new MarkdownIt();
     this.setupConfluenceMarkdownExtensions();
@@ -412,7 +413,7 @@ class ConfluenceClient {
         const webui = page._links?.webui || '';
         return {
           title: page.title,
-          url: webui ? this.buildUrl(`/wiki${webui}`) : ''
+          url: webui ? this.buildUrl(`${this.webUrlPrefix}${webui}`) : ''
         };
       }
       return null;
@@ -506,7 +507,7 @@ class ConfluenceClient {
       // Format: - [Page Title](URL)
       const childPagesList = childPages.map(page => {
         const webui = page._links?.webui || '';
-        const url = webui ? this.buildUrl(`/wiki${webui}`) : '';
+        const url = webui ? this.buildUrl(`${this.webUrlPrefix}${webui}`) : '';
         if (url) {
           return `- [${page.title}](${url})`;
         } else {
@@ -1073,10 +1074,11 @@ class ConfluenceClient {
       // so they appear as literal characters in the CDATA output
       const decodedCode = code.replace(/\n$/, '')
         .replace(/"/g, '"')
-        .replace(/&/g, '&')
         .replace(/&lt;/g, '<')
-        .replace(/&gt;/g, '>');
-      return `<ac:structured-macro ac:name="code"><ac:parameter ac:name="language">${language}</ac:parameter><ac:plain-text-body><![CDATA[${decodedCode}]]></ac:plain-text-body></ac:structured-macro>`;
+        .replace(/&gt;/g, '>')
+        .replace(/&amp;/g, '&');   // & last to avoid double-decoding
+      const safeCode = decodedCode.replace(/]]>/g, ']]]]><![CDATA[>');
+      return `<ac:structured-macro ac:name="code"><ac:parameter ac:name="language">${language}</ac:parameter><ac:plain-text-body><![CDATA[${safeCode}]]></ac:plain-text-body></ac:structured-macro>`;
     });
     
     // Convert inline code
@@ -1351,11 +1353,11 @@ class ConfluenceClient {
       // Try to build a proper URL - if spaceKey starts with ~, it's a user space
       if (spaceKey.startsWith('~')) {
         const spacePath = `display/${spaceKey}/${encodeURIComponent(title)}`;
-        return `\n> 📄 **${labels.includePage}**: [${title}](${this.buildUrl(`/wiki/${spacePath}`)})\n`;
+        return `\n> 📄 **${labels.includePage}**: [${title}](${this.buildUrl(`${this.webUrlPrefix}/${spacePath}`)})\n`;
       } else {
         // For non-user spaces, we cannot construct a valid link without the page ID.
         // Document that manual correction is required.
-        return `\n> 📄 **${labels.includePage}**: [${title}](${this.buildUrl(`/wiki/spaces/${spaceKey}/pages/[PAGE_ID_HERE]`)}) _(manual link correction required)_\n`;
+        return `\n> 📄 **${labels.includePage}**: [${title}](${this.buildUrl(`${this.webUrlPrefix}/spaces/${spaceKey}/pages/[PAGE_ID_HERE]`)}) _(manual link correction required)_\n`;
       }
     });
     

package/package.json

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