claude-autopm 2.7.0 → 2.8.2

package/lib/cli/commands/issue.js

@@ -351,33 +351,142 @@ async function issueEdit(argv) {
  * @param {Object} argv - Command arguments
  */
 async function issueSync(argv) {
-  const spinner = ora(`Syncing issue: #${argv.number}`).start();
+  const provider = argv.provider || 'github';
+  const spinner = ora(`Syncing issue: #${argv.number} (${provider})`).start();
 
   try {
-    const issueService = new IssueService();
+    let providerInstance;
+    let issueService;
+
+    // Load provider based on --provider flag
+    if (provider === 'azure') {
+      // Load Azure DevOps provider
+      const AzureDevOpsProvider = require('../../providers/AzureDevOpsProvider');
+      providerInstance = new AzureDevOpsProvider({
+        token: process.env.AZURE_DEVOPS_PAT,
+        organization: process.env.AZURE_DEVOPS_ORG,
+        project: process.env.AZURE_DEVOPS_PROJECT
+      });
 
-    // Check if issue exists
-    const issue = await issueService.getLocalIssue(argv.number);
+      await providerInstance.authenticate();
+      issueService = new IssueService({ provider: providerInstance });
 
-    // TODO: Implement provider integration
-    // For now, just show a message
-    spinner.info(chalk.yellow('Provider sync not yet implemented'));
+      let result;
 
-    console.log(chalk.yellow(`\n⚠️  GitHub/Azure sync feature coming soon!\n`));
+      if (argv.push) {
+        // Push to Azure
+        spinner.text = 'Pushing to Azure DevOps...';
+        result = await issueService.syncToAzure(argv.number, { detectConflicts: true });
+      } else if (argv.pull && argv.azure) {
+        // Pull from Azure
+        spinner.text = 'Pulling from Azure DevOps...';
+        result = await issueService.syncFromAzure(argv.azure, { detectConflicts: true });
+      } else {
+        // Default: bidirectional sync
+        spinner.text = 'Bidirectional sync...';
+        result = await issueService.syncBidirectionalAzure(argv.number, { conflictStrategy: 'detect' });
+      }
 
-    console.log(chalk.dim('This feature will:'));
-    console.log(chalk.dim('  - Create GitHub/Azure issue if not exists'));
-    console.log(chalk.dim('  - Update existing issue'));
-    console.log(chalk.dim('  - Sync issue status and comments\n'));
+      if (!result.success && result.conflict) {
+        spinner.warn(chalk.yellow('Conflict detected'));
 
-    console.log(chalk.bold('For now, you can:'));
-    console.log(`  ${chalk.cyan('1.')} View issue:      ${chalk.yellow('autopm issue show ' + argv.number)}`);
-    console.log(`  ${chalk.cyan('2.')} Check status:    ${chalk.yellow('autopm issue status ' + argv.number)}\n`);
+        console.log(chalk.yellow(`\n⚠️  Sync Conflict Detected!\n`));
+        console.log(chalk.bold('Conflict Details:'));
+        console.log(`  Local newer:   ${result.conflict.localNewer}`);
+        console.log(`  Remote newer:  ${result.conflict.remoteNewer}\n`);
+
+        console.log(chalk.bold('Resolution Options:'));
+        console.log(`  ${chalk.cyan('1.')} Use local:    ${chalk.yellow('autopm issue sync-resolve ' + argv.number + ' --provider azure --strategy local')}`);
+        console.log(`  ${chalk.cyan('2.')} Use remote:   ${chalk.yellow('autopm issue sync-resolve ' + argv.number + ' --provider azure --strategy remote')}`);
+        console.log(`  ${chalk.cyan('3.')} Use newest:   ${chalk.yellow('autopm issue sync-resolve ' + argv.number + ' --provider azure --strategy newest')}\n`);
+      } else {
+        spinner.succeed(chalk.green('Sync complete'));
+
+        console.log(chalk.green(`\n✅ Issue #${argv.number} synced successfully!\n`));
+        console.log(chalk.bold('Sync Details:'));
+        console.log(`  Provider:      Azure DevOps`);
+        console.log(`  Action:        ${result.action || 'synced'}`);
+        if (result.workItemId) {
+          console.log(`  Work Item #:   ${result.workItemId}`);
+        }
+        if (result.direction) {
+          console.log(`  Direction:     ${result.direction}`);
+        }
+        console.log();
+      }
+
+    } else {
+      // Load GitHub provider (default)
+      const GitHubProvider = require('../../providers/GitHubProvider');
+      providerInstance = new GitHubProvider({
+        token: process.env.GITHUB_TOKEN,
+        owner: process.env.GITHUB_OWNER || process.env.GITHUB_USER,
+        repo: process.env.GITHUB_REPO
+      });
+
+      await providerInstance.authenticate();
+      issueService = new IssueService({ provider: providerInstance });
+
+      let result;
+
+      if (argv.push) {
+        // Push to GitHub
+        spinner.text = 'Pushing to GitHub...';
+        result = await issueService.syncToGitHub(argv.number, { detectConflicts: true });
+      } else if (argv.pull && argv.github) {
+        // Pull from GitHub
+        spinner.text = 'Pulling from GitHub...';
+        result = await issueService.syncFromGitHub(argv.github, { detectConflicts: true });
+      } else {
+        // Default: bidirectional sync
+        spinner.text = 'Bidirectional sync...';
+        result = await issueService.syncBidirectional(argv.number, { conflictStrategy: 'detect' });
+      }
+
+      if (!result.success && result.conflict) {
+        spinner.warn(chalk.yellow('Conflict detected'));
+
+        console.log(chalk.yellow(`\n⚠️  Sync Conflict Detected!\n`));
+        console.log(chalk.bold('Conflict Details:'));
+        console.log(`  Local newer:   ${result.conflict.localNewer}`);
+        console.log(`  Remote newer:  ${result.conflict.remoteNewer}`);
+        console.log(`  Fields:        ${result.conflict.conflictFields.join(', ')}\n`);
+
+        console.log(chalk.bold('Resolution Options:'));
+        console.log(`  ${chalk.cyan('1.')} Use local:    ${chalk.yellow('autopm issue sync-resolve ' + argv.number + ' --strategy local')}`);
+        console.log(`  ${chalk.cyan('2.')} Use remote:   ${chalk.yellow('autopm issue sync-resolve ' + argv.number + ' --strategy remote')}`);
+        console.log(`  ${chalk.cyan('3.')} Use newest:   ${chalk.yellow('autopm issue sync-resolve ' + argv.number + ' --strategy newest')}\n`);
+      } else {
+        spinner.succeed(chalk.green('Sync complete'));
+
+        console.log(chalk.green(`\n✅ Issue #${argv.number} synced successfully!\n`));
+        console.log(chalk.bold('Sync Details:'));
+        console.log(`  Provider:      GitHub`);
+        console.log(`  Action:        ${result.action || 'synced'}`);
+        if (result.githubNumber) {
+          console.log(`  GitHub #:      ${result.githubNumber}`);
+        }
+        if (result.direction) {
+          console.log(`  Direction:     ${result.direction}`);
+        }
+        console.log();
+      }
+    }
 
   } catch (error) {
     spinner.fail(chalk.red('Failed to sync issue'));
 
-    if (error.message.includes('not found')) {
+    if (error.message.includes('GITHUB_TOKEN')) {
+      console.error(chalk.red(`\n❌ GitHub token not configured`));
+      console.error(chalk.yellow('Set: export GITHUB_TOKEN=your_token'));
+      console.error(chalk.yellow('Set: export GITHUB_OWNER=username'));
+      console.error(chalk.yellow('Set: export GITHUB_REPO=repository\n'));
+    } else if (error.message.includes('AZURE_DEVOPS_PAT')) {
+      console.error(chalk.red(`\n❌ Azure DevOps token not configured`));
+      console.error(chalk.yellow('Set: export AZURE_DEVOPS_PAT=your_pat_token'));
+      console.error(chalk.yellow('Set: export AZURE_DEVOPS_ORG=your_organization'));
+      console.error(chalk.yellow('Set: export AZURE_DEVOPS_PROJECT=your_project\n'));
+    } else if (error.message.includes('not found')) {
       console.error(chalk.red(`\nError: ${error.message}`));
     } else {
       console.error(chalk.red(`\nError: ${error.message}`));
@@ -385,6 +494,180 @@ async function issueSync(argv) {
   }
 }
 
+/**
+ * Check sync status of an issue
+ * @param {Object} argv - Command arguments
+ */
+async function issueSyncStatus(argv) {
+  const provider = argv.provider || 'github';
+  const spinner = ora(`Checking sync status: #${argv.number} (${provider})`).start();
+
+  try {
+    let providerInstance;
+    let issueService;
+
+    if (provider === 'azure') {
+      // Load Azure DevOps provider
+      const AzureDevOpsProvider = require('../../providers/AzureDevOpsProvider');
+      providerInstance = new AzureDevOpsProvider({
+        token: process.env.AZURE_DEVOPS_PAT,
+        organization: process.env.AZURE_DEVOPS_ORG,
+        project: process.env.AZURE_DEVOPS_PROJECT
+      });
+
+      await providerInstance.authenticate();
+      issueService = new IssueService({ provider: providerInstance });
+      const status = await issueService.getAzureSyncStatus(argv.number);
+
+      spinner.succeed(chalk.green('Status retrieved'));
+
+      console.log('\n' + chalk.bold('🔄 Sync Status (Azure DevOps)') + '\n');
+      console.log(chalk.gray('─'.repeat(50)) + '\n');
+
+      console.log(chalk.bold('Issue:'));
+      console.log(`  Local #:        ${status.localNumber}`);
+      console.log(`  Work Item #:    ${status.workItemId || 'Not synced'}`);
+      console.log(`  Status:         ${status.synced ? chalk.green('✓ Synced') : chalk.yellow('⚠ Out of sync')}`);
+
+      if (status.lastSync) {
+        console.log(`  Last Sync:      ${new Date(status.lastSync).toLocaleString()}`);
+      }
+
+      console.log('\n' + chalk.gray('─'.repeat(50)) + '\n');
+
+      if (!status.synced) {
+        console.log(chalk.yellow('💡 Tip: Run sync to update:'));
+        console.log(`   ${chalk.cyan('autopm issue sync ' + argv.number + ' --provider azure')}\n`);
+      }
+
+    } else {
+      // Load GitHub provider
+      const GitHubProvider = require('../../providers/GitHubProvider');
+      providerInstance = new GitHubProvider({
+        token: process.env.GITHUB_TOKEN,
+        owner: process.env.GITHUB_OWNER || process.env.GITHUB_USER,
+        repo: process.env.GITHUB_REPO
+      });
+
+      await providerInstance.authenticate();
+      issueService = new IssueService({ provider: providerInstance });
+      const status = await issueService.getSyncStatus(argv.number);
+
+    spinner.succeed(chalk.green('Status retrieved'));
+
+    console.log('\n' + chalk.bold('🔄 Sync Status') + '\n');
+    console.log(chalk.gray('─'.repeat(50)) + '\n');
+
+    console.log(chalk.bold('Issue:'));
+    console.log(`  Local #:       ${status.localNumber}`);
+    console.log(`  GitHub #:      ${status.githubNumber || 'Not synced'}`);
+    console.log(`  Status:        ${status.synced ? chalk.green('✓ Synced') : chalk.yellow('⚠ Out of sync')}`);
+
+    if (status.lastSync) {
+      console.log(`  Last Sync:     ${new Date(status.lastSync).toLocaleString()}`);
+    }
+
+    console.log('\n' + chalk.gray('─'.repeat(50)) + '\n');
+
+    if (!status.synced) {
+      console.log(chalk.yellow('💡 Tip: Run sync to update:'));
+      console.log(`   ${chalk.cyan('autopm issue sync ' + argv.number)}\n`);
+    }
+    }
+
+  } catch (error) {
+    spinner.fail(chalk.red('Failed to check status'));
+    console.error(chalk.red(`\nError: ${error.message}`));
+  }
+}
+
+/**
+ * Resolve sync conflict
+ * @param {Object} argv - Command arguments
+ */
+async function issueSyncResolve(argv) {
+  const provider = argv.provider || 'github';
+  const spinner = ora(`Resolving conflict: #${argv.number} (${provider})`).start();
+
+  try {
+    let providerInstance;
+    let issueService;
+
+    if (provider === 'azure') {
+      // Load Azure DevOps provider
+      const AzureDevOpsProvider = require('../../providers/AzureDevOpsProvider');
+      providerInstance = new AzureDevOpsProvider({
+        token: process.env.AZURE_DEVOPS_PAT,
+        organization: process.env.AZURE_DEVOPS_ORG,
+        project: process.env.AZURE_DEVOPS_PROJECT
+      });
+
+      await providerInstance.authenticate();
+      issueService = new IssueService({ provider: providerInstance });
+      const result = await issueService.resolveAzureConflict(argv.number, argv.strategy);
+
+      if (result.resolved) {
+        spinner.succeed(chalk.green('Conflict resolved'));
+
+        console.log(chalk.green(`\n✅ Conflict resolved using "${result.appliedStrategy}" strategy\n`));
+        console.log(chalk.bold('Result:'));
+        console.log(`  Provider:      Azure DevOps`);
+        console.log(`  Action:        ${result.result.action || 'resolved'}`);
+        if (result.result.workItemId) {
+          console.log(`  Work Item #:   ${result.result.workItemId}`);
+        }
+        console.log();
+      } else {
+        spinner.info(chalk.yellow('Manual resolution required'));
+
+        console.log(chalk.yellow(`\n⚠️  Manual resolution required\n`));
+        console.log(chalk.bold('Available strategies:'));
+        console.log(`  ${chalk.cyan('local')}   - Use local version`);
+        console.log(`  ${chalk.cyan('remote')}  - Use remote (Azure DevOps) version`);
+        console.log(`  ${chalk.cyan('newest')}  - Use most recently updated\n`);
+      }
+
+    } else {
+      // Load GitHub provider (default)
+      const GitHubProvider = require('../../providers/GitHubProvider');
+      providerInstance = new GitHubProvider({
+        token: process.env.GITHUB_TOKEN,
+        owner: process.env.GITHUB_OWNER || process.env.GITHUB_USER,
+        repo: process.env.GITHUB_REPO
+      });
+
+      await providerInstance.authenticate();
+      issueService = new IssueService({ provider: providerInstance });
+      const result = await issueService.resolveConflict(argv.number, argv.strategy);
+
+      if (result.resolved) {
+        spinner.succeed(chalk.green('Conflict resolved'));
+
+        console.log(chalk.green(`\n✅ Conflict resolved using "${result.appliedStrategy}" strategy\n`));
+        console.log(chalk.bold('Result:'));
+        console.log(`  Provider:      GitHub`);
+        console.log(`  Action:        ${result.result.action || 'resolved'}`);
+        if (result.result.githubNumber) {
+          console.log(`  GitHub #:      ${result.result.githubNumber}`);
+        }
+        console.log();
+      } else {
+        spinner.info(chalk.yellow('Manual resolution required'));
+
+        console.log(chalk.yellow(`\n⚠️  Manual resolution required\n`));
+        console.log(chalk.bold('Available strategies:'));
+        console.log(`  ${chalk.cyan('local')}   - Use local version`);
+        console.log(`  ${chalk.cyan('remote')}  - Use remote (GitHub) version`);
+        console.log(`  ${chalk.cyan('newest')}  - Use most recently updated\n`);
+      }
+    }
+
+  } catch (error) {
+    spinner.fail(chalk.red('Failed to resolve conflict'));
+    console.error(chalk.red(`\nError: ${error.message}`));
+  }
+}
+
 /**
  * Command builder - registers all subcommands
  * @param {Object} yargs - Yargs instance
@@ -467,6 +750,12 @@ function builder(yargs) {
             describe: 'Issue number',
             type: 'number'
           })
+          .option('provider', {
+            describe: 'Provider to sync with',
+            type: 'string',
+            choices: ['github', 'azure'],
+            default: 'github'
+          })
           .option('push', {
             describe: 'Push local changes to provider',
             type: 'boolean',
@@ -477,12 +766,59 @@ function builder(yargs) {
             type: 'boolean',
             default: false
           })
-          .example('autopm issue sync 123', 'Sync issue #123 with provider')
-          .example('autopm issue sync 123 --push', 'Push local changes')
-          .example('autopm issue sync 123 --pull', 'Pull remote updates');
+          .example('autopm issue sync 123', 'Sync issue #123 with GitHub (default)')
+          .example('autopm issue sync 123 --provider azure', 'Sync with Azure DevOps')
+          .example('autopm issue sync 123 --push', 'Push local changes to GitHub')
+          .example('autopm issue sync 123 --provider azure --push', 'Push to Azure DevOps');
       },
       issueSync
     )
+    .command(
+      'sync-status <number>',
+      'Check sync status for issue',
+      (yargs) => {
+        return yargs
+          .positional('number', {
+            describe: 'Issue number',
+            type: 'number'
+          })
+          .option('provider', {
+            describe: 'Provider to check status with',
+            type: 'string',
+            choices: ['github', 'azure'],
+            default: 'github'
+          })
+          .example('autopm issue sync-status 123', 'Check GitHub sync status (default)')
+          .example('autopm issue sync-status 123 --provider azure', 'Check Azure DevOps sync status');
+      },
+      issueSyncStatus
+    )
+    .command(
+      'sync-resolve <number>',
+      'Resolve sync conflict',
+      (yargs) => {
+        return yargs
+          .positional('number', {
+            describe: 'Issue number',
+            type: 'number'
+          })
+          .option('provider', {
+            describe: 'Provider to resolve conflict with',
+            type: 'string',
+            choices: ['github', 'azure'],
+            default: 'github'
+          })
+          .option('strategy', {
+            describe: 'Resolution strategy',
+            type: 'string',
+            choices: ['local', 'remote', 'newest', 'manual'],
+            demandOption: true
+          })
+          .example('autopm issue sync-resolve 123 --strategy newest', 'Use newest version (GitHub)')
+          .example('autopm issue sync-resolve 123 --provider azure --strategy local', 'Use local version (Azure)');
+      },
+      issueSyncResolve
+    )
     .demandCommand(1, 'You must specify an issue command')
     .strictCommands()
     .help();
@@ -506,6 +842,8 @@ module.exports = {
       console.log('  status <number>       Check issue status');
       console.log('  edit <number>         Edit issue in editor');
       console.log('  sync <number>         Sync with GitHub/Azure');
+      console.log('  sync-status <number>  Check sync status');
+      console.log('  sync-resolve <number> Resolve sync conflict');
       console.log('\nUse: autopm issue <command> --help for more info\n');
     }
   },
@@ -515,6 +853,8 @@ module.exports = {
     close: issueClose,
     status: issueStatus,
     edit: issueEdit,
-    sync: issueSync
+    sync: issueSync,
+    syncStatus: issueSyncStatus,
+    syncResolve: issueSyncResolve
   }
 };