sap-ai-dev-toolkit 0.4.0 → 0.4.2

package/package.json

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

package/scripts/install-local.mjs

@@ -61,6 +61,9 @@ async function verify() {
   const pkg = JSON.parse(await readFile(join(root, 'package.json'), 'utf8'));
   const prefix = await resolveGlobalBinaryPath();
   const expected = resolvePath(prefix, 'lib', 'node_modules', pkg.name);
+  const serverCommand = process.platform === 'win32'
+    ? join(prefix, 'sap-ai-dev.cmd')
+    : join(prefix, 'bin', 'sap-ai-dev');
   const installedRoot = await new Promise((resolve, reject) => {
     const child = spawn(process.platform === 'win32' ? 'npm.cmd' : 'npm', ['list', '-g', pkg.name, '--parseable'], {
       cwd: root,
@@ -73,14 +76,16 @@ async function verify() {
     child.once('error', reject);
     child.once('close', code => resolve(code === 0 ? stdout.trim().split('\n').filter(Boolean).pop() : null));
   });
-  console.log(`Global prefix:      ${prefix}`);
-  console.log(`Installed location: ${installedRoot || '(not installed)'}`);
+  console.log(`MCP server location: ${serverCommand}`);
   console.log(`Workspace root:     ${root}`);
   if (!installedRoot) throw new Error(`${pkg.name} is not installed globally`);
   if (installedRoot !== expected) {
     console.log(`Expected location:  ${expected}`);
     throw new Error('Global installation does not match the expected npm layout');
   }
+  if (!await lstat(serverCommand).catch(() => null)) {
+    throw new Error(`Global sap-ai-dev command is missing at ${serverCommand}`);
+  }
   const stats = await lstat(installedRoot).catch(() => null);
   console.log(`Install mode:       ${stats?.isSymbolicLink() ? 'npm link (live workspace)' : 'tarball (snapshot)'}`);
   return 0;

package/src/mcp-config.mjs

@@ -1,7 +1,8 @@
 import { randomUUID } from 'node:crypto';
-import { mkdir, readFile, rename, rm, stat, writeFile } from 'node:fs/promises';
+import { constants } from 'node:fs';
+import { access, mkdir, readFile, rename, rm, stat, writeFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
-import { basename, dirname, join } from 'node:path';
+import { basename, delimiter, dirname, join, resolve } from 'node:path';
 import { brandedEnvValue } from './branding.mjs';
 
 const LEGACY_MCP_SERVER_PREFIXES = ['sapAiDev_', 'basVspMcp_'];
@@ -61,6 +62,25 @@ async function exists(path) {
   }
 }
 
+export async function resolveMcpServerCommand(env = process.env) {
+  const executableNames = process.platform === 'win32'
+    ? ['sap-ai-dev.cmd', 'sap-ai-dev.exe', 'sap-ai-dev']
+    : ['sap-ai-dev'];
+  const searchPath = String(env.PATH || env.Path || '').split(delimiter).filter(Boolean);
+  for (const directory of searchPath) {
+    for (const executableName of executableNames) {
+      const candidate = resolve(directory, executableName);
+      try {
+        await access(candidate, constants.X_OK);
+        return candidate;
+      } catch {
+        // Continue searching PATH; use the command name as a portable fallback.
+      }
+    }
+  }
+  return 'sap-ai-dev';
+}
+
 export async function resolveMcpConfigPath(env = process.env) {
   const configuredPath = brandedEnvValue(env, 'MCP_CONFIG');
   if (configuredPath) return configuredPath;
@@ -149,13 +169,31 @@ function isCompanionServer(entry) {
 }
 
 function isPackageLauncher(entry) {
-  const commands = new Set(['sap-ai-dev', 'sap-ai-dev-toolkit', 'bas-vsp-mcp']);
-  const packages = [/^--package=sap-ai-dev-toolkit(?:@[^/]+)?$/, /^--package=bas-mcp-addon(?:@[^/]+)?$/];
-  const npxLauncher = entry?.command === 'npx'
+  const currentCommands = new Set(['sap-ai-dev', 'sap-ai-dev-toolkit']);
+  const legacyCommands = new Set(['bas-vsp-mcp']);
+  const commandName = typeof entry?.command === 'string'
+    ? entry.command.slice(Math.max(entry.command.lastIndexOf('/'), entry.command.lastIndexOf('\\')) + 1).replace(/\.(?:cmd|exe)$/i, '')
+    : '';
+  const currentCommand = currentCommands.has(entry?.command) || currentCommands.has(commandName);
+  const legacyCommand = legacyCommands.has(entry?.command) || legacyCommands.has(commandName);
+  const currentPackages = [/^--package=sap-ai-dev-toolkit(?:@[^/]+)?$/];
+  const legacyPackages = [/^--package=bas-mcp-addon(?:@[^/]+)?$/];
+  const hasPackage = patterns => Array.isArray(entry?.args)
+    && entry.args.some(argument => typeof argument === 'string' && patterns.some(pattern => pattern.test(argument)));
+  const currentNpxLauncher = entry?.command === 'npx'
+    && Array.isArray(entry.args)
+    && entry.args.some(argument => currentCommands.has(argument))
+    && hasPackage(currentPackages);
+  const legacyNpxLauncher = entry?.command === 'npx'
     && Array.isArray(entry.args)
-    && entry.args.some(argument => commands.has(argument))
-    && entry.args.some(argument => typeof argument === 'string' && packages.some(pattern => pattern.test(argument)));
-  return entry?.BAS_EXT === 'true' && (commands.has(entry?.command) || npxLauncher);
+    && entry.args.some(argument => legacyCommands.has(argument))
+    && hasPackage(legacyPackages);
+  // Current launchers are treated as managed only when tagged by this add-on.
+  // Some early bas-mcp-addon entries were not tagged with BAS_EXT, though, and
+  // leaving them behind keeps advertising the old full VSP surface (~159 tools).
+  return (entry?.BAS_EXT === 'true' && (currentCommand || currentNpxLauncher || legacyCommand || legacyNpxLauncher))
+    || legacyCommand
+    || legacyNpxLauncher;
 }
 
 function destinationValue(env) {
@@ -240,11 +278,12 @@ export async function installMcpConfig(destinationsOrOptions, options = {}) {
     ...buildMcpEntries(destinations, env),
     ...buildSapDevelopmentMcpEntries(options.sapDevelopmentServers || [])
   };
-  if (options.command) {
+  const launcherCommand = options.command || (destinations.length ? await resolveMcpServerCommand(env) : null);
+  if (launcherCommand) {
     for (const entry of Object.values(generated)) {
       if (isCompanionServer(entry)) continue;
-      entry.command = options.command;
-      if (options.args?.length) entry.args = [...options.args];
+      entry.command = launcherCommand;
+      if (options.command && options.args?.length) entry.args = [...options.args];
     }
   }
   const servers = Object.create(null);

package/test/mcp-config-cf.test.mjs

@@ -61,6 +61,23 @@ test('writes source-qualified CF entries beside same-named BAS destinations', ()
   assert.equal(onPremise['cf:space-one:onprem-instance:shared'].env.BAS_CF_CONNECTIVITY_KEY, 'connectivity-key');
 });
 
+test('stores and reconciles the MCP launcher executable location', async t => {
+  const directory = await mkdtemp(join(tmpdir(), 'bas-mcp-launcher-location-'));
+  const path = join(directory, 'mcp.json');
+  const command = join(directory, 'sap-ai-dev');
+  await writeFile(command, '#!/bin/sh\nexit 0\n', { mode: 0o755 });
+  await writeFile(path, JSON.stringify({ servers: { userServer: { command: 'custom-server' } } }));
+  t.after(() => rm(directory, { recursive: true, force: true }));
+
+  const env = { H2O_URL: 'http://h2o.example', PATH: directory };
+  const installed = await installMcpConfig([bas], { env, path });
+  assert.equal(installed.servers.shared.command, command);
+  assert.equal((await readMcpConfig(path)).servers.shared.command, command);
+
+  await installMcpConfig([], { env, path });
+  assert.deepEqual(Object.keys((await readMcpConfig(path)).servers), ['userServer']);
+});
+
 test('extracts key references only from package-managed Cloud Foundry entries', () => {
   const cloudFoundry = buildMcpEntries([
     cfDestination('space-one', 'instance-one', 'destination-key', 'OnPremise')
@@ -225,9 +242,38 @@ test('recognizes old npx Cloud Foundry entries so setup can reuse their service
       BAS_VSP_DESTINATION: current.env.SAP_AI_DEV_TOOLKIT_DESTINATION
     }
   };
+  delete legacy.BAS_EXT;
   delete legacy.env.SAP_AI_DEV_TOOLKIT_DESTINATION_SOURCE;
   delete legacy.env.SAP_AI_DEV_TOOLKIT_DESTINATION;
   assert.deepEqual(collectManagedCloudFoundryKeyReferences({ servers: { legacy } }), [
     { kind: 'destination', spaceGuid: 'space-one', instanceGuid: 'instance-one', instanceName: 'destination-instance-one', keyName: 'old-key' }
   ]);
 });
+
+test('setup removes untagged legacy bas-mcp-addon launchers that expose the full VSP surface', async t => {
+  const directory = await mkdtemp(join(tmpdir(), 'sap-ai-toolkit-untagged-legacy-'));
+  const path = join(directory, 'mcp.json');
+  t.after(() => rm(directory, { recursive: true, force: true }));
+  await writeFile(path, JSON.stringify({
+    servers: {
+      shared: {
+        type: 'stdio',
+        command: 'npx',
+        args: ['--yes', '--package=bas-mcp-addon@0.2.0', 'bas-vsp-mcp'],
+        env: { H2O_URL: 'http://old-h2o.example', BAS_VSP_DESTINATION: 'shared' }
+      },
+      legacyCommand: {
+        type: 'stdio',
+        command: 'bas-vsp-mcp',
+        env: { H2O_URL: 'http://old-h2o.example', BAS_VSP_DESTINATION: 'other' }
+      },
+      userServer: { type: 'stdio', command: 'custom-server' }
+    }
+  }));
+
+  await installMcpConfig([bas], { env: { H2O_URL: 'http://h2o.example' }, path });
+  const migrated = await readMcpConfig(path);
+  assert.deepEqual(Object.keys(migrated.servers).sort(), ['shared', 'userServer']);
+  assert.equal(migrated.servers.shared.command, 'sap-ai-dev');
+  assert.equal(migrated.servers.shared.env.SAP_AI_DEV_TOOLKIT_DESTINATION, 'shared');
+});

package/test/setup.test.mjs

@@ -306,7 +306,7 @@ test('global postinstall completes BAS selection before optional Copilot assets'
   assert.ok(acceptLogs.indexOf('Installation configuration summary') > acceptLogs.indexOf('Installed 19 Copilot files'), acceptLogs);
   assert.ok(acceptLogs.includes(`MCP config file: ${config}`), acceptLogs);
   assert.ok(acceptLogs.includes('Destination: BAS · alpha-system · client 100 · Basic'), acceptLogs);
-  assert.ok(acceptLogs.includes('Launch: stdio · sap-ai-dev'), acceptLogs);
+  assert.match(acceptLogs, /Launch: stdio · (?:[^\r\n]*[\\/])?sap-ai-dev(?:\.cmd)?(?:\r?\n|$)/, acceptLogs);
   assert.ok(acceptLogs.includes('Environment keys: H2O_URL, SAP_AI_DEV_TOOLKIT_DESTINATION, SAP_ALLOW_TRANSPORTABLE_EDITS'), acceptLogs);
   const configAfterAccept = JSON.parse(await readFile(config, 'utf8'));
   assert.deepEqual(Object.values(configAfterAccept.servers)