@mcp-abap-adt/configurator 0.0.11 → 0.1.0

package/README.md

@@ -27,7 +27,7 @@ mcp-conf tui
 
 ## TUI
 
-`mcp-conf tui` starts an interactive wizard (`ls`/`add`/`show`/`update`/`rm`/`enable`/`disable`).
+`mcp-conf tui` starts an interactive wizard (`ls`/`show`/`add`/`update`/`rm`/`enable`/`disable`).
 - Step order: `operation` -> `client` -> `scope` (auto-skipped if only one scope is supported).
 - For `add` + `sse/http`: prompts for URL, timeout, and repeatable headers.
 - For `rm`/`enable`/`disable`: server name is selected from existing servers in chosen client/scope.

package/bin/mcp-conf-tui.js

@@ -35,26 +35,36 @@ async function main() {
   };
 
   result.tuiAction = await askSelect("Operation", [
-    "ls",
-    "add",
-    "show",
-    "update",
-    "rm",
-    "enable",
-    "disable",
+    { name: "ls", message: "📖 ls" },
+    { name: "show", message: "🔎 show" },
+    { name: "sep-view", role: "separator", message: "────────────" },
+    { name: "add", message: "➕ add" },
+    { name: "update", message: "✏️ update" },
+    { name: "enable", message: "✅ enable" },
+    { name: "disable", message: "⏸️ disable" },
+    { name: "rm", message: "🗑️ rm" },
+    { name: "sep-exit", role: "separator", message: "────────────" },
+    { name: "exit", message: "🚪 exit" },
   ]);
+  if (result.tuiAction === "exit") {
+    emitResult({ tuiAction: "exit" });
+    return;
+  }
   const client = await askSelect(
     "Client",
     CLIENTS.map((item) => item.name),
     CLIENTS.map((item) => item.message),
   );
   result.clients = [client];
