add-mcp 1.8.0 → 1.9.1

package/README.md

@@ -18,7 +18,7 @@ Example installing the Context7 remote MCP server:
 npx add-mcp https://mcp.context7.com/mcp
 ```
 
-You can add env variables and arguments (stdio) and headers (remote) to the server config using the `--env`, `--args` and `--header` options.
+You can add env variables and arguments (stdio) and headers (remote) to the server config using the `--env`, `--args` and `--header` options. With `${VAR}` placeholders, interactive installs prompt for each variable (omit skipped optional keys so empty strings are not written to config).
 
 ## Find an MCP Servers
 

package/dist/index.js

@@ -816,6 +816,234 @@ function isRemoteSource(parsed) {
 
 // src/find.ts
 import * as p2 from "@clack/prompts";
+
+// src/template.ts
+var TEMPLATE_PATTERN = /\$\{([^}]+)\}/g;
+function findTemplateVars(value) {
+  const vars = [];
+  let match;
+  while ((match = TEMPLATE_PATTERN.exec(value)) !== null) {
+    vars.push(match[1]);
+  }
+  TEMPLATE_PATTERN.lastIndex = 0;
+  return vars;
+}
+function substituteTemplatePlaceholders(value, replacement) {
+  return value.replace(/\$\{([^}]+)\}/g, () => replacement);
+}
+async function resolveTemplates(value, ask) {
+  const vars = findTemplateVars(value);
+  if (vars.length === 0) return { resolved: value, cancelled: false };
+  let result = value;
+  for (const varName of vars) {
+    const answer = await ask(varName);
+    if (typeof answer === "symbol") return { resolved: value, cancelled: true };
+    const entered = typeof answer === "string" ? answer : "";
+    result = result.replace(`\${${varName}}`, entered);
+  }
+  return { resolved: result, cancelled: false };
+}
+async function resolveRecordTemplates(record, ask) {
+  const resolved = {};
+  for (const [key, value] of Object.entries(record)) {
+    const result = await resolveTemplates(value, ask);
+    if (result.cancelled) return { resolved: record, cancelled: true };
+    resolved[key] = result.resolved;
+  }
+  return { resolved, cancelled: false };
+}
+async function resolveArrayTemplates(values, ask) {
+  const resolved = [];
+  for (const value of values) {
+    const result = await resolveTemplates(value, ask);
+    if (result.cancelled) return { resolved: values, cancelled: true };
+    resolved.push(result.resolved);
+  }
+  return { resolved, cancelled: false };
+}
+function hasTemplateVars(values) {
+  const strings = Array.isArray(values) ? values : Object.values(values);
+  return strings.some((v) => findTemplateVars(v).length > 0);
+}
+
+// src/package-arguments.ts
+var ARG_PLACEHOLDER = "<your-variable-value-here>";
+function normalizeNamedFlag(name) {
+  const t = name.trim();
+  if (t.startsWith("-")) return t;
+  return `--${t}`;
+}
+function definitionsFromPackage(pkg) {
+  return pkg.packageArguments ?? [];
+}
+function isNamedArg(d) {
+  if (d.type === "positional") return false;
+  if (d.type === "named") return true;
+  return Boolean(d.name?.trim());
+}
+function labelForArg(d, index) {
+  if (isNamedArg(d)) {
+    return `Flag ${normalizeNamedFlag(d.name)}`;
+  }
+  return d.valueHint?.trim() || d.description?.trim() || `Positional argument #${index + 1}`;
+}
+function hasTemplates(s) {
+  return Boolean(s && findTemplateVars(s).length > 0);
+}
+function buildPackageArgumentsArgvNonInteractive(definitions, placeholder = ARG_PLACEHOLDER) {
+  const out = [];
+  for (let i = 0; i < definitions.length; i++) {
+    const d = definitions[i];
+    if (isNamedArg(d)) {
+      const flag = normalizeNamedFlag(d.name);
+      let val = d.value?.trim() ?? "";
+      if (hasTemplates(d.value)) {
+        val = substituteTemplatePlaceholders(d.value, placeholder);
+      } else if (!val && d.default?.trim()) {
+        val = d.default.trim();
+      }
+      if (!val) {
+        if (d.isRequired === true) {
+          out.push(flag, placeholder);
+        }
+        continue;
+      }
+      out.push(flag, val);
+    } else {
+      let val = d.value?.trim() ?? "";
+      if (hasTemplates(d.value)) {
+        val = substituteTemplatePlaceholders(d.value, placeholder);
+        pushPositionalSegments(out, d, val);
+        continue;
+      }
+      if (val) {
+        pushPositionalSegments(out, d, val);
+        continue;
+      }
+      if (d.default?.trim()) {
+        pushPositionalSegments(out, d, d.default.trim());
+        continue;
+      }
+      pushPositionalSegments(out, d, placeholder);
+    }
+  }
+  return out;
+}
+function pushPositionalSegments(out, d, raw) {
+  if (d.isRepeated === true) {
+    const parts = raw.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
+    if (parts.length === 0) {
+      out.push(raw);
+      return;
+    }
+    for (const p4 of parts) {
+      out.push(p4);
+    }
+    return;
+  }
+  out.push(raw);
+}
+async function buildPackageArgumentsArgvInteractive(definitions, prompt) {
+  const out = [];
+  for (let i = 0; i < definitions.length; i++) {
+    const d = definitions[i];
+    const label = labelForArg(d, i);
+    if (isNamedArg(d)) {
+      const flag = normalizeNamedFlag(d.name);
+      let val2 = d.value ?? "";
+      if (hasTemplates(d.value)) {
+        const res = await resolveTemplates(d.value, async (varName) => {
+          const answer = await prompt({
+            label: `${label} (${varName})`,
+            isRequired: true,
+            placeholder: `<${varName}>`
+          });
+          return answer;
+        });
+        if (res.cancelled) return { cancelled: true };
+        val2 = res.resolved;
+        out.push(flag, val2);
+        continue;
+      }
+      if (val2.trim()) {
+        out.push(flag, val2.trim());
+        continue;
+      }
+      const defVal2 = d.default?.trim() ?? "";
+      const raw2 = await prompt({
+        label,
+        isRequired: d.isRequired === true,
+        placeholder: defVal2 || ARG_PLACEHOLDER
+      });
+      if (typeof raw2 === "symbol") return { cancelled: true };
+      const trimmed2 = typeof raw2 === "string" ? raw2.trim() : "";
+      if (!trimmed2) {
+        if (d.isRequired === true) {
+          out.push(flag, defVal2 || ARG_PLACEHOLDER);
+        } else if (defVal2) {
+          out.push(flag, defVal2);
+        }
+        continue;
+      }
+      out.push(flag, trimmed2);
+      continue;
+    }
+    let val = d.value ?? "";
+    if (hasTemplates(d.value)) {
+      const res = await resolveTemplates(d.value, async (varName) => {
+        const answer = await prompt({
+          label: `${label} (${varName})`,
+          isRequired: true,
+          placeholder: `<${varName}>`
+        });
+        return answer;
+      });
+      if (res.cancelled) return { cancelled: true };
+      val = res.resolved;
+      pushPositionalSegments(out, d, val);
+      continue;
+    }
+    if (val.trim()) {
+      pushPositionalSegments(out, d, val.trim());
+      continue;
+    }
+    const defVal = d.default?.trim() ?? "";
+    if (defVal) {
+      pushPositionalSegments(out, d, defVal);
+      continue;
+    }
+    if (d.isRequired !== true) {
+      const raw2 = await prompt({
+        label,
+        isRequired: false,
+        placeholder: ARG_PLACEHOLDER
+      });
+      if (typeof raw2 === "symbol") return { cancelled: true };
+      const trimmed2 = typeof raw2 === "string" ? raw2.trim() : "";
+      if (!trimmed2) {
+        pushPositionalSegments(out, d, ARG_PLACEHOLDER);
+      } else {
+        pushPositionalSegments(out, d, trimmed2);
+      }
+      continue;
+    }
+    const raw = await prompt({
+      label,
+      isRequired: true,
+      placeholder: ARG_PLACEHOLDER
+    });
+    if (typeof raw === "symbol") return { cancelled: true };
+    const trimmed = typeof raw === "string" ? raw.trim() : "";
+    pushPositionalSegments(
+      out,
+      d,
+      trimmed.length > 0 ? trimmed : ARG_PLACEHOLDER
+    );
+  }
+  return { argv: out, cancelled: false };
+}
+
+// src/find.ts
 function buildPlaceholderValue(kind) {
   return kind === "header" ? "<your-header-value-here>" : "<your-variable-value-here>";
 }
