confluence-cli 1.25.0 → 1.26.0

package/bin/confluence.js

@@ -4,7 +4,7 @@ const { program } = require('commander');
 const chalk = require('chalk');
 const inquirer = require('inquirer');
 const ConfluenceClient = require('../lib/confluence-client');
-const { getConfig, initConfig } = require('../lib/config');
+const { getConfig, initConfig, listProfiles, setActiveProfile, deleteProfile, isValidProfileName } = require('../lib/config');
 const Analytics = require('../lib/analytics');
 const pkg = require('../package.json');
 
@@ -16,7 +16,13 @@ function buildPageUrl(config, path) {
 program
   .name('confluence')
   .description('CLI tool for Atlassian Confluence')
-  .version(pkg.version);
+  .version(pkg.version)
+  .option('--profile <name>', 'Use a specific configuration profile');
+
+// Helper: resolve profile name from global --profile flag
+function getProfileName() {
+  return program.opts().profile || undefined;
+}
 
 // Init command
 program
@@ -29,7 +35,8 @@ program
   .option('-e, --email <email>', 'Email or username for basic auth')
   .option('-t, --token <token>', 'API token')
   .action(async (options) => {
-    await initConfig(options);
+    const profile = getProfileName();
+    await initConfig({ ...options, profile });
   });
 
 // Read command
@@ -40,7 +47,7 @@ program
   .action(async (pageId, options) => {
     const analytics = new Analytics();
     try {
-      const client = new ConfluenceClient(getConfig());
+      const client = new ConfluenceClient(getConfig(getProfileName()));
       const content = await client.readPage(pageId, options.format);
       console.log(content);
       analytics.track('read', true);
@@ -58,7 +65,7 @@ program
   .action(async (pageId) => {
     const analytics = new Analytics();
     try {
-      const client = new ConfluenceClient(getConfig());
+      const client = new ConfluenceClient(getConfig(getProfileName()));
       const info = await client.getPageInfo(pageId);
       console.log(chalk.blue('Page Information:'));
       console.log(`Title: ${chalk.green(info.title)}`);
@@ -85,7 +92,7 @@ program
   .action(async (query, options) => {
     const analytics = new Analytics();
     try {
-      const client = new ConfluenceClient(getConfig());
+      const client = new ConfluenceClient(getConfig(getProfileName()));
       const results = await client.search(query, parseInt(options.limit), options.cql);
       
       if (results.length === 0) {
@@ -116,7 +123,7 @@ program
   .action(async () => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
       const spaces = await client.getSpaces();
       
@@ -200,7 +207,7 @@ program
   .action(async (title, spaceKey, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
       
       let content = '';
@@ -243,7 +250,7 @@ program
   .action(async (title, parentId, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
       
       // Get parent page info to get space key
@@ -297,7 +304,7 @@ program
         throw new Error('At least one of --title, --file, or --content must be provided.');
       }
 
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
       
       let content = null; // Use null to indicate no content change
@@ -336,7 +343,7 @@ program
   .action(async (pageId, newParentId, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
       const result = await client.movePage(pageId, newParentId, options.title);
 
@@ -363,7 +370,7 @@ program
   .action(async (pageIdOrUrl, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
       const pageInfo = await client.getPageInfo(pageIdOrUrl);
 
@@ -406,7 +413,7 @@ program
   .action(async (pageId, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
       const pageData = await client.getPageForEdit(pageId);
       
@@ -443,7 +450,7 @@ program
   .action(async (title, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
       const pageInfo = await client.findPageByTitle(title, options.space);
       
@@ -473,7 +480,7 @@ program
   .action(async (pageId, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
       const maxResults = options.limit ? parseInt(options.limit, 10) : null;
       const pattern = options.pattern ? options.pattern.trim() : null;
@@ -605,7 +612,7 @@ program
 
       const fs = require('fs');
       const path = require('path');
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
 
       const resolvedFiles = files.map((filePath) => ({
@@ -652,7 +659,7 @@ program
   .action(async (pageId, attachmentId, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
 
       if (!options.yes) {
@@ -696,7 +703,7 @@ program
   .action(async (pageId, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
 
       const format = (options.format || 'text').toLowerCase();
@@ -766,7 +773,7 @@ program
   .action(async (pageId, key, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
 
       const format = (options.format || 'text').toLowerCase();
@@ -802,7 +809,7 @@ program
   .action(async (pageId, key, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
 
       if (!options.value && !options.file) {
@@ -858,7 +865,7 @@ program
   .action(async (pageId, key, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
 
       if (!options.yes) {
@@ -904,7 +911,7 @@ program
   .action(async (pageId, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
 
       const format = (options.format || 'text').toLowerCase();
@@ -1059,7 +1066,7 @@ program
     const analytics = new Analytics();
     let location = null;
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
 
       let content = '';
@@ -1173,7 +1180,7 @@ program
   .action(async (commentId, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
 
       if (!options.yes) {
@@ -1225,7 +1232,7 @@ program
   .action(async (pageId, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
       const fs = require('fs');
       const path = require('path');
@@ -1591,7 +1598,7 @@ program
   .action(async (sourcePageId, targetParentId, newTitle, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
       
       // Parse numeric flags with safe fallbacks
@@ -1711,7 +1718,7 @@ program
   .action(async (pageId, options) => {
     const analytics = new Analytics();
     try {
-      const config = getConfig();
+      const config = getConfig(getProfileName());
       const client = new ConfluenceClient(config);
       
       // Extract page ID from URL if needed
@@ -1852,8 +1859,83 @@ function printTree(nodes, config, options, depth = 1) {
   });
 }
 
+// Profile management commands
+const profileCmd = program
+  .command('profile')
+  .description('Manage configuration profiles');
+
+profileCmd
+  .command('list')
+  .description('List all configuration profiles')
+  .action(() => {
+    const { profiles } = listProfiles();
+    if (profiles.length === 0) {
+      console.log(chalk.yellow('No profiles configured. Run "confluence init" to create one.'));
+      return;
+    }
+    console.log(chalk.blue('Configuration profiles:\n'));
+    profiles.forEach(p => {
+      const marker = p.active ? chalk.green(' (active)') : '';
+      console.log(`  ${p.active ? chalk.green('*') : ' '} ${chalk.cyan(p.name)}${marker} - ${chalk.gray(p.domain)}`);
+    });
+  });
+
+profileCmd
+  .command('use <name>')
+  .description('Set the active configuration profile')
+  .action((name) => {
+    try {
+      setActiveProfile(name);
+      console.log(chalk.green(`Switched to profile "${name}"`));
+    } catch (error) {
+      console.error(chalk.red('Error:'), error.message);
+      process.exit(1);
+    }
+  });
+
+profileCmd
+  .command('add <name>')
+  .description('Add a new configuration profile interactively')
+  .option('-d, --domain <domain>', 'Confluence domain')
+  .option('--protocol <protocol>', 'Protocol (http or https)')
+  .option('-p, --api-path <path>', 'REST API path')
+  .option('-a, --auth-type <type>', 'Authentication type (basic or bearer)')
+  .option('-e, --email <email>', 'Email or username for basic auth')
+  .option('-t, --token <token>', 'API token')
+  .action(async (name, options) => {
+    if (!isValidProfileName(name)) {
+      console.error(chalk.red('Invalid profile name. Use only letters, numbers, hyphens, and underscores.'));
+      process.exit(1);
+    }
+    await initConfig({ ...options, profile: name });
+  });
+
+profileCmd
+  .command('remove <name>')
+  .description('Remove a configuration profile')
+  .action(async (name) => {
+    try {
+      const { confirmed } = await inquirer.prompt([{
+        type: 'confirm',
+        name: 'confirmed',
+        message: `Delete profile "${name}"?`,
+        default: false
+      }]);
+      if (!confirmed) {
+        console.log(chalk.yellow('Cancelled.'));
+        return;
+      }
+      deleteProfile(name);
+      console.log(chalk.green(`Profile "${name}" removed.`));
+    } catch (error) {
+      console.error(chalk.red('Error:'), error.message);
+      process.exit(1);
+    }
+  });
+
 // Exported for testing
 module.exports = {
+  program,
   _test: {
     EXPORT_MARKER,
     writeExportMarker,

package/bin/index.js

@@ -21,4 +21,9 @@ if (!nodeVersion.startsWith('v') ||
 }
 
 // Load the main CLI application
-require('./confluence.js');
+const { program } = require('./confluence.js');
+
+if (process.argv.length <= 2) {
+  program.help({ error: false });
+}
+program.parse(process.argv);

package/lib/config.js

@@ -6,12 +6,15 @@ const chalk = require('chalk');
 
 const CONFIG_DIR = path.join(os.homedir(), '.confluence-cli');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
+const DEFAULT_PROFILE = 'default';
 
 const AUTH_CHOICES = [
   { name: 'Basic (credentials)', value: 'basic' },
   { name: 'Bearer token', value: 'bearer' }
 ];
 
+const isValidProfileName = (name) => /^[a-zA-Z0-9_-]+$/.test(name);
+
 const requiredInput = (label) => (input) => {
   if (!input || !input.trim()) {
     return `${label} is required`;
@@ -68,6 +71,47 @@ const normalizeApiPath = (rawValue, domain) => {
   return withoutTrailing || inferApiPath(domain);
 };
 
+// Read config file with backward compatibility for old flat format
+function readConfigFile() {
+  if (!fs.existsSync(CONFIG_FILE)) {
+    return null;
+  }
+
+  try {
+    const raw = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
+
+    // Detect old flat format (has domain at top level, no profiles key)
+    if (raw.domain && !raw.profiles) {
+      const profile = {
+        domain: raw.domain,
+        protocol: raw.protocol,
+        apiPath: raw.apiPath,
+        token: raw.token,
+        authType: raw.authType
+      };
+      if (raw.email) {
+        profile.email = raw.email;
+      }
+      return {
+        activeProfile: DEFAULT_PROFILE,
+        profiles: { [DEFAULT_PROFILE]: profile }
+      };
+    }
+
+    return raw;
+  } catch {
+    return null;
+  }
+}
+
+// Write the full multi-profile config structure
+function saveConfigFile(data) {
+  if (!fs.existsSync(CONFIG_DIR)) {
+    fs.mkdirSync(CONFIG_DIR, { recursive: true });
+  }
+  fs.writeFileSync(CONFIG_FILE, JSON.stringify(data, null, 2));
+}
+
 // Helper function to validate CLI-provided options
 const validateCliOptions = (options) => {
   const errors = [];
@@ -115,23 +159,36 @@ const validateCliOptions = (options) => {
 };
 
 // Helper function to save configuration with validation
-const saveConfig = (configData) => {
-  if (!fs.existsSync(CONFIG_DIR)) {
-    fs.mkdirSync(CONFIG_DIR, { recursive: true });
-  }
-
+const saveConfig = (configData, profileName) => {
   const config = {
     domain: configData.domain.trim(),
     protocol: normalizeProtocol(configData.protocol),
     apiPath: normalizeApiPath(configData.apiPath, configData.domain),
     token: configData.token.trim(),
-    authType: configData.authType,
-    email: configData.authType === 'basic' && configData.email ? configData.email.trim() : undefined
+    authType: configData.authType
   };
 
-  fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
+  if (configData.authType === 'basic' && configData.email) {
+    config.email = configData.email.trim();
+  }
+
+  // Read existing config file (or create new structure)
+  const fileData = readConfigFile() || { activeProfile: DEFAULT_PROFILE, profiles: {} };
+
+  const targetProfile = profileName || fileData.activeProfile || DEFAULT_PROFILE;
+  fileData.profiles[targetProfile] = config;
+
+  // If this is the first profile, make it active
+  if (!fileData.activeProfile || !fileData.profiles[fileData.activeProfile]) {
+    fileData.activeProfile = targetProfile;
+  }
+
+  saveConfigFile(fileData);
 
   console.log(chalk.green('✅ Configuration saved successfully!'));
+  if (profileName) {
+    console.log(`Profile: ${chalk.cyan(targetProfile)}`);
+  }
   console.log(`Config file location: ${chalk.gray(CONFIG_FILE)}`);
   console.log(chalk.yellow('\n💡 Tip: You can regenerate this config anytime by running "confluence init"'));
 };
@@ -232,6 +289,14 @@ const promptForMissingValues = async (providedValues) => {
 };
 
 async function initConfig(cliOptions = {}) {
+  const profileName = cliOptions.profile;
+
+  // Validate profile name if provided
+  if (profileName && !isValidProfileName(profileName)) {
+    console.error(chalk.red('❌ Invalid profile name. Use only letters, numbers, hyphens, and underscores.'));
+    process.exit(1);
+  }
+
   // Extract provided values from CLI options
   const providedValues = {
     protocol: cliOptions.protocol,
@@ -248,6 +313,9 @@ async function initConfig(cliOptions = {}) {
   if (!hasCliOptions) {
     // Interactive mode: no CLI options provided
     console.log(chalk.blue('🚀 Confluence CLI Configuration'));
+    if (profileName) {
+      console.log(`Profile: ${chalk.cyan(profileName)}`);
+    }
     console.log('Please provide your Confluence connection details:\n');
 
     const answers = await inquirer.prompt([
@@ -307,7 +375,7 @@ async function initConfig(cliOptions = {}) {
       }
     ]);
 
-    saveConfig(answers);
+    saveConfig(answers, profileName);
     return;
   }
 
@@ -325,8 +393,8 @@ async function initConfig(cliOptions = {}) {
   // Check if all required values are provided for non-interactive mode
   // Non-interactive requires: domain, token, and either authType or email (for inference)
   const hasRequiredValues = Boolean(
-    providedValues.domain && 
-    providedValues.token && 
+    providedValues.domain &&
+    providedValues.token &&
     (providedValues.authType || providedValues.email)
   );
 
@@ -341,7 +409,7 @@ async function initConfig(cliOptions = {}) {
 
       const normalizedAuthType = normalizeAuthType(inferredAuthType, Boolean(providedValues.email));
       const normalizedDomain = providedValues.domain.trim();
-      
+
       // Verify basic auth has email
       if (normalizedAuthType === 'basic' && !providedValues.email) {
         console.error(chalk.red('❌ Email is required for basic authentication'));
@@ -362,7 +430,7 @@ async function initConfig(cliOptions = {}) {
         email: providedValues.email
       };
 
-      saveConfig(configData);
+      saveConfig(configData, profileName);
     } catch (error) {
       console.error(chalk.red(`❌ ${error.message}`));
       process.exit(1);
@@ -373,21 +441,24 @@ async function initConfig(cliOptions = {}) {
   // Hybrid mode: some values provided, prompt for the rest
   try {
     console.log(chalk.blue('🚀 Confluence CLI Configuration'));
+    if (profileName) {
+      console.log(`Profile: ${chalk.cyan(profileName)}`);
+    }
     console.log('Completing configuration with interactive prompts:\n');
 
     const mergedValues = await promptForMissingValues(providedValues);
-    
+
     // Normalize auth type
     mergedValues.authType = normalizeAuthType(mergedValues.authType, Boolean(mergedValues.email));
-    
-    saveConfig(mergedValues);
+
+    saveConfig(mergedValues, profileName);
   } catch (error) {
     console.error(chalk.red(`❌ ${error.message}`));
     process.exit(1);
   }
 }
 
-function getConfig() {
+function getConfig(profileName) {
   const envDomain = process.env.CONFLUENCE_DOMAIN || process.env.CONFLUENCE_HOST;
   const envToken = process.env.CONFLUENCE_API_TOKEN || process.env.CONFLUENCE_PASSWORD;
   const envEmail = process.env.CONFLUENCE_EMAIL || process.env.CONFLUENCE_USERNAME;
@@ -422,15 +493,34 @@ function getConfig() {
     };
   }
 
-  if (!fs.existsSync(CONFIG_FILE)) {
+  // Resolve profile: explicit param > CONFLUENCE_PROFILE env var > activeProfile > default
+  const resolvedProfileName = profileName
+    || process.env.CONFLUENCE_PROFILE
+    || null;
+
+  const fileData = readConfigFile();
+
+  if (!fileData) {
     console.error(chalk.red('❌ No configuration found!'));
     console.log(chalk.yellow('Please run "confluence init" to set up your configuration.'));
     console.log(chalk.gray('Or set environment variables: CONFLUENCE_DOMAIN, CONFLUENCE_API_TOKEN (or CONFLUENCE_PASSWORD), CONFLUENCE_EMAIL (or CONFLUENCE_USERNAME), and optionally CONFLUENCE_API_PATH, CONFLUENCE_PROTOCOL.'));
     process.exit(1);
   }
 
+  const targetProfile = resolvedProfileName || fileData.activeProfile || DEFAULT_PROFILE;
+  const storedConfig = fileData.profiles && fileData.profiles[targetProfile];
+
+  if (!storedConfig) {
+    console.error(chalk.red(`❌ Profile "${targetProfile}" not found!`));
+    const available = fileData.profiles ? Object.keys(fileData.profiles) : [];
+    if (available.length > 0) {
+      console.log(chalk.yellow(`Available profiles: ${available.join(', ')}`));
+    }
+    console.log(chalk.yellow('Run "confluence init --profile <name>" to create it, or "confluence profile list" to see available profiles.'));
+    process.exit(1);
+  }
+
   try {
-    const storedConfig = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
     const trimmedDomain = (storedConfig.domain || '').trim();
     const trimmedToken = (storedConfig.token || '').trim();
     const trimmedEmail = storedConfig.email ? storedConfig.email.trim() : undefined;
@@ -472,7 +562,60 @@ function getConfig() {
   }
 }
 
+function listProfiles() {
+  const fileData = readConfigFile();
+  if (!fileData || !fileData.profiles || Object.keys(fileData.profiles).length === 0) {
+    return { activeProfile: null, profiles: [] };
+  }
+  return {
+    activeProfile: fileData.activeProfile,
+    profiles: Object.keys(fileData.profiles).map(name => ({
+      name,
+      active: name === fileData.activeProfile,
+      domain: fileData.profiles[name].domain
+    }))
+  };
+}
+
+function setActiveProfile(profileName) {
+  const fileData = readConfigFile();
+  if (!fileData) {
+    throw new Error('No configuration file found. Run "confluence init" first.');
+  }
+  if (!fileData.profiles || !fileData.profiles[profileName]) {
+    const available = fileData.profiles ? Object.keys(fileData.profiles) : [];
+    throw new Error(`Profile "${profileName}" not found. Available: ${available.join(', ')}`);
+  }
+  fileData.activeProfile = profileName;
+  saveConfigFile(fileData);
+}
+
+function deleteProfile(profileName) {
+  const fileData = readConfigFile();
+  if (!fileData) {
+    throw new Error('No configuration file found. Run "confluence init" first.');
+  }
+  if (!fileData.profiles || !fileData.profiles[profileName]) {
+    throw new Error(`Profile "${profileName}" not found.`);
+  }
+  if (Object.keys(fileData.profiles).length === 1) {
+    throw new Error('Cannot delete the only remaining profile.');
+  }
+  delete fileData.profiles[profileName];
+  if (fileData.activeProfile === profileName) {
+    fileData.activeProfile = Object.keys(fileData.profiles)[0];
+  }
+  saveConfigFile(fileData);
+}
+
 module.exports = {
   initConfig,
-  getConfig
+  getConfig,
+  listProfiles,
+  setActiveProfile,
+  deleteProfile,
+  isValidProfileName,
+  CONFIG_DIR,
+  CONFIG_FILE,
+  DEFAULT_PROFILE
 };

package/package.json

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