-
-  const scopes = getSupportedScopes(client);
-  result.scope = scopes.length === 1 ? scopes[0] : await askSelect("Scope", ["global", "local"]);
+  await configureScope(result, client);
 
   if (["rm", "enable", "disable", "show", "update"].includes(result.tuiAction)) {
-    const serverNames = listExistingServers(client, result.scope);
+    const serverNames = listExistingServers(
+      client,
+      result.scope,
+      result.allProjects,
+      result.projectPath,
+    );
     if (serverNames.length === 0) {
       throw new Error(`No existing MCP servers found for ${client} (${result.scope})`);
     }
@@ -79,32 +89,37 @@ async function main() {
 
   if (result.transport === "stdio") {
     const authSource = await askSelect("Auth source for stdio", [
-      "service key destination (--mcp)",
-      "session environment (--env)",
-      "specific env file (--env-path)",
+      "destination (--mcp=<name>)",
+      "env name (--env=<name>)",
+      "env file (--env-path=<name>)",
     ]);
-    if (authSource.startsWith("service key")) {
+    if (authSource.startsWith("destination")) {
       result.mcpDestination = await askInput("Destination name", "TRIAL");
       result.useSessionEnv = false;
+      result.envName = null;
       result.envPath = null;
       result.url = null;
       emitResult(result);
       return;
     }
-    if (authSource.startsWith("specific env file")) {
+    if (authSource.startsWith("env name")) {
+      result.envName = await askInput("Env name", "TRIAL");
+      result.useSessionEnv = false;
+      result.envPath = null;
+      result.mcpDestination = null;
+      result.url = null;
+      emitResult(result);
+      return;
+    }
+    if (authSource.startsWith("env file")) {
       result.envPath = await askInput("Path to .env file");
       result.useSessionEnv = false;
+      result.envName = null;
       result.mcpDestination = null;
       result.url = null;
       emitResult(result);
       return;
     }
-    result.useSessionEnv = true;
-    result.envPath = null;
-    result.mcpDestination = null;
-    result.url = null;
-    emitResult(result);
-    return;
   }
 
   result.url = await askInput("Server URL (http/https)");
@@ -118,7 +133,13 @@ async function main() {
 }
 
 async function configureUpdate(result, client) {
-  const current = getServerConfig(client, result.scope, result.name);
+  const current = getServerConfig(
+    client,
+    result.scope,
+    result.name,
+    result.allProjects,
+    result.projectPath,
+  );
   const currentTransport = current.transport || "stdio";
   result.transport = currentTransport;
   result.command = current.command || "mcp-abap-adt";
@@ -128,42 +149,48 @@ async function configureUpdate(result, client) {
 
   if (currentTransport === "stdio") {
     const authChoices = [
-      "service key destination (--mcp)",
-      "session environment (--env)",
-      "specific env file (--env-path)",
+      "destination (--mcp=<name>)",
+      "env name (--env=<name>)",
+      "env file (--env-path=<name>)",
     ];
     const authType = current.auth?.type || "unknown";
     const authInitial =
       authType === "mcp" ? 0 : authType === "env" ? 1 : authType === "env-path" ? 2 : 0;
     const authSource = await askSelect("Auth source for stdio", authChoices, null, authInitial);
-    if (authSource.startsWith("service key")) {
+    if (authSource.startsWith("destination")) {
       result.mcpDestination = await askInput("Destination name", current.auth?.value || "TRIAL");
       result.useSessionEnv = false;
+      result.envName = null;
       result.envPath = null;
       result.url = null;
       result.headers = {};
       return;
     }
-    if (authSource.startsWith("specific env file")) {
+    if (authSource.startsWith("env name")) {
+      result.envName = await askInput("Env name", current.auth?.value || "TRIAL");
+      result.useSessionEnv = false;
+      result.envPath = null;
+      result.mcpDestination = null;
+      result.url = null;
+      result.headers = {};
+      return;
+    }
+    if (authSource.startsWith("env file")) {
       result.envPath = await askInput("Path to .env file", current.auth?.value || undefined);
       result.useSessionEnv = false;
+      result.envName = null;
       result.mcpDestination = null;
       result.url = null;
       result.headers = {};
       return;
     }
-    result.useSessionEnv = true;
-    result.envPath = null;
-    result.mcpDestination = null;
-    result.url = null;
-    result.headers = {};
-    return;
   }
 
   result.url = await askInput("Server URL (http/https)", current.url || undefined);
   result.timeout = await askPositiveNumber("Timeout seconds", result.timeout);
   result.headers = await askHeaders(current.headers || {});
   result.useSessionEnv = false;
+  result.envName = null;
   result.envPath = null;
   result.mcpDestination = null;
 }
@@ -173,10 +200,15 @@ function emitResult(result) {
 }
 
 async function askSelect(message, choices, choiceLabels, initial = 0) {
-  const promptChoices = choices.map((value, index) => ({
-    name: value,
-    message: choiceLabels?.[index] || value,
-  }));
+  const promptChoices = choices.map((value, index) => {
+    if (value && typeof value === "object" && !Array.isArray(value)) {
+      return value;
+    }
+    return {
+      name: value,
+      message: choiceLabels?.[index] || value,
+    };
+  });
   const select = new Select({
     name: "value",
     message,
@@ -239,6 +271,33 @@ function getSupportedScopes(clientName) {
   return ["global", "local"];
 }
 
+async function configureScope(result, clientName) {
+  result.allProjects = false;
+  result.projectPath = null;
+
+  if (clientName === "claude") {
+    result.scope = await askSelect("Scope", ["global", "local"]);
+    if (result.scope === "local") {
+      return;
+    }
+    if (supportsClaudeGlobalAllProjects(result.tuiAction)) {
+      const globalMode = await askSelect("Claude global", [
+        { name: "single", message: "for current project" },
+        { name: "all", message: "for all projects" },
+      ]);
+      result.allProjects = globalMode === "all";
+    }
+    return;
+  }
+
+  const scopes = getSupportedScopes(clientName);
+  result.scope = scopes.length === 1 ? scopes[0] : await askSelect("Scope", ["global", "local"]);
+}
+
+function supportsClaudeGlobalAllProjects(action) {
+  return ["ls", "show", "rm", "enable", "disable"].includes(action);
+}
+
 function getSupportedTransports(clientName) {
   if (clientName === "codex") {
     return ["stdio", "http"];
@@ -246,10 +305,16 @@ function getSupportedTransports(clientName) {
   return ["stdio", "sse", "http"];
 }
 
-function listExistingServers(clientName, scope) {
+function listExistingServers(clientName, scope, allProjects = false, projectPath = null) {
   const cliPath = path.join(__dirname, "mcp-conf.js");
   const scopeArg = scope === "local" ? "--local" : "--global";
-  const run = spawnSync(process.execPath, [cliPath, "ls", "--client", clientName, scopeArg], {
+  const cliArgs = [cliPath, "ls", "--client", clientName, scopeArg];
+  if (allProjects) {
+    cliArgs.push("--all-projects");
+  } else if (projectPath) {
+    cliArgs.push("--project", projectPath);
+  }
+  const run = spawnSync(process.execPath, cliArgs, {
     encoding: "utf8",
   });
   if (run.status !== 0) {
@@ -271,16 +336,28 @@ function listExistingServers(clientName, scope) {
   return [...new Set(names)].sort((a, b) => a.localeCompare(b));
 }
 
-function getServerConfig(clientName, scope, serverName) {
+function getServerConfig(clientName, scope, serverName, allProjects = false, projectPath = null) {
   const cliPath = path.join(__dirname, "mcp-conf.js");
   const scopeArg = scope === "local" ? "--local" : "--global";
-  const run = spawnSync(
-    process.execPath,
-    [cliPath, "show", "--client", clientName, "--name", serverName, scopeArg, "--json"],
-    {
-      encoding: "utf8",
-    },
-  );
+  const cliArgs = [
+    cliPath,
+    "show",
+    "--client",
+    clientName,
+    "--name",
+    serverName,
+    scopeArg,
+    "--json",
+    "--normalized",
+  ];
+  if (allProjects) {
+    cliArgs.push("--all-projects");
+  } else if (projectPath) {
+    cliArgs.push("--project", projectPath);
+  }
+  const run = spawnSync(process.execPath, cliArgs, {
+    encoding: "utf8",
+  });
   if (run.status !== 0) {
     const stderr = String(run.stderr || "").trim();
     throw new Error(stderr || "Failed to read existing server config");
@@ -293,9 +370,40 @@ function getServerConfig(clientName, scope, serverName) {
 }
 
 main().catch((error) => {
-  if (error === "") {
+  if (isPromptCancelError(error)) {
+    process.exit(0);
+  }
+  process.stderr.write(`${error?.message || String(error)}\n`);
+  process.exit(1);
+});
+
+process.on("uncaughtException", (error) => {
+  if (isPromptCancelError(error)) {
     process.exit(0);
   }
   process.stderr.write(`${error?.message || String(error)}\n`);
   process.exit(1);
 });
+
+process.on("unhandledRejection", (error) => {
+  if (isPromptCancelError(error)) {
+    process.exit(0);
+  }
+  process.stderr.write(`${error?.message || String(error)}\n`);
+  process.exit(1);
+});
+
+function isPromptCancelError(error) {
+  if (error === "" || error === null || error === undefined) {
+    return true;
+  }
+  if (typeof error === "string") {
+    return error.toLowerCase().includes("cancel");
+  }
+  const message = String(error?.message || "");
+  return (
+    error?.code === "ERR_USE_AFTER_CLOSE" ||
+    message.toLowerCase().includes("cancel") ||
+    message.toLowerCase().includes("readline was closed")
+  );
+}

package/bin/mcp-conf.js

@@ -26,7 +26,7 @@ const args = process.argv.slice(2);
 const action = args[0] && !args[0].startsWith("-") ? args[0] : null;
 if (
   action &&
-  ["add", "rm", "ls", "enable", "disable", "where", "show", "update", "tui", "help"].includes(
+  ["add", "rm", "ls", "show", "enable", "disable", "where", "update", "tui", "help"].includes(
     action,
   )
 ) {
@@ -34,6 +34,7 @@ if (
 }
 const options = {
   clients: [],
+  envName: null,
   envPath: null,
   useSessionEnv: false,
   mcpDestination: null,
@@ -52,6 +53,7 @@ const options = {
   where: false,
   show: false,
   outputJson: false,
+  outputNormalized: false,
   url: null,
   headers: {},
   timeout: 60,
@@ -62,7 +64,7 @@ if (args.includes("--help") || args.includes("-h") || action === "help") {
     action === "help"
       ? args[0]
       : action &&
-          ["add", "rm", "ls", "enable", "disable", "where", "show", "update", "tui"].includes(
+          ["add", "rm", "ls", "show", "enable", "disable", "where", "update", "tui"].includes(
             action,
           )
         ? action
@@ -76,30 +78,45 @@ for (let i = 0; i < args.length; i += 1) {
   if (arg === "--client") {
     options.clients.push(normalizeClientName(args[i + 1]));
     i += 1;
+  } else if (arg.startsWith("--env=")) {
+    options.envName = arg.slice("--env=".length);
+    options.useSessionEnv = false;
+    options.envPath = null;
+    options.mcpDestination = null;
   } else if (arg === "--env") {
     const maybePath = args[i + 1];
     if (maybePath && !maybePath.startsWith("-")) {
-      // Backward-compatible form: --env /path/to/.env
-      options.envPath = maybePath;
+      if (looksLikeEnvPath(maybePath)) {
+        // Backward-compatible form: --env /path/to/.env
+        options.envPath = maybePath;
+        options.envName = null;
+      } else {
+        options.envName = maybePath;
+        options.envPath = null;
+      }
       options.useSessionEnv = false;
       options.mcpDestination = null;
       i += 1;
     } else {
       options.useSessionEnv = true;
+      options.envName = null;
       options.envPath = null;
       options.mcpDestination = null;
     }
   } else if (arg === "--env-path") {
     options.envPath = args[i + 1];
+    options.envName = null;
     options.useSessionEnv = false;
     options.mcpDestination = null;
     i += 1;
   } else if (arg === "--session-env") {
     options.useSessionEnv = true;
+    options.envName = null;
     options.envPath = null;
     options.mcpDestination = null;
   } else if (arg === "--mcp") {
     options.mcpDestination = args[i + 1];
+    options.envName = null;
     options.useSessionEnv = false;
     options.envPath = null;
     i += 1;
@@ -154,14 +171,16 @@ for (let i = 0; i < args.length; i += 1) {
     options.force = true;
   } else if (arg === "--json") {
     options.outputJson = true;
+  } else if (arg === "--normalized") {
+    options.outputNormalized = true;
   }
 }
 
 if (
   !action ||
-  !["add", "rm", "ls", "enable", "disable", "where", "show", "update", "tui"].includes(action)
+  !["add", "rm", "ls", "show", "enable", "disable", "where", "update", "tui"].includes(action)
 ) {
-  fail("Provide a command: add | rm | ls | enable | disable | where | show | update | tui.");
+  fail("Provide a command: add | rm | ls | show | enable | disable | where | update | tui.");
 }
 
 let effectiveAction = action;
@@ -169,6 +188,9 @@ if (action === "tui") {
   runTuiWizard(options);
   effectiveAction = options.tuiAction || "add";
 }
+if (effectiveAction === "exit") {
+  process.exit(0);
+}
 
 if (options.clients.length === 0) {
   fail("Provide at least one --client.");
@@ -242,8 +264,8 @@ const requiresConnectionParams =
   !options.remove && !options.toggle && !options.list && !options.where && !options.show;
 
 if (requiresConnectionParams && options.transport === "stdio") {
-  if (!options.envPath && !options.mcpDestination && !options.useSessionEnv) {
-    fail("Provide --env, --env-path <path>, or --mcp <destination>.");
+  if (!options.envName && !options.envPath && !options.mcpDestination && !options.useSessionEnv) {
+    fail("Provide --env <name>, --env-path <path>, --session-env, or --mcp <destination>.");
   }
 }
 
@@ -251,8 +273,8 @@ if (requiresConnectionParams && options.transport !== "stdio") {
   if (!options.url) {
     fail("Provide --url <http(s)://...> for sse/http transports.");
   }
-  if (options.envPath || options.mcpDestination || options.useSessionEnv) {
-    fail("--env/--env-path/--mcp are only valid for stdio transport.");
+  if (options.envName || options.envPath || options.mcpDestination || options.useSessionEnv) {
+    fail("--env/--env-path/--session-env/--mcp are only valid for stdio transport.");
   }
 }
 
@@ -263,13 +285,15 @@ const userProfile = process.env.USERPROFILE || home;
 
 const serverArgsRaw = [
   `--transport=${options.transport}`,
-  options.useSessionEnv
-    ? "--env"
-    : options.envPath
-      ? `--env-path=${options.envPath}`
-      : options.mcpDestination
-        ? `--mcp=${options.mcpDestination.toLowerCase()}`
-        : undefined,
+  options.envName
+    ? `--env=${options.envName}`
+    : options.useSessionEnv
+      ? "--session-env"
+      : options.envPath
+        ? `--env-path=${options.envPath}`
+        : options.mcpDestination
+          ? `--mcp=${options.mcpDestination.toLowerCase()}`
+          : undefined,
 ];
 const serverArgs = serverArgsRaw.filter(Boolean);
 
@@ -489,7 +513,8 @@ function runTuiWizard(opts) {
   const rawPayload = run.output?.[3] || "";
   const payload = String(rawPayload).trim();
   if (!payload) {
-    fail("TUI did not return configuration.");
+    opts.tuiAction = "exit";
+    return;
   }
   let selected;
   try {
@@ -1314,7 +1339,10 @@ function showJsonConfig(filePath, clientType, serverName) {
   if (!entry) {
     fail(`Server "${serverName}" not found in ${filePath}.`);
   }
-  outputShow(filePath, serverName, normalizeServerDetails(clientType, serverName, entry));
+  const details = options.outputNormalized
+    ? normalizeServerDetails(clientType, serverName, entry)
+    : cloneJsonLike(entry);
+  outputShow(filePath, serverName, details);
 }
 
 function showCodexConfig(filePath, serverName) {
@@ -1327,7 +1355,10 @@ function showCodexConfig(filePath, serverName) {
   if (!entry) {
     fail(`Server "${serverName}" not found in ${filePath}.`);
   }
-  outputShow(filePath, serverName, normalizeServerDetails("codex", serverName, entry));
+  const details = options.outputNormalized
+    ? normalizeServerDetails("codex", serverName, entry)
+    : cloneJsonLike(entry);
+  outputShow(filePath, serverName, details);
 }
 
 function showGooseConfig(filePath, serverName) {
@@ -1340,7 +1371,10 @@ function showGooseConfig(filePath, serverName) {
   if (!entry) {
     fail(`Server "${serverName}" not found in ${filePath}.`);
   }
-  outputShow(filePath, serverName, normalizeServerDetails("goose", serverName, entry));
+  const details = options.outputNormalized
+    ? normalizeServerDetails("goose", serverName, entry)
+    : cloneJsonLike(entry);
+  outputShow(filePath, serverName, details);
 }
 
 function showClaudeConfig(filePath, serverName, allProjects, projectPath) {
@@ -1355,10 +1389,17 @@ function showClaudeConfig(filePath, serverName, allProjects, projectPath) {
         const projectNode = data.projects?.[key];
         const store = projectNode?.mcpServers || {};
         if (store[serverName]) {
-          results.push({
-            project: key,
-            ...normalizeServerDetails("claude", serverName, store[serverName]),
-          });
+          results.push(
+            options.outputNormalized
+              ? {
+                  project: key,
+                  ...normalizeServerDetails("claude", serverName, store[serverName]),
+                }
+              : {
+                  project: key,
+                  raw: cloneJsonLike(store[serverName]),
+                },
+          );
         }
       }
       if (!results.length) {
@@ -1369,7 +1410,12 @@ function showClaudeConfig(filePath, serverName, allProjects, projectPath) {
         return;
       }
       for (const result of results) {
-        outputShow(filePath, serverName, result, result.project);
+        outputShow(
+          filePath,
+          serverName,
+          options.outputNormalized ? result : result.raw,
+          result.project,
+        );
       }
       return;
     }
@@ -1379,12 +1425,10 @@ function showClaudeConfig(filePath, serverName, allProjects, projectPath) {
     if (!entry) {
       fail(`Server "${serverName}" not found for ${projectKey}.`);
     }
-    outputShow(
-      filePath,
-      serverName,
-      normalizeServerDetails("claude", serverName, entry, projectKey),
-      projectKey,
-    );
+    const details = options.outputNormalized
+      ? normalizeServerDetails("claude", serverName, entry, projectKey)
+      : cloneJsonLike(entry);
+    outputShow(filePath, serverName, details, projectKey);
     return;
   }
   const store = data.mcpServers || {};
@@ -1392,7 +1436,10 @@ function showClaudeConfig(filePath, serverName, allProjects, projectPath) {
   if (!entry) {
     fail(`Server "${serverName}" not found in ${filePath}.`);
   }
-  outputShow(filePath, serverName, normalizeServerDetails("claude", serverName, entry));
+  const details = options.outputNormalized
+    ? normalizeServerDetails("claude", serverName, entry)
+    : cloneJsonLike(entry);
+  outputShow(filePath, serverName, details);
 }
 
 function normalizeServerDetails(clientType, serverName, entry, projectKey) {
@@ -1439,26 +1486,72 @@ function compactServerDetails(details) {
   return compact;
 }
 
+function cloneJsonLike(value) {
+  if (value === null || value === undefined) {
+    return value;
+  }
+  try {
+    return JSON.parse(JSON.stringify(value));
+  } catch {
+    return value;
+  }
+}
+
 function parseServerArgs(args) {
   const parsed = {
     transport: null,
+    envName: null,
     envPath: null,
     mcpDestination: null,
     useSessionEnv: false,
   };
-  for (const arg of args) {
+  for (let i = 0; i < args.length; i += 1) {
+    const arg = args[i];
     if (typeof arg !== "string") {
       continue;
     }
     if (arg.startsWith("--transport=")) {
       const value = arg.slice("--transport=".length);
       parsed.transport = value === "streamableHttp" ? "http" : value;
-    } else if (arg === "--env") {
+    } else if (arg === "--session-env") {
       parsed.useSessionEnv = true;
-    } else if (arg.startsWith("--env-path=") || arg.startsWith("--env=")) {
+    } else if (arg.startsWith("--env=")) {
+      const value = arg.slice("--env=".length);
+      if (looksLikeEnvPath(value)) {
+        parsed.envPath = value;
+      } else {
+        parsed.envName = value;
+      }
+    } else if (arg === "--env") {
+      const next = args[i + 1];
+      if (typeof next === "string" && next && !next.startsWith("-")) {
+        if (looksLikeEnvPath(next)) {
+          // Backward-compatible form: --env /path/to/.env
+          parsed.envPath = next;
+        } else {
+          parsed.envName = next;
+        }
+        parsed.useSessionEnv = false;
+        i += 1;
+      } else {
+        parsed.useSessionEnv = true;
+      }
+    } else if (arg.startsWith("--env-path=")) {
       parsed.envPath = arg.slice(arg.indexOf("=") + 1);
+    } else if (arg === "--env-path") {
+      const next = args[i + 1];
+      if (typeof next === "string" && next && !next.startsWith("-")) {
+        parsed.envPath = next;
+        i += 1;
+      }
     } else if (arg.startsWith("--mcp=")) {
       parsed.mcpDestination = arg.slice("--mcp=".length);
+    } else if (arg === "--mcp") {
+      const next = args[i + 1];
+      if (typeof next === "string" && next && !next.startsWith("-")) {
+        parsed.mcpDestination = next;
+        i += 1;
+      }
     }
   }
   return parsed;
@@ -1534,15 +1627,31 @@ function inferAuth(parsedArgs) {
   if (parsedArgs.mcpDestination) {
     return { type: "mcp", value: parsedArgs.mcpDestination };
   }
+  if (parsedArgs.envName) {
+    return { type: "env", value: parsedArgs.envName };
+  }
   if (parsedArgs.envPath) {
     return { type: "env-path", value: parsedArgs.envPath };
   }
   if (parsedArgs.useSessionEnv) {
-    return { type: "env", value: null };
+    return { type: "session-env", value: null };
   }
   return { type: "unknown", value: null };
 }
 
+function looksLikeEnvPath(value) {
+  if (!value || typeof value !== "string") {
+    return false;
+  }
+  return (
+    value.includes("/") ||
+    value.includes("\\") ||
+    value.endsWith(".env") ||
+    value.startsWith(".") ||
+    value.startsWith("~")
+  );
+}
+
 function readJson(filePath) {
   if (!fs.existsSync(filePath)) {
     return {};
@@ -1643,7 +1752,7 @@ function printHelp(command) {
     process.stdout.write(`${header}
 
 Usage:
-  mcp-conf <add|rm|ls|enable|disable|where|show|update> --client <name> [options]
+  mcp-conf <add|rm|ls|show|enable|disable|where|update> --client <name> [options]
   mcp-conf tui
   mcp-conf help <command>
 
@@ -1651,10 +1760,10 @@ Commands:
   add       add or update an MCP server entry
   rm        remove an MCP server entry
   ls        list MCP server entries
+  show      show server configuration details
   enable    enable an existing entry
   disable   disable an existing entry
   where     show where a server name is defined
-  show      show server configuration details
   update    update an existing server entry
   tui       interactive setup wizard
 
@@ -1674,13 +1783,14 @@ Notes:
       process.stdout.write(`${header} add
 
 Usage:
-  mcp-conf add --client <name> --name <serverName> [--env | --env-path <path> | --mcp <dest>] [options]
+  mcp-conf add --client <name> --name <serverName> [--env <name> | --env-path <path> | --session-env | --mcp <dest>] [options]
 
 Options:
   --client <name>       cline | codex | claude | goose | cursor | windsurf | opencode | kilo | copilot | antigravity | crush (repeatable)
   --name <serverName>   required MCP server name key
-  --env                 use current shell/session env vars (stdio only)
+  --env <name>          env profile name (stdio only), writes --env=<name>
   --env-path <path>     .env path (stdio only)
+  --session-env         use current shell/session env vars (stdio only)
   --mcp <dest>          destination name (stdio only)
   --transport <type>    stdio | sse | http (http => streamableHttp)
   --command <bin>       command to run (default: mcp-abap-adt)
@@ -1803,6 +1913,7 @@ Options:
   --all-projects        Claude global: show from all projects
   --project <path>      Claude global: target a specific project path
   --json                output JSON only (machine-readable)
+  --normalized          output normalized view (for tooling); default is raw config entry
 
 Notes:
   Antigravity local scope is not supported yet; use --global.
@@ -1812,13 +1923,14 @@ Notes:
       process.stdout.write(`${header} update
 
 Usage:
-  mcp-conf update --client <name> --name <serverName> [--env | --env-path <path> | --mcp <dest>] [options]
+  mcp-conf update --client <name> --name <serverName> [--env <name> | --env-path <path> | --session-env | --mcp <dest>] [options]
 
 Options:
   --client <name>       cline | codex | claude | goose | cursor | windsurf | opencode | kilo | copilot | antigravity | crush (repeatable)
   --name <serverName>   required MCP server name key
-  --env                 use current shell/session env vars (stdio only)
+  --env <name>          env profile name (stdio only), writes --env=<name>
   --env-path <path>     .env path (stdio only)
+  --session-env         use current shell/session env vars (stdio only)
   --mcp <dest>          destination name (stdio only)
   --transport <type>    stdio | sse | http (http => streamableHttp)
   --url <http(s)://...> required for sse/http
@@ -1840,7 +1952,7 @@ Usage:
   mcp-conf tui
 
 Description:
-  Start interactive setup wizard for ls/add/show/update/rm/enable/disable.
+  Start interactive setup wizard for ls/show/add/update/rm/enable/disable.
   Flow: operation -> client -> scope (skips scope when only one is supported).
   For add/update + sse/http, wizard also asks timeout and repeatable headers.
   For rm/enable/disable/show/update, wizard selects server from existing entries.

package/docs/CLIENT_INSTALLERS.md

@@ -92,10 +92,11 @@ mcp-conf tui
 - Controls: arrow keys + Enter, Ctrl+C to cancel.
 
 Options:
-- Commands: `add`, `rm`, `ls`, `enable`, `disable`, `where`, `show`, `update`, `tui` (first argument)
+- Commands: `add`, `rm`, `ls`, `show`, `enable`, `disable`, `where`, `update`, `tui` (first argument)
 - `--client <name>` (repeatable): `cline`, `codex`, `claude`, `goose`, `cursor`, `windsurf`, `opencode` (`kilo` alias), `copilot`, `antigravity`, `crush`
-- `--env`: use shell/session environment variables (stdio only)
+- `--env <name>`: use named env profile; writes `--env=<name>` (stdio only)
 - `--env-path <path>`: use a specific `.env` file (stdio only)
+- `--session-env`: use shell/session environment variables (stdio only)
 - `--mcp <destination>`: use service key destination
 - `--name <serverName>`: MCP server name (required)
 - `--transport <type>`: `stdio`, `sse`, or `http` (`http` maps to `streamableHttp`)
@@ -110,9 +111,9 @@ Options:
 - `--json`: JSON-only output for `show`
 
 Notes:
-- `disable` and `rm` do not require `--env`, `--env-path`, or `--mcp`.
-- `--env`/`--env-path`/`--mcp` are only valid for `stdio` transport. For `sse/http`, use `--url` and optional `--header`.
-- `mcp-conf tui` starts an interactive wizard for `ls`/`add`/`show`/`update`/`rm`/`enable`/`disable`.
+- `disable` and `rm` do not require `--env`, `--env-path`, `--session-env`, or `--mcp`.
+- `--env`/`--env-path`/`--session-env`/`--mcp` are only valid for `stdio` transport. For `sse/http`, use `--url` and optional `--header`.
+- `mcp-conf tui` starts an interactive wizard for `ls`/`show`/`add`/`update`/`rm`/`enable`/`disable`.
 - Cursor/Copilot enable/disable are not implemented yet.
 - Antigravity enable/disable uses `disabled: true|false` on the entry.
 - Antigravity local scope is not supported yet; use `--global`.
@@ -121,7 +122,7 @@ Notes:
 - Antigravity HTTP entries use `serverUrl` instead of `url`.
 - New entries for Cline, Codex, Windsurf, Goose, Claude, OpenCode, and Crush are added **disabled by default**. Use `enable` to turn them on.
 - Windsurf follows `disabled` like Cline. The configurator sets `disabled = true` for default-disabled entries.
-- `enable`/`disable` only work if the server entry already exists. Use add commands with `--env`, `--env-path`, or `--mcp` first.
+- `enable`/`disable` only work if the server entry already exists. Use add commands with `--env`, `--env-path`, `--session-env`, or `--mcp` first.
 - Non-stdio transports are supported for Cline/Cursor/Windsurf/Claude/Goose. Codex supports `http` (streamable HTTP) but not `sse`.
 - Codex writes custom headers under `http_headers` in `~/.codex/config.toml` (or `./.codex/config.toml` for `--local`).
 - Codex HTTP entries include `startup_timeout_sec` (default: 60).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcp-abap-adt/configurator",
-  "version": "0.0.11",
+  "version": "0.1.0",
   "description": "MCP client configurator for mcp-abap-adt and mcp-abap-adt-proxy",
   "license": "MIT",
   "repository": {