sap-ai-dev-toolkit 0.2.7 → 0.3.1

package/src/launcher.mjs

@@ -9,8 +9,10 @@ import { MCPProxy } from './mcp-proxy.mjs';
 import { installMcpConfig } from './mcp-config.mjs';
 import { runSetup } from './setup.mjs';
 import { resolveConfiguredCloudFoundryDestination } from './cf-destination.mjs';
+import { withBrandedEnvironment } from './branding.mjs';
 const root = dirname(dirname(fileURLToPath(import.meta.url)));
 const pkg = JSON.parse(await readFile(join(root, 'package.json'), 'utf8'));
+const runtimeEnv = withBrandedEnvironment(process.env);
 
 function hasFlag(name) { return process.argv.slice(2).includes(name); }
 function json(value) { process.stdout.write(`${JSON.stringify(value)}\n`); }
@@ -19,7 +21,7 @@ function usage() {
   return [
     'Usage: sap-ai-dev [options]',
     '',
-    'With H2O_URL set and no command, starts the BAS MCP stdio server.',
+    'With H2O_URL set and no command, starts the SAP AI Dev Toolkit stdio server for selected BAS destinations.',
     'Options:',
     '  --setup                  Configure generated BAS MCP servers',
     '  --tools                  Also offer full-stack SAP companion MCP servers (use with --setup)',
@@ -27,6 +29,9 @@ function usage() {
     '  --list-destinations      List discovered BAS destinations',
     '  --list-destinations --json  Print redacted JSON status',
     '  --check                  Probe destination availability',
+    '  --doctor                 Check destination, VSP, SAP, and MCP connectivity',
+    '  --doctor --json          Print redacted JSON diagnostics',
+    '  --demo                   Start an isolated, offline SAP MCP playground',
     '  --help, -h               Show this help and exit',
     '',
     'Use an MCP client to call server tools; the BAS runtime uses stdio for MCP.',
@@ -34,6 +39,86 @@ function usage() {
   ].join('\n');
 }
 
+function doctorRow(name, stage, status, detail) {
+  return { name, stage, status, ...(detail ? { detail } : {}) };
+}
+
+function redactText(value) {
+  return String(value).replace(/(authorization|cookie|password|secret|token)\s*[:=]\s*[^\s,;]+/gi, '$1=[redacted]');
+}
+
+async function runDoctor(destinations) {
+  const checks = [];
+  if (!destinations.length) {
+    return { ok: false, destinations: 0, checks: [doctorRow('-', 'destination discovery', 'failed', 'No destinations were found. Check H2O_URL or the configured Cloud Foundry destination.')] };
+  }
+  let binary;
+  let binaryError;
+  try { binary = await binaryOrError(); }
+  catch (error) { binaryError = error.message; }
+
+  for (const destination of destinations) {
+    const probe = destination.probe;
+    const probeStatus = !probe || probe.status === 'skipped' ? 'skipped' : (probe.available === true ? 'passed' : 'failed');
+    checks.push(doctorRow(destination.name, 'ADT probe', probeStatus, probe?.status || 'No BAS ADT probe was supplied; GetSystemInfo will check the route.'));
+    checks.push(doctorRow(destination.name, 'VSP binary', binary ? 'passed' : 'failed', binary ? 'installed' : binaryError));
+    if (!binary) {
+      checks.push(doctorRow(destination.name, 'VSP MCP startup', 'skipped', 'The VSP binary is unavailable.'));
+      checks.push(doctorRow(destination.name, 'SAP system check', 'skipped', 'VSP MCP startup could not run.'));
+      checks.push(doctorRow(destination.name, 'MCP tools/list', 'skipped', 'VSP MCP startup could not run.'));
+      try { await destination.close?.(); } catch {}
+      continue;
+    }
+    const proxy = new MCPProxy({ binary, destinations: [destination], env: runtimeEnv, log: message => console.error(message) });
+    try {
+      proxy.start();
+      const initialized = await proxy.handle({ jsonrpc: '2.0', id: 1, method: 'initialize', params: { protocolVersion: '2024-11-05' } });
+      if (initialized?.error) throw new Error(initialized.error.message || 'MCP initialization failed');
+      checks.push(doctorRow(destination.name, 'VSP MCP startup', 'passed', 'initialized'));
+      const listed = await proxy.handle({ jsonrpc: '2.0', id: 2, method: 'tools/list', params: {} });
+      if (listed?.error) throw new Error(listed.error.message || 'MCP tools/list failed');
+      const tools = listed.result?.tools || [];
+      const localNames = new Set(['LintABAP', 'GetApplicationLog', 'PrepareABAPChangeSet', 'ApplyABAPChangeSet', 'CheckTransportReadiness', 'PlanABAPCloudMigration', 'GenerateRAPRegressionSuite', 'RunRAPRegressionSuite']);
+      const upstreamCount = tools.filter(tool => !localNames.has(tool.name.slice(tool.name.indexOf('__') + 2))).length;
+      checks.push(doctorRow(destination.name, 'MCP tools/list', upstreamCount ? 'passed' : 'failed', `${upstreamCount} VSP tools available`));
+      const systemInfo = tools.find(tool => tool.name.endsWith('__GetSystemInfo'));
+      if (!systemInfo) {
+        checks.push(doctorRow(destination.name, 'SAP system check', 'skipped', 'GetSystemInfo is not exposed by this VSP mode.'));
+      } else {
+        const inspected = await proxy.handle({ jsonrpc: '2.0', id: 3, method: 'tools/call', params: { name: systemInfo.name, arguments: {} } });
+        const failed = inspected?.error || inspected?.result?.isError;
+        checks.push(doctorRow(destination.name, 'SAP system check', failed ? 'failed' : 'passed', failed ? redactText(inspected?.error?.message || inspected?.result?.content?.[0]?.text || 'GetSystemInfo failed') : 'GetSystemInfo returned successfully'));
+      }
+    } catch (error) {
+      const detail = redactText(error.message || error).slice(0, 300);
+      const initialized = checks.some(row => row.name === destination.name && row.stage === 'VSP MCP startup' && row.status === 'passed');
+      if (!initialized) checks.push(doctorRow(destination.name, 'VSP MCP startup', 'failed', detail));
+      else checks.push(doctorRow(destination.name, 'MCP tools/list', 'failed', detail));
+      checks.push(doctorRow(destination.name, 'SAP system check', 'skipped', 'An earlier diagnostic step failed.'));
+    } finally {
+      await proxy.close();
+    }
+  }
+  const required = checks.filter(check => check.status !== 'skipped');
+  return { ok: required.every(check => check.status === 'passed'), destinations: destinations.length, checks };
+}
+
+async function runOfflineDemo() {
+  const demoPath = join(root, 'src', 'demo-vsp.mjs');
+  const proxy = new MCPProxy({
+    binary: process.execPath,
+    childArgs: () => [demoPath],
+    destinations: [{ name: 'demo', url: 'http://demo.dest', client: '001', demo: true }],
+    env: { ...runtimeEnv, SAP_AI_DEV_TOOLKIT_DESTINATION: 'demo' },
+    log: message => console.error(message)
+  });
+  console.error('[sap-ai-dev-toolkit] offline demo active; all SAP changes are simulated in memory');
+  const shutdown = signal => { void proxy.close().finally(() => process.exit(signal === 'SIGINT' ? 130 : 143)); };
+  process.once('SIGINT', () => shutdown('SIGINT'));
+  process.once('SIGTERM', () => shutdown('SIGTERM'));
+  await proxy.serve(process.stdin);
+}
+
 function probeDiagnostic(destination) {
   const probe = destination.probe || {};
   const details = [];
@@ -49,14 +134,14 @@ function probeDiagnostic(destination) {
 }
 
 async function binaryOrError() {
-  const path = await findBinary(pkg);
+  const path = await findBinary(pkg, { env: runtimeEnv });
   if (path) return path;
-  throw new Error('VSP binary is not installed. Reinstall with scripts enabled, set BAS_VSP_BINARY to a trusted patched binary, or run npm run build:vsp.');
+  throw new Error('VSP binary is not installed. Reinstall with scripts enabled, set SAP_AI_DEV_TOOLKIT_BINARY to a trusted patched binary, or run npm run build:vsp.');
 }
 
 async function discoverForCommand() {
-  const env = { ...process.env };
-  if (env.BAS_VSP_DESTINATION_SOURCE === 'cloud-foundry') env.BAS_VSP_DESTINATION = '';
+  const env = { ...runtimeEnv };
+  if (env.SAP_AI_DEV_TOOLKIT_DESTINATION_SOURCE === 'cloud-foundry') env.SAP_AI_DEV_TOOLKIT_DESTINATION = '';
   return discoverDestinations({ env });
 }
 
@@ -64,10 +149,32 @@ async function main() {
   const setup = hasFlag('--setup');
   const check = hasFlag('--check');
   const list = hasFlag('--list-destinations');
+  const doctor = hasFlag('--doctor');
+  const demo = hasFlag('--demo');
   if (hasFlag('--help') || hasFlag('-h')) {
     process.stdout.write(usage());
     return;
   }
+  if (doctor && demo) throw new Error('Use either --doctor or --demo, not both.');
+  if (demo) {
+    await runOfflineDemo();
+    return;
+  }
+  if (doctor) {
+    let report;
+    try {
+      const destinations = runtimeEnv.SAP_AI_DEV_TOOLKIT_DESTINATION_SOURCE === 'cloud-foundry'
+        ? [await resolveConfiguredCloudFoundryDestination({ env: runtimeEnv })]
+        : await discoverForCommand();
+      report = await runDoctor(destinations);
+    } catch (error) {
+      report = { ok: false, destinations: 0, checks: [doctorRow('-', 'destination discovery', 'failed', redactText(error.message || error).slice(0, 300))] };
+    }
+    if (hasFlag('--json')) json(report);
+    else for (const row of report.checks) console.log(`[${row.status.toUpperCase()}] ${row.name} — ${row.stage}: ${row.detail || ''}`);
+    if (!report.ok) process.exitCode = 1;
+    return;
+  }
   if (setup) {
     const setupOptions = {
       includeSapDevelopmentToolsPrompt: hasFlag('--tools') || hasFlag('--companion-tools')
@@ -93,12 +200,12 @@ async function main() {
     return;
   }
 
-  if (process.env.BAS_VSP_DESTINATION_SOURCE === 'cloud-foundry') {
-    const destination = await resolveConfiguredCloudFoundryDestination({ env: process.env });
+  if (runtimeEnv.SAP_AI_DEV_TOOLKIT_DESTINATION_SOURCE === 'cloud-foundry') {
+    const destination = await resolveConfiguredCloudFoundryDestination({ env: runtimeEnv });
     let proxy;
     try {
       const binary = await binaryOrError();
-      proxy = new MCPProxy({ binary, destinations: [destination], env: process.env, log: message => console.error(message) });
+      proxy = new MCPProxy({ binary, destinations: [destination], env: runtimeEnv, log: message => console.error(message) });
       const shutdown = signal => { void proxy.close().finally(() => process.exit(signal === 'SIGINT' ? 130 : 143)); };
       process.once('SIGINT', () => shutdown('SIGINT'));
       process.once('SIGTERM', () => shutdown('SIGTERM'));
@@ -111,9 +218,9 @@ async function main() {
     return;
   }
 
-  if (!process.env.H2O_URL) {
+  if (!runtimeEnv.H2O_URL) {
     const binary = await binaryOrError();
-    const child = spawn(binary, process.argv.slice(2), { env: process.env, stdio: 'inherit' });
+    const child = spawn(binary, process.argv.slice(2), { env: runtimeEnv, stdio: 'inherit' });
     process.once('SIGINT', () => child.kill('SIGINT'));
     process.once('SIGTERM', () => child.kill('SIGTERM'));
     const [code, signal] = await new Promise(resolve => child.once('exit', (exitCode, exitSignal) => resolve([exitCode, exitSignal])));
@@ -122,7 +229,7 @@ async function main() {
     return;
   }
 
-  const discovered = await discoverDestinations({ env: process.env });
+  const discovered = await discoverDestinations({ env: runtimeEnv });
   for (const destination of discovered) console.error(probeDiagnostic(destination));
   const destinations = discovered;
   if (!destinations.length) {

package/src/mcp-config.mjs

@@ -2,6 +2,7 @@ import { randomUUID } from 'node:crypto';
 import { mkdir, readFile, rename, rm, stat, writeFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { basename, dirname, join } from 'node:path';
+import { brandedEnvValue } from './branding.mjs';
 
 const LEGACY_MCP_SERVER_PREFIXES = ['sapAiDev_', 'basVspMcp_'];
 const COMPANION_SERVER_KIND = 'sap-development-companion';
@@ -52,8 +53,8 @@ async function exists(path) {
 }
 
 export async function resolveMcpConfigPath(env = process.env) {
-  if (env.SAP_AI_DEV_MCP_CONFIG) return env.SAP_AI_DEV_MCP_CONFIG;
-  if (env.BAS_VSP_MCP_CONFIG) return env.BAS_VSP_MCP_CONFIG;
+  const configuredPath = brandedEnvValue(env, 'MCP_CONFIG');
+  if (configuredPath) return configuredPath;
   const home = env.HOME || homedir();
   const candidates = [
     join(home, '.vscode', 'data', 'User', 'mcp.json'),
@@ -91,7 +92,7 @@ export function buildSapDevelopmentMcpEntries(serverIds = SAP_DEVELOPMENT_MCP_SE
 
 export function buildMcpEntries(destinations, env = process.env) {
   const h2oUrl = env.H2O_URL;
-  if (!h2oUrl) throw new Error('H2O_URL is required to write BAS MCP configuration');
+  if (!h2oUrl) throw new Error('H2O_URL is required to write SAP AI Dev Toolkit configuration');
   const entries = Object.create(null);
   const selected = [...destinations].sort((a, b) => String(a.serverName || a.name).localeCompare(String(b.serverName || b.name)));
   for (const destination of selected) {
@@ -106,8 +107,8 @@ export function buildMcpEntries(destinations, env = process.env) {
       const cf = destination.cf;
       if (!cf) throw new Error(`Cloud Foundry destination "${destination.name}" is missing service references`);
       Object.assign(entryEnv, {
-        BAS_VSP_DESTINATION_SOURCE: 'cloud-foundry',
-        BAS_VSP_DESTINATION: String(destination.name),
+        SAP_AI_DEV_TOOLKIT_DESTINATION_SOURCE: 'cloud-foundry',
+        SAP_AI_DEV_TOOLKIT_DESTINATION: String(destination.name),
         BAS_CF_SPACE_GUID: String(cf.spaceGuid),
         BAS_CF_DESTINATION_INSTANCE_GUID: String(cf.destinationInstanceGuid),
         BAS_CF_DESTINATION_INSTANCE: String(cf.destinationInstanceName),
@@ -122,7 +123,7 @@ export function buildMcpEntries(destinations, env = process.env) {
         });
       }
     } else {
-      entryEnv.BAS_VSP_DESTINATION = String(destination.name);
+      entryEnv.SAP_AI_DEV_TOOLKIT_DESTINATION = String(destination.name);
     }
     entries[name] = {
       type: 'stdio',
@@ -139,7 +140,7 @@ function isCompanionServer(entry) {
 }
 
 function isPackageLauncher(entry) {
-  const commands = new Set(['sap-ai-dev', 'bas-vsp-mcp']);
+  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'
     && Array.isArray(entry.args)
@@ -148,11 +149,19 @@ function isPackageLauncher(entry) {
   return entry?.BAS_EXT === 'true' && (commands.has(entry?.command) || npxLauncher);
 }
 
+function destinationValue(env) {
+  return env?.SAP_AI_DEV_TOOLKIT_DESTINATION ?? env?.BAS_VSP_DESTINATION;
+}
+
+function destinationSource(env) {
+  return env?.SAP_AI_DEV_TOOLKIT_DESTINATION_SOURCE ?? env?.BAS_VSP_DESTINATION_SOURCE;
+}
+
 function collectCloudFoundryKeyReferences(config, managedOnly) {
   const refs = new Map();
   for (const entry of Object.values(config?.servers || {})) {
     const e = entry?.env;
-    if (!e || (managedOnly && (e.BAS_VSP_DESTINATION_SOURCE !== 'cloud-foundry' || !isPackageLauncher(entry)))) continue;
+    if (!e || (managedOnly && (destinationSource(e) !== 'cloud-foundry' || !isPackageLauncher(entry)))) continue;
     const candidates = [
       { kind: 'destination', spaceGuid: e.BAS_CF_SPACE_GUID, instanceGuid: e.BAS_CF_DESTINATION_INSTANCE_GUID, instanceName: e.BAS_CF_DESTINATION_INSTANCE, keyName: e.BAS_CF_DESTINATION_KEY },
       { kind: 'connectivity', spaceGuid: e.BAS_CF_SPACE_GUID, instanceGuid: e.BAS_CF_CONNECTIVITY_INSTANCE_GUID, instanceName: e.BAS_CF_CONNECTIVITY_INSTANCE, keyName: e.BAS_CF_CONNECTIVITY_KEY }
@@ -232,8 +241,8 @@ export async function installMcpConfig(destinationsOrOptions, options = {}) {
   const servers = Object.create(null);
   for (const [name, entry] of Object.entries(config.servers)) {
     const managed = isPackageLauncher(entry)
-      && typeof entry?.env?.BAS_VSP_DESTINATION === 'string'
-      && (entry.env.BAS_VSP_DESTINATION_SOURCE === 'cloud-foundry'
+      && typeof destinationValue(entry?.env) === 'string'
+      && (destinationSource(entry.env) === 'cloud-foundry'
         ? typeof entry.env.BAS_CF_DESTINATION_KEY === 'string'
         : entry.env.BAS_VSP_DESTINATION_SOURCE === undefined);
     if (!LEGACY_MCP_SERVER_PREFIXES.some(prefix => name.startsWith(prefix)) && !managed && !isCompanionServer(entry)) servers[name] = entry;

package/src/mcp-proxy.mjs

@@ -2,6 +2,8 @@ import { spawn as nodeSpawn } from 'node:child_process';
 import { once } from 'node:events';
 import { sanitizeChildEnv, slugifyDestination } from './bas-discovery.mjs';
 import { ABAP_LINT_TOOL, runABAPLint } from './abaplint.mjs';
+import { createEngineeringTools } from './engineering-tools.mjs';
+import { brandedEnvValue } from './branding.mjs';
 
 const JSONRPC = '2.0';
 const FORWARDED_METHODS = new Set(['ping', 'resources/list', 'resources/read', 'resources/templates/list', 'prompts/list', 'completion/complete', 'logging/setLevel']);
@@ -64,7 +66,7 @@ function childEnvironment(destination, env) {
 export function childArguments(destination, env = process.env) {
   // The proxy allowlist keeps transport mutations to CreateTransport.
   // Transportable source edits are controlled by SAP_ALLOW_TRANSPORTABLE_EDITS.
-  const mode = env.BAS_VSP_MODE || 'expert';
+  const mode = brandedEnvValue(env, 'MODE') || 'expert';
   const args = ['--url', destination.url, '--client', destination.client || '001', '--mode', mode];
   if (destination.source !== 'cloud-foundry' || destination.authentication === 'PrincipalPropagation') args.push('--proxy-auth');
   args.push('--enable-transports');
@@ -186,11 +188,12 @@ class Child {
 }
 
 export class MCPProxy {
-  constructor({ binary, destinations, env = process.env, spawn = nodeSpawn, log = message => console.error(message), output = line => process.stdout.write(`${line}\n`) }) {
+  constructor({ binary, destinations, env = process.env, spawn = nodeSpawn, childArgs, log = message => console.error(message), output = line => process.stdout.write(`${line}\n`) }) {
     this.binary = binary;
     this.destinations = destinations;
     this.env = env;
     this.spawn = spawn;
+    this.childArgs = childArgs;
     this.log = log;
     this.output = output;
     this.children = [];
@@ -214,6 +217,7 @@ export class MCPProxy {
           child: new Child(this.binary, destination, {
             env: this.env,
             spawn: this.spawn,
+            args: this.childArgs?.(destination),
             log: this.log,
             onNotification: notification => {
               if (this.clientInitialized) this.output(JSON.stringify(notification));
@@ -264,7 +268,8 @@ export class MCPProxy {
       this.namespace.set(lintName, { handler: runABAPLint });
       merged.push({ ...ABAP_LINT_TOOL, name: lintName });
       try {
-        for (const tool of await entry.child.listTools()) {
+        const upstreamTools = await entry.child.listTools();
+        for (const tool of upstreamTools) {
           if (tool.name === 'SAP') {
             const applicationLogName = `${slug}__GetApplicationLog`;
             this.namespace.set(applicationLogName, {
@@ -284,6 +289,15 @@ export class MCPProxy {
           this.namespace.set(name, { entry, upstream: tool.name });
           merged.push({ ...tool, name, description: `${tool.description || tool.name} [destination: ${entry.destination.name}]` });
         }
+        for (const localTool of createEngineeringTools(entry, upstreamTools, { env: this.env, log: this.log })) {
+          const name = `${slug}__${localTool.definition.name}`;
+          this.namespace.set(name, { handler: localTool.handler });
+          merged.push({
+            ...localTool.definition,
+            name,
+            description: `${localTool.definition.description} [destination: ${entry.destination.name}]`
+          });
+        }
       } catch (error) {
         this.log(`[${entry.destination.name}] tools/list failed: ${redactText(error.message)}`);
       }
@@ -301,7 +315,7 @@ export class MCPProxy {
     try {
       if (message.method === 'initialize') {
         await this.initializeChildren(message.params || {});
-        return rpcResult(message.id, { protocolVersion: message.params?.protocolVersion || '2024-11-05', capabilities: { tools: {} }, serverInfo: { name: this.env.BAS_VSP_DESTINATION || this.children[0].destination.name, version: '0.1.0' } });
+        return rpcResult(message.id, { protocolVersion: message.params?.protocolVersion || '2024-11-05', capabilities: { tools: {} }, serverInfo: { name: brandedEnvValue(this.env, 'DESTINATION') || this.children[0].destination.name, version: '0.1.0' } });
       }
       if (!this.initialized) return rpcError(message.id, -32002, 'MCP proxy is not initialized');
       if (message.method === 'tools/list') return rpcResult(message.id, { tools: await this.mergedTools() });

package/src/setup.mjs

@@ -72,7 +72,7 @@ function printConnectionInstructions(output, result) {
   const servers = Object.entries(result?.servers || {});
   if (!servers.length) {
     print(output, '');
-    print(output, formatStatus('No destinations were selected; no MCP servers were added.', 'info', output, 'BAS setup'));
+    print(output, formatStatus('No destinations were selected; no MCP servers were added.', 'info', output, 'SAP AI Dev Toolkit'));
     return;
   }
   print(output, '');
@@ -99,11 +99,11 @@ export async function runSetup({
   includeSapDevelopmentToolsPrompt = false
 } = {}) {
   if (!env.H2O_URL) {
-    print(output, formatStatus(`Setup skipped: H2O_URL is not set. Run ${SETUP_COMMAND} in a BAS dev space.`, 'info', output, 'BAS setup'));
+    print(output, formatStatus(`Setup skipped: H2O_URL is not set. Run ${SETUP_COMMAND} in a BAS dev space.`, 'info', output, 'SAP AI Dev Toolkit'));
     return { skipped: true, reason: 'non-bas' };
   }
   if (!input.isTTY || !output.isTTY) {
-    print(output, formatStatus(`Interactive setup needs a terminal. Rerun ${SETUP_COMMAND} from a BAS terminal.`, 'warning', output, 'BAS setup'));
+    print(output, formatStatus(`Interactive setup needs a terminal. Rerun ${SETUP_COMMAND} from a BAS terminal.`, 'warning', output, 'SAP AI Dev Toolkit'));
     return { skipped: true, reason: 'non-tty' };
   }
   print(output, '');
@@ -111,7 +111,7 @@ export async function runSetup({
 
   let basDestinations;
   try {
-    basDestinations = await discover({ env: { ...env, BAS_VSP_DESTINATION: '' } });
+    basDestinations = await discover({ env: { ...env, SAP_AI_DEV_TOOLKIT_DESTINATION: '' } });
   } catch (error) {
     throw new Error(`BAS discovery failed: ${error.message}`);
   }
@@ -146,7 +146,7 @@ export async function runSetup({
         destinations.push(...cfDestinations.map(safeCloudFoundryDestination));
         warnings.push(...(Array.isArray(result?.warnings) ? result.warnings.filter(value => typeof value === 'string') : []));
       } catch {
-        warnings.push('Cloud Foundry import failed; BAS setup can continue.');
+        warnings.push('Cloud Foundry import failed; SAP AI Dev Toolkit setup can continue.');
       }
     } else if (!warnings.some(message => message.includes('Cloud Foundry import prompt failed'))) {
       warnings.push('Cloud Foundry destinations were skipped because import was not confirmed.');
@@ -269,4 +269,3 @@ export async function runSetup({
     throw new Error(`MCP config writing failed: ${error.message}`);
   }
 }
-

package/test/cf-destination.test.mjs

@@ -273,8 +273,8 @@ test('resolves a CF Basic destination only after matching the active space', asy
   const cf = mockCf({ origin });
   const env = {
     ...envForLocal(),
-    BAS_VSP_DESTINATION_SOURCE: 'cloud-foundry',
-    BAS_VSP_DESTINATION: 'runtime-basic',
+    SAP_AI_DEV_TOOLKIT_DESTINATION_SOURCE: 'cloud-foundry',
+    SAP_AI_DEV_TOOLKIT_DESTINATION: 'runtime-basic',
     BAS_CF_SPACE_GUID: SPACE_GUID,
     BAS_CF_DESTINATION_INSTANCE_GUID: DESTINATION_GUID,
     BAS_CF_DESTINATION_INSTANCE: DESTINATION_INSTANCE,

package/test/cf-runtime.test.mjs

@@ -129,9 +129,9 @@ test('launches a CF Basic destination with per-child credentials and no proxy-au
   const env = {
     ...process.env,
     ...cfEnv,
-    BAS_VSP_BINARY: fakeVsp,
-    BAS_VSP_DESTINATION_SOURCE: 'cloud-foundry',
-    BAS_VSP_DESTINATION: 'cf-basic',
+    SAP_AI_DEV_TOOLKIT_BINARY: fakeVsp,
+    SAP_AI_DEV_TOOLKIT_DESTINATION_SOURCE: 'cloud-foundry',
+    SAP_AI_DEV_TOOLKIT_DESTINATION: 'cf-basic',
     BAS_CF_SPACE_GUID: SPACE_GUID,
     BAS_CF_DESTINATION_INSTANCE_GUID: INSTANCE_GUID,
     BAS_CF_DESTINATION_INSTANCE: INSTANCE_NAME,
@@ -268,9 +268,9 @@ test('routes a PrincipalPropagation MCP call through CF Connectivity to the SAP
   const result = await runLauncher({
     ...process.env,
     ...cfEnv,
-    BAS_VSP_BINARY: fakeVsp,
-    BAS_VSP_DESTINATION_SOURCE: 'cloud-foundry',
-    BAS_VSP_DESTINATION: 'pp-target',
+    SAP_AI_DEV_TOOLKIT_BINARY: fakeVsp,
+    SAP_AI_DEV_TOOLKIT_DESTINATION_SOURCE: 'cloud-foundry',
+    SAP_AI_DEV_TOOLKIT_DESTINATION: 'pp-target',
     BAS_CF_SPACE_GUID: SPACE_GUID,
     BAS_CF_DESTINATION_INSTANCE_GUID: INSTANCE_GUID,
     BAS_CF_DESTINATION_INSTANCE: INSTANCE_NAME,
@@ -420,9 +420,9 @@ test('routes a CF Basic OnPremise MCP call through the HTTP Connectivity proxy',
   const result = await runLauncher({
     ...process.env,
     ...cfEnv,
-    BAS_VSP_BINARY: fakeVsp,
-    BAS_VSP_DESTINATION_SOURCE: 'cloud-foundry',
-    BAS_VSP_DESTINATION: 'basic-onprem',
+    SAP_AI_DEV_TOOLKIT_BINARY: fakeVsp,
+    SAP_AI_DEV_TOOLKIT_DESTINATION_SOURCE: 'cloud-foundry',
+    SAP_AI_DEV_TOOLKIT_DESTINATION: 'basic-onprem',
     BAS_CF_SPACE_GUID: SPACE_GUID,
     BAS_CF_DESTINATION_INSTANCE_GUID: INSTANCE_GUID,
     BAS_CF_DESTINATION_INSTANCE: INSTANCE_NAME,
@@ -491,13 +491,13 @@ test('CF list-destinations clears the CF name filter and remains BAS-only', asyn
   const result = await runLauncher({
     ...process.env,
     ...cfEnv,
-    BAS_VSP_DESTINATION_SOURCE: 'cloud-foundry',
-    BAS_VSP_DESTINATION: 'cf-name-not-in-bas',
+    SAP_AI_DEV_TOOLKIT_DESTINATION_SOURCE: 'cloud-foundry',
+    SAP_AI_DEV_TOOLKIT_DESTINATION: 'cf-name-not-in-bas',
     H2O_URL: origin,
     HTTP_PROXY: '',
     HTTPS_PROXY: '',
     NO_PROXY: '127.0.0.1,localhost',
-    BAS_VSP_SKIP_PROBE: 'true'
+    SAP_AI_DEV_TOOLKIT_SKIP_PROBE: 'true'
   }, ['--list-destinations', '--json']);
   assert.equal(result.code, 0, result.stderr);
   assert.deepEqual(JSON.parse(result.stdout), [{ name: 'bas-only', client: '101', authentication: 'Unknown', probe: 'skipped' }]);

package/test/copilot-assets.test.mjs

@@ -1,6 +1,7 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
 import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import { createHash } from 'node:crypto';
 import { tmpdir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { installUserCopilotAssets } from '../scripts/install-user-copilot-assets.mjs';
@@ -35,3 +36,28 @@ test('updates unchanged global assets and preserves user-edited customizations',
   assert.equal(await readFile(join(home, '.copilot', 'agents', 'abap-developer.agent.md'), 'utf8'), 'user customization');
   assert.equal(await readFile(join(home, '.copilot', 'skills', 'example', 'SKILL.md'), 'utf8'), 'skill revision two');
 });
+
+test('migrates the previous managed-file manifest without losing update ownership', async t => {
+  const directory = await mkdtemp(join(tmpdir(), 'sap-ai-toolkit-assets-migration-'));
+  t.after(() => rm(directory, { recursive: true, force: true }));
+  const root = join(directory, 'package');
+  const home = join(directory, 'home');
+  const target = join(home, '.copilot', 'agents', 'abap-developer.agent.md');
+  const oldManifest = join(home, '.copilot', '.bas-mcp-addon-assets.json');
+  await writeAsset(root, 'agents/abap-developer.agent.md', 'managed revision one');
+  await writeAsset(root, 'skills/example/SKILL.md', 'skill revision one');
+  const first = await installUserCopilotAssets({ home, root });
+  assert.equal(first.installed, 2);
+
+  const managedContent = await readFile(target);
+  const managedHash = createHash('sha256').update(managedContent).digest('hex');
+  await rm(join(home, '.copilot', '.sap-ai-dev-toolkit-assets.json'));
+  await writeFile(oldManifest, JSON.stringify({ version: 1, files: { [join('agents', 'abap-developer.agent.md')]: managedHash } }));
+  await writeAsset(root, 'agents/abap-developer.agent.md', 'managed revision two');
+
+  const migrated = await installUserCopilotAssets({ home, root });
+  assert.equal(migrated.updated, 1);
+  assert.equal(await readFile(target, 'utf8'), 'managed revision two');
+  await assert.rejects(readFile(oldManifest), { code: 'ENOENT' });
+  assert.equal(JSON.parse(await readFile(join(home, '.copilot', '.sap-ai-dev-toolkit-assets.json'), 'utf8')).version, 1);
+});

package/test/discovery.test.mjs

@@ -23,7 +23,7 @@ test('returns every named destination regardless of ADT probe and preserves allo
   const probeImpl = async url => ({ status: url.includes('a-system') ? 403 : url.includes('b-system') ? 200 : 404 });
   const allowlisted = await discoverDestinations({
     body,
-    env: { BAS_VSP_DESTINATION: 'a-system,b-system' },
+    env: { SAP_AI_DEV_TOOLKIT_DESTINATION: 'a-system,b-system' },
     probeImpl
   });
   assert.deepEqual(allowlisted.map(item => [item.name, item.client, item.probe.status]), [
@@ -38,6 +38,15 @@ test('returns every named destination regardless of ADT probe and preserves allo
     ['z-system', 'not-found']
   ]);
 });
+
+test('accepts the previous destination environment variable during upgrades', async () => {
+  const destinations = await discoverDestinations({
+    body: [{ Name: 'legacy-system' }, { Name: 'other-system' }],
+    env: { BAS_VSP_DESTINATION: 'legacy-system' },
+    skipProbe: true
+  });
+  assert.deepEqual(destinations.map(destination => destination.name), ['legacy-system']);
+});
 test('parses sample-style destination records and enables every ADT heartbeat response', async () => {
   const body = [
     {