@cspeach/cli 1.1.20 → 1.1.22

package/dist/sap/standalone-profile.js

@@ -90,7 +90,7 @@ const S4_YEAR_TO_ABAP = {
     '2021': '7.56',
     '2022': '7.57',
     '2023': '7.58',
-    '2025': '7.59',
+    '2025': '8.16', // ABAP Platform 2025 = SAP_BASIS 816 (matches system-info.ts abapVersionFor)
 };
 function releaseYear(release) {
     for (const year of Object.keys(S4_YEAR_TO_ABAP)) {

package/dist/sap/system-info.js

@@ -19,6 +19,12 @@ import { join } from 'node:path';
 import { auditLog, xmlParser } from '@cspeach/sap-client';
 import { cspeachRoot } from '../config/paths.js';
 const CACHE_TTL_MS = 30 * 24 * 60 * 60 * 1000; // 30 days
+/**
+ * Bump when the cached shape or its meaning changes, so files written by
+ * an older CLI are re-queried instead of served. v2 (2026-09-29): CVERS
+ * now includes SAP_APPL; v1 files classified ECC EHP8 as NetWeaver.
+ */
+const CACHE_VERSION = 2;
 const memCache = new Map();
 /**
  * Top-level entry point. Returns cached info when available, queries
@@ -68,7 +74,8 @@ export function _resetSystemInfoCache() {
 async function queryLive(adt, alias) {
     // S4FND covers some private-cloud variants where S4CORE isn't shipped
     // — including both broadens detection without extra cost.
-    const sql = `SELECT COMPONENT, RELEASE FROM CVERS WHERE COMPONENT IN ('SAP_BASIS', 'S4CORE', 'S4FND', 'SAP_ABA')`;
+    // SAP_APPL tells ECC apart from plain NetWeaver (see classify()).
+    const sql = `SELECT COMPONENT, RELEASE FROM CVERS WHERE COMPONENT IN ('SAP_BASIS', 'S4CORE', 'S4FND', 'SAP_ABA', 'SAP_APPL')`;
     // Dispatch order is INTENTIONALLY connection-first: AdtClient.sqlQuery
     // internally uses parseDataPreview which silently returns empty rows on
     // shapes it doesn't recognise — exactly the failure mode that surfaced
@@ -380,11 +387,17 @@ export async function parseCversTree(xml) {
  */
 export function classify(alias, components) {
     const sapBasis = components['SAP_BASIS'];
+    // SAP_APPL is the ERP application component: present on ECC, replaced by
+    // S4CORE on S/4, absent on BW / SolMan / PI. It — not the SAP_BASIS
+    // number — is what tells ECC apart from a plain NetWeaver system
+    // (ECC EHP8 runs on SAP_BASIS 750).
+    const sapAppl = components['SAP_APPL'];
     const s4Core = components['S4CORE'] || components['S4FND'];
     const platform = s4Core ? 'S/4HANA'
-        : sapBasis ? (parseInt(sapBasis, 10) >= 750 ? 'NetWeaver' : 'ECC')
-            : 'unknown';
-    const release = humanReadableRelease(platform, sapBasis, s4Core);
+        : sapAppl ? 'ECC'
+            : sapBasis ? 'NetWeaver'
+                : 'unknown';
+    const release = humanReadableRelease(platform, sapBasis, s4Core, sapAppl);
     const abapVersion = abapVersionFor(sapBasis);
     return {
         alias,
@@ -405,38 +418,42 @@ export function classify(alias, components) {
  * so we anchor on S4CORE when present and fall back to SAP_BASIS only
  * for ECC/NW systems.
  */
-function humanReadableRelease(platform, sapBasis, s4Core) {
+function humanReadableRelease(platform, sapBasis, s4Core, sapAppl) {
     if (platform === 'S/4HANA' && s4Core) {
+        // S4CORE release → S/4HANA edition. FPS/SPS levels do not change the
+        // S4CORE release, so there are no "FPS" entries here.
         const map = {
-            '100': 'S/4HANA 1503',
-            '101': 'S/4HANA 1511',
-            '102': 'S/4HANA 1610',
-            '103': 'S/4HANA 1709',
-            '104': 'S/4HANA 1809',
-            '105': 'S/4HANA 1909',
-            '106': 'S/4HANA 2020',
+            '100': 'S/4HANA 1511',
+            '101': 'S/4HANA 1610',
+            '102': 'S/4HANA 1709',
+            '103': 'S/4HANA 1809',
+            '104': 'S/4HANA 1909',
+            '105': 'S/4HANA 2020',
+            '106': 'S/4HANA 2021',
             '107': 'S/4HANA 2022',
             '108': 'S/4HANA 2023',
-            '109': 'S/4HANA 2023 FPS01',
-            '110': 'S/4HANA 2025',
+            '109': 'S/4HANA 2025',
         };
         return map[s4Core] ?? `S/4HANA (S4CORE ${s4Core})`;
     }
     if (platform === 'NetWeaver' && sapBasis) {
-        return `NetWeaver / ECC (SAP_BASIS ${sapBasis})`;
+        return `NetWeaver (SAP_BASIS ${sapBasis})`;
     }
-    if (platform === 'ECC' && sapBasis) {
+    if (platform === 'ECC' && sapAppl) {
+        // Enhancement pack is read from SAP_APPL: SAP_BASIS is ambiguous
+        // (730 covers EHP5 and EHP6; 750 is EHP8 but also plain NW 7.50).
         const map = {
-            '700': 'ECC 6.0',
-            '701': 'ECC 6.0 EHP1',
-            '702': 'ECC 6.0 EHP2',
-            '703': 'ECC 6.0 EHP3',
-            '704': 'ECC 6.0 EHP4',
-            '730': 'ECC 6.0 EHP5/6',
-            '731': 'ECC 6.0 EHP6',
-            '740': 'ECC 6.0 EHP7',
+            '600': 'ECC 6.0',
+            '602': 'ECC 6.0 EHP2',
+            '603': 'ECC 6.0 EHP3',
+            '604': 'ECC 6.0 EHP4',
+            '605': 'ECC 6.0 EHP5',
+            '606': 'ECC 6.0 EHP6',
+            '616': 'ECC 6.0 EHP6 (HANA)',
+            '617': 'ECC 6.0 EHP7',
+            '618': 'ECC 6.0 EHP8',
         };
-        return map[sapBasis] ?? `ECC 6.0 (SAP_BASIS ${sapBasis})`;
+        return map[sapAppl] ?? `ECC 6.0 (SAP_APPL ${sapAppl})`;
     }
     return 'unknown';
 }
@@ -455,6 +472,9 @@ function abapVersionFor(sapBasis) {
     // Modern releases — return as N.NN (e.g. 757 → 7.57).
     if (n >= 740 && n < 800)
         return `7.${n - 700}`;
+    // ABAP Platform 2025 moved to 8.xx (SAP_BASIS 816 → 8.16).
+    if (n >= 800 && n < 900)
+        return `8.${String(n - 800).padStart(2, '0')}`;
     return sapBasis;
 }
 // ── Disk cache ─────────────────────────────────────────────────────────────
@@ -473,12 +493,15 @@ function readDiskCache(alias) {
         if (!existsSync(path))
             return null;
         const raw = JSON.parse(readFileSync(path, 'utf8'));
+        if (raw.cacheVersion !== CACHE_VERSION)
+            return null;
         if (!raw.queriedAt)
             return null;
         const age = Date.now() - new Date(raw.queriedAt).getTime();
         if (age > CACHE_TTL_MS)
             return null;
-        return raw;
+        const { cacheVersion: _v, ...info } = raw;
+        return info;
     }
     catch {
         return null;
@@ -489,7 +512,7 @@ function writeDiskCache(alias, info) {
         const dir = cacheDir();
         if (!existsSync(dir))
             mkdirSync(dir, { recursive: true });
-        writeFileSync(cacheFile(alias), JSON.stringify(info, null, 2), 'utf8');
+        writeFileSync(cacheFile(alias), JSON.stringify({ ...info, cacheVersion: CACHE_VERSION }, null, 2), 'utf8');
     }
     catch {
         // best-effort — we still return the in-memory result