abapgit-agent 1.10.0 → 1.10.1

package/bin/abapgit-agent

@@ -121,4 +121,11 @@ To enable integration:
   process.exit(1);
 }
 
-main();
+main().catch((err) => {
+  // Known CLI errors (e.g. pull conflict) already printed their own output — skip re-printing.
+  // For all other unexpected errors, print the message without the stack trace.
+  if (!err._isPullError) {
+    console.error(err.message || err);
+  }
+  process.exit(1);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abapgit-agent",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "ABAP Git Agent - Pull and activate ABAP code via abapGit from any git repository",
   "main": "src/index.js",
   "files": [
@@ -42,6 +42,7 @@
     "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",
+    "test:conflict": "node tests/run-all.js --conflict",
     "pull": "node bin/abapgit-agent",
     "release": "node scripts/release.js",
     "unrelease": "node scripts/unrelease.js"

package/src/commands/debug.js

@@ -806,7 +806,7 @@ async function cmdStep(args, config, adt) {
       process.exit(1);
     }
     if (!resp.ok) {
-      console.error(`\n  Error: ${resp.error}${resp.statusCode ? ` (HTTP ${resp.statusCode})` : ''}\n`);
+      console.error(`\n  Error: ${resp.error}${resp.statusCode ? ` (HTTP ${resp.statusCode})` : ''}${resp.body ? '\n  Body: ' + resp.body.substring(0, 400) : ''}\n`);
       process.exit(1);
     }
     // continued+finished (or empty position) means the program ran to completion
@@ -1074,7 +1074,7 @@ async function cmdStack(args, config, adt) {
       process.exit(1);
     }
     if (!resp.ok) {
-      console.error(`\n  Error: ${resp.error}${resp.statusCode ? ` (HTTP ${resp.statusCode})` : ''}\n`);
+      console.error(`\n  Error: ${resp.error}${resp.statusCode ? ` (HTTP ${resp.statusCode})` : ''}${resp.body ? '\n  Body: ' + resp.body.substring(0, 400) : ''}\n`);
       process.exit(1);
     }
     const frames = resp.frames;

package/src/commands/pull.js

@@ -29,12 +29,14 @@ module.exports = {
     const branchArgIndex = args.indexOf('--branch');
     const filesArgIndex = args.indexOf('--files');
     const transportArgIndex = args.indexOf('--transport');
+    const conflictModeArgIndex = args.indexOf('--conflict-mode');
     const jsonOutput = args.includes('--json');
 
     // Auto-detect git remote URL if not provided
     let gitUrl = urlArgIndex !== -1 ? args[urlArgIndex + 1] : null;
     let branch = branchArgIndex !== -1 ? args[branchArgIndex + 1] : gitUtils.getBranch();
     let files = null;
+    let conflictMode = conflictModeArgIndex !== -1 ? args[conflictModeArgIndex + 1] : 'abort';
 
     // Transport: CLI arg takes priority, then config/environment, then null
     let transportRequest = null;
@@ -74,10 +76,10 @@ module.exports = {
       }
     }
 
-    await this.pull(gitUrl, branch, files, transportRequest, loadConfig, AbapHttp, jsonOutput);
+    await this.pull(gitUrl, branch, files, transportRequest, loadConfig, AbapHttp, jsonOutput, undefined, conflictMode);
   },
 
-  async pull(gitUrl, branch = 'main', files = null, transportRequest = null, loadConfig, AbapHttp, jsonOutput = false, gitCredentials = undefined) {
+  async pull(gitUrl, branch = 'main', files = null, transportRequest = null, loadConfig, AbapHttp, jsonOutput = false, gitCredentials = undefined, conflictMode = 'abort') {
     const TERM_WIDTH = process.stdout.columns || 80;
 
     if (!jsonOutput) {
@@ -107,6 +109,7 @@ module.exports = {
       const data = {
         url: gitUrl,
         branch: branch,
+        conflict_mode: conflictMode,
         ...(resolvedCredentials ? { username: resolvedCredentials.username, password: resolvedCredentials.password } : {})
       };
 
@@ -140,12 +143,23 @@ module.exports = {
       const jobId = result.JOB_ID || result.job_id;
       const message = result.MESSAGE || result.message;
       const errorDetail = result.ERROR_DETAIL || result.error_detail;
-      const transportRequestUsed = result.TRANSPORT_REQUEST || result.transport_request;
       const activatedCount = result.ACTIVATED_COUNT || result.activated_count || 0;
       const failedCount = result.FAILED_COUNT || result.failed_count || 0;
       const logMessages = result.LOG_MESSAGES || result.log_messages || [];
       const activatedObjects = result.ACTIVATED_OBJECTS || result.activated_objects || [];
       const failedObjects = result.FAILED_OBJECTS || result.failed_objects || [];
+      const conflictReport = result.CONFLICT_REPORT || result.conflict_report || '';
+      const conflictCount = result.CONFLICT_COUNT || result.conflict_count || 0;
+
+      // --- Conflict report (pull was aborted) ---
+      if (conflictCount > 0 && conflictReport) {
+        console.error(`⚠️  Pull aborted — ${conflictCount} conflict(s) detected\n`);
+        console.error('─'.repeat(TERM_WIDTH));
+        console.error(conflictReport.replace(/\\n/g, '\n'));
+        const err = new Error(message || `Pull aborted — ${conflictCount} conflict(s) detected`);
+        err._isPullError = true;
+        throw err;
+      }
 
       // Icon mapping for message types
       const getIcon = (type) => {

package/src/utils/adt-http.js

@@ -199,12 +199,37 @@ class AdtHttp {
           return;
         }
 
-        // Update cookies from any response that sets them
+        // Update cookies from any response that sets them.
+        // Merge by name so that updated values (e.g. SAP_SESSIONID) replace
+        // their old counterparts rather than accumulating duplicates.
+        // Duplicate SAP_SESSIONID cookies would cause the ICM to route requests
+        // to a stale work process ("Service cannot be reached").
         if (res.headers['set-cookie']) {
-          const newCookies = Array.isArray(res.headers['set-cookie'])
-            ? res.headers['set-cookie'].map(c => c.split(';')[0]).join('; ')
-            : res.headers['set-cookie'].split(';')[0];
-          this.cookies = this.cookies ? this.cookies + '; ' + newCookies : newCookies;
+          const incoming = Array.isArray(res.headers['set-cookie'])
+            ? res.headers['set-cookie'].map(c => c.split(';')[0])
+            : [res.headers['set-cookie'].split(';')[0]];
+          // Parse existing cookies into a Map (preserves insertion order)
+          const jar = new Map();
+          if (this.cookies) {
+            this.cookies.split(';').forEach(pair => {
+              const trimmed = pair.trim();
+              if (trimmed) {
+                const eq = trimmed.indexOf('=');
+                const k = eq === -1 ? trimmed : trimmed.slice(0, eq);
+                jar.set(k.trim(), trimmed);
+              }
+            });
+          }
+          // Overwrite with incoming cookies
+          incoming.forEach(pair => {
+            const trimmed = pair.trim();
+            if (trimmed) {
+              const eq = trimmed.indexOf('=');
+              const k = eq === -1 ? trimmed : trimmed.slice(0, eq);
+              jar.set(k.trim(), trimmed);
+            }
+          });
+          this.cookies = [...jar.values()].join('; ');
         }
 
         let respBody = '';

package/src/utils/debug-daemon.js

@@ -170,7 +170,8 @@ async function _handleLine(socket, line, session, cleanupAndExit, resetIdle) {
     _send(socket, {
       ok: false,
       error: err.message || JSON.stringify(err),
-      statusCode: err.statusCode
+      statusCode: err.statusCode,
+      body: err.body || null
     });
   }
 }

package/src/utils/debug-session.js

@@ -25,6 +25,37 @@ const { AdtHttp } = require('./adt-http');
 // Header required to pin all requests to the same ABAP work process.
 const STATEFUL_HEADER = { 'X-sap-adt-sessiontype': 'stateful' };
 
+/**
+ * Retry a debug ADT call up to maxRetries times on transient ICM errors.
+ *
+ * The SAP ICM (load balancer) returns HTTP 400 with an HTML "Service cannot
+ * be reached" body when the target ABAP work process is momentarily unavailable
+ * (e.g. finishing a previous step, or briefly between requests).  This is a
+ * transient condition that resolves within a second or two — retrying is safe
+ * for all debug read/navigation operations.
+ *
+ * @param {function} fn         - Async function to retry (takes no args)
+ * @param {number}   maxRetries - Max additional attempts after the first (default 3)
+ * @param {number}   delayMs    - Wait between retries in ms (default 1000)
+ */
+async function retryOnIcmError(fn, maxRetries = 3, delayMs = 1000) {
+  let lastErr;
+  for (let attempt = 0; attempt <= maxRetries; attempt++) {
+    try {
+      return await fn();
+    } catch (err) {
+      const isIcmError = err && err.statusCode === 400 &&
+        err.body && err.body.includes('Service cannot be reached');
+      if (!isIcmError) throw err;
+      lastErr = err;
+      if (attempt < maxRetries) {
+        await new Promise(r => setTimeout(r, delayMs));
+      }
+    }
+  }
+  throw lastErr;
+}
+
 class DebugSession {
   /**
    * @param {AdtHttp} adtHttp   - ADT HTTP client instance (carries session cookie)
@@ -94,30 +125,33 @@ class DebugSession {
     // completion.  When the program runs to completion ADT returns HTTP 500
     // (no suspended session left).  Treat both 200 and 500 as "continued".
     if (method === 'stepContinue') {
-      try {
-        await this.http.post(`/sap/bc/adt/debugger?method=${method}`, '', {
-          contentType: 'application/vnd.sap.as+xml',
-          headers: STATEFUL_HEADER
-        });
-        // 200: program hit another breakpoint (or is still running).
-        // Position query is not meaningful until a new breakpoint fires via
-        // the listener, so return the sentinel and let the caller re-attach.
-        return { position: { continued: true }, source: [] };
-      } catch (err) {
-        // 500: debuggee ran to completion, session ended normally.
-        if (err && err.statusCode === 500) {
-          return { position: { continued: true, finished: true }, source: [] };
+      return retryOnIcmError(async () => {
+        try {
+          await this.http.post(`/sap/bc/adt/debugger?method=${method}`, '', {
+            contentType: 'application/vnd.sap.as+xml',
+            headers: { ...STATEFUL_HEADER, 'Accept': 'application/xml' }
+          });
+          // 200: program hit another breakpoint (or is still running).
+          // Position query is not meaningful until a new breakpoint fires via
+          // the listener, so return the sentinel and let the caller re-attach.
+          return { position: { continued: true }, source: [] };
+        } catch (err) {
+          // 500: debuggee ran to completion, session ended normally.
+          if (err && err.statusCode === 500) {
+            return { position: { continued: true, finished: true }, source: [] };
+          }
+          throw err;
         }
-        throw err;
-      }
+      });
     }
 
-    await this.http.post(`/sap/bc/adt/debugger?method=${method}`, '', {
-      contentType: 'application/vnd.sap.as+xml',
-      headers: STATEFUL_HEADER
+    return retryOnIcmError(async () => {
+      await this.http.post(`/sap/bc/adt/debugger?method=${method}`, '', {
+        contentType: 'application/vnd.sap.as+xml',
+        headers: { ...STATEFUL_HEADER, 'Accept': 'application/xml' }
+      });
+      return this.getPosition();
     });
-
-    return this.getPosition();
   }
 
   /**
@@ -337,13 +371,31 @@ class DebugSession {
    * @returns {Promise<Array<{ frame: number, class: string, method: string, line: number }>>}
    */
   async getStack() {
-    const { body } = await this.http.post(
-      '/sap/bc/adt/debugger?method=getStack&emode=_&semanticURIs=true', '', {
-        contentType: 'application/vnd.sap.as+xml',
-        headers: STATEFUL_HEADER
+    return retryOnIcmError(async () => {
+      // Try newer dedicated stack endpoint first (abap-adt-api v7+ approach)
+      try {
+        const { body } = await this.http.get(
+          '/sap/bc/adt/debugger/stack?emode=_&semanticURIs=true', {
+            accept: 'application/xml',
+            headers: STATEFUL_HEADER
+          }
+        );
+        const frames = parseStack(body);
+        if (frames.length > 0) return frames;
+      } catch (e) {
+        // Re-throw ICM errors so the outer retryOnIcmError can catch them
+        if (e && e.statusCode === 400 && e.body && e.body.includes('Service cannot be reached')) throw e;
+        // Otherwise fall through to POST approach
       }
-    );
-    return parseStack(body);
+      // Fallback: POST approach (older ADT versions)
+      const { body } = await this.http.post(
+        '/sap/bc/adt/debugger?method=getStack&emode=_&semanticURIs=true', '', {
+          contentType: 'application/vnd.sap.as+xml',
+          headers: { ...STATEFUL_HEADER, 'Accept': 'application/xml' }
+        }
+      );
+      return parseStack(body);
+    });
   }
 
   /**