abapgit-agent 1.15.0 → 1.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abapgit-agent",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "ABAP Git Agent - Pull and activate ABAP code via abapGit from any git repository",
   "files": [
     "bin/",
@@ -37,6 +37,7 @@
     "test:cmd:tree": "node tests/run-all.js --cmd --command=tree",
     "test:cmd:dump": "node tests/run-all.js --cmd --command=dump",
     "test:cmd:debug": "node tests/run-all.js --cmd --command=debug",
+    "test:debug": "node tests/run-all.js --debug",
     "test:debug:scenarios": "bash tests/integration/debug-scenarios.sh",
     "test:debug:scenarios:1": "bash tests/integration/debug-scenarios.sh 1",
     "test:debug:scenarios:2": "bash tests/integration/debug-scenarios.sh 2",

package/src/commands/debug.js

@@ -109,8 +109,23 @@ function objectUri(name, includeType) {
   }
   // FUGR source includes: L<group>U<NN>, L<group>TOP, L<group>F<NN>, etc.
   // All start with 'L'. Customer Z/Y programs never start with 'L'.
+  // Correct ADT URI (verified against abap-adt-api):
+  //   /sap/bc/adt/functions/groups/<group>/includes/<include>/source/main
+  // NOT /programs/includes/ — that path is for standalone PROG/I includes only.
+  // Group name is derived by stripping leading 'L' and trailing suffix:
+  //   U<NN>  — FM source include (U01, U02, ...)
+  //   TOP    — pool include
+  //   F<NN>  — form include
+  //   XX     — internal include
   if (/^L/.test(upper)) {
-    return `/sap/bc/adt/programs/includes/${lower}`;
+    const withoutL = upper.slice(1); // e.g. ZCAIS_DEMOU01
+    const group = withoutL
+      .replace(/U\d+$/, '')   // strip Unn suffix
+      .replace(/TOP$/, '')    // strip TOP suffix
+      .replace(/F\d+$/, '')   // strip Fnn suffix
+      .replace(/XX$/, '')     // strip XX suffix
+      .toLowerCase();
+    return `/sap/bc/adt/functions/groups/${group}/includes/${lower}/source/main`;
   }
   return `/sap/bc/adt/programs/programs/${lower}`;
 }
@@ -236,15 +251,25 @@ async function refreshBreakpoints(config, adt, bps) {
 
   const serverResults = parseBreakpointResponse(resp.body || '', bps);
 
-  // Match server results back to local bps by uri+line
+  // Match server results back to local bps by uri+line.
+  // ADT may return a different canonical URI than what was sent (e.g. it rewrites
+  // /functions/groups/<g>/includes/<inc>/... to /functions/groups/<g>/fmodules/<fm>/...).
+  // Fall back to matching by line alone when URI doesn't match, then adopt the
+  // server's canonical URI so future refreshes continue to work.
   const valid = [];
   const stale = [];
   for (const bp of bps) {
-    const match = serverResults.find(r => r.uri === bp.uri && r.line === bp.line);
+    let match = serverResults.find(r => r.uri === bp.uri && r.line === bp.line);
+    if (!match) {
+      // Fallback: match by line number alone (handles URI canonicalization by ADT)
+      match = serverResults.find(r => r.line === bp.line);
+    }
     if (match && match.error) {
       stale.push({ ...bp, error: match.error });
     } else if (match && match.id) {
-      valid.push({ ...bp, id: match.id });
+      // Adopt the server's canonical URI so subsequent refreshes match correctly
+      const canonicalUri = match.uri || bp.uri;
+      valid.push({ ...bp, id: match.id, uri: canonicalUri });
     } else {
       // No match in response — server silently dropped it (e.g. expired)
       stale.push({ ...bp, error: 'Not registered on server' });
@@ -398,9 +423,16 @@ async function cmdSet(args, config, adt) {
   }
 
   // Update local state with server-assigned IDs
+  // Use URI+line match first; fall back to line-only for FUGR where ADT rewrites
+  // /includes/<inc>/ to /fmodules/<fm>/ in the response.
   const updatedWithServerIds = updated.map(bp => {
-    const sr = serverResults.find(r => r.uri === bp.uri && r.line === bp.line);
-    return sr && sr.id ? { ...bp, id: sr.id } : bp;
+    const sr = serverResults.find(r => r.uri === bp.uri && r.line === bp.line)
+      || serverResults.find(r => r.line === bp.line);
+    if (sr && sr.id) {
+      const canonicalUri = sr.uri || bp.uri;
+      return { ...bp, id: sr.id, uri: canonicalUri };
+    }
+    return bp;
   });
   if (_saveBpState) _saveBpState(config, updatedWithServerIds);
 
@@ -435,7 +467,8 @@ async function cmdSet(args, config, adt) {
 
   if (jsonOutput) {
     const out = added.map(a => {
-      const sr = serverResults.find(r => r.uri === a.uri && r.line === a.line);
+      const sr = serverResults.find(r => r.uri === a.uri && r.line === a.line)
+        || serverResults.find(r => r.line === a.line);
       return { id: (sr && sr.id) || null, object: a.name, line: a.line };
     });
     console.log(JSON.stringify(out.length === 1 ? out[0] : out));