feat: enhance AI configuration by adding assistant labels and improving agent selection logic

Author: Marina-L-Stoyanova

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

@@ -1,4 +1,4 @@
-import { addMcpServers, AI_AGENT_LABELS, AI_AGENT_CHOICES, AIAgentTarget, copyAgentInstructionFiles, copyAISkillsToProject, GoogleAnalytics, InquirerWrapper, Util, AiCodingAssistant, AI_ASSISTANT_MCP_CONFIGS } 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(assistants: AiCodingAssistant[] = ["vscode"]): void {
@@ -30,27 +30,16 @@ export function configureSkills(agents: AIAgentTarget[]): void {
 }
 
 export async function configure(agents?: AIAgentTarget[], skills = true, assistants: AiCodingAssistant[] = ["vscode"]): Promise<void> {
-	if (!agents?.length) {
-		agents = await promptForAgents();
-	}
-	if (!agents.length) return;
 	configureMCP(assistants);
+	if (!agents?.length) return;
 	if (skills) {
 		configureSkills(agents);
 	}
 	copyAgentInstructionFiles(agents);
 }
 const AI_AGENT_CHECKBOX_DEFAULTS: AIAgentTarget[] = ["generic", "claude"];
 
-const AI_ASSISTANT_CHOICES = Object.keys(AI_ASSISTANT_MCP_CONFIGS) as AiCodingAssistant[];
-
-const AI_ASSISTANT_LABELS: Record<AiCodingAssistant, string> = {
-	"vscode":      "VS Code (GitHub Copilot)",
-	"cursor":      "Cursor",
-	"claude-code": "Claude Code",
-	"gemini":      "Gemini",
-	"junie":       "JetBrains Junie",
-};
+const AI_ASSISTANT_CHECKBOX_DEFAULTS: AiCodingAssistant[] = ["vscode", "claude-code"];
 
 const AI_AGENT_CHECKBOX_CHOICES = [
 	{ value: "none", name: "None (skip skills and instructions)" },
@@ -66,7 +55,7 @@ const AI_ASSISTANT_CHECKBOX_CHOICES = [
 	...AI_ASSISTANT_CHOICES.map(a => ({
 		value: a,
 		name: AI_ASSISTANT_LABELS[a],
-		checked: a === "vscode"
+		checked: AI_ASSISTANT_CHECKBOX_DEFAULTS.includes(a)
 	}))
 ];
 
@@ -84,13 +73,16 @@ export async function promptForAgents(): Promise<AIAgentTarget[]> {
 }
 
 export async function promptForAssistant(): Promise<AiCodingAssistant[]> {
-	// TODO: check Util.canPrompt() and assign defaults
-	const selected = await InquirerWrapper.checkbox({
-		message: "Which coding assistants should MCP servers be configured for?",
-		required: true,
-		choices: AI_ASSISTANT_CHECKBOX_CHOICES
-	});
-	return selected.includes("none") ? [] : selected as AiCodingAssistant[];
+	let selected: AiCodingAssistant[] = 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.includes("none") ? [] : result as AiCodingAssistant[];
+	}
+	return selected;
 }
 
 const command: CommandModule = {
@@ -112,34 +104,34 @@ const command: CommandModule = {
 	async handler(argv: ArgumentsCamelCase) {
 		let agents = argv.agent as AIAgentTarget[] | undefined;
 		let assistants = argv.assistant as AiCodingAssistant[] | undefined;
-
 		GoogleAnalytics.post({
 			t: "screenview",
 			cd: "Ai Config"
 		});
 
-		if (!assistants?.length) {
-			assistants = await promptForAssistant();
-		}
 		if (!agents?.length) {
 			agents = await promptForAgents();
 		}
+		if (!assistants?.length) {
+			assistants = await promptForAssistant();
+		}
 
 		GoogleAnalytics.post({
 			t: "event",
 			ec: "$ig ai-config",
-			ea: `agent: ${agents.join(", ") || "none"}`
+			ea: `agent: ${agents?.join(", ") || "none"}; assistant: ${assistants?.join(", ") || "none"}`
 		});
 
-		if (assistants.length) {
-			configureMCP(assistants);
+		if (!assistants.length) {
+			Util.log("No MCP configuration selected. Skipping.");
+			return;
 		}
 
 		if (!agents.length) {
 			Util.log("No AI configuration selected. Skipping.");
 			return;
 		}
-		await configure(agents);
+		await configure(agents, true, assistants);
 	}
 };
 

packages/core/util/mcp-config.ts

@@ -7,17 +7,26 @@ export interface McpServerEntry {
 	args: string[];
 }
 
-export type AiCodingAssistant = "vscode" | "cursor" | "claude-code" | "gemini" | "junie";
+export const AI_ASSISTANT_CHOICES = ["vscode", "claude-code", "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> = {
+	"vscode":      "VS Code (GitHub Copilot)",
+	"claude-code": "Claude Code",
+	"cursor":      "Cursor",
+	"gemini":      "Gemini",
+	"junie":       "JetBrains Junie",
+};
+
 export const AI_ASSISTANT_MCP_CONFIGS: Record<AiCodingAssistant, AssistantMcpConfig> = {
 	"vscode":      { mcpFilePath: ".vscode/mcp.json",      rootKey: "servers" },
-	"cursor":      { mcpFilePath: ".cursor/mcp.json",       rootKey: "mcpServers" },
 	"claude-code": { mcpFilePath: ".mcp.json",              rootKey: "mcpServers" },
+	"cursor":      { mcpFilePath: ".cursor/mcp.json",       rootKey: "mcpServers" },
 	"gemini":      { mcpFilePath: ".gemini/settings.json",  rootKey: "mcpServers" },
 	"junie":       { mcpFilePath: ".junie/mcp/mcp.json",    rootKey: "mcpServers" },
 };

packages/ng-schematics/src/cli-config/index.ts

@@ -2,7 +2,7 @@ import * as ts from "typescript";
 import { DependencyNotFoundException } from "@angular-devkit/core";
 import { chain, FileDoesNotExistException, Rule, SchematicContext, Tree } from "@angular-devkit/schematics";
 import { RunSchematicTask } from "@angular-devkit/schematics/tasks";
-import { addClassToBody, addMcpServers, AIAgentTarget, AiCodingAssistant, App, copyAgentInstructionFiles, copyAISkillsToProject, FormatSettings, McpServerEntry, NPM_ANGULAR, resolvePackage, TEMPLATE_MANAGER, TypeScriptAstTransformer, TypeScriptUtils, VS_CODE_MCP_PATH } from "@igniteui/cli-core";
+import { addClassToBody, addMcpServers, AIAgentTarget, AiCodingAssistant, App, copyAgentInstructionFiles, copyAISkillsToProject, FormatSettings, McpServerEntry, NPM_ANGULAR, resolvePackage, TEMPLATE_MANAGER, TypeScriptAstTransformer, TypeScriptUtils } from "@igniteui/cli-core";
 import { AngularTypeScriptFileUpdate } from "@igniteui/angular-templates";
 import { createCliConfig } from "../utils/cli-config";
 import { setVirtual } from "../utils/NgFileSystem";