sap-ai-dev-toolkit 0.8.0 → 0.8.1

package/README.md

@@ -272,8 +272,35 @@ The installer handles VSP provisioning automatically:
 
 Setup detects where it is running. With `H2O_URL` set, it treats the environment as SAP Business Application Studio and opens a checkbox picker for BAS destinations, with no destinations selected by default. Use **Space** to choose destinations and **Enter** to confirm. Press **a** to toggle all destinations (select all if any are unchecked; otherwise clear the selection). Confirming with none selected removes this add-on's managed MCP entries. When the `cf` CLI 8.18 or newer is authenticated to a targeted space, setup first offers an optional import from that space's Destination service; type **y** then **Enter** to include it, or press **Enter** to skip. Accepted CF and BAS destinations appear together in the picker.
 
-Without `H2O_URL`, interactive setup looks for local SAP GUI system configuration on macOS and Windows (for example SAP GUI landscape XML and `saplogon.ini`). SAP GUI landscape files describe SAP GUI/DIAG connectivity, not the ADT HTTP(S) endpoint, so setup asks you to confirm the ADT URL for each selected system. The generated MCP entry uses VS Code input prompts for the SAP user and password at server start; raw SAP credentials are not stored in `mcp.json`. On Windows, setup can instead write an experimental `SAP_AUTH_MODE=windows-sso` entry without username/password prompts; this requires the ADT endpoint to support HTTP Negotiate/SPNEGO. Runtime uses the bundled Windows Negotiate helper by default, or a trusted custom helper configured with `SAP_AI_DEV_TOOLKIT_NEGOTIATE_HELPER`. npm may run its install hook without an interactive terminal, even when the shell is interactive; in that case, destination selection is skipped without changing MCP config.
+Without `H2O_URL`, interactive setup looks for local SAP GUI system configuration on macOS and Windows (for example SAP GUI landscape XML and `saplogon.ini`). SAP GUI landscape files describe SAP GUI/DIAG connectivity, not the ADT HTTP(S) endpoint or a complete ABAP client catalog, so setup asks for the SAP client or comma-separated clients to configure for each selected system (for example `100,200`), proposes an ADT URL from the SAP GUI host and instance when it can, and asks you to confirm or edit that value. Multiple entered clients create separate isolated MCP entries, one per system/client pair. When the ADT URL uses an IP address, setup automatically inspects the SAP HTTPS certificate, extracts DNS subjectAltName entries, and offers to enable secure TLS self-healing with a simple yes/no confirmation; you do not need to type certificate names. The generated MCP entry uses VS Code input prompts for the SAP user and password at server start; raw SAP credentials are not stored in `mcp.json`. On Windows, setup can instead write an experimental `SAP_AUTH_MODE=windows-sso` entry without username/password prompts; this requires the ADT endpoint to support HTTP Negotiate/SPNEGO. Runtime uses the bundled Windows Negotiate helper by default, or a trusted custom helper configured with `SAP_AI_DEV_TOOLKIT_NEGOTIATE_HELPER`. npm may run its install hook without an interactive terminal, even when the shell is interactive; in that case, destination selection is skipped without changing MCP config.
 
