IgniteUI · damyanpetev · May 13, 2026 · May 8, 2026 · May 8, 2026 · May 11, 2026
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -80,12 +80,11 @@
 			"program": "${workspaceRoot}/packages/cli/bin/execute.js",
 			"console": "externalTerminal",
 			"preLaunchTask": "build",
-			"outFiles": [ "${workspaceRoot}/lib/**/*.js",
-				"${workspaceRoot}/spec/**/*.js" ],
 			"args": [
 				"new",
 				"angularproj",
-				"--framework=angular"
+				"--framework=angular",
+				"--skip-install"
 			]
 		},
 		{

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 15.1.0
+
+## What's Changed
+* feat(ai-config): The ai-config command now enables users to select and configure an AI coding assistant integration for their Ignite UI project. Based on the selected provider, the command adds the required skills, instruction files, and MCP configuration to streamline AI-assisted development workflows. The `new` command now accepts `--agents` (for adding skills and instruction files) and `--assistants`(for adding mcp configuration) options, allowing users to configure AI integration directly during project creation. When using the step-by-step wizard, users are automatically prompted to select their preferred AI agents and coding assistants after the project structure is generated. The Angular schematics package includes a dedicated `ai-config` schematic that runs automatically during `ng new` with Ignite UI and can also be invoked standalone via `ng generate @igniteui/angular-schematics:ai-config` to add AI configuration to existing Angular projects. by @Marina-L-Stoyanova https://github.com/IgniteUI/igniteui-cli/pull/1684
+
 # 15.0.1 (2026-04-28)
 
 ## What's Changed

diff --git a/README.md b/README.md
@@ -151,13 +151,17 @@ To configure Ignite UI AI tooling — MCP servers and AI coding skills — run:
 ig ai-config
 ```
 
-You will be prompted to select which AI tools to configure (Claude and Generic are selected by default). You can also pass agents directly:
+You will be prompted with two selections:
+- **AI agents** — which tools to generate skill and instruction files for (Generic and Claude are selected by default)
+- **Coding assistants** — which assistants to configure MCP servers for (general `.mcp.json` is selected by default, compatible with Claude Code, VS Code, and others)
+
+You can also pass options directly:
 
 ```bash
-ig ai-config --agents claude copilot generic
+ig ai-config --agents claude copilot generic --assistants vscode cursor
 ```
 
-This creates or updates `.vscode/mcp.json` with entries for the [Ignite UI MCP](#mcp-server) and `igniteui-theming` MCP servers (existing servers are preserved), copies AI coding skill files from installed Ignite UI packages, and generates agent-specific instruction files (e.g. `CLAUDE.md`, `AGENTS.md`).
+This creates or updates the assistant-specific MCP config file (e.g. `.mcp.json`, `.vscode/mcp.json`, `.cursor/mcp.json`) with entries for the [Ignite UI MCP](#mcp-server) and `igniteui-theming` MCP servers (existing servers are preserved), copies AI coding skill files from installed Ignite UI packages, and generates agent-specific instruction files (e.g. `CLAUDE.md`, `AGENTS.md`).
 
 The `ig new` command also prompts for AI tool configuration as part of project creation.
 

diff --git a/packages/cli/lib/commands/ai-config.ts b/packages/cli/lib/commands/ai-config.ts
@@ -1,14 +1,17 @@
-import { addMcpServers, AI_AGENT_LABELS, AI_AGENT_CHOICES, AIAgentTarget, copyAgentInstructionFiles, copyAISkillsToProject, GoogleAnalytics, InquirerWrapper, Util, VS_CODE_MCP_PATH } from "@igniteui/cli-core";
+import { addMcpServers, AI_AGENT_LABELS, AI_AGENT_CHOICES, AIAgentTarget, copyAgentInstructionFiles, copyAISkillsToProject, GoogleAnalytics, InquirerWrapper, Util, AiCodingAssistant, AI_ASSISTANT_MCP_CONFIGS, AI_ASSISTANT_CHOICES, AI_ASSISTANT_LABELS } from "@igniteui/cli-core";
 import { ArgumentsCamelCase, CommandModule } from "yargs";
 
-export function configureMCP(): void {
-	const modified = addMcpServers(VS_CODE_MCP_PATH);
+export function configureMCP(assistants: AiCodingAssistant[]): void {
+	for (const assistant of assistants) {
+		const { mcpFilePath } = AI_ASSISTANT_MCP_CONFIGS[assistant];
+		const modified = addMcpServers(assistant);
 
-	if (!modified) {
-		Util.log(` Ignite UI MCP servers already configured in ${VS_CODE_MCP_PATH}`);
-		return;
+		if (!modified) {
+			Util.log(` Ignite UI MCP servers already configured in ${mcpFilePath}`);
+		} else {
+			Util.log(Util.greenCheck() + ` MCP servers configured in ${mcpFilePath}`);
+		}
 	}
-	Util.log(Util.greenCheck() + ` MCP servers configured in ${VS_CODE_MCP_PATH}`);
 }
 
 export function configureSkills(agents: AIAgentTarget[]): void {
@@ -26,36 +29,81 @@ export function configureSkills(agents: AIAgentTarget[]): void {
 	}
 }
 
-export async function configure(agents?: AIAgentTarget[], skills = true): Promise<void> {
-	if (!agents?.length) {
+type AIAgentOption = AIAgentTarget | "none";
+type AIAssistantOption = AiCodingAssistant | "none";
+
+export async function configure(agents: AIAgentOption[] = [], assistants: AIAssistantOption[] = [], skills = true): Promise<{ agents: AIAgentTarget[], assistants: AiCodingAssistant[] }> {
+	if (!agents.length) {
 		agents = await promptForAgents();
 	}
-	if (!agents.length) return;
-	configureMCP();
-	if (skills) {
-		configureSkills(agents);
+
+	if (!assistants.length) {
+		assistants = await promptForAssistant();
+	}
+
+	const resolvedAgents: AIAgentTarget[] = agents.includes("none") ? [] : agents as AIAgentTarget[];
+	const resolvedAssistants: AiCodingAssistant[] = assistants.includes("none") ? [] : assistants as AiCodingAssistant[];
+
+	if (!resolvedAssistants.length) {
+		Util.log("No MCP configuration selected. Skipping.");
 	}
-	copyAgentInstructionFiles(agents);
+	configureMCP(resolvedAssistants);
+
+	if (!resolvedAgents.length) {
+		Util.log("No AI configuration selected. Skipping.");
+	} else {
+		if (skills) {
+			configureSkills(resolvedAgents);
+		}
+		copyAgentInstructionFiles(resolvedAgents);
+	}
+
+	return { agents: resolvedAgents, assistants: resolvedAssistants };
 }
+
 const AI_AGENT_CHECKBOX_DEFAULTS: AIAgentTarget[] = ["generic", "claude"];
+const AI_ASSISTANT_CHECKBOX_DEFAULTS: AiCodingAssistant[] = ["generic"];
+
 const AI_AGENT_CHECKBOX_CHOICES = [
-	{ value: "none", name: "None (skip AI configuration)" },
+	{ value: "none", name: "None (skip skills and instructions)" },
 	...AI_AGENT_CHOICES.map(agent => ({
 		value: agent,
 		name: AI_AGENT_LABELS[agent],
 		checked: AI_AGENT_CHECKBOX_DEFAULTS.includes(agent)
 	}))
 ];
 
-export async function promptForAgents(): Promise<AIAgentTarget[]> {
-	let selected: AIAgentTarget[] = AI_AGENT_CHECKBOX_DEFAULTS;
+const AI_ASSISTANT_CHECKBOX_CHOICES = [
+	{ value: "none", name: "None (skip MCP configuration)" },
+	...AI_ASSISTANT_CHOICES.map(a => ({
+		value: a,
+		name: AI_ASSISTANT_LABELS[a],
+		checked: AI_ASSISTANT_CHECKBOX_DEFAULTS.includes(a)
+	}))
+];
+
+export async function promptForAgents(): Promise<AIAgentOption[]> {
+	let selected: AIAgentOption[] = AI_AGENT_CHECKBOX_DEFAULTS;
 	if (Util.canPrompt()) {
 		const result = await InquirerWrapper.checkbox({
-			message: "Which AI tools do you want to generate configuration files for?",
+			message: "Which AI agents do you want to generate skills and instructions for?",
 			required: true,
 			choices: AI_AGENT_CHECKBOX_CHOICES
 		});
-		selected = result.includes("none") ? [] : result as AIAgentTarget[];
+		selected = result as AIAgentOption[];
+	}
+	return selected;
+}
+
+export async function promptForAssistant(): Promise<AIAssistantOption[]> {
+	let selected: AIAssistantOption[] = AI_ASSISTANT_CHECKBOX_DEFAULTS;
+	if (Util.canPrompt()) {
+		const result = await InquirerWrapper.checkbox({
+			message: "Which coding assistants should MCP servers be configured for?",
+			required: true,
+			choices: AI_ASSISTANT_CHECKBOX_CHOICES
+		});
+		selected = result as AIAssistantOption[];
 	}
 	return selected;
 }
@@ -65,33 +113,31 @@ const command: CommandModule = {
 	describe: "Configures Ignite UI AI tooling (MCP servers, AI coding skills and instructions)",
 	builder: (yargs) => yargs
 		.usage("")
-		.option("agent", {
-			alias: "a",
+		.option("agents", {
 			describe: "AI agents/tools to generate configuration files for",
-			choices: AI_AGENT_CHOICES,
+			choices: [...AI_AGENT_CHOICES, "none"] as string[],
+			type: "array"
+		})
+		.option("assistants", {
+			describe: "Coding assistant(s) to configure MCP servers for",
+			choices: [...AI_ASSISTANT_CHOICES, "none"] as string[],
 			type: "array"
 		}),
 	async handler(argv: ArgumentsCamelCase) {
-		let agents = argv.agent as AIAgentTarget[] | undefined;
+		const agents = (argv.agents ?? []) as AIAgentOption[];
+		const assistants = (argv.assistants ?? []) as AIAssistantOption[];
 		GoogleAnalytics.post({
 			t: "screenview",
 			cd: "Ai Config"
 		});
 
-		if (!agents?.length) {
-			agents = await promptForAgents();
-		}
+		const result = await configure(agents, assistants);
+
 		GoogleAnalytics.post({
 			t: "event",
 			ec: "$ig ai-config",
-			ea: `agent: ${agents.join(", ")}`
+			ea: `agent: ${result.agents.join(", ") || "none"}; assistant: ${result.assistants.join(", ") || "none"}`
 		});
-
-		if (!agents.length) {
-			Util.log("No AI configuration selected. Skipping.");
-			return;
-		}
-		await configure(agents);
 	}
 };
 

diff --git a/packages/cli/lib/commands/new.ts b/packages/cli/lib/commands/new.ts
@@ -1,4 +1,4 @@
-import { AI_AGENT_CHOICES, AIAgentTarget, App, type BaseTemplateManager, GoogleAnalytics, PackageManager, ProjectConfig, ProjectLibrary, TEMPLATE_MANAGER, Util } from "@igniteui/cli-core";
+import { AI_AGENT_CHOICES, AI_ASSISTANT_CHOICES, AIAgentTarget, type AiCodingAssistant, App, type BaseTemplateManager, GoogleAnalytics, PackageManager, ProjectConfig, ProjectLibrary, TEMPLATE_MANAGER, Util } from "@igniteui/cli-core";
 import * as path from "path";
 import { PromptSession } from "./../PromptSession";
 import { NewCommandType, PositionalArgs } from "./types";
@@ -60,9 +60,13 @@ const command: NewCommandType = {
 				type: "string"
 			})
 			.option("agents", {
-				alias: "a",
 				describe: "AI agents/tools to generate configuration files for",
-				choices: AI_AGENT_CHOICES,
+				choices: [...AI_AGENT_CHOICES, "none"] as string[],
+				type: "array"
+			})
+			.option("assistants", {
+				describe: "Coding assistant(s) to configure MCP servers for",
+				choices: [...AI_ASSISTANT_CHOICES, "none"] as string[],
 				type: "array"
 			})
 			.example("$0 new my-app", "Scaffold a new project interactively")
@@ -157,6 +161,10 @@ const command: NewCommandType = {
 				config, projTemplate.delimiters, false);
 		}
 
+		process.chdir(argv.name);
+		await configure(argv.agents as (AIAgentTarget | "none")[], argv.assistants as (AiCodingAssistant | "none")[]);
+		process.chdir("..");
+
 		Util.log(Util.greenCheck() + " Project Created");
 
 		if (!argv.skipInstall) {
@@ -165,10 +173,6 @@ const command: NewCommandType = {
 			process.chdir("..");
 		}
 
-		process.chdir(argv.name);
-		await configure(argv.agents as AIAgentTarget[] | undefined);
-		process.chdir("..");
-
 		if (!argv["skip-git"] && !ProjectConfig.getConfig().skipGit) {
 			Util.gitInit(process.cwd(), argv.name);
 		}

diff --git a/packages/core/util/ai-skills.ts b/packages/core/util/ai-skills.ts
@@ -35,14 +35,14 @@ const AI_AGENT_INSTRUCTION_FILES: Record<AIAgentTarget, string> = {
 };
 
 export const AI_AGENT_LABELS: Record<AIAgentTarget, string> = {
-	generic: "Generic (Adding .agents/skills and AGENTS.md)",
-	claude: "Claude (Adding .claude/skills and CLAUDE.md)",
-	copilot: "Copilot (Adding .github/skills and copilot-instructions.md)",
-	cursor: "Cursor (Adding .cursor/skills and .cursor/rules/cursor.mdc)",
-	codex: "Codex (Adding .codex/skills and .codex/instructions.md)",
-	windsurf: "Windsurf (Adding .windsurf/skills and .windsurf/rules/guidelines.md)",
-	gemini: "Gemini (Adding .gemini/skills and .gemini/GEMINI.md)",
-	junie: "Junie (Adding .junie/skills and .junie/guidelines.md)"
+	generic: "Generic (Add .agents/skills and AGENTS.md general for most assistants)",
+	claude: "Claude (Add .claude/skills and CLAUDE.md)",
+	copilot: "Copilot (Add .github/skills and copilot-instructions.md)",
+	cursor: "Cursor (Add .cursor/skills and .cursor/rules/cursor.mdc)",
+	codex: "Codex (Add .codex/skills and .codex/instructions.md)",
+	windsurf: "Windsurf (Add .windsurf/skills and .windsurf/rules/guidelines.md)",
+	gemini: "Gemini (Add .gemini/skills and .gemini/GEMINI.md)",
+	junie: "Junie (Add .junie/skills and .junie/guidelines.md)"
 };
 
 /**

diff --git a/packages/core/util/mcp-config.ts b/packages/core/util/mcp-config.ts
@@ -7,6 +7,30 @@ export interface McpServerEntry {
 	args: string[];
 }
 
+export const AI_ASSISTANT_CHOICES = ["generic", "vscode", "cursor", "gemini", "junie"] as const;
+export type AiCodingAssistant = typeof AI_ASSISTANT_CHOICES[number];
+
+interface AssistantMcpConfig {
+	mcpFilePath: string;
+	rootKey: "servers" | "mcpServers";
+}
+
+export const AI_ASSISTANT_LABELS: Record<AiCodingAssistant, string> = {
+	"generic":	".mcp.json (generic for Claude Code, VS Code, and other assistants)",
+	"vscode":	"VS Code (GitHub Copilot)",
+	"cursor":	"Cursor",
+	"gemini":	"Gemini",
+	"junie":	"JetBrains Junie",
+};
+
+export const AI_ASSISTANT_MCP_CONFIGS: Record<AiCodingAssistant, AssistantMcpConfig> = {
+	"generic":	{ mcpFilePath: ".mcp.json",              rootKey: "mcpServers" },
+	"vscode":	{ mcpFilePath: ".vscode/mcp.json",      rootKey: "servers" },
+	"cursor":	{ mcpFilePath: ".cursor/mcp.json",       rootKey: "mcpServers" },
+	"gemini":	{ mcpFilePath: ".gemini/settings.json",  rootKey: "mcpServers" },
+	"junie":	{ mcpFilePath: ".junie/mcp/mcp.json",    rootKey: "mcpServers" },
+};
+
 const IGNITEUI_MCP_SERVERS: Record<string, McpServerEntry> = {
 	"igniteui-cli": {
 		command: "npx",
@@ -18,18 +42,18 @@ const IGNITEUI_MCP_SERVERS: Record<string, McpServerEntry> = {
 	}
 };
 
-export const VS_CODE_MCP_PATH = ".vscode/mcp.json";
-
 /**
- * Reads .vscode/mcp.json, ensures all IgniteUI MCP servers are present,
+ * Reads the assistant-specific MCP config file, ensures all IgniteUI MCP servers are present,
  * optionally adds additional servers. Creates the file if it doesn't exist.
+ * @param assistant target AI coding assistant (defaults to "vscode")
  * @param additionalServers optional extra servers to include alongside the built-in ones
  * @returns whether the file was modified
  */
 export function addMcpServers(
-	mcpFilePath: string,
+	assistant: AiCodingAssistant,
 	additionalServers?: Record<string, McpServerEntry>
 ): boolean {
+	const { mcpFilePath, rootKey } = AI_ASSISTANT_MCP_CONFIGS[assistant];
 	const fileSystem = App.container.get<IFileSystem>(FS_TOKEN);
 	const servers = { ...additionalServers, ...IGNITEUI_MCP_SERVERS };
 
@@ -44,20 +68,20 @@ export function addMcpServers(
 		if (Object.keys(servers).length === 0) {
 			return false;
 		}
-		fileSystem.writeFile(mcpFilePath, JSON.stringify({ servers }, null, 2) + "\n");
+		fileSystem.writeFile(mcpFilePath, JSON.stringify({ [rootKey]: servers }, null, 2) + "\n");
 		return true;
 	}
 
 	const parsed = jsonc.parse(existingContent);
-	const existing = parsed.servers ?? {};
+	const existing = parsed[rootKey] ?? {};
 	const formattingOptions: jsonc.FormattingOptions = { tabSize: 2, insertSpaces: true };
 
 	let text = existingContent;
 	let modified = false;
 
 	for (const [key, value] of Object.entries(servers)) {
 		if (!existing[key]) {
-			const edits = jsonc.modify(text, ["servers", key], value, { formattingOptions });
+			const edits = jsonc.modify(text, [rootKey, key], value, { formattingOptions });
 			text = jsonc.applyEdits(text, edits);
 			modified = true;
 		}