Refactor code structure for improved readability and maintainability

Author: dkalinovInfra

.gitignore

@@ -12,7 +12,6 @@
 # ignore compiled files in packages
 /packages/**/*.js.map
 /packages/**/*.js
-!/packages/igniteui-mcp/igniteui-doc-mcp/scripts/build.js
 /scripts/**/*.js.map
 /scripts/**/*.js
 /spec/**/*.js.map
@@ -30,6 +29,9 @@ packages/core/config/Config.schema.json
 !packages/cli/templates/angular/**/files/**/*
 !packages/cli/templates/react/**/files/**/*
 
+# bundled MCP server (build artifact)
+/packages/cli/mcp/
+
 # Misc
 npm-debug.log*
 yarn-error.log*

.npmignore

@@ -0,0 +1,3 @@
+# MCP server source, submodules, and build artifacts
+# (bundled into packages/cli/mcp/ via build:mcp-bundle script)
+packages/igniteui-mcp/

README.md

@@ -38,6 +38,7 @@ This monorepo contains several packages that combine into the `igniteui-cli`:
 | [@igniteui/angular-templates](https://www.npmjs.com/package/@igniteui/angular-templates) | Contains the template definitions for Angular components | [packages/igx-templates](./packages/igx-templates) |
 | [@igniteui/angular-schematics](https://www.npmjs.com/package/@igniteui/angular-schematics) | IgniteUI CLI implementation to be used with Angular CLI's schematics engine | [packages/ng-schematics](./packages/ng-schematics) |
 | [igniteui-cli](https://www.npmjs.com/package/igniteui-cli) | Standalone IgniteUI CLI tool for React, jQuery and Angular | [packages/cli](./packages/cli) |
+| [@igniteui/mcp-server](https://www.npmjs.com/package/@igniteui/mcp-server) | MCP server providing AI assistants with Ignite UI documentation and API reference | [packages/igniteui-mcp/igniteui-doc-mcp](./packages/igniteui-mcp/igniteui-doc-mcp) |
 
 ## Table of Contents
 
@@ -50,6 +51,9 @@ This monorepo contains several packages that combine into the `igniteui-cli`:
 	* [Generate Ignite UI for React project](#generate-ignite-ui-for-react-project)
 	* [Adding components](#adding-components)
   * [Build and run](#build-and-run)
+* [MCP Server](#mcp-server)
+  * [Using with AI Assistants](#using-with-ai-assistants)
+  * [Testing with MCP Inspector](#testing-with-mcp-inspector)
 * [Schematics](#schematics)
   * [Schematic Definitions](#schematic-definitions)
 * [Contribution](#contribution)
@@ -137,6 +141,54 @@ ig build
 ig start
 ```
 
+## MCP Server
+
+The CLI includes a bundled [MCP (Model Context Protocol)](https://modelcontextprotocol.io/) server that provides AI assistants with Ignite UI documentation search, API reference lookup, and scaffolding guidance for Angular, React, Blazor, and Web Components.
+
+Start the MCP server:
+```bash
+ig mcp
+```
+
+The server runs over stdio and supports the following options:
+```bash
+ig mcp --remote <url>   # Use a remote backend instead of the local SQLite database
+ig mcp --debug          # Enable debug logging to mcp-server.log
+```
+
+### Using with AI Assistants
+
+Configure your MCP client (e.g., VS Code, Claude Desktop, Cursor) to use the CLI as the MCP server:
+
+```json
+{
+  "mcpServers": {
+    "igniteui": {
+      "command": "ig",
+      "args": ["mcp"]
+    }
+  }
+}
+```
+
+The MCP server exposes the following tools to AI assistants:
+
+| Tool | Description |
+|------|-------------|
+| `list_components` | List available Ignite UI component docs for a framework |
+| `get_doc` | Fetch full markdown content of a specific component doc |
+| `search_docs` | Full-text search across Ignite UI documentation |
+| `get_api_reference` | Retrieve the full API reference for a component or class |
+| `search_api` | Search API entries by keyword or partial component name |
+| `generate_ignite_app` | Return a setup guide for a new Ignite UI project |
+
+### Testing with MCP Inspector
+
+To interactively test and debug the MCP server tools:
+```bash
+npx @modelcontextprotocol/inspector ig mcp
+```
+
 ## Schematics
 You can also add `Ignite UI for Angular` components to your projects by using the `igniteui/angular-schematics` package. It included schematic definitions for most of the logic present in the [`igniteui-cli`](/packages/cli). These can be called in any existing Angular project or even when creating one. You can learn more about the schematics package on from its [readme](/package/ng-schematics).
 
@@ -147,12 +199,88 @@ See the [Contribution guide](https://github.com/IgniteUI/igniteui-cli/blob/maste
 ### Run locally
 1. Clone the repository
 2. Install dependencies with `yarn install`
-3. To build the packages, run `yarn build` in the project `root`.
-4. Open in Visual Studio Code
+3. Build the MCP server and bundle it into the CLI:
+    ```bash
+    cd packages/igniteui-mcp/igniteui-doc-mcp
+    npm install
+    npm run build
+    cd ../../..
+    npm run build:mcp-bundle
+    ```
+4. Build the monorepo packages: `npm run build`
+5. Open in Visual Studio Code
 
     There is a predefined launch.config file for VS Code in the root folder, so you can use VS Code View/Debug window and choose one of the predefined actions. These include launching the step by step guide, create new project for a particular framework or add components.
 
-5. Hit Start Debugging/F5
+6. Hit Start Debugging/F5
+
+#### MCP Server development
+
+The MCP server at `packages/igniteui-mcp/igniteui-doc-mcp` has its own build pipeline, separate from the monorepo. It uses ESM (ES2022, Node16 modules) while the rest of the monorepo uses CommonJS. See [DEVELOPMENT.md](./packages/igniteui-mcp/igniteui-doc-mcp/DEVELOPMENT.md) for the full MCP server development guide.
+
+**Build the MCP server:**
+```bash
+cd packages/igniteui-mcp/igniteui-doc-mcp
+npm install          # Install MCP-specific dependencies (separate from yarn workspaces)
+npm run build        # Compile TypeScript + copy SQLite DB to dist/
+```
+
+**Build API reference documentation:**
+
+The MCP server includes API reference docs for Angular, React, and Web Components. Angular and Web Components docs are generated from framework submodules via TypeDoc (submodules are auto-initialized by the build scripts). React uses a pre-built TypeDoc JSON model checked into git.
+
+```bash
+cd packages/igniteui-mcp/igniteui-doc-mcp
+npm run build:docs:angular         # Angular: init submodule → TypeDoc → markdown + index.json
+npm run build:docs:webcomponents   # Web Components: init submodule → build lib → TypeDoc → markdown + index.json
+npm run build:docs:all             # Build both
+```
+
+> **Note:** Web Components requires a one-time library build (`npm run build:publish` in the submodule) before TypeDoc can run. The build script handles this automatically.
+
+**Bundle MCP into CLI** (from the repo root):
+```bash
+npm run build:mcp-bundle    # Copies dist/ and docs/ into packages/cli/mcp/
+```
+
+This copies the compiled MCP server, SQLite documentation database, and API reference docs into the CLI package. The `packages/cli/mcp/` directory is a build artifact (gitignored) and must be regenerated before publishing.
+
+**Test the MCP server locally:**
+```bash
+npm run build:mcp-bundle
+npm run build
+node packages/cli/lib/cli.js mcp          # Start via CLI
+# or directly:
+node packages/cli/mcp/dist/index.js       # Start the bundled server
+```
+
+#### Building CLI package with bundled MCP server
+
+The CLI package includes the MCP server as a bundled build artifact (not an npm dependency). To produce a complete CLI package with full MCP functionality, follow these steps:
+
+```bash
+# 1. Install monorepo dependencies
+yarn install
+
+# 2. Build the MCP server
+cd packages/igniteui-mcp/igniteui-doc-mcp
+npm install
+npm run build                              # Compile TypeScript + copy SQLite DB
+
+# 3. Build API reference docs (optional but recommended for full functionality)
+npm run build:docs:all                     # Init submodules + generate Angular + WC API docs via TypeDoc
+
+# 4. Bundle MCP into CLI (from repo root)
+cd ../../..
+npm run build:mcp-bundle                   # Copy dist/ + docs/ → packages/cli/mcp/
+
+# 5. Build all packages for publishing
+npm run build-pack
+```
+
+After step 5, `npm pack` from the repo root or `packages/cli/` will produce a tarball with the MCP server, documentation database, and API reference docs all included.
+
+> **Skipping API docs:** If you skip step 3, the MCP server will still work for `list_components`, `get_doc`, `search_docs`, and `generate_ignite_app` tools using the bundled SQLite database. Only the `get_api_reference` and `search_api` tools require API docs.
 
 ## Data Collection
 

package.json

@@ -28,7 +28,8 @@
 		"jasmine": "node spec/jasmine-runner.js",
 		"coverage": "nyc report --report-dir",
 		"lint": "eslint -c eslint.config.mjs ./**/*.ts",
-		"config-schema": "typescript-json-schema packages/core/types/Config.ts Config -o packages/core/config/Config.schema.json"
+		"config-schema": "typescript-json-schema packages/core/types/Config.ts Config -o packages/core/config/Config.schema.json",
+		"build:mcp-bundle": "node scripts/bundle-mcp.js"
 	},
 	"nyc": {
 		"extension": [

packages/cli/lib/cli.ts

@@ -9,6 +9,7 @@ import {
 	doc,
 	generate,
 	list,
+	mcp,
 	newCommand,
 	start,
 	test,
@@ -54,6 +55,7 @@ export async function run(args = null) {
 		.command(test)
 		.command(list)
 		.command(upgrade)
+		.command(mcp)
 		.version(false) // disable built-in `yargs.version` to override it with our custom option
 		.options({
 			version: {

packages/cli/lib/commands/index.ts

@@ -4,6 +4,7 @@ export { default as config } from "./config";
 export { default as doc } from "./doc";
 export { default as generate } from "./generate";
 export { default as list } from "./list";
+export { default as mcp } from "./mcp";
 export { default as newCommand } from "./new";
 export { default as start } from "./start";
 export { default as test } from "./test";

packages/cli/lib/commands/mcp.ts

@@ -0,0 +1,64 @@
+import * as fs from "fs";
+import * as path from "path";
+import { spawn } from "child_process";
+import { CommandType, PositionalArgs } from "./types";
+import { ArgumentsCamelCase } from "yargs";
+
+const command: CommandType = {
+	command: "mcp",
+	describe: "Starts the Ignite UI MCP server for AI assistant integration",
+	templateManager: null,
+	builder: (yargs) => {
+		return yargs
+			.option("remote", {
+				describe: "Backend URL for remote mode (uses HTTP instead of local SQLite)",
+				type: "string",
+				requiresArg: true
+			})
+			.option("debug", {
+				describe: "Enable debug logging to mcp-server.log",
+				type: "boolean",
+				default: false
+			})
+			.usage("");
+	},
+	async handler(argv: ArgumentsCamelCase<PositionalArgs>) {
+		const mcpEntry = path.resolve(__dirname, "..", "..", "mcp", "dist", "index.js");
+
+		if (!fs.existsSync(mcpEntry)) {
+			process.stderr.write(
+				"MCP server bundle not found. Build it first:\n" +
+				"  cd packages/igniteui-mcp/igniteui-doc-mcp && npm install && npm run build && cd ../../..\n" +
+				"  npm run build:mcp-bundle\n"
+			);
+			process.exitCode = 1;
+			return;
+		}
+
+		const args: string[] = [];
+		if (argv.remote) {
+			args.push("--remote", argv.remote as string);
+		}
+		if (argv.debug) {
+			args.push("--debug");
+		}
+
+		return new Promise<void>((resolve, reject) => {
+			const child = spawn(process.execPath, [mcpEntry, ...args], {
+				stdio: "inherit"
+			});
+
+			child.on("error", (err) => {
+				process.stderr.write(`Failed to start MCP server: ${err.message}\n`);
+				reject(err);
+			});
+
+			child.on("exit", (code) => {
+				process.exitCode = code ?? 0;
+				resolve();
+			});
+		});
+	}
+};
+
+export default command;

packages/cli/lib/commands/types.ts

@@ -12,6 +12,7 @@ export const DOC_COMMAND_NAME = "doc";
 export const TEST_COMMAND_NAME = "test";
 export const LIST_COMMAND_NAME = "list";
 export const UPGRADE_COMMAND_NAME = "upgrade-packages";
+export const MCP_COMMAND_NAME = "mcp";
 
 export const ALL_COMMANDS = new Set([
   ADD_COMMAND_NAME,
@@ -23,7 +24,8 @@ export const ALL_COMMANDS = new Set([
   DOC_COMMAND_NAME,
   TEST_COMMAND_NAME,
   LIST_COMMAND_NAME,
-  UPGRADE_COMMAND_NAME
+  UPGRADE_COMMAND_NAME,
+  MCP_COMMAND_NAME
 ]);
 
 export interface PositionalArgs {

packages/cli/package.json

@@ -39,7 +39,13 @@
     "migrations/**/*.json",
     "schematics/**/*.d.ts",
     "schematics/**/*.js",
-    "schematics/**/*.json"
+    "schematics/**/*.json",
+    "mcp/dist/**/*.js",
+    "mcp/dist/**/*.d.ts",
+    "mcp/dist/igniteui-docs.db",
+    "mcp/dist/package.json",
+    "mcp/docs/**/*.json",
+    "mcp/docs/**/*.md"
   ],
   "nyc": {
     "extension": [
@@ -69,14 +75,18 @@
     "@igniteui/angular-templates": "~21.1.1492",
     "@igniteui/cli-core": "~14.9.2",
     "@inquirer/prompts": "^7.9.0",
+    "@modelcontextprotocol/sdk": "^1.12.1",
     "@types/yargs": "^17.0.33",
     "chalk": "^5.3.0",
+    "dotenv": "^17.2.4",
     "glob": "^11.0.0",
     "open": "^10.1.0",
     "resolve": "^1.22.8",
+    "sql.js": "^1.14.1",
     "through2": "^4.0.2",
     "typescript": "~5.5.4",
-    "yargs": "^17.7.2"
+    "yargs": "^17.7.2",
+    "zod": "^3.25.1"
   },
   "devDependencies": {
     "@angular-devkit/core": "^21.0.0",