@agiflowai/scaffold-mcp 1.1.0 → 1.3.0

package/README.md

@@ -121,6 +121,25 @@ npx @agiflowai/scaffold-mcp scaffold list ./apps/my-app
 npx @agiflowai/scaffold-mcp scaffold add scaffold-nextjs-page \
   --project ./apps/my-app \
   --vars '{"pageTitle":"About","nextjsPagePath":"/about"}'
+
+# Create template authoring entries (CLI equivalents for admin MCP tools)
+npx @agiflowai/scaffold-mcp boilerplate generate scaffold-vite-app \
+  --template vite-react \
+  --description "React Vite starter" \
+  --target-folder apps \
+  --variables '[{"name":"appName","description":"Application name","type":"string","required":true}]'
+
+npx @agiflowai/scaffold-mcp scaffold generate scaffold-service \
+  --template typescript-lib \
+  --description "Generate a service class and unit test" \
+  --variables '[{"name":"serviceName","description":"Service name","type":"string","required":true}]'
+
+npx @agiflowai/scaffold-mcp template file create src/index.ts \
+  --template typescript-lib \
+  --content 'export const {{ name | camelCase }} = "{{ name }}";'
+
+npx @agiflowai/scaffold-mcp file write .env.local \
+  --content 'NEXT_PUBLIC_API_URL=https://api.example.com'
 ```
 
 ---
@@ -284,6 +303,20 @@ Hooks let scaffold-mcp proactively suggest templates when your AI agent creates
 
 When Claude tries to write a new file, the hook shows available scaffolding methods that match, so Claude can use templates instead of writing from scratch.
 
+Hooks are also available for **Gemini CLI** and **OpenAI Codex CLI** (`--type codex.preToolUse`, configured in `.codex/config.toml`); see the hooks docs for setup.
+
+**Relaxing enforcement:** to let some files (docs, content, generated code) be written directly, add exclude globs — workspace-wide via `scaffold-mcp.hook.excludeGlobs` in `.toolkit/settings.yaml`, or per-template via a top-level `exclude` in `scaffold.yaml`:
+
+```yaml
+# .toolkit/settings.yaml
+scaffold-mcp:
+  hook:
+    excludeGlobs:
+      - '**/*.md'
+      - '**/*.mdx'
+      - '**/src/content/**'
+```
+
 See [Hooks Documentation](./docs/hooks.md) for details.
 
 ---

package/dist/{ListScaffoldingMethodsTool-DxdrPlcb.mjs → ListScaffoldingMethodsTool-dHaM4QXT.mjs}

@@ -174,6 +174,7 @@ const ScaffoldConfigEntrySchema = z.object({
 	patterns: z.array(z.string()).optional()
 });
 const ScaffoldYamlSchema = z.object({
+	exclude: z.array(z.string()).optional(),
 	boilerplate: z.union([ScaffoldConfigEntrySchema, z.array(ScaffoldConfigEntrySchema)]).optional(),
 	features: z.union([ScaffoldConfigEntrySchema, z.array(ScaffoldConfigEntrySchema)]).optional()
 }).catchall(z.union([ScaffoldConfigEntrySchema, z.array(ScaffoldConfigEntrySchema)]));
@@ -761,6 +762,7 @@ var ScaffoldingMethodsService = class {
 		if (!await this.fileSystem.pathExists(scaffoldYamlPath)) throw new Error(`scaffold.yaml not found at ${scaffoldYamlPath}`);
 		const scaffoldContent = await this.fileSystem.readFile(scaffoldYamlPath, "utf8");
 		const architectConfig = yaml.load(scaffoldContent);
+		const excludeGlobs = Array.isArray(architectConfig.exclude) ? architectConfig.exclude : [];
 		const methods = [];
 		if (architectConfig.features && Array.isArray(architectConfig.features)) architectConfig.features.forEach((feature) => {
 			const featureName = feature.name || `scaffold-${templateName}`;
@@ -779,16 +781,18 @@ var ScaffoldingMethodsService = class {
 		});
 		return {
 			templatePath,
-			methods
+			methods,
+			excludeGlobs
 		};
 	}
 	async listScaffoldingMethodsByTemplate(templateName, cursor) {
-		const { templatePath, methods } = await this.collectAllMethodsByTemplate(templateName);
+		const { templatePath, methods, excludeGlobs } = await this.collectAllMethodsByTemplate(templateName);
 		const paginatedResult = PaginationHelper.paginate(methods, cursor);
 		return {
 			sourceTemplate: templateName,
 			templatePath,
 			methods: paginatedResult.items,
+			excludeGlobs,
 			nextCursor: paginatedResult.nextCursor,
 			_meta: paginatedResult._meta
 		};

package/dist/{ListScaffoldingMethodsTool-CYZtpU-W.cjs → ListScaffoldingMethodsTool-rX9Hxn2d.cjs}

@@ -198,6 +198,7 @@ const ScaffoldConfigEntrySchema = zod.z.object({
 	patterns: zod.z.array(zod.z.string()).optional()
 });
 const ScaffoldYamlSchema = zod.z.object({
+	exclude: zod.z.array(zod.z.string()).optional(),
 	boilerplate: zod.z.union([ScaffoldConfigEntrySchema, zod.z.array(ScaffoldConfigEntrySchema)]).optional(),
 	features: zod.z.union([ScaffoldConfigEntrySchema, zod.z.array(ScaffoldConfigEntrySchema)]).optional()
 }).catchall(zod.z.union([ScaffoldConfigEntrySchema, zod.z.array(ScaffoldConfigEntrySchema)]));
@@ -785,6 +786,7 @@ var ScaffoldingMethodsService = class {
 		if (!await this.fileSystem.pathExists(scaffoldYamlPath)) throw new Error(`scaffold.yaml not found at ${scaffoldYamlPath}`);
 		const scaffoldContent = await this.fileSystem.readFile(scaffoldYamlPath, "utf8");
 		const architectConfig = js_yaml.default.load(scaffoldContent);
+		const excludeGlobs = Array.isArray(architectConfig.exclude) ? architectConfig.exclude : [];
 		const methods = [];
 		if (architectConfig.features && Array.isArray(architectConfig.features)) architectConfig.features.forEach((feature) => {
 			const featureName = feature.name || `scaffold-${templateName}`;
@@ -803,16 +805,18 @@ var ScaffoldingMethodsService = class {
 		});
 		return {
 			templatePath,
-			methods
+			methods,
+			excludeGlobs
 		};
 	}
 	async listScaffoldingMethodsByTemplate(templateName, cursor) {
-		const { templatePath, methods } = await this.collectAllMethodsByTemplate(templateName);
+		const { templatePath, methods, excludeGlobs } = await this.collectAllMethodsByTemplate(templateName);
 		const paginatedResult = PaginationHelper.paginate(methods, cursor);
 		return {
 			sourceTemplate: templateName,
 			templatePath,
 			methods: paginatedResult.items,
+			excludeGlobs,
 			nextCursor: paginatedResult.nextCursor,
 			_meta: paginatedResult._meta
 		};

package/dist/{claudeCode-DNgNiLlL.mjs → claudeCode-CyHppxA_.mjs}

@@ -1,6 +1,6 @@
-import { t as ListScaffoldingMethodsTool } from "./ListScaffoldingMethodsTool-DxdrPlcb.mjs";
-import "./tools-Cl06aoBi.mjs";
-import { n as resolveNewFileWriteTarget, t as formatScaffoldMethodsHookMessage } from "./shared-BVYIN3Is.mjs";
+import { t as ListScaffoldingMethodsTool } from "./ListScaffoldingMethodsTool-dHaM4QXT.mjs";
+import "./tools-BR1vQd_Y.mjs";
+import { n as getGlobalExcludeGlobs, o as resolveNewFileWriteTarget, r as matchesExcludeGlob, t as formatScaffoldMethodsHookMessage } from "./shared-BJjclypj.mjs";
 import { ProjectFinderService, TemplatesManagerService } from "@agiflowai/aicode-utils";
 import path from "node:path";
 import fs from "node:fs/promises";
@@ -152,6 +152,7 @@ var PhantomCodeCheckHook = class {
 function isScaffoldMethodsResponse(value) {
 	if (typeof value !== "object" || value === null) return false;
 	if ("methods" in value && !Array.isArray(value.methods)) return false;
+	if ("excludeGlobs" in value && !Array.isArray(value.excludeGlobs)) return false;
 	if ("nextCursor" in value && typeof value.nextCursor !== "string") return false;
 	return true;
 }
@@ -189,6 +190,10 @@ var UseScaffoldMethodHook = class {
 				decision: DECISION_SKIP,
 				message: "Not a new file write operation"
 			};
+			if (matchesExcludeGlob(absoluteFilePath, await getGlobalExcludeGlobs(context.cwd))) return {
+				decision: DECISION_ALLOW,
+				message: "File matches configured excludeGlobs - writing directly."
+			};
 			const executionLog = new ExecutionLogService(context.session_id);
 			if (await executionLog.hasExecuted({
 				filePath,
@@ -225,6 +230,10 @@ var UseScaffoldMethodHook = class {
 				message: "⚠️ Unexpected response shape from scaffolding methods tool"
 			};
 			const data = parsed;
+			if (matchesExcludeGlob(absoluteFilePath, data.excludeGlobs)) return {
+				decision: DECISION_ALLOW,
+				message: "File matches template exclude globs - writing directly."
+			};
 			if (!data.methods || data.methods.length === 0) {
 				await executionLog.logExecution({
 					filePath,

package/dist/{claudeCode-BxcEboyM.cjs → claudeCode-DZnJyFQt.cjs}

@@ -1,6 +1,6 @@
-const require_ListScaffoldingMethodsTool = require("./ListScaffoldingMethodsTool-CYZtpU-W.cjs");
-require("./tools-CVSZSirE.cjs");
-const require_shared = require("./shared-QxPXh-L-.cjs");
+const require_ListScaffoldingMethodsTool = require("./ListScaffoldingMethodsTool-rX9Hxn2d.cjs");
+require("./tools-CV6GWs6f.cjs");
+const require_shared = require("./shared-B0H-6AUG.cjs");
 let _agiflowai_aicode_utils = require("@agiflowai/aicode-utils");
 let node_path = require("node:path");
 node_path = require_ListScaffoldingMethodsTool.__toESM(node_path, 1);
@@ -155,6 +155,7 @@ var PhantomCodeCheckHook = class {
 function isScaffoldMethodsResponse(value) {
 	if (typeof value !== "object" || value === null) return false;
 	if ("methods" in value && !Array.isArray(value.methods)) return false;
+	if ("excludeGlobs" in value && !Array.isArray(value.excludeGlobs)) return false;
 	if ("nextCursor" in value && typeof value.nextCursor !== "string") return false;
 	return true;
 }
@@ -192,6 +193,10 @@ var UseScaffoldMethodHook = class {
 				decision: _agiflowai_hooks_adapter.DECISION_SKIP,
 				message: "Not a new file write operation"
 			};
+			if (require_shared.matchesExcludeGlob(absoluteFilePath, await require_shared.getGlobalExcludeGlobs(context.cwd))) return {
+				decision: _agiflowai_hooks_adapter.DECISION_ALLOW,
+				message: "File matches configured excludeGlobs - writing directly."
+			};
 			const executionLog = new _agiflowai_hooks_adapter.ExecutionLogService(context.session_id);
 			if (await executionLog.hasExecuted({
 				filePath,
@@ -228,6 +233,10 @@ var UseScaffoldMethodHook = class {
 				message: "⚠️ Unexpected response shape from scaffolding methods tool"
 			};
 			const data = parsed;
+			if (require_shared.matchesExcludeGlob(absoluteFilePath, data.excludeGlobs)) return {
+				decision: _agiflowai_hooks_adapter.DECISION_ALLOW,
+				message: "File matches template exclude globs - writing directly."
+			};
 			if (!data.methods || data.methods.length === 0) {
 				await executionLog.logExecution({
 					filePath,

package/dist/cli.cjs

@@ -1,13 +1,54 @@
 #!/usr/bin/env node
-const require_ListScaffoldingMethodsTool = require("./ListScaffoldingMethodsTool-CYZtpU-W.cjs");
-const require_src = require("./src-oF_UdSBu.cjs");
-const require_tools = require("./tools-CVSZSirE.cjs");
+const require_ListScaffoldingMethodsTool = require("./ListScaffoldingMethodsTool-rX9Hxn2d.cjs");
+const require_src = require("./src-CRT1Er93.cjs");
+const require_tools = require("./tools-CV6GWs6f.cjs");
 let _agiflowai_aicode_utils = require("@agiflowai/aicode-utils");
 let node_path = require("node:path");
 node_path = require_ListScaffoldingMethodsTool.__toESM(node_path, 1);
 let commander = require("commander");
 let _agiflowai_coding_agent_bridge = require("@agiflowai/coding-agent-bridge");
 let _agiflowai_hooks_adapter = require("@agiflowai/hooks-adapter");
+//#region src/commands/utils.ts
+function parseJsonOption(value, flagName) {
+	if (!value) throw new Error(`${flagName} is required`);
+	try {
+		return JSON.parse(value);
+	} catch (error) {
+		throw new Error(`Invalid JSON for ${flagName}: ${error instanceof Error ? error.message : String(error)}`);
+	}
+}
+async function resolveTemplatesPath() {
+	const templatesDir = await _agiflowai_aicode_utils.TemplatesManagerService.findTemplatesPath();
+	if (!templatesDir) throw new Error("Templates folder not found. Create a templates folder or specify templatesPath in toolkit.yaml");
+	return templatesDir;
+}
+async function detectMonolithMode() {
+	try {
+		return (await _agiflowai_aicode_utils.ProjectConfigResolver.resolveProjectConfig(process.cwd())).type === "monolith";
+	} catch {
+		return false;
+	}
+}
+async function loadTextOption(config) {
+	const { value, filePath, valueFlag, fileFlag, required = false } = config;
+	if (value !== void 0 && filePath !== void 0) throw new Error(`Use only one of ${valueFlag} or ${fileFlag}`);
+	if (filePath !== void 0) return (0, _agiflowai_aicode_utils.readFile)(filePath, "utf-8");
+	if (value !== void 0) return value;
+	if (required) throw new Error(`${valueFlag} or ${fileFlag} is required`);
+}
+function collectOption(value, previous = []) {
+	return [...previous, value];
+}
+function firstTextContent(result) {
+	const firstContent = result.content[0];
+	return firstContent?.type === "text" ? firstContent.text : "";
+}
+function assertToolSuccess(result) {
+	const text = firstTextContent(result);
+	if (result.isError) throw new Error(text || "Tool execution failed");
+	return text;
+}
+//#endregion
 //#region src/commands/boilerplate.ts
 /**
 * Boilerplate CLI command
@@ -44,7 +85,7 @@ boilerplateCommand.command("list").description("List all available boilerplate t
 		process.exit(1);
 	}
 });
-boilerplateCommand.command("create <boilerplateName>").description("Create a new project from a boilerplate template").option("-v, --vars <json>", "JSON string containing variables for the boilerplate").option("-m, --monolith", "Create as monolith project at workspace root with toolkit.yaml (default: false, creates as monorepo with project.json)").option("-t, --target-folder <path>", "Override target folder (defaults to boilerplate targetFolder for monorepo, workspace root for monolith)").option("--verbose", "Enable verbose logging").action(async (boilerplateName, options) => {
+boilerplateCommand.command("create <boilerplateName>").description("Create a new project from a boilerplate template").option("-v, --vars <json>", "JSON string containing variables for the boilerplate").option("-m, --monolith", "Create as monolith project at workspace root with toolkit.yaml (default: false, creates as monorepo with project.json)").option("-t, --target-folder <path>", "Override target folder (defaults to boilerplate targetFolder for monorepo, workspace root for monolith)").option("--marker <tag>", "Custom scaffold marker tag to inject into generated code files").option("--verbose", "Enable verbose logging").action(async (boilerplateName, options) => {
 	try {
 		const templatesDir = await _agiflowai_aicode_utils.TemplatesManagerService.findTemplatesPath();
 		if (!templatesDir) {
@@ -94,7 +135,8 @@ boilerplateCommand.command("create <boilerplateName>").description("Create a new
 			boilerplateName,
 			variables,
 			monolith: options.monolith,
-			targetFolderOverride: options.targetFolder
+			targetFolderOverride: options.targetFolder,
+			marker: options.marker
 		});
 		if (result.success) {
 			_agiflowai_aicode_utils.messages.success("Project created successfully!");
@@ -121,6 +163,42 @@ boilerplateCommand.command("create <boilerplateName>").description("Create a new
 		process.exit(1);
 	}
 });
+boilerplateCommand.command("generate <boilerplateName>").description("Create a new boilerplate configuration in a template's scaffold.yaml").option("-t, --template <name>", "Template name (optional in monolith mode)").option("--description <text>", "Boilerplate description").option("--description-file <path>", "Read boilerplate description from a file").option("--instruction <text>", "Detailed boilerplate instructions").option("--instruction-file <path>", "Read detailed boilerplate instructions from a file").option("--target-folder <path>", "Target folder for generated projects").option("--variables <json>", "JSON array of variable definitions: [{\"name\":\"appName\",\"description\":\"App name\",\"type\":\"string\",\"required\":true}]").option("-i, --include <path>", "Template include path (repeatable)", collectOption, []).action(async (boilerplateName, options) => {
+	try {
+		const templatesPath = await resolveTemplatesPath();
+		const isMonolith = await detectMonolithMode();
+		const description = await loadTextOption({
+			value: options.description,
+			filePath: options.descriptionFile,
+			valueFlag: "--description",
+			fileFlag: "--description-file",
+			required: true
+		});
+		const instruction = await loadTextOption({
+			value: options.instruction,
+			filePath: options.instructionFile,
+			valueFlag: "--instruction",
+			fileFlag: "--instruction-file"
+		});
+		const variables = parseJsonOption(options.variables, "--variables");
+		if (!Array.isArray(variables)) throw new Error("--variables must be a JSON array");
+		const targetFolder = options.targetFolder ?? (isMonolith ? "." : void 0);
+		if (!targetFolder) throw new Error("--target-folder is required outside monolith mode");
+		const result = await new require_tools.GenerateBoilerplateTool(templatesPath, isMonolith).execute({
+			templateName: options.template,
+			boilerplateName,
+			description: description ?? "",
+			instruction,
+			targetFolder,
+			variables,
+			includes: options.include ?? []
+		});
+		_agiflowai_aicode_utils.print.info(assertToolSuccess(result));
+	} catch (error) {
+		_agiflowai_aicode_utils.print.error("Error generating boilerplate:", error instanceof Error ? error.message : String(error));
+		process.exit(1);
+	}
+});
 boilerplateCommand.command("info <boilerplateName>").description("Show detailed information about a boilerplate template").action(async (boilerplateName) => {
 	try {
 		const templatesDir = await _agiflowai_aicode_utils.TemplatesManagerService.findTemplatesPath();
@@ -146,6 +224,28 @@ boilerplateCommand.command("info <boilerplateName>").description("Show detailed
 	}
 });
 //#endregion
+//#region src/commands/file.ts
+const fileCommand$1 = new commander.Command("file").description("Workspace file utilities");
+fileCommand$1.command("write <filePath>").description("Write content to a file inside the current workspace").option("--content <text>", "Content to write").option("--content-file <path>", "Read content to write from a file").action(async (filePath, options) => {
+	try {
+		const content = await loadTextOption({
+			value: options.content,
+			filePath: options.contentFile,
+			valueFlag: "--content",
+			fileFlag: "--content-file",
+			required: true
+		});
+		const result = await new require_tools.WriteToFileTool().execute({
+			file_path: filePath,
+			content
+		});
+		_agiflowai_aicode_utils.print.info(assertToolSuccess(result));
+	} catch (error) {
+		_agiflowai_aicode_utils.print.error("Error writing file:", error instanceof Error ? error.message : String(error));
+		process.exit(1);
+	}
+});
+//#endregion
 //#region src/commands/mcp-serve.ts
 /**
 * MCP Serve Command
@@ -299,13 +399,6 @@ const mcpServeCommand = new commander.Command("mcp-serve").description("Start MC
 const scaffoldCommand = new commander.Command("scaffold").description("Add features to existing projects");
 scaffoldCommand.command("list [projectPath]").description("List available scaffolding methods for a project or template").option("-t, --template <name>", "Template name (e.g., nextjs-15, typescript-mcp-package)").option("-c, --cursor <cursor>", "Pagination cursor for next page").action(async (projectPath, options) => {
 	try {
-		if (!projectPath && !options.template) {
-			_agiflowai_aicode_utils.messages.error("Either projectPath or --template option must be provided");
-			_agiflowai_aicode_utils.messages.hint("Examples:");
-			_agiflowai_aicode_utils.print.debug("  scaffold-mcp scaffold list ./my-project");
-			_agiflowai_aicode_utils.print.debug("  scaffold-mcp scaffold list --template nextjs-15");
-			process.exit(1);
-		}
 		const templatesDir = await _agiflowai_aicode_utils.TemplatesManagerService.findTemplatesPath();
 		if (!templatesDir) {
 			_agiflowai_aicode_utils.messages.error("Templates folder not found. Create a templates folder or specify templatesPath in toolkit.yaml");
@@ -314,15 +407,16 @@ scaffoldCommand.command("list [projectPath]").description("List available scaffo
 		const scaffoldingMethodsService = new require_ListScaffoldingMethodsTool.ScaffoldingMethodsService(new require_ListScaffoldingMethodsTool.FileSystemService(), templatesDir);
 		let result;
 		let displayName;
-		if (projectPath) {
-			const absolutePath = node_path.default.resolve(projectPath);
+		if (projectPath || !options.template) {
+			const inputProjectPath = projectPath ?? process.cwd();
+			const absolutePath = node_path.default.resolve(inputProjectPath);
 			if (!await _agiflowai_aicode_utils.ProjectConfigResolver.hasConfiguration(absolutePath)) {
 				_agiflowai_aicode_utils.messages.error(`No project configuration found in ${absolutePath}`);
 				_agiflowai_aicode_utils.messages.hint("For monorepo: ensure project.json exists with sourceTemplate field\nFor monolith: ensure toolkit.yaml exists at workspace root\nOr use --template option to list methods for a specific template");
 				process.exit(1);
 			}
 			result = await scaffoldingMethodsService.listScaffoldingMethods(absolutePath, options.cursor);
-			displayName = projectPath;
+			displayName = projectPath ?? absolutePath;
 		} else {
 			result = await scaffoldingMethodsService.listScaffoldingMethodsByTemplate(options.template, options.cursor);
 			displayName = `template: ${options.template}`;
@@ -351,7 +445,7 @@ scaffoldCommand.command("list [projectPath]").description("List available scaffo
 		process.exit(1);
 	}
 });
-scaffoldCommand.command("add <featureName>").description("Add a feature to an existing project").option("-p, --project <path>", "Project path", process.cwd()).option("-v, --vars <json>", "JSON string containing variables for the feature").option("--verbose", "Enable verbose logging").action(async (featureName, options) => {
+scaffoldCommand.command("add <featureName>").description("Add a feature to an existing project").option("-p, --project <path>", "Project path", process.cwd()).option("-v, --vars <json>", "JSON string containing variables for the feature").option("--marker <tag>", "Custom scaffold marker tag to inject into generated code files").option("--verbose", "Enable verbose logging").action(async (featureName, options) => {
 	try {
 		const projectPath = node_path.default.resolve(options.project);
 		if (!await _agiflowai_aicode_utils.ProjectConfigResolver.hasConfiguration(projectPath)) {
@@ -408,9 +502,17 @@ scaffoldCommand.command("add <featureName>").description("Add a feature to an ex
 		const result = await scaffoldingMethodsService.useScaffoldMethod({
 			projectPath,
 			scaffold_feature_name: featureName,
-			variables
+			variables,
+			marker: options.marker
 		});
 		if (result.success) {
+			const scaffoldId = (0, _agiflowai_aicode_utils.generateStableId)(6);
+			if (result.createdFiles && result.createdFiles.length > 0) await require_tools.writePendingScaffoldLog({
+				scaffoldId,
+				projectPath,
+				featureName,
+				generatedFiles: result.createdFiles
+			});
 			_agiflowai_aicode_utils.messages.success("✅ Feature added successfully!");
 			if (result.createdFiles && result.createdFiles.length > 0) {
 				_agiflowai_aicode_utils.print.header("\n📁 Created files:");
@@ -424,6 +526,7 @@ scaffoldCommand.command("add <featureName>").description("Add a feature to an ex
 					_agiflowai_aicode_utils.print.debug(`   - ${warning}`);
 				});
 			}
+			_agiflowai_aicode_utils.print.debug(`\nSCAFFOLD_ID:${scaffoldId}`);
 			_agiflowai_aicode_utils.print.header("\n📋 Next steps:");
 			_agiflowai_aicode_utils.print.debug("   - Review the generated files");
 			_agiflowai_aicode_utils.print.debug("   - Update imports if necessary");
@@ -437,6 +540,40 @@ scaffoldCommand.command("add <featureName>").description("Add a feature to an ex
 		process.exit(1);
 	}
 });
+scaffoldCommand.command("generate <featureName>").description("Create a new feature scaffold configuration in a template's scaffold.yaml").option("-t, --template <name>", "Template name (optional in monolith mode)").option("--description <text>", "Feature description").option("--description-file <path>", "Read feature description from a file").option("--instruction <text>", "Detailed feature instructions").option("--instruction-file <path>", "Read detailed feature instructions from a file").option("--variables <json>", "JSON array of variable definitions: [{\"name\":\"featureName\",\"description\":\"Feature name\",\"type\":\"string\",\"required\":true}]").option("-i, --include <path>", "Template include path (repeatable)", collectOption, []).option("--pattern <glob>", "File pattern this scaffold applies to (repeatable)", collectOption, []).action(async (featureName, options) => {
+	try {
+		const templatesPath = await resolveTemplatesPath();
+		const isMonolith = await detectMonolithMode();
+		const description = await loadTextOption({
+			value: options.description,
+			filePath: options.descriptionFile,
+			valueFlag: "--description",
+			fileFlag: "--description-file",
+			required: true
+		});
+		const instruction = await loadTextOption({
+			value: options.instruction,
+			filePath: options.instructionFile,
+			valueFlag: "--instruction",
+			fileFlag: "--instruction-file"
+		});
+		const variables = parseJsonOption(options.variables, "--variables");
+		if (!Array.isArray(variables)) throw new Error("--variables must be a JSON array");
+		const result = await new require_tools.GenerateFeatureScaffoldTool(templatesPath, isMonolith).execute({
+			templateName: options.template,
+			featureName,
+			description: description ?? "",
+			instruction,
+			variables,
+			includes: options.include ?? [],
+			patterns: options.pattern ?? []
+		});
+		_agiflowai_aicode_utils.print.info(assertToolSuccess(result));
+	} catch (error) {
+		_agiflowai_aicode_utils.print.error("Error generating feature scaffold:", error instanceof Error ? error.message : String(error));
+		process.exit(1);
+	}
+});
 scaffoldCommand.command("info <featureName>").description("Show detailed information about a scaffold method").option("-p, --project <path>", "Project path").option("-t, --template <name>", "Template name (e.g., nextjs-15, typescript-mcp-package)").action(async (featureName, options) => {
 	try {
 		if (!options.project && !options.template) {
@@ -575,7 +712,7 @@ const hookCommand = new commander.Command("hook").description("Execute scaffold
 		const resolvedAdapterConfig = Object.keys(adapterConfig).length > 0 ? adapterConfig : void 0;
 		if (!isHookMethod(hookMethod)) process.exit(0);
 		if (agent === _agiflowai_coding_agent_bridge.CLAUDE_CODE) {
-			const hookModule = await Promise.resolve().then(() => require("./claudeCode-BxcEboyM.cjs"));
+			const hookModule = await Promise.resolve().then(() => require("./claudeCode-DZnJyFQt.cjs"));
 			const claudeCallbacks = [];
 			if (hookModule.UseScaffoldMethodHook) {
 				const hookInstance = new hookModule.UseScaffoldMethodHook();
@@ -590,7 +727,7 @@ const hookCommand = new commander.Command("hook").description("Execute scaffold
 			if (claudeCallbacks.length === 0) process.exit(0);
 			await new _agiflowai_hooks_adapter.ClaudeCodeAdapter().executeMultiple(claudeCallbacks, resolvedAdapterConfig);
 		} else if (agent === _agiflowai_coding_agent_bridge.GEMINI_CLI) {
-			const hookModule = await Promise.resolve().then(() => require("./geminiCli--s1Qy7ZP.cjs"));
+			const hookModule = await Promise.resolve().then(() => require("./geminiCli-wTHUG-A6.cjs"));
 			const geminiCallbacks = [];
 			if (hookModule.UseScaffoldMethodHook) {
 				const hookInstance = new hookModule.UseScaffoldMethodHook();
@@ -599,13 +736,62 @@ const hookCommand = new commander.Command("hook").description("Execute scaffold
 			}
 			if (geminiCallbacks.length === 0) process.exit(0);
 			await new _agiflowai_hooks_adapter.GeminiCliAdapter().executeMultiple(geminiCallbacks, resolvedAdapterConfig);
-		} else throw new Error(`Unsupported agent: ${agent}. Supported: ${_agiflowai_coding_agent_bridge.CLAUDE_CODE}, ${_agiflowai_coding_agent_bridge.GEMINI_CLI}`);
+		} else if (agent === _agiflowai_coding_agent_bridge.CODEX) {
+			const hookModule = await Promise.resolve().then(() => require("./codex-CfOJFx29.cjs"));
+			const codexCallbacks = [];
+			if (hookModule.UseScaffoldMethodHook) {
+				const hookInstance = new hookModule.UseScaffoldMethodHook();
+				const hookFn = hookInstance[hookMethod];
+				if (hookFn) codexCallbacks.push(hookFn.bind(hookInstance));
+			}
+			if (codexCallbacks.length === 0) process.exit(0);
+			await new _agiflowai_hooks_adapter.CodexAdapter().executeMultiple(codexCallbacks, resolvedAdapterConfig);
+		} else throw new Error(`Unsupported agent: ${agent}. Supported: ${_agiflowai_coding_agent_bridge.CLAUDE_CODE}, ${_agiflowai_coding_agent_bridge.GEMINI_CLI}, ${_agiflowai_coding_agent_bridge.CODEX}`);
 	} catch (error) {
 		_agiflowai_aicode_utils.print.error(`Hook error: ${error instanceof Error ? error.message : String(error)}`);
 		process.exit(1);
 	}
 });
 //#endregion
+//#region src/commands/template.ts
+const templateCommand = new commander.Command("template").description("Manage scaffold template authoring assets");
+const fileCommand = new commander.Command("file").description("Manage template files");
+fileCommand.command("create <filePath>").description("Create or update a Liquid template file for a boilerplate or feature").option("-t, --template <name>", "Template name (optional in monolith mode)").option("--content <text>", "Template file content").option("--content-file <path>", "Read template file content from a file").option("--source-file <path>", "Copy content from an existing source file").option("--header <text>", "Header comment to prepend to the template file").option("--header-file <path>", "Read header comment from a file").action(async (filePath, options) => {
+	try {
+		if ([
+			options.content !== void 0,
+			options.contentFile !== void 0,
+			options.sourceFile !== void 0
+		].filter(Boolean).length !== 1) throw new Error("Use exactly one of --content, --content-file, or --source-file");
+		const templatesPath = await resolveTemplatesPath();
+		const isMonolith = await detectMonolithMode();
+		const content = await loadTextOption({
+			value: options.content,
+			filePath: options.contentFile,
+			valueFlag: "--content",
+			fileFlag: "--content-file"
+		});
+		const header = await loadTextOption({
+			value: options.header,
+			filePath: options.headerFile,
+			valueFlag: "--header",
+			fileFlag: "--header-file"
+		});
+		const result = await new require_tools.GenerateBoilerplateFileTool(templatesPath, isMonolith).execute({
+			templateName: options.template,
+			filePath,
+			content,
+			sourceFile: options.sourceFile,
+			header
+		});
+		_agiflowai_aicode_utils.print.info(assertToolSuccess(result));
+	} catch (error) {
+		_agiflowai_aicode_utils.print.error("Error creating template file:", error instanceof Error ? error.message : String(error));
+		process.exit(1);
+	}
+});
+templateCommand.addCommand(fileCommand);
+//#endregion
 //#region src/cli.ts
 /**
 * Main entry point
@@ -616,6 +802,8 @@ async function main() {
 	program.addCommand(mcpServeCommand);
 	program.addCommand(boilerplateCommand);
 	program.addCommand(scaffoldCommand);
+	program.addCommand(templateCommand);
+	program.addCommand(fileCommand$1);
 	program.addCommand(hookCommand);
 	await program.parseAsync(process.argv);
 }