abapgit-agent 1.14.5 → 1.15.1

package/src/commands/debug.js

@@ -89,6 +89,10 @@ const INCLUDE_TYPE_TO_ADT = {
  * e.g. ZCL_ABGAGT_AGENT=============CM00D
  * These must be routed to the programs/includes ADT endpoint.
  *
+ * FUGR source includes follow L<group><suffix> naming (e.g. LSUSRU04, LSUSRTOP,
+ * LSUSRF10, L_ABAU01). They start with 'L' and are routed to programs/includes.
+ * Customer-namespace programs always start with Z/Y, so this branch is safe.
+ *
  * When includeType is supplied (testclasses|locals_imp|locals_def),
  * the URI targets the sub-include of the class instead of /source/main.
  * Line numbers are then section-local (from the .clas.<file>.abap file).
@@ -103,6 +107,26 @@ function objectUri(name, includeType) {
     }
     return `/sap/bc/adt/oo/classes/${lower}/source/main`;
   }
+  // 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)) {
+    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}`;
 }
 
@@ -227,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' });
@@ -389,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);
 
@@ -426,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));

package/src/commands/view.js

@@ -154,7 +154,9 @@ function findFirstExecutableLine(lines) {
   const declPattern = /^\s*(data|final|types|constants|class-data)[\s:(]/i;
   const methodPattern = /^\s*method\s+/i;
   const commentPattern = /^\s*[*"]/;
-  let inDeclBlock = false; // true while inside a multi-line DATA:/TYPES: block
+  // Program-level header/declaration keywords that are not executable statements
+  const progDeclPattern = /^\s*(report|program|parameters|tables|selection-screen|select-options|class-pool|function-pool|interface-pool|type-pool|include)\b/i;
+  let inDeclBlock = false; // true while inside a multi-line DATA:/TYPES:/PARAMETERS: block
   for (let i = 0; i < lines.length; i++) {
     const trimmed = lines[i].trim();
     if (inDeclBlock) {
@@ -170,6 +172,11 @@ function findFirstExecutableLine(lines) {
       if (!trimmed.endsWith('.')) inDeclBlock = true;
       continue;
     }
+    if (progDeclPattern.test(trimmed)) {
+      // Multi-line block (PARAMETERS: ...,\n  ...) stays open until period
+      if (!trimmed.endsWith('.')) inDeclBlock = true;
+      continue;
+    }
     return i;
   }
   return 0;
@@ -201,6 +208,15 @@ module.exports = {
     const jsonOutput = args.includes('--json');
     const fullMode = args.includes('--full');
     const linesMode = args.includes('--lines');
+    const fmArgIndex = args.indexOf('--fm');
+    const fmName = fmArgIndex !== -1 && fmArgIndex + 1 < args.length
+      ? args[fmArgIndex + 1].toUpperCase()
+      : null;
+
+    if (fmName && !fullMode) {
+      console.error('  Error: --fm requires --full');
+      process.exit(1);
+    }
 
     console.log(`\n  Viewing ${objects.length} object(s)`);
 
@@ -220,6 +236,10 @@ module.exports = {
       data.full = true;
     }
 
+    if (fmName) {
+      data.fm = fmName;
+    }
+
     const result = await http.post('/sap/bc/z_abapgit_agent/view', data, { csrfToken });
 
     // Handle uppercase keys from ABAP
@@ -290,6 +310,7 @@ module.exports = {
             const file = section.FILE || section.file || '';
             const lines = section.LINES || section.lines || [];
             const isCmSection = suffix.startsWith('CM') && methodName;
+            const isFugrFmSection = !isCmSection && !!methodName;
 
             if (linesMode) {
               // --full --lines: dual line numbers (G [N]) for debugging
@@ -315,10 +336,44 @@ module.exports = {
                   bpHint = `debug set --objects ${objName}:<global_line>`;
                 }
                 console.log(`  * ---- Method: ${methodName} (${suffix}) — breakpoint: ${bpHint} ----`);
+              } else if (isFugrFmSection) {
+                // Find first executable line: skip FUNCTION header, comments, blanks,
+                // and declaration blocks (DATA:, CONSTANTS:, TYPES:, etc.)
+                const declPat = /^\s*(data|final|types|constants|class-data)[\s:(]/i;
+                let firstExecLine = 1;
+                let inDecl = false;
+                for (let li = 0; li < lines.length; li++) {
+                  const t = lines[li].trim();
+                  if (inDecl) {
+                    if (t.endsWith('.')) inDecl = false;
+                    continue;
+                  }
+                  if (!t) continue;
+                  if (/^\*/.test(t)) continue;
+                  if (/^"/.test(t)) continue;
+                  if (/^function\s+/i.test(t)) continue;
+                  if (declPat.test(t)) {
+                    if (!t.endsWith('.')) inDecl = true;
+                    continue;
+                  }
+                  firstExecLine = li + 1;
+                  break;
+                }
+                const bpHint = `debug set --objects ${suffix}:${firstExecLine}`;
+                console.log(`  * ---- FM: ${methodName} (${suffix}) — breakpoint: ${bpHint} ----`);
               } else if (file) {
                 console.log(`  * ---- Section: ${section.DESCRIPTION || section.description} (from .clas.${file}.abap) ----`);
               } else if (suffix) {
-                console.log(`  * ---- Section: ${section.DESCRIPTION || section.description} (${suffix}) ----`);
+                // For program source sections, emit a breakpoint hint at the first executable line.
+                const isProgSection = suffix === 'PROG' || suffix === 'prog';
+                if (isProgSection) {
+                  const execOffset = findFirstExecutableLine(lines);
+                  const execLine = execOffset + 1; // 1-based
+                  const bpHint = `debug set --objects ${objName}:${execLine}`;
+                  console.log(`  * ---- Section: ${section.DESCRIPTION || section.description} (${suffix}) — breakpoint: ${bpHint} ----`);
+                } else {
+                  console.log(`  * ---- Section: ${section.DESCRIPTION || section.description} (${suffix}) ----`);
+                }
               }
 
               let includeRelLine = 0;
@@ -334,6 +389,10 @@ module.exports = {
                   const gStr = globalLine ? String(globalLine).padStart(4) : '    ';
                   const iStr = String(includeRelLine).padStart(3);
                   console.log(`  ${gStr} [${iStr}]  ${codeLine}`);
+                } else if (isFugrFmSection) {
+                  // FM include: line numbers are include-relative = ADT line numbers
+                  const lStr = String(includeRelLine).padStart(4);
+                  console.log(`  ${lStr}  ${codeLine}`);
                 } else {
                   // For sub-include sections with a known ADT include type,
                   // detect METHOD..ENDMETHOD blocks and emit breakpoint hints.
@@ -363,6 +422,8 @@ module.exports = {
               // --full (no --lines): clean source, no line numbers
               if (isCmSection) {
                 console.log(`  * ---- Method: ${methodName} (${suffix}) ----`);
+              } else if (isFugrFmSection) {
+                console.log(`  * ---- FM: ${methodName} (${suffix}) ----`);
               } else if (file) {
                 console.log(`  * ---- Section: ${section.DESCRIPTION || section.description} (from .clas.${file}.abap) ----`);
               } else if (suffix) {

package/src/utils/abap-reference.js

@@ -515,6 +515,8 @@ async function getTopic(topic) {
     // Map topic to local guideline file
     const guidelineMap = {
       'abapgit': 'abapgit.md',
+      'abapgit-xml-only': 'abapgit-xml-only.md',
+      'abapgit-fugr': 'abapgit-fugr.md',
       'xml': 'objects.md',
       'objects': 'objects.md',
       'naming': 'objects.md'