feat(init): set up the Netlify MCP server for the project

docs/commands/init.md

@@ -22,10 +22,13 @@ netlify init
 - `force` (*boolean*) - Reinitialize CI hooks if the linked project is already configured to use CI
 - `git-remote-name` (*string*) - Name of Git remote to use. e.g. "origin"
 - `manual` (*boolean*) - Manually configure a git remote for CI
+- `mcp-scope` (*project | user*) - Add the Netlify MCP server for this project only, or for your user across all projects
 - `reset-context` (*boolean*) - Replace locally edited Netlify skills with the latest release, and migrate or delete edited copies under renamed or deprecated names
+- `reset-mcp-setup` (*boolean*) - Forget your saved Netlify MCP server choices and ask which AI coding agents to set up
+- `skip-mcp-setup` (*boolean*) - Skip adding the Netlify MCP server to your AI coding agents
 - `debug` (*boolean*) - Print debugging information
 - `auth` (*string*) - Netlify auth token - can be used to run this command without logging in
-- `skip-agent-setup` (*boolean*) - Skip installing Netlify skills for AI coding agents into the project
+- `skip-agent-setup` (*boolean*) - Skip installing Netlify skills and adding the Netlify MCP server for AI coding agents
 
 
 <!-- AUTO-GENERATED-CONTENT:END -->

src/commands/init/index.ts

@@ -1,4 +1,4 @@
-import { OptionValues } from 'commander'
+import { Option, OptionValues } from 'commander'
 import terminalLink from 'terminal-link'
 
 import BaseCommand from '../base-command.js'
@@ -11,7 +11,23 @@ export const createInitCommand = (program: BaseCommand) =>
     )
     .option('-m, --manual', 'Manually configure a git remote for CI')
     .option('--git-remote-name <name>', 'Name of Git remote to use. e.g. "origin"')