@@ -1009,9 +1237,6 @@ function pickRemote(entry, preferredTransport) {
   return preferred ?? remotes[0] ?? null;
 }
 function formatPackageTarget(pkg) {
-  if (pkg.version) {
-    return `${pkg.identifier}@${pkg.version}`;
-  }
   return pkg.identifier;
 }
 function transportLabel(entry) {
@@ -1064,6 +1289,15 @@ function headerFields(headers) {
     placeholder: buildPlaceholderValue("header")
   }));
 }
+function packageVariableFields(variables) {
+  if (!variables) return [];
+  return variables.filter((variable) => variable.name && variable.name.trim().length > 0).map((variable) => ({
+    key: variable.name,
+    label: `Environment variable ${variable.name}`,
+    isRequired: variable.isRequired === true,
+    placeholder: buildPlaceholderValue("variable")
+  }));
+}
 function resolveNonInteractiveRemote(remote) {
   const variableValues = {};
   for (const [key, def] of Object.entries(remote.variables ?? {})) {
@@ -1098,6 +1332,55 @@ async function resolveInteractiveRemote(remote) {
     headers: Object.keys(headerResult.values).length > 0 ? headerResult.values : void 0
   };
 }
+function resolveNonInteractivePackage(pkg) {
+  const env = {};
+  for (const field of packageVariableFields(pkg.environmentVariables)) {
+    if (field.isRequired) {
+      env[field.key] = field.placeholder;
+    }
+  }
+  const headers = {};
+  for (const field of headerFields(pkg.headers)) {
+    if (field.isRequired) {
+      headers[field.key] = field.placeholder;
+    }
+  }
+  const argv = buildPackageArgumentsArgvNonInteractive(
+    definitionsFromPackage(pkg),
+    buildPlaceholderValue("variable")
+  );
+  return {
+    env: Object.keys(env).length > 0 ? env : void 0,
+    headers: Object.keys(headers).length > 0 ? headers : void 0,
+    args: argv.length > 0 ? argv : void 0
+  };
+}
+async function resolveInteractivePackage(pkg) {
+  const promptPackageArg = async (info) => p2.text({
+    message: `${info.label} ${info.isRequired ? "(required)" : "(optional)"}`,
+    placeholder: info.placeholder
+  });
+  const envResult = await collectPromptValues(
+    packageVariableFields(pkg.environmentVariables),
+    promptValue
+  );
+  if (envResult.cancelled) return null;
+  const headerResult = await collectPromptValues(
+    headerFields(pkg.headers),
+    promptValue
+  );
+  if (headerResult.cancelled) return null;
+  const argvResult = await buildPackageArgumentsArgvInteractive(
+    definitionsFromPackage(pkg),
+    promptPackageArg
+  );
+  if (argvResult.cancelled) return null;
+  return {
+    env: Object.keys(envResult.values).length > 0 ? envResult.values : void 0,
+    headers: Object.keys(headerResult.values).length > 0 ? headerResult.values : void 0,
+    args: argvResult.argv.length > 0 ? argvResult.argv : void 0
+  };
+}
 async function buildInstallPlanForEntry(entry, options) {
   const remote = pickRemote(entry, options.preferredTransport);
   const pkg = entry.package ?? null;
@@ -1130,9 +1413,14 @@ async function buildInstallPlanForEntry(entry, options) {
     mode = hasRemote ? "remote" : "package";
   }
   if (mode === "package" && pkg) {
+    const resolved2 = options.yes ? resolveNonInteractivePackage(pkg) : await resolveInteractivePackage(pkg);
+    if (!resolved2) return null;
     return {
       target: formatPackageTarget(pkg),
-      serverName: resolveServerName(entry)
+      serverName: resolveServerName(entry),
+      env: resolved2.env,
+      headers: resolved2.headers,
+      args: resolved2.args
     };
   }
   if (!remote) return null;
@@ -1306,13 +1594,13 @@ function getNestedValue(obj, path) {
 }
 
 // src/formats/json.ts
-function detectIndent(text2) {
+function detectIndent(text3) {
   let result = null;
-  jsonc.visit(text2, {
+  jsonc.visit(text3, {
     onObjectProperty: (_property, offset, _length, startLine, startCharacter) => {
       if (result === null && startLine > 0 && startCharacter > 0) {
-        const lineStart = text2.lastIndexOf("\n", offset - 1) + 1;
-        const whitespace = text2.slice(lineStart, offset);
+        const lineStart = text3.lastIndexOf("\n", offset - 1) + 1;
+        const whitespace = text3.slice(lineStart, offset);
         result = {
           tabSize: startCharacter,
           insertSpaces: !whitespace.includes("	")
@@ -1562,7 +1850,7 @@ function buildServerConfig(parsed, options = {}) {
   if (parsed.type === "command") {
     const parts = parsed.value.split(" ");
     const command = parts[0];
-    const args = parts.slice(1);
+    const args = [...parts.slice(1), ...options.args ?? []];
     const config2 = {
       command,
       args
@@ -1574,7 +1862,7 @@ function buildServerConfig(parsed, options = {}) {
   }
   const config = {
     command: "npx",
-    args: ["-y", parsed.value]
+    args: ["-y", parsed.value, ...options.args ?? []]
   };
   if (options.env && Object.keys(options.env).length > 0) {
     config.env = options.env;
@@ -1797,7 +2085,7 @@ function findMatchingServers(agentServersList, query) {
 // package.json
 var package_default = {
   name: "add-mcp",
-  version: "1.8.0",
+  version: "1.9.1",
   description: "Add MCP servers to your favorite coding agents with a single command.",
   author: "Andre Landgraf <andre@neon.tech>",
   license: "Apache-2.0",
@@ -1813,12 +2101,13 @@ var package_default = {
     fmt: "prettier --write .",
     build: "tsup src/index.ts --format esm --dts --clean",
     dev: "tsx src/index.ts",
-    test: "tsx tests/source-parser.test.ts && tsx tests/agents.test.ts && tsx tests/config.test.ts && tsx tests/installer.test.ts && tsx tests/find.test.ts && tsx tests/reader.test.ts && tsx tests/formats-remove.test.ts && tsx tests/e2e/install.test.ts && tsx tests/e2e/cli.test.ts",
-    "test:unit": "tsx tests/source-parser.test.ts && tsx tests/agents.test.ts && tsx tests/config.test.ts && tsx tests/installer.test.ts && tsx tests/find.test.ts && tsx tests/reader.test.ts && tsx tests/formats-remove.test.ts",
+    test: "tsx tests/source-parser.test.ts && tsx tests/agents.test.ts && tsx tests/config.test.ts && tsx tests/installer.test.ts && tsx tests/find.test.ts && tsx tests/package-arguments.test.ts && tsx tests/template.test.ts && tsx tests/reader.test.ts && tsx tests/formats-remove.test.ts && tsx tests/e2e/install.test.ts && tsx tests/e2e/cli.test.ts",
+    "test:unit": "tsx tests/source-parser.test.ts && tsx tests/agents.test.ts && tsx tests/config.test.ts && tsx tests/installer.test.ts && tsx tests/find.test.ts && tsx tests/package-arguments.test.ts && tsx tests/template.test.ts && tsx tests/reader.test.ts && tsx tests/formats-remove.test.ts",
     "registry:sort": "tsx scripts/sort-registry.ts",
     "registry:verify": "tsx scripts/verify-registry.ts",
     "test:e2e": "tsx tests/e2e/install.test.ts && tsx tests/e2e/cli.test.ts",
     typecheck: "tsc --noEmit",
+    fallow: "fallow",
     prepublishOnly: "npm run build"
   },
   keywords: [
@@ -1842,11 +2131,11 @@ var package_default = {
   ],
   repository: {
     type: "git",
-    url: "git+https://github.com/neondatabase/add-mcp.git"
+    url: "git+https://github.com/neon-solutions/add-mcp.git"
   },
-  homepage: "https://github.com/neondatabase/add-mcp#readme",
+  homepage: "https://github.com/neon-solutions/add-mcp#readme",
   bugs: {
-    url: "https://github.com/neondatabase/add-mcp/issues"
+    url: "https://github.com/neon-solutions/add-mcp/issues"
   },
   dependencies: {
     "@clack/prompts": "^0.9.1",
@@ -1859,6 +2148,7 @@ var package_default = {
   devDependencies: {
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.10.0",
+    fallow: "^2.61.0",
     prettier: "^3.8.1",
     tsup: "^8.3.5",
     tsx: "^4.19.2",
@@ -1976,6 +2266,27 @@ function extractSubcommandOptionsFromArgv() {
       result.gitignore = true;
       continue;
     }
+    if (arg === "--header" && argv[i + 1]) {
+      const headers = result.header ? [...result.header] : [];
+      headers.push(argv[i + 1]);
+      result.header = headers;
+      i += 1;
+      continue;
+    }
+    if (arg === "--env" && argv[i + 1]) {
+      const env = result.env ? [...result.env] : [];
+      env.push(argv[i + 1]);
+      result.env = env;
+      i += 1;
+      continue;
+    }
+    if (arg === "--args" && argv[i + 1]) {
+      const args = result.args ? [...result.args] : [];
+      args.push(argv[i + 1]);
+      result.args = args;
+      i += 1;
+      continue;
+    }
     if ((arg === "-n" || arg === "--name") && argv[i + 1]) {
       result.name = argv[i + 1];
       i += 1;
@@ -2020,6 +2331,16 @@ function inferFindPreferredTransport(options) {
 function collect(value, previous) {
   return previous.concat([value]);
 }
+function looksLikeEatenShellVar(invalidEntries, separator) {
+  for (const entry of invalidEntries) {
+    const separatorIndex = entry.indexOf(separator);
+    if (separatorIndex <= 0) continue;
+    const key = entry.slice(0, separatorIndex).trim();
+    const value = entry.slice(separatorIndex + 1).trim();
+    if (key && !value) return true;
+  }
+  return false;
+}
 function parseHeaders(values) {
   const headers = {};
   const invalid = [];
@@ -2049,8 +2370,8 @@ function parseEnv(values) {
       continue;
     }
     const key = entry.slice(0, separatorIndex).trim();
-    const value = entry.slice(separatorIndex + 1);
-    if (!key) {
+    const value = entry.slice(separatorIndex + 1).trim();
+    if (!key || !value) {
       invalid.push(entry);
       continue;
     }
@@ -2058,6 +2379,13 @@ function parseEnv(values) {
   }
   return { env, invalid };
 }
+function omitEmptyStringValues(record) {
+  return Object.fromEntries(
+    Object.entries(record).filter(
+      ([, v]) => typeof v === "string" && v.trim().length > 0
+    )
+  );
+}
 program.name("add-mcp").description(
   "Install MCP servers for coding agents (Claude Code, Cursor, VS Code, OpenCode, Codex, and more \u2014 run list-agents for the full list)"
 ).version(version).argument("[target]", "MCP server URL (remote) or package name (local stdio)").option(
@@ -2071,12 +2399,17 @@ program.name("add-mcp").description(
   "Transport type for remote servers (http, sse)"
 ).option("--type <type>", "Alias for --transport").option(
   "--header <header>",
-  "HTTP header for remote servers (repeatable, 'Key: Value')",
+  "HTTP header for remote servers (repeatable, 'Key: Value'). Placeholders ${VAR} prompt interactively when not using --yes. Use single quotes so your shell does not expand the ${VAR}.",
   collect,
   []
 ).option(
   "--env <env>",
-  "Environment variable for local stdio servers (repeatable, 'KEY=VALUE')",
+  "Environment variable for local stdio servers (repeatable, 'KEY=VALUE'). Placeholders ${VAR} prompt interactively when not using --yes. Use single quotes so your shell does not expand the ${VAR}.",
+  collect,
+  []
+).option(
+  "--args <arg>",
+  "Argument for local stdio servers (repeatable). Placeholders ${VAR} prompt interactively when not using --yes. Use single quotes so your shell does not expand the ${VAR}.",
   collect,
   []
 ).option("-y, --yes", "Skip confirmation prompts").option("--all", "Install to all agents").option("--gitignore", "Add generated project config files to .gitignore").action(async (target, options) => {
@@ -2111,7 +2444,9 @@ async function runFindCommand(keyword, rawOptions) {
     transport: installPlan.transport,
     header: installPlan.headers ? Object.entries(installPlan.headers).map(
       ([key, value]) => `${key}: ${value}`
-    ) : options.header
+    ) : options.header,
+    env: installPlan.env ? Object.entries(installPlan.env).map(([key, value]) => `${key}=${value}`) : options.env,
+    args: installPlan.args ?? options.args
   };
   await main(installPlan.target, mergedOptions);
 }
@@ -2656,8 +2991,9 @@ async function main(target, options) {
   const headerValues = options.header ?? [];
   const headerResult = parseHeaders(headerValues);
   if (headerResult.invalid.length > 0) {
+    const hint = looksLikeEatenShellVar(headerResult.invalid, ":") ? " (looks like your shell expanded a ${VAR} to an empty string; use single quotes: --header 'Key: ${VAR}' to pass the template literally)" : "";
     p3.log.error(
-      `Invalid --header value(s): ${headerResult.invalid.join(", ")}. Use "Key: Value" format.`
+      `Invalid --header value(s): ${headerResult.invalid.join(", ")}. Use "Key: Value" format.${hint}`
     );
     process.exit(1);
   }
@@ -2669,8 +3005,9 @@ async function main(target, options) {
   const envValues = options.env ?? [];
   const envResult = parseEnv(envValues);
   if (envResult.invalid.length > 0) {
+    const hint = looksLikeEatenShellVar(envResult.invalid, "=") ? " (looks like your shell expanded a ${VAR} to an empty string; use single quotes: --env 'KEY=${VAR}' to pass the template literally)" : "";
     p3.log.error(
-      `Invalid --env value(s): ${envResult.invalid.join(", ")}. Use "KEY=VALUE" format.`
+      `Invalid --env value(s): ${envResult.invalid.join(", ")}. Use "KEY=VALUE" format.${hint}`
     );
     process.exit(1);
   }
@@ -2681,6 +3018,55 @@ async function main(target, options) {
       "--env is only used for local/package/command installs, ignoring"
     );
   }
+  const argsValues = options.args ?? [];
+  const hasArgsValues = argsValues.length > 0;
+  if (hasArgsValues && isRemote) {
+    p3.log.warn(
+      "--args is only used for local/package/command installs, ignoring"
+    );
+  }
+  const promptTemplateVar = (varName) => p3.text({
+    message: `Enter value for ${varName}`,
+    placeholder: `<${varName}>`
+  });
+  let resolvedArgs = [...argsValues];
+  if (!options.yes && hasHeaderValues && hasTemplateVars(headerResult.headers)) {
+    const result = await resolveRecordTemplates(
+      headerResult.headers,
+      promptTemplateVar
+    );
+    if (result.cancelled) {
+      p3.cancel("Cancelled");
+      process.exit(0);
+    }
+    for (const [key, value] of Object.entries(result.resolved)) {
+      headerResult.headers[key] = value;
+    }
+  }
+  if (!options.yes && hasEnvValues && hasTemplateVars(envResult.env)) {
+    const result = await resolveRecordTemplates(
+      envResult.env,
+      promptTemplateVar
+    );
+    if (result.cancelled) {
+      p3.cancel("Cancelled");
+      process.exit(0);
+    }
+    for (const [key, value] of Object.entries(result.resolved)) {
+      envResult.env[key] = value;
+    }
+  }
+  if (!options.yes && hasArgsValues && hasTemplateVars(resolvedArgs)) {
+    const result = await resolveArrayTemplates(resolvedArgs, promptTemplateVar);
+    if (result.cancelled) {
+      p3.cancel("Cancelled");
+      process.exit(0);
+    }
+    resolvedArgs = result.resolved;
+  }
+  const headersForConfig = isRemote && hasHeaderValues ? omitEmptyStringValues(headerResult.headers) : void 0;
+  const envForConfig = !isRemote && hasEnvValues ? omitEmptyStringValues(envResult.env) : void 0;
+  const argsForConfig = !isRemote && hasArgsValues ? resolvedArgs.filter((a) => a.trim().length > 0) : void 0;
   const serverName = options.name || parsed.inferredName;
   p3.log.info(`Server name: ${chalk.cyan(serverName)}`);
   const transportValue = options.transport || options.type;
@@ -2700,8 +3086,9 @@ async function main(target, options) {
   }
   const serverConfig = buildServerConfig(parsed, {
     transport: resolvedTransport,
-    headers: isRemote && hasHeaderValues ? headerResult.headers : void 0,
-    env: !isRemote && hasEnvValues ? envResult.env : void 0
+    headers: headersForConfig && Object.keys(headersForConfig).length > 0 ? headersForConfig : void 0,
+    env: envForConfig && Object.keys(envForConfig).length > 0 ? envForConfig : void 0,
+    args: argsForConfig && argsForConfig.length > 0 ? argsForConfig : void 0
   });
   let targetAgents;
   const allAgentTypes = getAgentTypes();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "add-mcp",
-  "version": "1.8.0",
+  "version": "1.9.1",
   "description": "Add MCP servers to your favorite coding agents with a single command.",
   "author": "Andre Landgraf <andre@neon.tech>",
   "license": "Apache-2.0",
@@ -16,12 +16,13 @@
     "fmt": "prettier --write .",
     "build": "tsup src/index.ts --format esm --dts --clean",
     "dev": "tsx src/index.ts",
-    "test": "tsx tests/source-parser.test.ts && tsx tests/agents.test.ts && tsx tests/config.test.ts && tsx tests/installer.test.ts && tsx tests/find.test.ts && tsx tests/reader.test.ts && tsx tests/formats-remove.test.ts && tsx tests/e2e/install.test.ts && tsx tests/e2e/cli.test.ts",
-    "test:unit": "tsx tests/source-parser.test.ts && tsx tests/agents.test.ts && tsx tests/config.test.ts && tsx tests/installer.test.ts && tsx tests/find.test.ts && tsx tests/reader.test.ts && tsx tests/formats-remove.test.ts",
+    "test": "tsx tests/source-parser.test.ts && tsx tests/agents.test.ts && tsx tests/config.test.ts && tsx tests/installer.test.ts && tsx tests/find.test.ts && tsx tests/package-arguments.test.ts && tsx tests/template.test.ts && tsx tests/reader.test.ts && tsx tests/formats-remove.test.ts && tsx tests/e2e/install.test.ts && tsx tests/e2e/cli.test.ts",
+    "test:unit": "tsx tests/source-parser.test.ts && tsx tests/agents.test.ts && tsx tests/config.test.ts && tsx tests/installer.test.ts && tsx tests/find.test.ts && tsx tests/package-arguments.test.ts && tsx tests/template.test.ts && tsx tests/reader.test.ts && tsx tests/formats-remove.test.ts",
     "registry:sort": "tsx scripts/sort-registry.ts",
     "registry:verify": "tsx scripts/verify-registry.ts",
     "test:e2e": "tsx tests/e2e/install.test.ts && tsx tests/e2e/cli.test.ts",
     "typecheck": "tsc --noEmit",
+    "fallow": "fallow",
     "prepublishOnly": "npm run build"
   },
   "keywords": [
@@ -45,11 +46,11 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/neondatabase/add-mcp.git"
+    "url": "git+https://github.com/neon-solutions/add-mcp.git"
   },
-  "homepage": "https://github.com/neondatabase/add-mcp#readme",
+  "homepage": "https://github.com/neon-solutions/add-mcp#readme",
   "bugs": {
-    "url": "https://github.com/neondatabase/add-mcp/issues"
+    "url": "https://github.com/neon-solutions/add-mcp/issues"
   },
   "dependencies": {
     "@clack/prompts": "^0.9.1",
@@ -62,6 +63,7 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.10.0",
+    "fallow": "^2.61.0",
     "prettier": "^3.8.1",
     "tsup": "^8.3.5",
     "tsx": "^4.19.2",