+### 🖥️ Local machine SAP GUI support
+
+Local setup is intended for developers running the MCP server from their own workstation rather than SAP Business Application Studio.
+
+Supported discovery and runtime behavior:
+
+- **Discovery sources:** SAP GUI landscape XML and `saplogon.ini` style configuration on macOS and Windows. Setup de-duplicates entries, ignores incomplete DIAG records, and shows the discovered SAP systems in the same checkbox picker used for BAS destinations.
+- **Client selection:** SAP GUI entries may contain one default client but cannot reliably list every ABAP client available through ADT. Setup asks for one or more 3-digit clients per selected system; enter comma-separated values such as `100,200` to create separate MCP servers for each client.
+- **ADT endpoint derivation:** SAP GUI entries usually contain DIAG/router information, not the HTTP(S) ADT endpoint. Setup derives the common ADT port from the SAP instance when possible, for example instance `00` → `https://host:44300`, and asks for confirmation only when configuring the selected entry.
+- **Credential handling:** username/password local entries use VS Code MCP input prompts (`${input:...}`) at server start. Plain SAP credentials are not written to `mcp.json`.
+- **Windows SSO:** local Windows entries can use `SAP_AUTH_MODE=windows-sso` instead of username/password prompts when the ABAP ADT endpoint supports HTTP Negotiate/SPNEGO. The runtime starts a loopback ADT proxy and uses the bundled Windows SSPI helper unless `SAP_AI_DEV_TOOLKIT_NEGOTIATE_HELPER` points to a trusted custom helper. NTLM fallback is rejected.
+- **IP-address HTTPS self-healing:** if the confirmed ADT URL is `https://<ip>:<port>` and the certificate is issued to DNS names, setup reads the certificate DNS SANs automatically and stores them as `SAP_TLS_SERVER_NAMES`. At runtime a loopback proxy dials the IP address but verifies TLS against those discovered DNS names, trying them one by one. Certificate verification stays enabled; there is no `--insecure` mode.
+- **Private CAs:** if the SAP HTTPS certificate chains to an internal CA that is not trusted by the local Node runtime, set `SAP_TLS_CA_FILE` or `SAP_AI_DEV_TOOLKIT_TLS_CA_FILE` to a PEM CA bundle. This adds trust roots for the self-healing proxy without disabling certificate validation.
+- **Redirect and request safety:** local loopback proxies reject cross-origin forward-form requests and rewrite same-origin SAP redirects back through the loopback listener, so VSP stays on the safe route.
+
+Typical local setup flow:
+
+```sh
+sap-ai-dev --setup
+```
+
+1. Select the discovered SAP GUI system with **Space** and confirm with **Enter**.
+2. Confirm the detected/default SAP client, or enter multiple clients such as `100,200`.
+3. Accept the proposed ADT URL when it is correct, or edit it if your landscape exposes ADT through a different HTTP(S) host/port.
+4. If setup discovers certificate DNS names for an IP-based HTTPS URL, accept the yes/no TLS self-healing prompt.
+5. Choose password or Windows SSO when the prompt is available.
+6. Start each generated MCP server from VS Code's **MCP: List Servers** command.
 
 The same postinstall offers the bundled agents and skills for several AI coding harnesses in a checkbox picker. **GitHub Copilot** and **Claude Code** start pre-checked, so pressing **Enter** alone installs both; **Space** selects or deselects a harness, **a** toggles all seven, and confirming with none selected skips the step without changing files. When destination MCP setup succeeds, the generated managed MCP servers are also mirrored into selected harnesses that have a stable user-level JSON MCP configuration (Claude Code, Cursor, Gemini CLI, and Pi Coding Agent). GitHub Copilot continues to use the BAS/VS Code MCP configuration written during destination setup. With no interactive terminal, the assets are installed for GitHub Copilot only; set `SAP_AI_DEV_TOOLKIT_HARNESSES` to a comma-separated list of harness ids (`github-copilot`, `claude-code`, `codex`, `cursor`, `gemini-cli`, `opencode`, `pi-coding-agent`) to choose non-interactively.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sap-ai-dev-toolkit",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "SAP AI development toolkit for BAS, ABAP, RAP, CAP, HANA Cloud, Fiori, UI5, and MCP",
   "author": "Gurkan Yilmaz",
   "type": "module",

package/src/setup.mjs

@@ -45,6 +45,51 @@ async function confirmCloudFoundryImport({ input = stdin, output = stdout } = {}
   }
 }
 
