abapgit-agent 1.8.8 → 1.8.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abapgit-agent",
-  "version": "1.8.8",
+  "version": "1.8.9",
   "description": "ABAP Git Agent - Pull and activate ABAP code via abapGit from any git repository",
   "main": "src/index.js",
   "files": [

package/src/commands/pull.js

@@ -77,7 +77,7 @@ module.exports = {
     await this.pull(gitUrl, branch, files, transportRequest, loadConfig, AbapHttp, jsonOutput);
   },
 
-  async pull(gitUrl, branch = 'main', files = null, transportRequest = null, loadConfig, AbapHttp, jsonOutput = false) {
+  async pull(gitUrl, branch = 'main', files = null, transportRequest = null, loadConfig, AbapHttp, jsonOutput = false, gitCredentials = undefined) {
     const TERM_WIDTH = process.stdout.columns || 80;
 
     if (!jsonOutput) {
@@ -99,11 +99,15 @@ module.exports = {
       const csrfToken = await http.fetchCsrfToken();
 
       // Prepare request data with git credentials
+      // gitCredentials=null means no credentials (public repo); undefined means use config defaults
+      const resolvedCredentials = gitCredentials === undefined
+        ? { username: config.gitUsername, password: config.gitPassword }
+        : gitCredentials;
+
       const data = {
         url: gitUrl,
         branch: branch,
-        username: config.gitUsername,
-        password: config.gitPassword
+        ...(resolvedCredentials ? { username: resolvedCredentials.username, password: resolvedCredentials.password } : {})
       };
 
       // Add files array if specified
@@ -198,9 +202,9 @@ module.exports = {
         console.log(`   Job ID: ${jobId || 'N/A'}`);
         console.log(`   Message: ${message || 'N/A'}`);
       } else {
-        console.log(`❌ Pull completed with errors!`);
-        console.log(`   Job ID: ${jobId || 'N/A'}`);
-        console.log(`   Message: ${message || 'N/A'}`);
+        console.error(`❌ Pull completed with errors!`);
+        console.error(`   Job ID: ${jobId || 'N/A'}`);
+        console.error(`   Message: ${message || 'N/A'}`);
       }
 
       // Display error detail if available
@@ -306,8 +310,18 @@ module.exports = {
         console.log(`\n❌ Failed Objects Log (${failedCount})`);
       }
 
+      // Throw if pull was not successful so callers (e.g. upgrade) can detect failure
+      if (success !== 'X' && success !== true) {
+        const err = new Error(message || 'Pull completed with errors');
+        err._isPullError = true;
+        throw err;
+      }
+
       return result;
     } catch (error) {
+      if (error._isPullError) {
+        throw error;
+      }
       console.error(`\n❌ Error: ${error.message}`);
       process.exit(1);
     }

package/src/commands/upgrade.js

@@ -46,10 +46,29 @@ module.exports = {
         const { apiVersion } = await versionCheck.checkCompatibility(config);
         abapVersion = apiVersion;
       } catch (e) {
-        console.error(`⚠️  Could not fetch ABAP version: ${e.message}`);
+        console.error(`⚠️  Could not reach ABAP system: ${e.message}`);
       }
     }
 
+    // If ABAP is unreachable and we need to upgrade it, warn and ask whether to continue CLI-only
+    if (needsAbapConfig && abapVersion === null && !flags.cliOnly && !flags.abapOnly && !flags.match) {
+      console.error('');
+      console.error('⚠️  ABAP system is unreachable. Cannot upgrade ABAP backend.');
+      if (flags.yes) {
+        console.log('   --yes flag set: upgrading CLI only.');
+        flags.cliOnly = true;
+      } else {
+        const proceed = await this.confirmCliOnlyFallback();
+        if (!proceed) {
+          console.log('Upgrade cancelled.');
+          return;
+        }
+        flags.cliOnly = true;
+      }
+      console.log('   Run "abapgit-agent upgrade --abap-only" once the system is back.');
+      console.log('');
+    }
+
     // Get latest version from npm
     const latestVersion = await versionCheck.getLatestNpmVersion();
     if (!latestVersion && !flags.version && !flags.match) {
@@ -260,8 +279,8 @@ module.exports = {
       step++;
     }
     if (targets.abapTarget) {
-      console.log(`  ${step}. abapgit-agent pull --branch v${targets.abapTarget}`);
-      console.log('     (via existing abapGit repository)');
+      console.log(`  ${step}. abapgit-agent pull --url <agentRepoUrl> --branch v${targets.abapTarget}`);
+      console.log('     (agentRepoUrl from .abapGitAgent config or current git remote)');
       step++;
     }
     console.log(`  ${step}. Verify versions match`);
@@ -379,7 +398,24 @@ module.exports = {
   },
 
   /**
-   * Upgrade ABAP backend via pull command
+   * Confirm CLI-only fallback when ABAP system is unreachable
+   */
+  async confirmCliOnlyFallback() {
+    return new Promise((resolve) => {
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });
+
+      rl.question('   Continue with CLI upgrade only? [Y/n] ', (answer) => {
+        rl.close();
+        const normalized = answer.trim().toLowerCase();
+        resolve(normalized === '' || normalized === 'y' || normalized === 'yes');
+      });
+    });
+  },
+
+  /**
    */
   async upgradeAbapBackend(version, transport, context) {
     console.log(`📦 Upgrading ABAP backend to v${version}...`);
@@ -387,15 +423,20 @@ module.exports = {
     console.log('');
 
     try {
-      // Build pull command args
-      const pullArgs = ['--branch', `v${version}`];
-      if (transport) {
-        pullArgs.push('--transport', transport);
-      }
+      const { loadConfig } = context;
+
+      // Determine the abapgit-agent repository URL.
+      // Priority:
+      //   1. agentRepoUrl from .abapGitAgent config (for forks/mirrors)
+      //   2. Default canonical repository
+      const config = loadConfig();
+      const agentRepoUrl = config.agentRepoUrl || 'https://github.com/SylvosCai/abapgit-agent.git';
 
-      // Execute pull command
+      // Execute pull command — pass null credentials so the canonical
+      // public GitHub repo is not sent the project's SAP internal git credentials.
       const pullCommand = require('./pull');
-      await pullCommand.execute(pullArgs, context);
+      const { loadConfig: lc, AbapHttp } = context;
+      await pullCommand.pull(agentRepoUrl, `v${version}`, null, transport || null, lc, AbapHttp, false, null);
 
       console.log('');
       console.log(`✅ ABAP backend upgraded to v${version}`);
@@ -404,9 +445,13 @@ module.exports = {
       console.error(`❌ Failed to upgrade ABAP backend: ${error.message}`);
       console.error('');
       console.error('This may be due to:');
+      console.error('  - ABAP system is unavailable');
       console.error('  - Git tag not found in repository');
       console.error('  - ABAP activation errors');
       console.error('  - Connection issues with ABAP system');
+      console.error('');
+      console.error('To retry once the system is available:');
+      console.error(`  abapgit-agent upgrade --abap-only --version ${version}`);
       process.exit(1);
     }
   },

package/src/utils/version-check.js

@@ -75,9 +75,9 @@ async function checkCompatibility(config) {
             const apiVersion = result.version || '1.0.0';
 
             if (cliVersion !== apiVersion) {
-              console.log(`\n⚠️  Version mismatch: CLI ${cliVersion}, ABAP API ${apiVersion}`);
-              console.log('   Some commands may not work correctly.');
-              console.log('   Update ABAP code: abapgit-agent pull\n');
+              console.error(`\n⚠️  Version mismatch: CLI ${cliVersion}, ABAP API ${apiVersion}`);
+              console.error('   Some commands may not work correctly.');
+              console.error('   Update ABAP code: abapgit-agent upgrade --match\n');
             }
             resolve({ cliVersion, apiVersion, compatible: cliVersion === apiVersion });
           } catch (e) {
@@ -242,9 +242,9 @@ async function showNewVersionReminder() {
     const { hasNewVersion, latestVersion, currentVersion } = await checkForNewVersion();
 
     if (hasNewVersion) {
-      console.log('');
-      console.log(`💡 New version available: ${latestVersion} (current: ${currentVersion})`);
-      console.log(`   Run: abapgit-agent upgrade`);
+      console.error('');
+      console.error(`💡 New version available: ${latestVersion} (current: ${currentVersion})`);
+      console.error(`   Run: abapgit-agent upgrade`);
     }
   } catch (e) {
     // Silent - don't interrupt user's workflow