abapgit-agent 1.8.5 → 1.8.7

package/bin/abapgit-agent

@@ -24,7 +24,7 @@ const gitUtils = require('../src/utils/git-utils');
 const versionCheck = require('../src/utils/version-check');
 const validators = require('../src/utils/validators');
 const { AbapHttp } = require('../src/utils/abap-http');
-const { loadConfig, getTransport, isAbapIntegrationEnabled } = require('../src/config');
+const { loadConfig, getTransport, isAbapIntegrationEnabled, getSafeguards } = require('../src/config');
 
 // Get terminal width for responsive table
 const getTermWidth = () => process.stdout.columns || 80;
@@ -52,7 +52,8 @@ async function main() {
     where: require('../src/commands/where'),
     ref: require('../src/commands/ref'),
     init: require('../src/commands/init'),
-    pull: require('../src/commands/pull')
+    pull: require('../src/commands/pull'),
+    upgrade: require('../src/commands/upgrade')
   };
 
   // Check if this is a modular command
@@ -98,11 +99,17 @@ To enable integration:
       isAbapIntegrationEnabled,
       loadConfig,
       AbapHttp,
-      getTransport
+      getTransport,
+      getSafeguards
     };
 
     // Execute command
     await cmd.execute(args.slice(1), context);
+
+    // Show new version reminder (non-blocking, cached daily)
+    if (command !== 'upgrade') {
+      await versionCheck.showNewVersionReminder();
+    }
     return;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abapgit-agent",
