@agiflowai/aicode-toolkit 1.0.7 → 1.0.9

package/README.md

@@ -1,150 +1,185 @@
 # @agiflowai/aicode-toolkit
 
-AI-powered code toolkit CLI for scaffolding and development workflows.
+> CLI for initializing projects and managing AI Code Toolkit templates
 
-## Features
+The main entry point for setting up AI Code Toolkit in your workspace. Handles project initialization, template management, and MCP server configuration.
 
-- **Template management**: Initialize templates folder and add templates from remote repositories
-- **Dynamic template discovery**: Automatically finds templates in your workspace
-- **Multiple frameworks**: Support for Next.js, Vite React, and custom boilerplates
-- **Git integration**: Clone templates from GitHub repositories or subdirectories
-
-## Installation
+## Quick Start
 
 ```bash
-pnpm install @agiflowai/aicode-toolkit
-```
+# Initialize templates in existing project
+npx @agiflowai/aicode-toolkit init
 
-Or install globally:
-
-```bash
-pnpm install -g @agiflowai/aicode-toolkit
+# Create new project with templates
+npx @agiflowai/aicode-toolkit init --name my-project --project-type monolith
 ```
 
-## Usage
+---
 
-### Initialize Templates
+## Commands
 
-The `init` command sets up your templates folder and **automatically downloads official templates** from the AgiFlow repository:
+### `init`
 
+Initialize AI Code Toolkit in your workspace.
+
+**For existing projects:**
 ```bash
-# Initialize templates folder and download official templates
-aicode init
+npx @agiflowai/aicode-toolkit init
+```
 
-# Or specify a custom path
-aicode init --path ./my-templates
+This will:
+1. Create `templates/` folder in your workspace
+2. Download official templates (Next.js 15, TypeScript lib, MCP package)
+3. Detect installed AI coding agents (Claude Code, Cursor, etc.)
+4. Optionally configure MCP servers
+
+**For new projects:**
+```bash
+# Interactive mode
+npx @agiflowai/aicode-toolkit init
 
-# Skip auto-download if you want to add templates manually
-aicode init --no-download
+# Non-interactive mode
+npx @agiflowai/aicode-toolkit init --name my-app --project-type monolith
 ```
 
