@agiflowai/scaffold-mcp 0.5.0 → 0.6.0

package/dist/index.cjs

@@ -8,20 +8,20 @@ let commander = require("commander");
 commander = require_chunk.__toESM(commander);
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
-let fs_extra = require("fs-extra");
-fs_extra = require_chunk.__toESM(fs_extra);
 let __agiflowai_aicode_utils = require("@agiflowai/aicode-utils");
 __agiflowai_aicode_utils = require_chunk.__toESM(__agiflowai_aicode_utils);
-let node_child_process = require("node:child_process");
-node_child_process = require_chunk.__toESM(node_child_process);
-let node_util = require("node:util");
-node_util = require_chunk.__toESM(node_util);
+let fs_extra = require("fs-extra");
+fs_extra = require_chunk.__toESM(fs_extra);
+let execa = require("execa");
+execa = require_chunk.__toESM(execa);
 let __composio_json_schema_to_zod = require("@composio/json-schema-to-zod");
 __composio_json_schema_to_zod = require_chunk.__toESM(__composio_json_schema_to_zod);
 let js_yaml = require("js-yaml");
 js_yaml = require_chunk.__toESM(js_yaml);
 let zod = require("zod");
 zod = require_chunk.__toESM(zod);
+let __inquirer_prompts = require("@inquirer/prompts");
+__inquirer_prompts = require_chunk.__toESM(__inquirer_prompts);
 let __modelcontextprotocol_sdk_server_index_js = require("@modelcontextprotocol/sdk/server/index.js");
 __modelcontextprotocol_sdk_server_index_js = require_chunk.__toESM(__modelcontextprotocol_sdk_server_index_js);
 let __modelcontextprotocol_sdk_types_js = require("@modelcontextprotocol/sdk/types.js");