-  "version": "1.8.5",
+  "version": "1.8.7",
   "description": "ABAP Git Agent - Pull and activate ABAP code via abapGit from any git repository",
   "main": "src/index.js",
   "files": [
@@ -33,6 +33,7 @@
     "test:cmd:view": "node tests/run-all.js --cmd --command=view",
     "test:cmd:preview": "node tests/run-all.js --cmd --command=preview",
     "test:cmd:tree": "node tests/run-all.js --cmd --command=tree",
+    "test:cmd:upgrade": "node tests/run-all.js --cmd --command=upgrade",
     "test:lifecycle": "node tests/run-all.js --lifecycle",
     "test:pull": "node tests/run-all.js --pull",
     "pull": "node bin/abapgit-agent",

package/src/commands/import.js

@@ -2,6 +2,14 @@
  * Import command - Import existing objects from package to git repository
  */
 
+const {
+  startBackgroundJob,
+  pollForCompletion,
+  displayProgress,
+  formatTimestamp,
+  calculateTimeSpent
+} = require('../utils/backgroundJobPoller');
+
 module.exports = {
   name: 'import',
   description: 'Import existing objects from package to git repository',
@@ -9,9 +17,10 @@ module.exports = {
   requiresVersionCheck: true,
 
   async execute(args, context) {
-    const { loadConfig, gitUtils, AbapHttp } = context;
+    try {
+      const { loadConfig, gitUtils, AbapHttp } = context;
 
-    // Show help if requested
+      // Show help if requested
     const helpIndex = args.findIndex(a => a === '--help' || a === '-h');
     if (helpIndex !== -1) {
       console.log(`
@@ -22,6 +31,9 @@ Description:
   Import existing objects from package to git repository.
   Uses the git remote URL to find the abapGit online repository.
 
+  This command runs asynchronously using a background job and displays
+  real-time progress updates.
+
 Prerequisites:
   - Run "abapgit-agent create" first or create repository in abapGit UI
   - Package must have objects to import
@@ -51,7 +63,7 @@ Examples:
       commitMessage = args[messageArgIndex + 1];
     }
 
-    console.log(`\n📦 Importing objects to git repository`);
+    console.log(`\n📦 Starting import job`);
     console.log(`   URL: ${repoUrl}`);
     if (commitMessage) {
       console.log(`   Message: ${commitMessage}`);
@@ -76,23 +88,69 @@ Examples:
       data.password = config.gitPassword;
     }
 
-    const result = await http.post('/sap/bc/z_abapgit_agent/import', data, { csrfToken });
+    // Step 1: Start the background job
+    const endpoint = '/sap/bc/z_abapgit_agent/import';
+    const jobInfo = await startBackgroundJob(http, endpoint, data, csrfToken);
 
-    console.log('\n');
+    console.log(`✅ Job started: ${jobInfo.jobNumber}`);
+    console.log('');
 
-    // Handle uppercase keys from ABAP
-    const success = result.SUCCESS || result.success;
-    const filesStaged = result.FILES_STAGED || result.files_staged;
-    const abapCommitMessage = result.COMMIT_MESSAGE || result.commit_message;
-    const error = result.ERROR || result.error;
+    // Step 2: Poll for completion with progress updates
+    const finalResult = await pollForCompletion(http, endpoint, jobInfo.jobNumber, {
+      pollInterval: 2000,
+      maxAttempts: 300,
+      onProgress: (progress, message) => {
+        displayProgress(progress, message);
+      }
+    });
 
-    if (success === 'X' || success === true) {
-      console.log(`✅ Objects imported successfully!`);
-      console.log(`   Files staged: ${filesStaged}`);
-      console.log(`   Commit: ${commitMessage || abapCommitMessage}`);
+    // Step 3: Show final result
+    console.log('\n');
+
+    if (finalResult.status === 'completed' && finalResult.result) {
+      // Parse result JSON string
+      let resultData;
+      try {
+        if (typeof finalResult.result === 'string') {
+          resultData = JSON.parse(finalResult.result);
+        } else {
+          resultData = finalResult.result;
+        }
+      } catch (e) {
+        resultData = { filesStaged: 'unknown', commitMessage: commitMessage };
+      }
+
+      console.log(`✅ Import completed successfully!`);
+      console.log(`   Files staged: ${resultData.filesStaged || resultData.FILES_STAGED || 'unknown'}`);
+      console.log(`   Commit: ${resultData.commitMessage || resultData.COMMIT_MESSAGE || commitMessage || 'Initial import'}`);
+      console.log(``);
+
+      // Calculate time spent
+      if (finalResult.startedAt && finalResult.completedAt) {
+        const timeSpent = calculateTimeSpent(finalResult.startedAt, finalResult.completedAt);
+        console.log(`⏱️  Time spent: ${timeSpent}`);
+      }
+
+      console.log(`📈 Stats:`);
+      console.log(`   Job number: ${jobInfo.jobNumber}`);
+      if (finalResult.startedAt) {
+        console.log(`   Started: ${formatTimestamp(finalResult.startedAt)}`);
+      }
+      if (finalResult.completedAt) {
+        console.log(`   Completed: ${formatTimestamp(finalResult.completedAt)}`);
+      }
     } else {
       console.log(`❌ Import failed`);
-      console.log(`   Error: ${error || 'Unknown error'}`);
+      console.log(`   Status: ${finalResult.status}`);
+      process.exit(1);
+    }
+    } catch (error) {
+      console.error('\n❌ Error during import:');
+      console.error(`   ${error.message || error}`);
+      if (error.response) {
+        console.error(`   HTTP Status: ${error.response.status}`);
+        console.error(`   Response: ${JSON.stringify(error.response.data)}`);
+      }
       process.exit(1);
     }
   }

package/src/commands/pull.js

@@ -9,7 +9,21 @@ module.exports = {
   requiresVersionCheck: true,
 
   async execute(args, context) {
-    const { loadConfig, AbapHttp, gitUtils, getTransport } = context;
+    const { loadConfig, AbapHttp, gitUtils, getTransport, getSafeguards } = context;
+
+    // Check project-level safeguards
+    const safeguards = getSafeguards();
+
+    // SAFEGUARD 1: Check if pull is completely disabled
+    if (safeguards.disablePull) {
+      console.error('❌ Error: pull command is disabled for this project\n');
+      if (safeguards.reason) {
+        console.error(`Reason: ${safeguards.reason}\n`);
+      }
+      console.error('The pull command has been disabled in .abapgit-agent.json');
+      console.error('Please contact the project maintainer to enable it.');
+      process.exit(1);
+    }
 
     const urlArgIndex = args.indexOf('--url');
     const branchArgIndex = args.indexOf('--branch');
@@ -36,6 +50,18 @@ module.exports = {
       files = args[filesArgIndex + 1].split(',').map(f => f.trim());
     }
 
+    // SAFEGUARD 2: Check if files are required but not provided
+    if (safeguards.requireFilesForPull && !files) {
+      console.error('❌ Error: --files parameter is required for this project\n');
+      if (safeguards.reason) {
+        console.error(`Reason: ${safeguards.reason}\n`);
+      }
+      console.error('Usage: abapgit-agent pull --files <file1>,<file2>\n');
+      console.error('This safeguard is configured in .abapgit-agent.json');
+      console.error('Contact the project maintainer if you need to change this setting.');
+      process.exit(1);
+    }
+
     if (!gitUrl) {
       gitUrl = gitUtils.getRemoteUrl();
       if (!gitUrl) {

package/src/commands/upgrade.js

@@ -0,0 +1,456 @@
+/**
+ * Upgrade command - Upgrade CLI and/or ABAP backend to latest or specific version
+ */
+
+const { execSync } = require('child_process');
+const readline = require('readline');
+
+module.exports = {
+  name: 'upgrade',
+  description: 'Upgrade CLI and/or ABAP backend to latest or specific version',
+  requiresAbapConfig: false,  // Checked conditionally
+  requiresVersionCheck: false, // Does its own version checks
+
+  async execute(args, context) {
+    const { versionCheck, loadConfig, isAbapIntegrationEnabled } = context;
+
+    // Parse flags
+    const flags = this.parseFlags(args);
+
+    // Validate flag combinations
+    try {
+      this.validateFlags(flags);
+    } catch (error) {
+      console.error(`❌ Error: ${error.message}`);
+      process.exit(1);
+    }
+
+    // Check if ABAP config is needed
+    const needsAbapConfig = !flags.cliOnly && !flags.checkOnly;
+    if (needsAbapConfig && !isAbapIntegrationEnabled()) {
+      console.error('❌ Error: .abapGitAgent config file not found');
+      console.error('   ABAP upgrade requires configuration.');
+      console.error('   Run: abapgit-agent init');
+      console.error('');
+      console.error('   Or use --cli-only to upgrade CLI package only.');
+      process.exit(1);
+    }
+
+    // Get current versions
+    const cliVersion = versionCheck.getCliVersion();
+    let abapVersion = null;
+
+    if (needsAbapConfig) {
+      try {
+        const config = loadConfig();
+        const { apiVersion } = await versionCheck.checkCompatibility(config);
+        abapVersion = apiVersion;
+      } catch (e) {
+        console.error(`⚠️  Could not fetch ABAP version: ${e.message}`);
+      }
+    }
+
+    // Get latest version from npm
+    const latestVersion = await versionCheck.getLatestNpmVersion();
+    if (!latestVersion && !flags.version && !flags.match) {
+      console.error('❌ Error: Could not fetch latest version from npm registry');
+      console.error('   Please check your internet connection or specify --version X.X.X');
+      process.exit(1);
+    }
+
+    // Validate specified version exists in npm registry
+    if (flags.version && !flags.abapOnly) {
+      const versionExists = await this.validateVersionExists(flags.version);
+      if (!versionExists) {
+        console.error(`❌ Error: Version ${flags.version} not found in npm registry`);
+        console.error('   Please check available versions at: https://www.npmjs.com/package/abapgit-agent?activeTab=versions');
+        process.exit(1);
+      }
+    }
+
+    // Determine target versions
+    const targets = this.determineTargets(flags, cliVersion, abapVersion, latestVersion);
+
+    // Check-only mode
+    if (flags.checkOnly) {
+      this.showCheckReport(cliVersion, abapVersion, latestVersion);
+      return;
+    }
+
+    // Dry-run mode
+    if (flags.dryRun) {
+      this.showDryRunPlan(cliVersion, abapVersion, targets, flags);
+      return;
+    }
+
+    // Show upgrade plan
+    if (!flags.yes) {
+      const proceed = await this.confirmUpgrade(cliVersion, abapVersion, targets, flags);
+      if (!proceed) {
+        console.log('Upgrade cancelled.');
+        return;
+      }
+    }
+
+    // Execute upgrade
+    await this.performUpgrade(targets, flags, context);
+
+    // Verify upgrade
+    await this.verifyUpgrade(targets, flags, context);
+  },
+
+  /**
+   * Parse command-line flags
+   */
+  parseFlags(args) {
+    return {
+      checkOnly: args.includes('--check'),
+      cliOnly: args.includes('--cli-only'),
+      abapOnly: args.includes('--abap-only'),
+      match: args.includes('--match'),
+      version: this.getArgValue(args, '--version'),
+      latest: args.includes('--latest'),
+      yes: args.includes('--yes') || args.includes('-y'),
+      dryRun: args.includes('--dry-run'),
+      transport: this.getArgValue(args, '--transport')
+    };
+  },
+
+  /**
+   * Get argument value following a flag
+   */
+  getArgValue(args, flag) {
+    const index = args.indexOf(flag);
+    if (index !== -1 && index + 1 < args.length) {
+      return args[index + 1];
+    }
+    return null;
+  },
+
+  /**
+   * Validate flag combinations
+   */
+  validateFlags(flags) {
+    // Invalid combinations
+    if (flags.match && flags.version) {
+      throw new Error('Cannot use --match and --version together');
+    }
+
+    if (flags.match && flags.cliOnly) {
+      throw new Error('Cannot use --match with --cli-only. --match upgrades ABAP to match CLI version');
+    }
+
+    if (flags.cliOnly && flags.abapOnly) {
+      throw new Error('Cannot use --cli-only and --abap-only together');
+    }
+  },
+
+  /**
+   * Validate that a version exists in npm registry
+   */
+  async validateVersionExists(version) {
+    return new Promise((resolve) => {
+      const { execSync } = require('child_process');
+      try {
+        // Use npm view to check if version exists
+        const output = execSync(`npm view abapgit-agent@${version} version 2>/dev/null`, {
+          encoding: 'utf8',
+          stdio: ['pipe', 'pipe', 'ignore']
+        }).trim();
+
+        // If npm view returns the version, it exists
+        resolve(output === version);
+      } catch (e) {
+        // Version doesn't exist or npm command failed
+        resolve(false);
+      }
+    });
+  },
+
+  /**
+   * Determine target versions for CLI and ABAP
+   */
+  determineTargets(flags, cliVersion, abapVersion, latestVersion) {
+    let cliTarget = null;
+    let abapTarget = null;
+
+    if (flags.match) {
+      // Match ABAP to CLI version
+      abapTarget = cliVersion;
+    } else if (flags.version) {
+      // Specific version
+      cliTarget = flags.cliOnly ? flags.version : (flags.abapOnly ? null : flags.version);
+      abapTarget = flags.abapOnly ? flags.version : (flags.cliOnly ? null : flags.version);
+    } else {
+      // Latest version (default)
+      cliTarget = flags.abapOnly ? null : latestVersion;
+      abapTarget = flags.cliOnly ? null : latestVersion;
+    }
+
+    return { cliTarget, abapTarget };
+  },
+
+  /**
+   * Show check-only report
+   */
+  showCheckReport(cliVersion, abapVersion, latestVersion) {
+    console.log('');
+    console.log('Current versions:');
+    console.log(`  CLI:  v${cliVersion}`);
+    if (abapVersion) {
+      console.log(`  ABAP: v${abapVersion}`);
+    }
+    console.log('');
+
+    if (latestVersion) {
+      console.log(`Latest available: v${latestVersion}`);
+      console.log('');
+    }
+
+    const needsCliUpgrade = latestVersion && cliVersion !== latestVersion;
+    const needsAbapUpgrade = abapVersion && latestVersion && abapVersion !== latestVersion;
+    const versionMismatch = abapVersion && cliVersion !== abapVersion;
+
+    if (versionMismatch) {
+      console.log('⚠️  Version mismatch detected');
+      console.log('');
+    } else if (!needsCliUpgrade && !needsAbapUpgrade) {
+      console.log('✅ All components are up to date');
+      console.log('');
+      return;
+    }
+
+    console.log('To upgrade:');
+    console.log('  Both:      abapgit-agent upgrade');
+    console.log('  CLI only:  abapgit-agent upgrade --cli-only');
+    if (abapVersion) {
+      console.log('  ABAP only: abapgit-agent upgrade --abap-only');
+      console.log('  Match:     abapgit-agent upgrade --match');
+    }
+    console.log('');
+  },
+
+  /**
+   * Show dry-run plan
+   */
+  showDryRunPlan(cliVersion, abapVersion, targets, flags) {
+    console.log('');
+    console.log('🔹 DRY RUN - No changes will be made');
+    console.log('');
+    console.log('Current versions:');
+    console.log(`  CLI:  v${cliVersion}`);
+    if (abapVersion) {
+      console.log(`  ABAP: v${abapVersion}`);
+    }
+    console.log('');
+
+    console.log('Target versions:');
+    if (targets.cliTarget) {
+      console.log(`  CLI:  v${targets.cliTarget}`);
+    }
+    if (targets.abapTarget) {
+      console.log(`  ABAP: v${targets.abapTarget}`);
+    }
+    console.log('');
+
+    console.log('Would execute:');
+    let step = 1;
+    if (targets.cliTarget) {
+      console.log(`  ${step}. npm install -g abapgit-agent@${targets.cliTarget}`);
+      step++;
+    }
+    if (targets.abapTarget) {
+      console.log(`  ${step}. abapgit-agent pull --branch v${targets.abapTarget}`);
+      console.log('     (via existing abapGit repository)');
+      step++;
+    }
+    console.log(`  ${step}. Verify versions match`);
+    console.log('');
+    console.log('No changes made.');
+    console.log('');
+  },
+
+  /**
+   * Confirm upgrade with user
+   */
+  async confirmUpgrade(cliVersion, abapVersion, targets, flags) {
+    console.log('');
+    console.log('📦 Upgrade Plan:');
+    console.log('');
+    console.log('Current versions:');
+    console.log(`  CLI:  v${cliVersion}`);
+    if (abapVersion) {
+      console.log(`  ABAP: v${abapVersion}`);
+    }
+    console.log('');
+
+    console.log('Target versions:');
+    if (targets.cliTarget) {
+      console.log(`  CLI:  v${targets.cliTarget}`);
+    }
+    if (targets.abapTarget) {
+      console.log(`  ABAP: v${targets.abapTarget}`);
+    }
+    console.log('');
+
+    console.log('This will:');
+    let step = 1;
+    if (targets.cliTarget) {
+      console.log(`  ${step}. Upgrade npm package: abapgit-agent@${targets.cliTarget}`);
+      step++;
+    }
+    if (targets.abapTarget) {
+      console.log(`  ${step}. Pull ABAP code from git tag v${targets.abapTarget}`);
+      step++;
+      console.log(`  ${step}. Activate all backend components`);
+      step++;
+    }
+    console.log('');
+
+    return new Promise((resolve) => {
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });
+
+      rl.question('Do you want to continue? [Y/n] ', (answer) => {
+        rl.close();
+        const normalized = answer.trim().toLowerCase();
+        resolve(normalized === '' || normalized === 'y' || normalized === 'yes');
+      });
+    });
+  },
+
+  /**
+   * Perform upgrade
+   */
+  async performUpgrade(targets, flags, context) {
+    console.log('');
+    console.log('🚀 Starting upgrade...');
+    console.log('');
+
+    // Upgrade CLI
+    if (targets.cliTarget) {
+      await this.upgradeCliPackage(targets.cliTarget);
+    }
+
+    // Upgrade ABAP
+    if (targets.abapTarget) {
+      await this.upgradeAbapBackend(targets.abapTarget, flags.transport, context);
+    }
+  },
+
+  /**
+   * Upgrade CLI package via npm
+   */
+  async upgradeCliPackage(version) {
+    console.log(`📦 Upgrading CLI to v${version}...`);
+
+    try {
+      // Check if npm is available
+      try {
+        execSync('npm --version', { stdio: 'ignore' });
+      } catch (e) {
+        console.error('❌ Error: npm is not installed or not in PATH');
+        console.error('   Please install Node.js and npm: https://nodejs.org/');
+        process.exit(1);
+      }
+
+      // Run npm install
+      const command = `npm install -g abapgit-agent@${version}`;
+      console.log(`   Running: ${command}`);
+
+      execSync(command, {
+        stdio: 'inherit',
+        encoding: 'utf8'
+      });
+
+      console.log(`✅ CLI upgraded to v${version}`);
+      console.log('');
+    } catch (error) {
+      console.error(`❌ Failed to upgrade CLI: ${error.message}`);
+      console.error('');
+      console.error('This may be due to:');
+      console.error('  - Version not found in npm registry');
+      console.error('  - Permission issues (try with sudo)');
+      console.error('  - Network connectivity issues');
+      process.exit(1);
+    }
+  },
+
+  /**
+   * Upgrade ABAP backend via pull command
+   */
+  async upgradeAbapBackend(version, transport, context) {
+    console.log(`📦 Upgrading ABAP backend to v${version}...`);
+    console.log(`   Using git tag: v${version}`);
+    console.log('');
+
+    try {
+      // Build pull command args
+      const pullArgs = ['--branch', `v${version}`];
+      if (transport) {
+        pullArgs.push('--transport', transport);
+      }
+
+      // Execute pull command
+      const pullCommand = require('./pull');
+      await pullCommand.execute(pullArgs, context);
+
+      console.log('');
+      console.log(`✅ ABAP backend upgraded to v${version}`);
+      console.log('');
+    } catch (error) {
+      console.error(`❌ Failed to upgrade ABAP backend: ${error.message}`);
+      console.error('');
+      console.error('This may be due to:');
+      console.error('  - Git tag not found in repository');
+      console.error('  - ABAP activation errors');
+      console.error('  - Connection issues with ABAP system');
+      process.exit(1);
+    }
+  },
+
+  /**
+   * Verify upgrade success
+   */
+  async verifyUpgrade(targets, flags, context) {
+    console.log('🔍 Verifying upgrade...');
+    console.log('');
+
+    const { versionCheck, loadConfig } = context;
+
+    // Check CLI version
+    let cliVersion = null;
+    if (targets.cliTarget) {
+      cliVersion = versionCheck.getCliVersion();
+      if (cliVersion === targets.cliTarget) {
+        console.log(`✅ CLI version verified: v${cliVersion}`);
+      } else {
+        console.log(`⚠️  CLI version mismatch: expected v${targets.cliTarget}, got v${cliVersion}`);
+        console.log('   You may need to restart your terminal or reinstall globally');
+      }
+    }
+
+    // Check ABAP version
+    if (targets.abapTarget && !flags.cliOnly) {
+      try {
+        const config = loadConfig();
+        const { apiVersion: abapVersion } = await versionCheck.checkCompatibility(config);
+
+        if (abapVersion === targets.abapTarget) {
+          console.log(`✅ ABAP version verified: v${abapVersion}`);
+        } else {
+          console.log(`⚠️  ABAP version mismatch: expected v${targets.abapTarget}, got v${abapVersion}`);
+          console.log('   Some components may have failed to activate');
+        }
+      } catch (e) {
+        console.log(`⚠️  Could not verify ABAP version: ${e.message}`);
+      }
+    }
+
+    console.log('');
+    console.log('✅ Upgrade complete!');
+    console.log('');
+  }
+};