-**What `init` does:**
-1. Creates `templates/` folder in your workspace root
-2. Automatically downloads official templates from [AgiFlow/aicode-toolkit](https://github.com/AgiFlow/aicode-toolkit/tree/main/templates)
-3. Creates a README.md with usage instructions
-4. Skips templates that already exist (safe to re-run)
+This will:
+1. Create project directory
+2. Initialize git repository
+3. Download templates
+4. Create `toolkit.yaml` configuration
 
-**What gets downloaded:**
-- ✅ `nextjs-15-drizzle` - Next.js 15 with App Router, TypeScript, Tailwind CSS 4, Storybook, and optional Drizzle ORM
-- ✅ More templates coming soon...
+**Options:**
+| Option | Description | Default |
+|--------|-------------|---------|
+| `--name <name>` | Project name (for new projects) | - |
+| `--project-type <type>` | `monolith` or `monorepo` | - |
+| `--path <path>` | Custom templates path | `./templates` |
+| `--no-download` | Skip template download | `false` |
 
-### Add Templates
+### `add`
 
-Add templates from GitHub repositories or subdirectories:
+Add templates from GitHub repositories.
 
 ```bash
-# Add a template from a full repository
-aicode add --name my-template --url https://github.com/yourorg/nextjs-template
-
-# Add a template from a repository subdirectory
-aicode add \
-  --name nextjs-15-drizzle \
-  --url https://github.com/AgiFlow/aicode-toolkit/tree/main/templates/nextjs-15-drizzle
-
-# Add to a specific type folder
-aicode add \
-  --name react-component \
-  --url https://github.com/yourorg/react-component-scaffold \
-  --type scaffold
+# Add from full repository
+npx @agiflowai/aicode-toolkit add \
+  --name my-template \
+  --url https://github.com/yourorg/template-repo
+
+# Add from repository subdirectory
+npx @agiflowai/aicode-toolkit add \
+  --name react-vite \
+  --url https://github.com/AgiFlow/aicode-toolkit/tree/main/templates/react-vite
 ```
 
-**What `add` does:**
-1. Parses GitHub URL to detect full repository vs subdirectory
-2. Downloads template using git clone (full repo) or sparse checkout (subdirectory)
-3. Validates template has required configuration files (scaffold.yaml)
-4. Saves template to your templates folder
+**Options:**
+| Option | Description |
+|--------|-------------|
+| `--name <name>` | Template name (required) |
+| `--url <url>` | GitHub URL (required) |
+| `--type <type>` | Template type folder |
 
 **Supported URL formats:**
 - Full repository: `https://github.com/user/repo`
 - Subdirectory: `https://github.com/user/repo/tree/branch/path/to/template`
-- With `.git` extension: `https://github.com/user/repo.git`
+- With .git: `https://github.com/user/repo.git`
 
-## CLI Commands
+---
 
-### `aicode init`
+## What Gets Installed
 
-Initialize templates folder structure at workspace root.
+When you run `init`, these official templates are downloaded:
 
-**Options:**
-- `--path <path>`: Custom path for templates folder (default: `./templates`)
-- `--no-download`: Skip automatic download of official templates
+| Template | Description |
+|----------|-------------|
+| `nextjs-15-drizzle` | Next.js 15 + App Router + TypeScript + Tailwind CSS 4 + Drizzle ORM |
+| `typescript-lib` | TypeScript library with ESM/CJS builds |
+| `typescript-mcp-package` | MCP server package template |
 
-**Examples:**
-```bash
-# Initialize at default location
-aicode init
+Each template includes:
+- `scaffold.yaml` - Boilerplate and feature definitions
+- `architect.yaml` - Design patterns (optional)
+- `RULES.yaml` - Coding standards (optional)
 
-# Initialize at custom location
-aicode init --path ./custom-templates
+---
 
-# Initialize without downloading templates
-aicode init --no-download
-```
+## Project Types
 
-### `aicode add`
+### Monolith
 
-Add a template from a GitHub repository.
+Single application with `toolkit.yaml` at root:
 
-**Options:**
-- `--name <name>`: Name for the template (required)
-- `--url <url>`: GitHub repository URL (required)
-- `--type <type>`: Template type folder (default: auto-detect)
+```
+my-app/
+├── toolkit.yaml          # sourceTemplate: "nextjs-15"
+├── templates/
+│   └── nextjs-15/
+├── src/
+└── package.json
+```
 
-**Examples:**
-```bash
-# Add template from full repository
-aicode add --name my-template --url https://github.com/user/repo
-
-# Add template from subdirectory
-aicode add \
-  --name nextjs-15 \
-  --url https://github.com/AgiFlow/aicode-toolkit/tree/main/templates/nextjs-15-drizzle
-
-# Specify custom type
-aicode add \
-  --name my-scaffold \
-  --url https://github.com/user/repo \
-  --type scaffold
+### Monorepo
+
+Multiple projects with `project.json` in each:
+
+```
+my-workspace/
+├── templates/
+│   ├── nextjs-15/
+│   └── typescript-lib/
+├── apps/
+│   └── web/
+│       └── project.json  # sourceTemplate: "nextjs-15"
+└── packages/
+    └── shared/
+        └── project.json  # sourceTemplate: "typescript-lib"
 ```
 
-## Template Structure
+---
+
+## Coding Agent Detection
+
+The CLI automatically detects installed AI coding agents:
+
+| Agent | Config Location | Status |
+|-------|-----------------|--------|
+| Claude Code | `.mcp.json` | Supported |
+| Cursor | `.cursor/mcp.json` | Supported |
+| Gemini CLI | `.gemini/settings.json` | Supported |
+| Codex CLI | `.codex/config.json` | Supported |
+| GitHub Copilot | VS Code settings | Supported |
 
-Templates are organized in the `templates/` folder at your workspace root:
+When detected, the CLI offers to configure MCP servers (scaffold-mcp, architect-mcp) automatically.
+
+---
+
+## Template Structure
 
 ```
 templates/
-├── nextjs-15-drizzle/
-│   ├── scaffold.yaml          # Template configuration
-│   ├── package.json.liquid    # Template files with variables
-│   └── ...
-└── README.md
+└── nextjs-15/
+    ├── scaffold.yaml         # Required: boilerplate + feature definitions
+    ├── architect.yaml        # Optional: design patterns
+    ├── RULES.yaml            # Optional: coding standards
+    └── src/                  # Template files (.liquid for variable replacement)
+        ├── package.json.liquid
+        └── app/
+            └── page.tsx.liquid
 ```
 
-Each template must have a `scaffold.yaml` file that defines:
-- Boilerplate configurations
-- Feature scaffolds
-- Variable schemas
-- File includes
+See [scaffold-mcp documentation](../../packages/scaffold-mcp/docs/template-conventions.md) for template creation guide.
+
+---
+
+## Related Packages
+
+| Package | Description |
+|---------|-------------|
+| [@agiflowai/scaffold-mcp](../../packages/scaffold-mcp) | MCP server for code scaffolding |
+| [@agiflowai/architect-mcp](../../packages/architect-mcp) | MCP server for design patterns |
+| [@agiflowai/one-mcp](../../packages/one-mcp) | MCP proxy for reduced token usage |
+
+---
 
 ## License
 

package/dist/cli.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-const require_services = require('./services-DIUrmi_K.cjs');
-const require_mcp = require('./mcp-Dwt8nYQV.cjs');
+const require_services = require('./services-D7UKA2Yt.cjs');
+const require_mcp = require('./mcp--A-5zuBI.cjs');
 let __agiflowai_aicode_utils = require("@agiflowai/aicode-utils");
 let node_path = require("node:path");
 node_path = require_services.__toESM(node_path);
@@ -11,7 +11,7 @@ ora = require_services.__toESM(ora);
 let xstate = require("xstate");
 
 //#region package.json
-var version = "1.0.5";
+var version = "1.0.8";
 
 //#endregion
 //#region src/commands/add.ts
@@ -247,14 +247,14 @@ const initMachine = (0, xstate.createMachine)({
 		} },
 		downloadingTemplates: { invoke: {
 			src: "downloadTemplates",
-			onDone: {
+			onDone: [{
+				target: "checkingSkipMcp",
+				guard: ({ event }) => event.output === null
+			}, {
 				target: "listingTemplates",
 				actions: (0, xstate.assign)({ tmpTemplatesPath: ({ event }) => event.output })
-			},
-			onError: {
-				target: "failed",
-				actions: (0, xstate.assign)({ error: ({ event }) => event.error })
-			}
+			}],
+			onError: { target: "checkingSkipMcp" }
 		} },
 		listingTemplates: { invoke: {
 			src: "listTemplates",
@@ -342,7 +342,8 @@ const initMachine = (0, xstate.createMachine)({
 			src: "configureMCP",
 			input: ({ context }) => ({
 				workspaceRoot: context.workspaceRoot,
-				codingAgent: context.codingAgent
+				codingAgent: context.codingAgent,
+				selectedMcpServers: context.selectedMcpServers
 			}),
 			onDone: { target: "detectingSpecTool" },
 			onError: {
@@ -658,8 +659,9 @@ const initActors = {
 			spinner.succeed("Templates downloaded successfully");
 			return tmpPath;
 		} catch (error) {
-			spinner.fail("Failed to download templates");
-			throw error;
+			spinner.warn("Failed to download templates - skipping template setup");
+			__agiflowai_aicode_utils.print.info("You can run \"aicode-toolkit init\" again later to set up templates");
+			return null;
 		}
 	}),
 	listTemplates: (0, xstate.fromPromise)(async ({ input: input$1 }) => {
@@ -753,7 +755,7 @@ const initActors = {
 	configureMCP: (0, xstate.fromPromise)(async ({ input: actorInput }) => {
 		const spinner = (0, ora.default)(`Setting up MCP for ${actorInput.codingAgent}...`).start();
 		try {
-			await new require_services.CodingAgentService(actorInput.workspaceRoot).setupMCP(actorInput.codingAgent);
+			await new require_services.CodingAgentService(actorInput.workspaceRoot).setupMCP(actorInput.codingAgent, actorInput.selectedMcpServers);
 			spinner.succeed("MCP configuration completed");
 		} catch (error) {
 			spinner.fail("Failed to configure MCP");

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { r as MCP_SERVER_INFO, t as MCPServer } from "./mcp-C3HR_ZNF.mjs";
-import { a as SpecToolService, c as cloneSubdirectory, f as parseGitHubUrl, h as CodingAgentService, i as SpecTool, n as TemplateSelectionService, o as NewProjectService, p as displayBanner, r as SPEC_TOOL_INFO, s as cloneRepository, u as findWorkspaceRoot } from "./services-BvnOGCDG.mjs";
+import { r as MCP_SERVER_INFO, t as MCPServer } from "./mcp-CBcPdzNG.mjs";
+import { a as SpecToolService, c as cloneSubdirectory, f as parseGitHubUrl, h as CodingAgentService, i as SpecTool, n as TemplateSelectionService, o as NewProjectService, p as displayBanner, r as SPEC_TOOL_INFO, s as cloneRepository, u as findWorkspaceRoot } from "./services-Clvg2ZBI.mjs";
 import { ProjectType, TemplatesManagerService, detectProjectType, ensureDir, icons, messages, pathExists, print, sections } from "@agiflowai/aicode-utils";
 import path from "node:path";
 import { Command } from "commander";
@@ -9,7 +9,7 @@ import ora from "ora";
 import { assign, createActor, createMachine, fromPromise } from "xstate";
 
 //#region package.json
-var version = "1.0.5";
+var version = "1.0.8";
 
 //#endregion
 //#region src/commands/add.ts
@@ -245,14 +245,14 @@ const initMachine = createMachine({
 		} },
 		downloadingTemplates: { invoke: {
 			src: "downloadTemplates",
-			onDone: {
+			onDone: [{
+				target: "checkingSkipMcp",
+				guard: ({ event }) => event.output === null
+			}, {
 				target: "listingTemplates",
 				actions: assign({ tmpTemplatesPath: ({ event }) => event.output })
-			},
-			onError: {
-				target: "failed",
-				actions: assign({ error: ({ event }) => event.error })
-			}
+			}],
+			onError: { target: "checkingSkipMcp" }
 		} },
 		listingTemplates: { invoke: {
 			src: "listTemplates",
@@ -340,7 +340,8 @@ const initMachine = createMachine({
 			src: "configureMCP",
 			input: ({ context }) => ({
 				workspaceRoot: context.workspaceRoot,
-				codingAgent: context.codingAgent
+				codingAgent: context.codingAgent,
+				selectedMcpServers: context.selectedMcpServers
 			}),
 			onDone: { target: "detectingSpecTool" },
 			onError: {
@@ -656,8 +657,9 @@ const initActors = {
 			spinner.succeed("Templates downloaded successfully");
 			return tmpPath;
 		} catch (error) {
-			spinner.fail("Failed to download templates");
-			throw error;
+			spinner.warn("Failed to download templates - skipping template setup");
+			print.info("You can run \"aicode-toolkit init\" again later to set up templates");
+			return null;
 		}
 	}),
 	listTemplates: fromPromise(async ({ input: input$1 }) => {
@@ -751,7 +753,7 @@ const initActors = {
 	configureMCP: fromPromise(async ({ input: actorInput }) => {
 		const spinner = ora(`Setting up MCP for ${actorInput.codingAgent}...`).start();
 		try {
-			await new CodingAgentService(actorInput.workspaceRoot).setupMCP(actorInput.codingAgent);
+			await new CodingAgentService(actorInput.workspaceRoot).setupMCP(actorInput.codingAgent, actorInput.selectedMcpServers);
 			spinner.succeed("MCP configuration completed");
 		} catch (error) {
 			spinner.fail("Failed to configure MCP");

package/dist/index.cjs

@@ -1,5 +1,5 @@
-const require_services = require('./services-DIUrmi_K.cjs');
-require('./mcp-Dwt8nYQV.cjs');
+const require_services = require('./services-D7UKA2Yt.cjs');
+require('./mcp--A-5zuBI.cjs');
 
 exports.BANNER_GRADIENT = require_services.BANNER_GRADIENT;
 exports.CodingAgentService = require_services.CodingAgentService;

package/dist/index.d.cts

@@ -97,8 +97,16 @@ declare class CodingAgentService {
   /**
    * Setup MCP configuration for the selected coding agent
    * @param agent - The coding agent to configure
+   * @param selectedMcpServers - Optional array of selected MCP servers
    */
-  setupMCP(agent: CodingAgent): Promise<void>;
+  setupMCP(agent: CodingAgent, selectedMcpServers?: string[]): Promise<void>;
+  /**
+   * Create mcp-config.yaml file using one-mcp init command
+   * This is used when one-mcp is selected to configure which servers it should include
+   * Excludes one-mcp itself from the config file
+   * @param selectedMcpServers - Array of selected MCP servers
+   */
+  private createMcpConfigYaml;
 }
 //#endregion
 //#region src/services/NewProjectService.d.ts

package/dist/index.d.mts

@@ -97,8 +97,16 @@ declare class CodingAgentService {
   /**
    * Setup MCP configuration for the selected coding agent
    * @param agent - The coding agent to configure
+   * @param selectedMcpServers - Optional array of selected MCP servers
    */
-  setupMCP(agent: CodingAgent): Promise<void>;
+  setupMCP(agent: CodingAgent, selectedMcpServers?: string[]): Promise<void>;
+  /**
+   * Create mcp-config.yaml file using one-mcp init command
+   * This is used when one-mcp is selected to configure which servers it should include
+   * Excludes one-mcp itself from the config file
+   * @param selectedMcpServers - Array of selected MCP servers
+   */
+  private createMcpConfigYaml;
 }
 //#endregion
 //#region src/services/NewProjectService.d.ts

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import "./mcp-C3HR_ZNF.mjs";
-import { _ as THEME, c as cloneSubdirectory, d as gitInit, f as parseGitHubUrl, g as BANNER_GRADIENT, h as CodingAgentService, l as fetchGitHubDirectoryContents, m as displayCompactBanner, n as TemplateSelectionService, o as NewProjectService, p as displayBanner, s as cloneRepository, t as TemplatesService, u as findWorkspaceRoot } from "./services-BvnOGCDG.mjs";
+import "./mcp-CBcPdzNG.mjs";
+import { _ as THEME, c as cloneSubdirectory, d as gitInit, f as parseGitHubUrl, g as BANNER_GRADIENT, h as CodingAgentService, l as fetchGitHubDirectoryContents, m as displayCompactBanner, n as TemplateSelectionService, o as NewProjectService, p as displayBanner, s as cloneRepository, t as TemplatesService, u as findWorkspaceRoot } from "./services-Clvg2ZBI.mjs";
 
 export { BANNER_GRADIENT, CodingAgentService, NewProjectService, THEME, TemplateSelectionService, TemplatesService, cloneRepository, cloneSubdirectory, displayBanner, displayCompactBanner, fetchGitHubDirectoryContents, findWorkspaceRoot, gitInit, parseGitHubUrl };

package/dist/{mcp-Dwt8nYQV.cjs → mcp--A-5zuBI.cjs}

@@ -15,6 +15,7 @@
 * Available MCP servers
 */
 let MCPServer = /* @__PURE__ */ function(MCPServer$1) {
+	MCPServer$1["ONE_MCP"] = "one-mcp";
 	MCPServer$1["ARCHITECT"] = "architect-mcp";
 	MCPServer$1["SCAFFOLD"] = "scaffold-mcp";
 	return MCPServer$1;
@@ -23,10 +24,12 @@ let MCPServer = /* @__PURE__ */ function(MCPServer$1) {
 * MCP server configuration files
 * Maps each MCP server to its specific configuration files
 *
+* - one-mcp: Unified MCP server that includes all functionality
 * - architect-mcp: Only needs RULES.yaml and architect.yaml
 * - scaffold-mcp: Needs all other template files (excluding architect files)
 */
 const MCP_CONFIG_FILES = {
+	[MCPServer.ONE_MCP]: [],
 	[MCPServer.ARCHITECT]: ["RULES.yaml", "architect.yaml"],
 	[MCPServer.SCAFFOLD]: []
 };
@@ -34,6 +37,10 @@ const MCP_CONFIG_FILES = {
 * MCP server display names and descriptions for user prompts
 */
 const MCP_SERVER_INFO = {
+	[MCPServer.ONE_MCP]: {
+		name: "One MCP (Recommended)",
+		description: "Progressive disclosed MCP that is token efficient and customizable"
+	},
 	[MCPServer.ARCHITECT]: {
 		name: "Architect MCP",
 		description: "Code review, design patterns, and coding standards enforcement"

package/dist/mcp-B9X7HURl.cjs

@@ -0,0 +1,4 @@
+const require_mcp = require('./mcp--A-5zuBI.cjs');
+
+exports.MCPServer = require_mcp.MCPServer;
+exports.MCP_CONFIG_FILES = require_mcp.MCP_CONFIG_FILES;

package/dist/{mcp-C3HR_ZNF.mjs → mcp-CBcPdzNG.mjs}

@@ -14,6 +14,7 @@
 * Available MCP servers
 */
 let MCPServer = /* @__PURE__ */ function(MCPServer$1) {
+	MCPServer$1["ONE_MCP"] = "one-mcp";
 	MCPServer$1["ARCHITECT"] = "architect-mcp";
 	MCPServer$1["SCAFFOLD"] = "scaffold-mcp";
 	return MCPServer$1;
@@ -22,10 +23,12 @@ let MCPServer = /* @__PURE__ */ function(MCPServer$1) {
 * MCP server configuration files
 * Maps each MCP server to its specific configuration files
 *
+* - one-mcp: Unified MCP server that includes all functionality
 * - architect-mcp: Only needs RULES.yaml and architect.yaml
 * - scaffold-mcp: Needs all other template files (excluding architect files)
 */
 const MCP_CONFIG_FILES = {
+	[MCPServer.ONE_MCP]: [],
 	[MCPServer.ARCHITECT]: ["RULES.yaml", "architect.yaml"],
 	[MCPServer.SCAFFOLD]: []
 };
@@ -33,6 +36,10 @@ const MCP_CONFIG_FILES = {
 * MCP server display names and descriptions for user prompts
 */
 const MCP_SERVER_INFO = {
+	[MCPServer.ONE_MCP]: {
+		name: "One MCP (Recommended)",
+		description: "Progressive disclosed MCP that is token efficient and customizable"
+	},
 	[MCPServer.ARCHITECT]: {
 		name: "Architect MCP",
 		description: "Code review, design patterns, and coding standards enforcement"

package/dist/mcp-Cvo6pkS0.mjs

@@ -0,0 +1,3 @@
+import { n as MCP_CONFIG_FILES, r as MCP_SERVER_INFO, t as MCPServer } from "./mcp-CBcPdzNG.mjs";
+
+export { MCPServer, MCP_CONFIG_FILES };

package/dist/{services-BvnOGCDG.mjs → services-Clvg2ZBI.mjs}

@@ -189,8 +189,9 @@ var CodingAgentService = class {
 	/**
 	* Setup MCP configuration for the selected coding agent
 	* @param agent - The coding agent to configure
+	* @param selectedMcpServers - Optional array of selected MCP servers
 	*/
-	async setupMCP(agent) {
+	async setupMCP(agent, selectedMcpServers) {
 		if (agent === NONE) {
 			print.info("Skipping MCP configuration");
 			return;
@@ -220,8 +221,23 @@ var CodingAgentService = class {
 			print.info("Please configure MCP servers manually for this coding agent.");
 			return;
 		}
-		await service.updateMcpSettings({ servers: {
-			"scaffold-mcp": {
+		if (selectedMcpServers?.includes("one-mcp")) {
+			await this.createMcpConfigYaml(selectedMcpServers);
+			await service.updateMcpSettings({ servers: { "one-mcp": {
+				type: "stdio",
+				command: "npx",
+				args: [
+					"-y",
+					"@agiflowai/one-mcp",
+					"mcp-serve"
+				],
+				disabled: false
+			} } });
+			print.success(`Added one-mcp to ${configLocation}`);
+			print.success("Created mcp-config.yaml with selected MCP server configurations");
+		} else {
+			const mcpServers = {};
+			if (selectedMcpServers?.includes("scaffold-mcp") ?? true) mcpServers["scaffold-mcp"] = {
 				type: "stdio",
 				command: "npx",
 				args: [
@@ -230,8 +246,8 @@ var CodingAgentService = class {
 					"mcp-serve"
 				],
 				disabled: false
-			},
-			"architect-mcp": {
+			};
+			if (selectedMcpServers?.includes("architect-mcp") ?? true) mcpServers["architect-mcp"] = {
 				type: "stdio",
 				command: "npx",
 				args: [
@@ -240,14 +256,70 @@ var CodingAgentService = class {
 					"mcp-serve"
 				],
 				disabled: false
-			}
-		} });
-		print.success(`Added scaffold-mcp and architect-mcp to ${configLocation}`);
+			};
+			await service.updateMcpSettings({ servers: mcpServers });
+			const serverNames = Object.keys(mcpServers).join(" and ");
+			print.success(`Added ${serverNames} to ${configLocation}`);
+		}
 		print.info("\nNext steps:");
 		print.indent(`1. ${restartInstructions}`);
-		print.indent("2. The scaffold-mcp and architect-mcp servers will be available");
+		print.indent("2. The configured MCP servers will be available");
 		print.success("\nMCP configuration completed!");
 	}
+	/**
+	* Create mcp-config.yaml file using one-mcp init command
+	* This is used when one-mcp is selected to configure which servers it should include
+	* Excludes one-mcp itself from the config file
+	* @param selectedMcpServers - Array of selected MCP servers
+	*/
+	async createMcpConfigYaml(selectedMcpServers) {
+		const { execSync } = await import("node:child_process");
+		const path$1 = await import("node:path");
+		const servers = {};
+		const serversToInclude = selectedMcpServers?.filter((s) => s !== "one-mcp") ?? [];
+		for (const server of serversToInclude) if (server === "scaffold-mcp") servers["scaffold-mcp"] = {
+			command: "npx",
+			args: [
+				"-y",
+				"@agiflowai/scaffold-mcp",
+				"mcp-serve",
+				"--admin-enable"
+			]
+		};
+		else if (server === "architect-mcp") servers["architect-mcp"] = {
+			command: "npx",
+			args: [
+				"-y",
+				"@agiflowai/architect-mcp",
+				"mcp-serve",
+				"--admin-enable"
+			]
+		};
+		if (Object.keys(servers).length === 0) {
+			servers["scaffold-mcp"] = {
+				command: "npx",
+				args: [
+					"-y",
+					"@agiflowai/scaffold-mcp",
+					"mcp-serve",
+					"--admin-enable"
+				]
+			};
+			servers["architect-mcp"] = {
+				command: "npx",
+				args: [
+					"-y",
+					"@agiflowai/architect-mcp",
+					"mcp-serve",
+					"--admin-enable"
+				]
+			};
+		}
+		execSync(`npx -y @agiflowai/one-mcp init -o "${path$1.join(this.workspaceRoot, "mcp-config.yaml")}" -f --mcp-servers '${JSON.stringify(servers)}'`, {
+			cwd: this.workspaceRoot,
+			stdio: "inherit"
+		});
+	}
 };
 
 //#endregion
@@ -865,7 +937,7 @@ var TemplateSelectionService = class {
 	* @param selectedMcpServers - Selected MCP servers
 	*/
 	async copyTemplateWithMcpFilter(sourcePath, targetPath, selectedMcpServers) {
-		const { MCPServer: MCPServer$1, MCP_CONFIG_FILES: MCP_CONFIG_FILES$1 } = await import("./mcp-BgNkvV6h.mjs");
+		const { MCPServer: MCPServer$1, MCP_CONFIG_FILES: MCP_CONFIG_FILES$1 } = await import("./mcp-Cvo6pkS0.mjs");
 		const architectFiles = MCP_CONFIG_FILES$1[MCPServer$1.ARCHITECT];
 		const hasArchitect = selectedMcpServers.includes(MCPServer$1.ARCHITECT);
 		const hasScaffold = selectedMcpServers.includes(MCPServer$1.SCAFFOLD);

package/dist/{services-DIUrmi_K.cjs → services-D7UKA2Yt.cjs}

@@ -217,8 +217,9 @@ var CodingAgentService = class {
 	/**
 	* Setup MCP configuration for the selected coding agent
 	* @param agent - The coding agent to configure
+	* @param selectedMcpServers - Optional array of selected MCP servers
 	*/
-	async setupMCP(agent) {
+	async setupMCP(agent, selectedMcpServers) {
 		if (agent === __agiflowai_coding_agent_bridge.NONE) {
 			__agiflowai_aicode_utils.print.info("Skipping MCP configuration");
 			return;
@@ -248,8 +249,23 @@ var CodingAgentService = class {
 			__agiflowai_aicode_utils.print.info("Please configure MCP servers manually for this coding agent.");
 			return;
 		}
-		await service.updateMcpSettings({ servers: {
-			"scaffold-mcp": {
+		if (selectedMcpServers?.includes("one-mcp")) {
+			await this.createMcpConfigYaml(selectedMcpServers);
+			await service.updateMcpSettings({ servers: { "one-mcp": {
+				type: "stdio",
+				command: "npx",
+				args: [
+					"-y",
+					"@agiflowai/one-mcp",
+					"mcp-serve"
+				],
+				disabled: false
+			} } });
+			__agiflowai_aicode_utils.print.success(`Added one-mcp to ${configLocation}`);
+			__agiflowai_aicode_utils.print.success("Created mcp-config.yaml with selected MCP server configurations");
+		} else {
+			const mcpServers = {};
+			if (selectedMcpServers?.includes("scaffold-mcp") ?? true) mcpServers["scaffold-mcp"] = {
 				type: "stdio",
 				command: "npx",
 				args: [
@@ -258,8 +274,8 @@ var CodingAgentService = class {
 					"mcp-serve"
 				],
 				disabled: false
-			},
-			"architect-mcp": {
+			};
+			if (selectedMcpServers?.includes("architect-mcp") ?? true) mcpServers["architect-mcp"] = {
 				type: "stdio",
 				command: "npx",
 				args: [
@@ -268,14 +284,70 @@ var CodingAgentService = class {
 					"mcp-serve"
 				],
 				disabled: false
-			}
-		} });
-		__agiflowai_aicode_utils.print.success(`Added scaffold-mcp and architect-mcp to ${configLocation}`);
+			};
+			await service.updateMcpSettings({ servers: mcpServers });
+			const serverNames = Object.keys(mcpServers).join(" and ");
+			__agiflowai_aicode_utils.print.success(`Added ${serverNames} to ${configLocation}`);
+		}
 		__agiflowai_aicode_utils.print.info("\nNext steps:");
 		__agiflowai_aicode_utils.print.indent(`1. ${restartInstructions}`);
-		__agiflowai_aicode_utils.print.indent("2. The scaffold-mcp and architect-mcp servers will be available");
+		__agiflowai_aicode_utils.print.indent("2. The configured MCP servers will be available");
 		__agiflowai_aicode_utils.print.success("\nMCP configuration completed!");
 	}
+	/**
+	* Create mcp-config.yaml file using one-mcp init command
+	* This is used when one-mcp is selected to configure which servers it should include
+	* Excludes one-mcp itself from the config file
+	* @param selectedMcpServers - Array of selected MCP servers
+	*/
+	async createMcpConfigYaml(selectedMcpServers) {
+		const { execSync } = await import("node:child_process");
+		const path$4 = await import("node:path");
+		const servers = {};
+		const serversToInclude = selectedMcpServers?.filter((s) => s !== "one-mcp") ?? [];
+		for (const server of serversToInclude) if (server === "scaffold-mcp") servers["scaffold-mcp"] = {
+			command: "npx",
+			args: [
+				"-y",
+				"@agiflowai/scaffold-mcp",
+				"mcp-serve",
+				"--admin-enable"
+			]
+		};
+		else if (server === "architect-mcp") servers["architect-mcp"] = {
+			command: "npx",
+			args: [
+				"-y",
+				"@agiflowai/architect-mcp",
+				"mcp-serve",
+				"--admin-enable"
+			]
+		};
+		if (Object.keys(servers).length === 0) {
+			servers["scaffold-mcp"] = {
+				command: "npx",
+				args: [
+					"-y",
+					"@agiflowai/scaffold-mcp",
+					"mcp-serve",
+					"--admin-enable"
+				]
+			};
+			servers["architect-mcp"] = {
+				command: "npx",
+				args: [
+					"-y",
+					"@agiflowai/architect-mcp",
+					"mcp-serve",
+					"--admin-enable"
+				]
+			};
+		}
+		execSync(`npx -y @agiflowai/one-mcp init -o "${path$4.join(this.workspaceRoot, "mcp-config.yaml")}" -f --mcp-servers '${JSON.stringify(servers)}'`, {
+			cwd: this.workspaceRoot,
+			stdio: "inherit"
+		});
+	}
 };
 
 //#endregion
@@ -893,7 +965,7 @@ var TemplateSelectionService = class {
 	* @param selectedMcpServers - Selected MCP servers
 	*/
 	async copyTemplateWithMcpFilter(sourcePath, targetPath, selectedMcpServers) {
-		const { MCPServer: MCPServer$1, MCP_CONFIG_FILES: MCP_CONFIG_FILES$1 } = await Promise.resolve().then(() => require("./mcp-Bdxvi2Ej.cjs"));
+		const { MCPServer: MCPServer$1, MCP_CONFIG_FILES: MCP_CONFIG_FILES$1 } = await Promise.resolve().then(() => require("./mcp-B9X7HURl.cjs"));
 		const architectFiles = MCP_CONFIG_FILES$1[MCPServer$1.ARCHITECT];
 		const hasArchitect = selectedMcpServers.includes(MCPServer$1.ARCHITECT);
 		const hasScaffold = selectedMcpServers.includes(MCPServer$1.SCAFFOLD);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agiflowai/aicode-toolkit",
   "description": "AI-powered code toolkit CLI for scaffolding, architecture management, and development workflows",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "license": "AGPL-3.0",
   "author": "AgiflowIO",
   "repository": {
@@ -50,8 +50,8 @@
     "pino-pretty": "^13.1.1",
     "xstate": "^5.23.0",
     "zod": "3.25.76",
-    "@agiflowai/aicode-utils": "1.0.5",
-    "@agiflowai/coding-agent-bridge": "1.0.5"
+    "@agiflowai/aicode-utils": "1.0.7",
+    "@agiflowai/coding-agent-bridge": "1.0.7"
   },
   "devDependencies": {
     "@types/express": "^5.0.0",

package/dist/mcp-Bdxvi2Ej.cjs

@@ -1,4 +0,0 @@
-const require_mcp = require('./mcp-Dwt8nYQV.cjs');
-
-exports.MCPServer = require_mcp.MCPServer;
-exports.MCP_CONFIG_FILES = require_mcp.MCP_CONFIG_FILES;

package/dist/mcp-BgNkvV6h.mjs

@@ -1,3 +0,0 @@
-import { n as MCP_CONFIG_FILES, r as MCP_SERVER_INFO, t as MCPServer } from "./mcp-C3HR_ZNF.mjs";
-
-export { MCPServer, MCP_CONFIG_FILES };