confluence-cli 1.30.1 → 1.30.2

package/README.md

@@ -204,6 +204,27 @@ export CONFLUENCE_API_TOKEN="your-scoped-token"
 
 `CONFLUENCE_API_PATH` defaults to `/wiki/rest/api` for Atlassian Cloud domains and `/rest/api` otherwise. Override it when your site lives under a custom reverse proxy or on-premises path. `CONFLUENCE_AUTH_TYPE` defaults to `basic` when an email is present and falls back to `bearer` otherwise. For `mtls`, set `CONFLUENCE_TLS_CLIENT_CERT` and `CONFLUENCE_TLS_CLIENT_KEY`; `CONFLUENCE_TLS_CA_CERT` is optional.
 
+**Custom domains on Confluence Cloud:**
+
+If your Confluence Cloud instance uses a custom domain (e.g., `wiki.example.org` instead of `*.atlassian.net`), the CLI may misidentify it as a Server/Data Center instance and produce broken link formats. Set `CONFLUENCE_FORCE_CLOUD=true` to override the automatic detection:
+
+```bash
+export CONFLUENCE_FORCE_CLOUD=true
+```
+
+Or add `"forceCloud": true` to your profile in `~/.confluence-cli/config.json`:
+
+```json
+{
+  "profiles": {
+    "default": {
+      "domain": "wiki.example.org",
+      "forceCloud": true
+    }
+  }
+}
+```
+
 **Read-only mode** (recommended for AI agents):
 ```bash
 export CONFLUENCE_READ_ONLY=true

package/bin/confluence.js

@@ -16,6 +16,18 @@ function assertWritable(config) {
   }
 }
 
+function assertNonEmpty(value, label) {
+  if (typeof value !== 'string' || !value.trim()) {
+    throw new Error(`${label} is required and cannot be empty.`);
+  }
+}
+
+function handleCommandError(analytics, commandName, error) {
+  analytics.track(commandName, false);
+  console.error(chalk.red('Error:'), error.message);
+  process.exit(1);
+}
+
 program
   .name('confluence')
   .description('CLI tool for Atlassian Confluence')
@@ -59,9 +71,7 @@ program
       console.log(content);
       analytics.track('read', true);
     } catch (error) {
-      analytics.track('read', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'read', error);
     }
   });
 
@@ -84,9 +94,7 @@ program
       }
       analytics.track('info', true);
     } catch (error) {
-      analytics.track('info', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'info', error);
     }
   });
 
@@ -117,9 +125,7 @@ program
       });
       analytics.track('search', true);
     } catch (error) {
-      analytics.track('search', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'search', error);
     }
   });
 
@@ -140,9 +146,7 @@ program
       });
       analytics.track('spaces', true);
     } catch (error) {
-      analytics.track('spaces', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'spaces', error);
     }
   });
 
@@ -214,12 +218,15 @@ program
   .action(async (title, spaceKey, options) => {
     const analytics = new Analytics();
     try {
+      assertNonEmpty(title, 'title');
+      assertNonEmpty(spaceKey, 'spaceKey');
+
       const config = getConfig(getProfileName());
       assertWritable(config);
       const client = new ConfluenceClient(config);
 
       let content = '';
-      
+
       if (options.file) {
         const fs = require('fs');
         if (!fs.existsSync(options.file)) {
@@ -231,7 +238,7 @@ program
       } else {
         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!'));
@@ -242,9 +249,7 @@ program
 
       analytics.track('create', true);
     } catch (error) {
-      analytics.track('create', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'create', error);
     }
   });
 
@@ -258,6 +263,9 @@ program
   .action(async (title, parentId, options) => {
     const analytics = new Analytics();
     try {
+      assertNonEmpty(title, 'title');
+      assertNonEmpty(parentId, 'parentId');
+
       const config = getConfig(getProfileName());
       assertWritable(config);
       const client = new ConfluenceClient(config);
@@ -291,9 +299,7 @@ program
 
       analytics.track('create_child', true);
     } catch (error) {
-      analytics.track('create_child', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'create_child', error);
     }
   });
 
@@ -313,6 +319,10 @@ program
         throw new Error('At least one of --title, --file, or --content must be provided.');
       }
 
+      if (options.title !== undefined) {
+        assertNonEmpty(options.title, '--title');
+      }
+
       const config = getConfig(getProfileName());
       assertWritable(config);
       const client = new ConfluenceClient(config);
@@ -339,9 +349,7 @@ program
 
       analytics.track('update', true);
     } catch (error) {
-      analytics.track('update', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'update', error);
     }
   });
 
@@ -367,9 +375,7 @@ program
 
       analytics.track('move', true);
     } catch (error) {
-      analytics.track('move', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'move', error);
     }
   });
 
@@ -411,9 +417,7 @@ program
       console.log(`ID: ${chalk.blue(result.id)}`);
       analytics.track('delete', true);
     } catch (error) {
-      analytics.track('delete', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'delete', error);
     }
   });
 
@@ -449,9 +453,7 @@ program
       
       analytics.track('edit', true);
     } catch (error) {
-      analytics.track('edit', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'edit', error);
     }
   });
 
@@ -475,9 +477,7 @@ program
 
       analytics.track('find', true);
     } catch (error) {
-      analytics.track('find', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'find', error);
     }
   });
 
@@ -597,9 +597,7 @@ program
 
       analytics.track('attachments', true);
     } catch (error) {
-      analytics.track('attachments', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'attachments', error);
     }
   });
 
@@ -659,9 +657,7 @@ program
       console.log(chalk.green(`Uploaded ${uploaded} attachment${uploaded === 1 ? '' : 's'} to page ${pageId}`));
       analytics.track('attachment_upload', true);
     } catch (error) {
-      analytics.track('attachment_upload', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'attachment_upload', error);
     }
   });
 
@@ -701,9 +697,7 @@ program
       console.log(`Page ID: ${chalk.blue(result.pageId)}`);
       analytics.track('attachment_delete', true);
     } catch (error) {
-      analytics.track('attachment_delete', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'attachment_delete', error);
     }
   });
 
@@ -774,9 +768,7 @@ program
       }
       analytics.track('property_list', true);
     } catch (error) {
-      analytics.track('property_list', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'property_list', error);
     }
   });
 
@@ -808,9 +800,7 @@ program
       }
       analytics.track('property_get', true);
     } catch (error) {
-      analytics.track('property_get', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'property_get', error);
     }
   });
 
@@ -867,9 +857,7 @@ program
       }
       analytics.track('property_set', true);
     } catch (error) {
-      analytics.track('property_set', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'property_set', error);
     }
   });
 
@@ -909,9 +897,7 @@ program
       console.log(`${chalk.green('Page ID:')} ${chalk.blue(result.pageId)}`);
       analytics.track('property_delete', true);
     } catch (error) {
-      analytics.track('property_delete', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'property_delete', error);
     }
   });
 
@@ -1060,9 +1046,7 @@ program
 
       analytics.track('comments', true);
     } catch (error) {
-      analytics.track('comments', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'comments', error);
     }
   });
 
@@ -1225,9 +1209,7 @@ program
       console.log(`ID: ${chalk.blue(result.id)}`);
       analytics.track('comment_delete', true);
     } catch (error) {
-      analytics.track('comment_delete', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'comment_delete', error);
     }
   });
 
@@ -1332,9 +1314,7 @@ program
 
       analytics.track('export', true);
     } catch (error) {
-      analytics.track('export', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'export', error);
     }
   });
 
@@ -1720,9 +1700,7 @@ program
       
       analytics.track('copy_tree', true);
     } catch (error) {
-      analytics.track('copy_tree', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'copy_tree', error);
     }
   });
 
@@ -1819,9 +1797,7 @@ program
       
       analytics.track('children', true);
     } catch (error) {
-      analytics.track('children', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'children', error);
     }
   });
 
@@ -2039,9 +2015,7 @@ program
       }
       analytics.track('convert', true);
     } catch (error) {
-      analytics.track('convert', false);
-      console.error(chalk.red('Error:'), error.message);
-      process.exit(1);
+      handleCommandError(analytics, 'convert', error);
     }
   });
 
@@ -2056,6 +2030,8 @@ module.exports = {
     exportRecursive,
     sanitizeTitle,
     assertWritable,
+    assertNonEmpty,
+    handleCommandError,
   },
 };
 

package/lib/config.js

@@ -100,6 +100,30 @@ const validateMtlsProtocol = (protocol) => {
   return null;
 };
 
+// Validate a resolved auth configuration (post-normalization).
+// Returns error messages only; callers format source-specific hints.
+const validateAuthConfig = (auth, mtlsSourceLabel) => {
+  const errors = [];
+
+  if (auth.authType === 'basic' && !auth.email) {
+    errors.push('Basic authentication requires an email address or username.');
+  }
+
+  if (auth.authType !== 'mtls' && !auth.token) {
+    errors.push('Bearer or basic authentication requires a token.');
+  }
+
+  if (auth.authType === 'mtls') {
+    errors.push(...validateMtlsConfig(auth.mtls, mtlsSourceLabel));
+    const protocolError = validateMtlsProtocol(auth.protocol);
+    if (protocolError) {
+      errors.push(protocolError);
+    }
+  }
+
+  return errors;
+};
+
 /**
  * Build an inquirer question for an mTLS file path prompt.
  * @param {string} name       - answer key (e.g. 'tlsClientCert')
@@ -637,6 +661,7 @@ function getConfig(profileName) {
   const envApiPath = process.env.CONFLUENCE_API_PATH;
   const envProtocol = process.env.CONFLUENCE_PROTOCOL;
   const envReadOnly = process.env.CONFLUENCE_READ_ONLY;
+  const envForceCloud = process.env.CONFLUENCE_FORCE_CLOUD;
   const envMtls = normalizeMtlsConfig({
     caCert: process.env.CONFLUENCE_TLS_CA_CERT,
     clientCert: process.env.CONFLUENCE_TLS_CLIENT_CERT,
@@ -655,29 +680,19 @@ function getConfig(profileName) {
       process.exit(1);
     }
 
-    if (authType === 'basic' && !envEmail) {
-      console.error(chalk.red('❌ Basic authentication requires CONFLUENCE_EMAIL or CONFLUENCE_USERNAME.'));
-      console.log(chalk.yellow('Set CONFLUENCE_EMAIL (or CONFLUENCE_USERNAME for on-premise) or switch to bearer auth by setting CONFLUENCE_AUTH_TYPE=bearer.'));
-      process.exit(1);
-    }
-
-    if (authType !== 'mtls' && !envToken) {
-      console.error(chalk.red('❌ Bearer/basic authentication requires CONFLUENCE_API_TOKEN or CONFLUENCE_PASSWORD.'));
-      process.exit(1);
-    }
-
-    if (authType === 'mtls') {
-      const mtlsErrors = validateMtlsConfig(envMtls, 'CONFLUENCE_AUTH_TYPE=mtls');
-      if (mtlsErrors.length > 0) {
-        console.error(chalk.red(`❌ ${mtlsErrors.join(' ')}`));
-        console.log(chalk.yellow('Set CONFLUENCE_TLS_CLIENT_CERT and CONFLUENCE_TLS_CLIENT_KEY. Optionally set CONFLUENCE_TLS_CA_CERT.'));
-        process.exit(1);
+    const authErrors = validateAuthConfig(
+      { authType, token: envToken, email: envEmail, mtls: envMtls, protocol: envProtocol },
+      'CONFLUENCE_AUTH_TYPE=mtls'
+    );
+    if (authErrors.length > 0) {
+      console.error(chalk.red(`❌ ${authErrors.join(' ')}`));
+      if (authType === 'basic' && !envEmail) {
+        console.log(chalk.yellow('Set CONFLUENCE_EMAIL (or CONFLUENCE_USERNAME for on-premise) or switch to bearer auth by setting CONFLUENCE_AUTH_TYPE=bearer.'));
       }
-      if (normalizeProtocol(envProtocol) === 'http') {
-        const protocolError = validateMtlsProtocol(envProtocol);
-        console.error(chalk.red(`❌ ${protocolError}`));
-        process.exit(1);
+      if (authType === 'mtls' && !envMtls) {
+        console.log(chalk.yellow('Set CONFLUENCE_TLS_CLIENT_CERT and CONFLUENCE_TLS_CLIENT_KEY. Optionally set CONFLUENCE_TLS_CA_CERT.'));
       }
+      process.exit(1);
     }
 
     return {
@@ -688,7 +703,8 @@ function getConfig(profileName) {
       email: envEmail ? envEmail.trim() : undefined,
       authType,
       mtls: envMtls,
-      readOnly: envReadOnly === 'true'
+      readOnly: envReadOnly === 'true',
+      forceCloud: envForceCloud === 'true'
     };
   }
 
@@ -727,33 +743,22 @@ function getConfig(profileName) {
     const mtls = normalizeMtlsConfig(storedConfig.mtls);
     let apiPath;
 
-    if (!trimmedDomain || (authType !== 'mtls' && !trimmedToken)) {
+    if (!trimmedDomain) {
       console.error(chalk.red('❌ Configuration file is missing required values.'));
       console.log(chalk.yellow('Run "confluence init" to refresh your settings.'));
       process.exit(1);
     }
 
-    if (authType === 'basic' && !trimmedEmail) {
-      console.error(chalk.red('❌ Basic authentication requires an email address or username.'));
-      console.log(chalk.yellow('Please rerun "confluence init" to add your Confluence email or username.'));
+    const authErrors = validateAuthConfig(
+      { authType, token: trimmedToken, email: trimmedEmail, mtls, protocol: storedConfig.protocol },
+      'mTLS authentication'
+    );
+    if (authErrors.length > 0) {
+      console.error(chalk.red(`❌ ${authErrors.join(' ')}`));
+      console.log(chalk.yellow('Please rerun "confluence init" to refresh your settings.'));
       process.exit(1);
     }
 
-    if (authType === 'mtls') {
-      const mtlsErrors = validateMtlsConfig(mtls, 'mTLS authentication');
-      if (mtlsErrors.length > 0) {
-        console.error(chalk.red(`❌ ${mtlsErrors.join(' ')}`));
-        console.log(chalk.yellow('Please rerun "confluence init" to add your mTLS certificate paths.'));
-        process.exit(1);
-      }
-      if (normalizeProtocol(storedConfig.protocol) === 'http') {
-        const protocolError = validateMtlsProtocol(storedConfig.protocol);
-        console.error(chalk.red(`❌ ${protocolError}`));
-        console.log(chalk.yellow('Please rerun "confluence init" to update your protocol to HTTPS.'));
-        process.exit(1);
-      }
-    }
-
     try {
       apiPath = normalizeApiPath(storedConfig.apiPath, trimmedDomain);
     } catch (error) {
@@ -766,6 +771,10 @@ function getConfig(profileName) {
       ? envReadOnly === 'true'
       : Boolean(storedConfig.readOnly);
 
+    const forceCloud = envForceCloud !== undefined
+      ? envForceCloud === 'true'
+      : Boolean(storedConfig.forceCloud);
+
     return {
       domain: trimmedDomain,
       protocol: normalizeProtocol(storedConfig.protocol),
@@ -774,7 +783,8 @@ function getConfig(profileName) {
       email: trimmedEmail,
       authType,
       mtls,
-      readOnly
+      readOnly,
+      forceCloud
     };
   } catch (error) {
     console.error(chalk.red('❌ Error reading configuration file:'), error.message);

package/lib/confluence-client.js

@@ -35,6 +35,7 @@ class ConfluenceClient {
     this.token = config.token;
     this.email = config.email;
     this.authType = (config.authType || (this.email ? 'basic' : 'bearer')).toLowerCase();
+    this.forceCloud = !!config.forceCloud;
     this.mtls = config.mtls;
     this.apiPath = this.sanitizeApiPath(config.apiPath);
     this.webUrlPrefix = this.apiPath.startsWith('/wiki/') ? '/wiki' : '';
@@ -100,7 +101,7 @@ class ConfluenceClient {
   }
 
   isCloud() {
-    return this.isScopedToken() || (this.domain && this.domain.trim().toLowerCase().endsWith('.atlassian.net'));
+    return this.isScopedToken() || (this.domain && this.domain.trim().toLowerCase().endsWith('.atlassian.net')) || this.forceCloud;
   }
 
   isScopedToken() {
@@ -477,12 +478,12 @@ class ConfluenceClient {
     // Replace userkey references with display names in HTML
     let resolvedHtml = html;
     userMap.forEach((displayName, userKey) => {
-      // Replace <ac:link><ri:user ri:userkey="xxx" /></ac:link> with @displayName
+      const escapedKey = userKey.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
       const userLinkRegex = new RegExp(
-        `<ac:link>\\s*<ri:user\\s+ri:userkey="${userKey}"\\s*/>\\s*</ac:link>`,
+        `<ac:link>\\s*<ri:user\\s+ri:userkey="${escapedKey}"\\s*/>\\s*</ac:link>`,
         'g'
       );
-      resolvedHtml = resolvedHtml.replace(userLinkRegex, `@${displayName}`);
+      resolvedHtml = resolvedHtml.replace(userLinkRegex, () => `@${displayName}`);
     });
 
     return { html: resolvedHtml, userMap };

package/npm-shrinkwrap.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "confluence-cli",
-  "version": "1.30.1",
+  "version": "1.30.2",
   "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

@@ -29,6 +29,7 @@ confluence --version   # verify install
 | `CONFLUENCE_API_TOKEN` | API token or personal access token | `ATATT3x...` |
 | `CONFLUENCE_PROFILE` | Named profile to use (optional) | `staging` |
 | `CONFLUENCE_READ_ONLY` | Block all write operations when `true` | `true` |
+| `CONFLUENCE_FORCE_CLOUD` | Force Cloud link format for custom domains | `true` |
 
 **Global `--profile` flag (use a named profile for any command):**
 
@@ -53,6 +54,7 @@ confluence init \
 
 **Cloud vs Server/DC:**
 - Atlassian Cloud (`*.atlassian.net`): use `--api-path "/wiki/rest/api"`, auth type `basic` with email + API token
+- Atlassian Cloud (custom domain): if your Cloud instance uses a custom domain (e.g., `wiki.example.org`), set `CONFLUENCE_FORCE_CLOUD=true` or add `"forceCloud": true` to your profile in `~/.confluence-cli/config.json`. Without this, links will render incorrectly.
 - Atlassian Cloud (scoped token): use `--domain "api.atlassian.com"`, `--api-path "/ex/confluence/<your-cloud-id>/wiki/rest/api"`, auth type `basic` with email + scoped token. Get your Cloud ID from `https://<your-site>.atlassian.net/_edge/tenant_info`. Recommended for agents (least privilege).
 - Self-hosted / Data Center: use `--api-path "/rest/api"`, auth type `bearer` with a personal access token (no email needed)