+export function parseSapClientList(value, fallback = '001') {
+  const supplied = String(value ?? '').trim();
+  const raw = supplied || String(fallback || '001').trim() || '001';
+  const clients = raw.split(',').map(client => client.trim()).filter(Boolean);
+  const unique = [];
+  const seen = new Set();
+  for (const client of clients) {
+    if (!/^\d{3}$/.test(client)) throw new Error('Enter one or more SAP clients as 3 digits, separated by commas, for example 100 or 100,200.');
+    if (!seen.has(client)) {
+      seen.add(client);
+      unique.push(client);
+    }
+  }
+  if (!unique.length) throw new Error('Enter at least one SAP client.');
+  return unique;
+}
+
+async function promptSapClients(destination, { input = stdin, output = stdout } = {}) {
+  const fallback = destination.client || '001';
+  const answer = await textPrompt({
+    message: `SAP client(s) for ${destination.name}`,
+    placeholder: fallback,
+    required: false,
+    validate: value => {
+      try { parseSapClientList(value, fallback); return true; }
+      catch (error) { return error.message; }
+    }
+  }, { input, output });
+  return parseSapClientList(answer, fallback);
+}
+
+function localSystemDiscriminator(destination) {
+  return [destination.systemId, destination.host, destination.instance].map(value => String(value || '').trim()).filter(Boolean).join(' ');
+}
+
+function localClientDestinationName(destination, client, { multipleClients = false, duplicateSystemName = false } = {}) {
+  const suffix = [];
+  if (multipleClients || duplicateSystemName) suffix.push(client);
+  if (duplicateSystemName) {
+    const discriminator = localSystemDiscriminator(destination);
+    if (discriminator) suffix.push(discriminator);
+  }
+  return suffix.length ? `${destination.name} ${suffix.join(' ')}` : destination.name;
+}
+
 
 function safeProbe(probe) {
   const result = {};
@@ -293,7 +338,7 @@ export async function runSetup({
   print(output, '  Space = select/deselect · a = toggle all · Enter = confirm.');
   print(output, '  Nothing selected removes this add-on’s MCP entries.');
   print(output, '');
-  const selected = await checkboxPrompt({
+  let selected = await checkboxPrompt({
     message: colorText('🧭 Select destinations', 'cyan', output),
     choices,
     required: false,
@@ -302,12 +347,23 @@ export async function runSetup({
 
   if (!isBas && selected.length) {
     print(output, '');
-    print(output, formatStatus('SAP GUI landscapes do not contain ADT HTTP(S) endpoints. Confirm the ADT URL and authentication for each selected system.', 'step', output, 'Local SAP GUI'));
+    print(output, formatStatus('SAP GUI landscapes do not contain ADT HTTP(S) endpoints or a complete client catalog. Confirm the SAP client(s), ADT URL, and authentication for each selected system.', 'step', output, 'Local SAP GUI'));
+    print(output, '  Enter multiple clients as comma-separated 3-digit values, for example 100,200. Setup creates one isolated MCP server per system/client pair.');
     if (windowsSsoSetupAvailable(env)) print(output, '  Windows SSO is experimental and only applies to ADT systems configured for HTTP Integrated Authentication. Username/password remains the default.');
+    const selectedNameCounts = selected.reduce((counts, destination) => {
+      const key = String(destination.name).toLowerCase();
+      counts.set(key, (counts.get(key) || 0) + 1);
+      return counts;
+    }, new Map());
+    const expanded = [];
     for (const destination of selected) {
+      const duplicateSystemName = (selectedNameCounts.get(String(destination.name).toLowerCase()) || 0) > 1;
+      const discriminator = duplicateSystemName ? localSystemDiscriminator(destination) : '';
+      const promptLabel = discriminator ? `${destination.name} (${discriminator})` : destination.name;
+      const clients = await promptSapClients({ ...destination, name: promptLabel }, { input, output });
       const fallback = defaultAdtUrl(destination);
       const url = await textPrompt({
-        message: `ADT URL for ${destination.name}`,
+        message: `ADT URL for ${promptLabel}`,
         placeholder: fallback || 'https://host:44300',
         validate: value => {
           const candidate = value || fallback;
@@ -333,7 +389,7 @@ export async function runSetup({
         if (discoveredNames.length) {
           const preview = discoveredNames.slice(0, 5).join(', ');
           const answer = await textPrompt({
-            message: `Use discovered certificate DNS name${discoveredNames.length === 1 ? '' : 's'} for ${destination.name}: ${preview}${discoveredNames.length > 5 ? ', ...' : ''}? (y/Enter=yes, n=no)`,
+            message: `Use discovered certificate DNS name${discoveredNames.length === 1 ? '' : 's'} for ${promptLabel}: ${preview}${discoveredNames.length > 5 ? ', ...' : ''}? (y/Enter=yes, n=no)`,
             placeholder: 'y',
             required: false,
             validate: value => /^(?:|y|yes|n|no)$/i.test(String(value || '').trim()) || 'Enter y or n.'
@@ -346,26 +402,32 @@ export async function runSetup({
           print(output, formatStatus('No DNS subjectAltName entries could be read from the SAP HTTPS certificate. TLS self-healing was not configured automatically.', 'warning', output, 'TLS self-heal'));
         }
       }
-      const authMode = await chooseLocalAuthMode(destination, { input, output, env });
+      const authMode = await chooseLocalAuthMode({ ...destination, name: promptLabel }, { input, output, env });
       destination.authentication = authMode === 'windows-sso' ? 'WindowsSSO' : 'Basic';
       destination.authMode = authMode;
-      if (authMode === 'windows-sso') {
-        destination.childEnv = { SAP_AUTH_MODE: 'windows-sso' };
-        destination.inputs = [];
-      } else {
-        const userInputId = `sap-ai-dev-${destination.serverName || destination.name}-user`.toLowerCase().replace(/[^a-z0-9_-]+/g, '-');
-        const passwordInputId = `sap-ai-dev-${destination.serverName || destination.name}-password`.toLowerCase().replace(/[^a-z0-9_-]+/g, '-');
-        destination.childEnv = {
-          SAP_AUTH_MODE: 'basic',
-          SAP_USER: `\${input:${userInputId}}`,
-          SAP_PASSWORD: `\${input:${passwordInputId}}`
-        };
-        destination.inputs = [
-          { id: userInputId, type: 'promptString', description: `SAP user for ${destination.name}` },
-          { id: passwordInputId, type: 'promptString', description: `SAP password for ${destination.name}`, password: true }
-        ];
+      for (const client of clients) {
+        const name = localClientDestinationName(destination, client, { multipleClients: clients.length > 1, duplicateSystemName });
+        const localDestination = { ...destination, name, serverName: name, client };
+        if (authMode === 'windows-sso') {
+          localDestination.childEnv = { SAP_AUTH_MODE: 'windows-sso' };
+          localDestination.inputs = [];
+        } else {
+          const userInputId = `sap-ai-dev-${localDestination.serverName || localDestination.name}-user`.toLowerCase().replace(/[^a-z0-9_-]+/g, '-');
+          const passwordInputId = `sap-ai-dev-${localDestination.serverName || localDestination.name}-password`.toLowerCase().replace(/[^a-z0-9_-]+/g, '-');
+          localDestination.childEnv = {
+            SAP_AUTH_MODE: 'basic',
+            SAP_USER: `\${input:${userInputId}}`,
+            SAP_PASSWORD: `\${input:${passwordInputId}}`
+          };
+          localDestination.inputs = [
+            { id: userInputId, type: 'promptString', description: `SAP user for ${localDestination.name}` },
+            { id: passwordInputId, type: 'promptString', description: `SAP password for ${localDestination.name}`, password: true }
+          ];
+        }
+        expanded.push(localDestination);
       }
     }
+    selected = expanded;
   }
 
   let sapDevelopmentServers = [];