@@ -38,7 +38,31 @@ let __modelcontextprotocol_sdk_server_stdio_js = require("@modelcontextprotocol/
 __modelcontextprotocol_sdk_server_stdio_js = require_chunk.__toESM(__modelcontextprotocol_sdk_server_stdio_js);
 
 //#region src/utils/git.ts
-const execAsync = (0, node_util.promisify)(node_child_process.exec);
+/**
+* Execute a git command safely using execa to prevent command injection
+*/
+async function execGit(args, cwd) {
+	try {
+		await (0, execa.execa)("git", args, { cwd });
+	} catch (error) {
+		const execaError = error;
+		throw new Error(`Git command failed: ${execaError.stderr || execaError.message}`);
+	}
+}
+/**
+* Find the workspace root by searching upwards for .git folder
+* Returns null if no .git folder is found (indicating a new project setup is needed)
+*/
+async function findWorkspaceRoot(startPath = process.cwd()) {
+	let currentPath = node_path.default.resolve(startPath);
+	const rootPath = node_path.default.parse(currentPath).root;
+	while (true) {
+		const gitPath = node_path.default.join(currentPath, ".git");
+		if (await fs_extra.pathExists(gitPath)) return currentPath;
+		if (currentPath === rootPath) return null;
+		currentPath = node_path.default.dirname(currentPath);
+	}
+}
 /**
 * Parse GitHub URL to detect if it's a subdirectory
 * Supports formats:
@@ -78,14 +102,29 @@ function parseGitHubUrl(url) {
 async function cloneSubdirectory(repoUrl, branch, subdirectory, targetFolder) {
 	const tempFolder = `${targetFolder}.tmp`;
 	try {
-		await execAsync(`git init "${tempFolder}"`);
-		await execAsync(`git -C "${tempFolder}" remote add origin ${repoUrl}`);
-		await execAsync(`git -C "${tempFolder}" config core.sparseCheckout true`);
+		await execGit(["init", tempFolder]);
+		await execGit([
+			"remote",
+			"add",
+			"origin",
+			repoUrl
+		], tempFolder);
+		await execGit([
+			"config",
+			"core.sparseCheckout",
+			"true"
+		], tempFolder);
 		const sparseCheckoutFile = node_path.default.join(tempFolder, ".git", "info", "sparse-checkout");
 		await fs_extra.writeFile(sparseCheckoutFile, `${subdirectory}\n`);
-		await execAsync(`git -C "${tempFolder}" pull --depth=1 origin ${branch}`);
+		await execGit([
+			"pull",
+			"--depth=1",
+			"origin",
+			branch
+		], tempFolder);
 		const sourceDir = node_path.default.join(tempFolder, subdirectory);
 		if (!await fs_extra.pathExists(sourceDir)) throw new Error(`Subdirectory '${subdirectory}' not found in repository at branch '${branch}'`);
+		if (await fs_extra.pathExists(targetFolder)) throw new Error(`Target folder already exists: ${targetFolder}`);
 		await fs_extra.move(sourceDir, targetFolder);
 		await fs_extra.remove(tempFolder);
 	} catch (error) {
@@ -97,7 +136,11 @@ async function cloneSubdirectory(repoUrl, branch, subdirectory, targetFolder) {
 * Clone entire repository
 */
 async function cloneRepository(repoUrl, targetFolder) {
-	await execAsync(`git clone ${repoUrl} "${targetFolder}"`);
+	await execGit([
+		"clone",
+		repoUrl,
+		targetFolder
+	]);
 	const gitFolder = node_path.default.join(targetFolder, ".git");
 	if (await fs_extra.pathExists(gitFolder)) await fs_extra.remove(gitFolder);
 }
@@ -125,9 +168,9 @@ async function fetchGitHubDirectoryContents(owner, repo, path$6, branch = "main"
 /**
 * Add command - add a template to templates folder
 */
-const addCommand = new commander.Command("add").description("Add a template to templates folder").requiredOption("--name <name>", "Template name").requiredOption("--url <url>", "URL of the template repository to download").option("--path <path>", "Path to templates folder", "./templates").option("--type <type>", "Template type: boilerplate or scaffold", "boilerplate").action(async (options) => {
+const addCommand = new commander.Command("add").description("Add a template to templates folder").requiredOption("--name <name>", "Template name").requiredOption("--url <url>", "URL of the template repository to download").option("--path <path>", "Override templates folder path (uses toolkit.yaml config by default)").option("--type <type>", "Template type: boilerplate or scaffold", "boilerplate").action(async (options) => {
 	try {
-		const templatesPath = node_path.default.resolve(options.path);
+		const templatesPath = options.path ? node_path.default.resolve(options.path) : await __agiflowai_aicode_utils.TemplatesManagerService.findTemplatesPath();
 		const templateType = options.type.toLowerCase();
 		const templateName = options.name;
 		const templateUrl = options.url;
@@ -488,16 +531,14 @@ boilerplateCommand.command("info <boilerplateName>").description("Show detailed
 //#endregion
 //#region src/cli/init.ts
 /**
-* Find the workspace root by searching upwards for .git folder
+* Execute git init safely using execa to prevent command injection
 */
-async function findWorkspaceRoot(startPath = process.cwd()) {
-	let currentPath = node_path.default.resolve(startPath);
-	const rootPath = node_path.default.parse(currentPath).root;
-	while (true) {
-		const gitPath = node_path.default.join(currentPath, ".git");
-		if (await fs_extra.pathExists(gitPath)) return currentPath;
-		if (currentPath === rootPath) return process.cwd();
-		currentPath = node_path.default.dirname(currentPath);
+async function gitInit(projectPath) {
+	try {
+		await (0, execa.execa)("git", ["init", projectPath]);
+	} catch (error) {
+		const execaError = error;
+		throw new Error(`Git init failed: ${execaError.stderr || execaError.message}`);
 	}
 }
 const DEFAULT_TEMPLATE_REPO = {
@@ -507,6 +548,125 @@ const DEFAULT_TEMPLATE_REPO = {
 	path: "templates"
 };
 /**
+* Interactive setup for new projects
+* Prompts user for project details when no .git folder is found
+* @param providedName - Optional project name from CLI argument
+* @param providedProjectType - Optional project type from CLI argument
+*/
+async function setupNewProject(providedName, providedProjectType) {
+	__agiflowai_aicode_utils.print.header(`\n${__agiflowai_aicode_utils.icons.rocket} New Project Setup`);
+	__agiflowai_aicode_utils.print.info("No Git repository detected. Let's set up a new project!\n");
+	let projectName;
+	const reservedNames = [
+		".",
+		"..",
+		"CON",
+		"PRN",
+		"AUX",
+		"NUL",
+		"COM1",
+		"COM2",
+		"COM3",
+		"COM4",
+		"COM5",
+		"COM6",
+		"COM7",
+		"COM8",
+		"COM9",
+		"LPT1",
+		"LPT2",
+		"LPT3",
+		"LPT4",
+		"LPT5",
+		"LPT6",
+		"LPT7",
+		"LPT8",
+		"LPT9"
+	];
+	const validateProjectName = (value) => {
+		const trimmed = value.trim();
+		if (!trimmed) return "Project name is required";
+		if (!/^[a-zA-Z0-9]/.test(trimmed)) return "Project name must start with a letter or number";
+		if (!/^[a-zA-Z0-9][a-zA-Z0-9_-]*$/.test(trimmed)) return "Project name can only contain letters, numbers, hyphens, and underscores";
+		if (reservedNames.includes(trimmed.toUpperCase())) return "Project name uses a reserved name";
+		return true;
+	};
+	if (providedName) {
+		const trimmedName = providedName.trim();
+		const validationResult = validateProjectName(trimmedName);
+		if (validationResult !== true) throw new Error(validationResult);
+		projectName = trimmedName;
+		__agiflowai_aicode_utils.print.info(`Project name: ${projectName}`);
+	} else projectName = await (0, __inquirer_prompts.input)({
+		message: "Enter your project name:",
+		validate: validateProjectName
+	});
+	let projectType;
+	if (providedProjectType) {
+		if (providedProjectType !== __agiflowai_aicode_utils.ProjectType.MONOLITH && providedProjectType !== __agiflowai_aicode_utils.ProjectType.MONOREPO) throw new Error(`Invalid project type '${providedProjectType}'. Must be '${__agiflowai_aicode_utils.ProjectType.MONOLITH}' or '${__agiflowai_aicode_utils.ProjectType.MONOREPO}'`);
+		projectType = providedProjectType;
+		__agiflowai_aicode_utils.print.info(`Project type: ${projectType}`);
+	} else projectType = await (0, __inquirer_prompts.select)({
+		message: "Select project type:",
+		choices: [{
+			name: "Monolith - Single application structure",
+			value: __agiflowai_aicode_utils.ProjectType.MONOLITH,
+			description: "Traditional single-application project structure"
+		}, {
+			name: "Monorepo - Multiple packages/apps in one repository",
+			value: __agiflowai_aicode_utils.ProjectType.MONOREPO,
+			description: "Multiple packages managed together (uses workspaces)"
+		}]
+	});
+	const hasExistingRepo = await (0, __inquirer_prompts.confirm)({
+		message: "Do you have an existing Git repository you want to use?",
+		default: false
+	});
+	const projectPath = node_path.default.join(process.cwd(), projectName.trim());
+	try {
+		await fs_extra.mkdir(projectPath, { recursive: false });
+		__agiflowai_aicode_utils.print.success(`${__agiflowai_aicode_utils.icons.check} Created project directory: ${projectPath}`);
+	} catch (error) {
+		if (error.code === "EEXIST") throw new Error(`Directory '${projectName}' already exists. Please choose a different name.`);
+		throw error;
+	}
+	if (hasExistingRepo) {
+		const repoUrl = await (0, __inquirer_prompts.input)({
+			message: "Enter Git repository URL:",
+			validate: (value) => {
+				if (!value.trim()) return "Repository URL is required";
+				if (!value.match(/^(https?:\/\/|git@)/)) return "Please enter a valid Git repository URL";
+				return true;
+			}
+		});
+		__agiflowai_aicode_utils.print.info(`${__agiflowai_aicode_utils.icons.download} Cloning repository...`);
+		try {
+			const parsed = parseGitHubUrl(repoUrl.trim());
+			if (parsed.isSubdirectory && parsed.branch && parsed.subdirectory) await cloneSubdirectory(parsed.repoUrl, parsed.branch, parsed.subdirectory, projectPath);
+			else await cloneRepository(parsed.repoUrl, projectPath);
+			__agiflowai_aicode_utils.print.success(`${__agiflowai_aicode_utils.icons.check} Repository cloned successfully`);
+		} catch (error) {
+			await fs_extra.remove(projectPath);
+			throw new Error(`Failed to clone repository: ${error.message}`);
+		}
+	} else if (await (0, __inquirer_prompts.confirm)({
+		message: "Initialize a new Git repository?",
+		default: true
+	})) {
+		__agiflowai_aicode_utils.print.info(`${__agiflowai_aicode_utils.icons.rocket} Initializing Git repository...`);
+		try {
+			await gitInit(projectPath);
+			__agiflowai_aicode_utils.print.success(`${__agiflowai_aicode_utils.icons.check} Git repository initialized`);
+		} catch (error) {
+			__agiflowai_aicode_utils.messages.warning(`Failed to initialize Git: ${error.message}`);
+		}
+	}
+	return {
+		projectPath,
+		projectType
+	};
+}
+/**
 * Download templates from GitHub repository
 */
 async function downloadTemplates(templatesPath) {
@@ -536,11 +696,43 @@ async function downloadTemplates(templatesPath) {
 /**
 * Init command - initialize templates folder
 */
-const initCommand = new commander.Command("init").description("Initialize templates folder structure at workspace root").option("--no-download", "Skip downloading templates from repository").option("--path <path>", "Custom path for templates folder (relative to workspace root)").action(async (options) => {
+const initCommand = new commander.Command("init").description("Initialize templates folder structure at workspace root or create new project").option("--no-download", "Skip downloading templates from repository").option("--path <path>", "Custom path for templates folder (relative to workspace root)").option("--name <name>", "Project name (for new projects)").option("--project-type <type>", "Project type: monolith or monorepo (for new projects)").action(async (options) => {
 	try {
-		const workspaceRoot = await findWorkspaceRoot();
-		const templatesPath = options.path ? node_path.default.join(workspaceRoot, options.path) : node_path.default.join(workspaceRoot, "templates");
-		__agiflowai_aicode_utils.print.info(`${__agiflowai_aicode_utils.icons.rocket} Initializing templates folder at: ${templatesPath}`);
+		let workspaceRoot = await findWorkspaceRoot();
+		let projectType;
+		if (!workspaceRoot) {
+			const projectSetup = await setupNewProject(options.name, options.projectType);
+			workspaceRoot = projectSetup.projectPath;
+			projectType = projectSetup.projectType;
+			__agiflowai_aicode_utils.print.info(`\n${__agiflowai_aicode_utils.icons.folder} Project type: ${projectType}`);
+		}
+		let templatesPath = options.path ? node_path.default.join(workspaceRoot, options.path) : node_path.default.join(workspaceRoot, "templates");
+		if (await fs_extra.pathExists(templatesPath)) {
+			__agiflowai_aicode_utils.messages.warning(`\n⚠️  Templates folder already exists at: ${templatesPath}`);
+			if (await (0, __inquirer_prompts.confirm)({
+				message: "Do you want to use a different folder for templates?",
+				default: false
+			})) {
+				const alternateFolder = await (0, __inquirer_prompts.input)({
+					message: "Enter alternate folder name for templates:",
+					default: "my-templates",
+					validate: (value) => {
+						if (!value.trim()) return "Folder name is required";
+						if (!/^[a-zA-Z0-9_\-/]+$/.test(value)) return "Folder name can only contain letters, numbers, hyphens, underscores, and slashes";
+						return true;
+					}
+				});
+				templatesPath = node_path.default.join(workspaceRoot, alternateFolder.trim());
+				const toolkitConfig = {
+					templatesPath: alternateFolder.trim(),
+					projectType
+				};
+				__agiflowai_aicode_utils.print.info(`\n${__agiflowai_aicode_utils.icons.config} Creating toolkit.yaml with custom templates path...`);
+				await __agiflowai_aicode_utils.TemplatesManagerService.writeToolkitConfig(toolkitConfig, workspaceRoot);
+				__agiflowai_aicode_utils.print.success(`${__agiflowai_aicode_utils.icons.check} toolkit.yaml created`);
+			} else __agiflowai_aicode_utils.print.info(`\n${__agiflowai_aicode_utils.icons.info} Using existing templates folder`);
+		}
+		__agiflowai_aicode_utils.print.info(`\n${__agiflowai_aicode_utils.icons.rocket} Initializing templates folder at: ${templatesPath}`);
 		await fs_extra.ensureDir(templatesPath);
 		await fs_extra.writeFile(node_path.default.join(templatesPath, "README.md"), `# Templates
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agiflowai/scaffold-mcp",
   "description": "MCP server for scaffolding applications with boilerplate templates",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "license": "AGPL-3.0",
   "author": "AgiflowIO",
   "repository": {
@@ -34,9 +34,11 @@
   ],
   "dependencies": {
     "@composio/json-schema-to-zod": "0.1.15",
+    "@inquirer/prompts": "^7.8.6",
     "@modelcontextprotocol/sdk": "1.19.1",
     "chalk": "5.6.2",
     "commander": "14.0.1",
+    "execa": "^9.5.2",
     "express": "^4.21.2",
     "fs-extra": "11.3.2",
     "js-yaml": "4.1.0",
@@ -44,7 +46,7 @@
     "pino": "^10.0.0",
     "pino-pretty": "^13.1.1",
     "zod": "3.25.76",
-    "@agiflowai/aicode-utils": "0.5.0"
+    "@agiflowai/aicode-utils": "0.6.0"
   },
   "devDependencies": {
     "@types/express": "^5.0.0",