-    .option('--skip-agent-setup', 'Skip installing Netlify skills for AI coding agents into the project')
+    .option(
+      '--skip-agent-setup',
+      'Skip installing Netlify skills and adding the Netlify MCP server for AI coding agents',
+    )
+    .option('--skip-mcp-setup', 'Skip adding the Netlify MCP server to your AI coding agents')
+    .addOption(
+      new Option(
+        '--mcp-scope <scope>',
+        'Add the Netlify MCP server for this project only, or for your user across all projects',
+      )
+        .choices(['project', 'user'])
+        .default('project'),
+    )
+    .option(
+      '--reset-mcp-setup',
+      'Forget your saved Netlify MCP server choices and ask which AI coding agents to set up',
+    )
     .option(
       '--reset-context',
       'Replace locally edited Netlify skills with the latest release, and migrate or delete edited copies under renamed or deprecated names',
@@ -26,6 +42,9 @@ For more information about getting started with Netlify CLI, see ${terminalLink(
       const { init } = await import('./init.js')
       await init(options, command, {
         setupAgentSkills: !options.skipAgentSetup,
+        setupAgentMcp: !options.skipAgentSetup && !options.skipMcpSetup,
+        resetMcpSetup: Boolean(options.resetMcpSetup),
+        mcpScope: options.mcpScope === 'user' ? 'user' : 'project',
         resetContext: Boolean(options.resetContext),
       })
     })

src/commands/init/init.ts

@@ -11,6 +11,8 @@ import type BaseCommand from '../base-command.js'
 import { link } from '../link/link.js'
 import { sitesCreate } from '../sites/sites-create.js'
 import type { LocalState, SiteInfo } from '../../utils/types.js'
+import { findProjectSetupBlocker } from '../../utils/init/agent-location.js'
+import { type McpScope, setupAgentMcp } from '../../utils/init/agent-mcp.js'
 import { setupAgentSkills } from '../../utils/init/agent-skills.js'
 import { getBuildSettings, saveNetlifyToml } from '../../utils/init/utils.js'
 import { type InitExitCode, LINKED_EXISTING_SITE_EXIT_CODE, LINKED_NEW_SITE_EXIT_CODE } from './constants.js'
@@ -212,12 +214,14 @@ type InitExtraOptions = {
   customizeExitMessage?: InitExitMessageCustomizer | undefined
   exitAfterConfiguringRepo?: boolean | undefined
   setupAgentSkills?: boolean | undefined
+  setupAgentMcp?: boolean | undefined
   resetContext?: boolean | undefined
+  resetMcpSetup?: boolean | undefined
+  mcpScope?: McpScope | undefined
 }
 
-const installAgentSkills = async (command: BaseCommand, reset: boolean): Promise<void> => {
-  log()
-  const result = await setupAgentSkills({ workingDir: command.netlify.repositoryRoot, reset })
+const installAgentSkills = async (workingDir: string, reset: boolean): Promise<void> => {
+  const result = await setupAgentSkills({ workingDir, reset })
   await track('sites_agentSkillsSetup', {
     installed: result.installed,
     directories: result.directories,
@@ -227,21 +231,78 @@ const installAgentSkills = async (command: BaseCommand, reset: boolean): Promise
   })
 }
 
+const addAgentMcp = async (command: BaseCommand, reset: boolean, scope: McpScope): Promise<void> => {
+  const { repositoryRoot, state } = command.netlify
+  const {
+    selection,
+    agents,
+    failed = false,
+  } = await setupAgentMcp({
+    workingDir: repositoryRoot,
+    store: state,
+    scope,
+    reset,
+  })
+  await track('sites_agentMcpSetup', { selection, agents, failed, scope, resetMcpSetup: reset })
+}
+
+const setUpAgents = async (
+  command: BaseCommand,
+  {
+    skills,
+    mcp,
+    reset,
+    resetMcp,
+    mcpScope,
+  }: { skills: boolean; mcp: boolean; reset: boolean; resetMcp: boolean; mcpScope: McpScope },
+): Promise<void> => {
+  if (!skills && !mcp) {
+    return
+  }
+  const { repositoryRoot } = command.netlify
+  log()
+  const blocker = await findProjectSetupBlocker(repositoryRoot)
+  const skillsBlocked = skills && blocker !== undefined
+  const mcpBlocked = mcp && blocker !== undefined && (blocker.place === 'root' || mcpScope === 'project')
+  if (blocker && (skillsBlocked || mcpBlocked)) {
+    const skipped = [skillsBlocked && 'Netlify skills', mcpBlocked && 'the Netlify MCP server']
+      .filter(Boolean)
+      .join(' and ')
+    log(`Skipped setting up ${skipped}: ${blocker.reason}.`)
+    log(
+      `  Run ${chalk.cyanBright.bold(`${netlifyCommand()} init`)} from your project folder to set up ${skipped} there.`,
+    )
+    await track('sites_agentSetupSkipped', { skills: skillsBlocked, mcp: mcpBlocked })
+  }
+  if (skills && !skillsBlocked) {
+    await installAgentSkills(repositoryRoot, reset)
+  }
+  if (mcp && !mcpBlocked) {
+    await addAgentMcp(command, resetMcp, mcpScope)
+  }
+}
+
 export const init = async (
   options: OptionValues,
   command: BaseCommand,
   {
     customizeExitMessage,
     exitAfterConfiguringRepo = false,
     setupAgentSkills: shouldSetupAgentSkills = false,
+    setupAgentMcp: shouldSetupAgentMcp = false,
     resetContext = false,
+    resetMcpSetup = false,
+    mcpScope = 'project',
   }: InitExtraOptions = {},
 ): Promise<SiteInfo> => {
   command.setAnalyticsPayload({
     manual: options.manual,
     force: options.force,
     skipAgentSetup: options.skipAgentSetup,
+    skipMcpSetup: options.skipMcpSetup,
     resetContext: options.resetContext,
+    resetMcpSetup: options.resetMcpSetup,
+    mcpScope,
   })
 
   const { repositoryRoot, state } = command.netlify
@@ -253,9 +314,13 @@ export const init = async (
   // Add .netlify to .gitignore file
   await ensureNetlifyIgnore(repositoryRoot)
 
-  if (shouldSetupAgentSkills) {
-    await installAgentSkills(command, resetContext)
-  }
+  await setUpAgents(command, {
+    skills: shouldSetupAgentSkills,
+    mcp: shouldSetupAgentMcp,
+    reset: resetContext,
+    resetMcp: resetMcpSetup,
+    mcpScope,
+  })
 
   const repoUrl = getRepoUrl(existingSiteInfo)
   if (repoUrl && !options.force) {

src/utils/init/agent-location.ts

@@ -0,0 +1,30 @@
+import { promises as fs } from 'node:fs'
+import { homedir } from 'node:os'
+import path from 'node:path'
+
+const realpathOrSelf = async (target: string): Promise<string> => {
+  try {
+    return await fs.realpath(target)
+  } catch {
+    return path.resolve(target)
+  }
+}
+
+export interface ProjectSetupBlocker {
+  place: 'home' | 'root'
+  reason: string
+}
+
+export const findProjectSetupBlocker = async (
+  root: string,
+  home: string = homedir(),
+): Promise<ProjectSetupBlocker | undefined> => {
+  const resolvedRoot = await realpathOrSelf(root)
+  if (resolvedRoot === (await realpathOrSelf(home))) {
+    return { place: 'home', reason: 'this is your home directory, where they would apply to every project' }
+  }
+  if (resolvedRoot === path.parse(resolvedRoot).root) {
+    return { place: 'root', reason: 'this is the root of the file system' }
+  }
+  return undefined
+}