Merge branch 'master' into ibarakov/blazor-api-docs

Author: onlyexeption

README.md

@@ -89,6 +89,7 @@ export class PromptSession extends BasePromptSession {
 			}
 			// move cwd to project folder
 			process.chdir(projectName);
+			await this.configureAI();
 		}
 		await this.chooseActionLoop(projLibrary);
 		//TODO: restore cwd?
@@ -105,8 +106,7 @@ export class PromptSession extends BasePromptSession {
 	}
 
 	protected async configureAI(): Promise<void> {
-		// skip adding skills since those are baked into the project template atm:
-		aiConfigure(false);
+		await aiConfigure();
 	}
 
 	/**

packages/cli/lib/PromptSession.ts

@@ -1,4 +1,4 @@
-import { addMcpServers, copyAISkillsToProject, GoogleAnalytics, Util, VS_CODE_MCP_PATH } from "@igniteui/cli-core";
+import { addMcpServers, AI_AGENT_LABELS, AI_AGENT_CHOICES, AIAgentTarget, copyAgentInstructionFiles, copyAISkillsToProject, GoogleAnalytics, InquirerWrapper, Util, VS_CODE_MCP_PATH } from "@igniteui/cli-core";
 import { ArgumentsCamelCase, CommandModule } from "yargs";
 
 export function configureMCP(): void {
@@ -11,8 +11,8 @@ export function configureMCP(): void {
 	Util.log(Util.greenCheck() + ` MCP servers configured in ${VS_CODE_MCP_PATH}`);
 }
 
-export function configureSkills(): void {
-	const result = copyAISkillsToProject();
+export function configureSkills(agents: AIAgentTarget[]): void {
+	const result = copyAISkillsToProject(agents);
 	if (result.found === 0) {
 		Util.warn("No AI skill files found. Make sure packages are installed (npm install) " +
 			"and your Ignite UI packages are up-to-date.", "yellow");
@@ -26,30 +26,72 @@ export function configureSkills(): void {
 	}
 }
 
-export function configure(skills = true): void {
+export async function configure(agents?: AIAgentTarget[], skills = true): Promise<void> {
+	if (!agents?.length) {
+		agents = await promptForAgents();
+	}
+	if (!agents.length) return;
 	configureMCP();
 	if (skills) {
-		configureSkills();
+		configureSkills(agents);
+	}
+	copyAgentInstructionFiles(agents);
+}
+const AI_AGENT_CHECKBOX_DEFAULTS: AIAgentTarget[] = ["generic", "claude"];
+const AI_AGENT_CHECKBOX_CHOICES = [
+	{ value: "none", name: "None (skip AI configuration)" },
+	...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;
+	if (Util.canPrompt()) {
+		const result = await InquirerWrapper.checkbox({
+			message: "Which AI tools do you want to generate configuration files for?",
+			required: true,
+			choices: AI_AGENT_CHECKBOX_CHOICES
+		});
+		selected = result.includes("none") ? [] : result as AIAgentTarget[];
 	}
+	return selected;
 }
 
 const command: CommandModule = {
 	command: "ai-config",
-	describe: "Configures Ignite UI AI tooling (MCP servers and AI coding skills)",
-	builder: (yargs) => yargs,
-	async handler(_argv: ArgumentsCamelCase) {
+	describe: "Configures Ignite UI AI tooling (MCP servers, AI coding skills and instructions)",
+	builder: (yargs) => yargs
+		.usage("")
+		.option("agent", {
+			alias: "a",
+			describe: "AI agents/tools to generate configuration files for",
+			choices: AI_AGENT_CHOICES,
+			type: "array"
+		}),
+	async handler(argv: ArgumentsCamelCase) {
+		let agents = argv.agent as AIAgentTarget[] | undefined;
 		GoogleAnalytics.post({
 			t: "screenview",
-			cd: "MCP"
+			cd: "Ai Config"
 		});
 
+		if (!agents?.length) {
+			agents = await promptForAgents();
+		}
 		GoogleAnalytics.post({
 			t: "event",
 			ec: "$ig ai-config",
-			ea: "client: vscode"
+			ea: `agent: ${agents.join(", ")}`
 		});
 
-		configure();
+		if (!agents.length) {
+			Util.log("No AI configuration selected. Skipping.");
+			return;
+		}
+		await configure(agents);
 	}
 };
 

packages/cli/lib/commands/ai-config.ts

@@ -1,9 +1,10 @@
-import { GoogleAnalytics, PackageManager, ProjectConfig, ProjectLibrary, Util } from "@igniteui/cli-core";
+import { AI_AGENT_CHOICES, AIAgentTarget, GoogleAnalytics, PackageManager, ProjectConfig, ProjectLibrary, Util } from "@igniteui/cli-core";
 import * as path from "path";
 import { PromptSession } from "./../PromptSession";
 import { NewCommandType, PositionalArgs } from "./types";
 import { TemplateManager } from "../TemplateManager";
 import { ArgumentsCamelCase, Choices } from "yargs";
+import { configure } from "./ai-config";
 
 // explicit typing because `type: "string"` will be inferred as `type: string` which yargs will not like
 const _framework: {
@@ -59,6 +60,12 @@ const command: NewCommandType = {
 				describe: "Project template",
 				type: "string"
 			})
+			.option("agents", {
+				alias: "a",
+				describe: "AI agents/tools to generate configuration files for",
+				choices: AI_AGENT_CHOICES,
+				type: "array"
+			})
 			.example("$0 new my-app", "Scaffold a new project interactively")
 			.example("$0 new my-app -f angular -t igx-ts", "Scaffold an Ignite UI for Angular project");
 	},
@@ -152,16 +159,20 @@ const command: NewCommandType = {
 
 		Util.log(Util.greenCheck() + " Project Created");
 
-		if (!argv["skip-git"] && !ProjectConfig.getConfig().skipGit) {
-			Util.gitInit(process.cwd(), argv.name);
-		}
-
 		if (!argv.skipInstall) {
 			process.chdir(argv.name);
 			await PackageManager.installPackages();
 			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);
+		}
+
 		Util.log("");
 		Util.log("Next Steps:");
 		Util.log(`  cd ${argv.name}`);

packages/cli/lib/commands/new.ts

@@ -6,8 +6,8 @@ class IgrTsDataGridComponent extends BaseComponent {
 	 */
 	constructor() {
 		super(__dirname);
-		this.name = "Data Grid";
-		this.group = "Grids";
+		this.name = "Grid";
+		this.group = "Grids & Lists";
 		this.description = "pick from grids: basic, sorting, templating.";
 	}
 }