@agiflowai/scaffold-mcp 1.0.10 → 1.0.11

package/dist/cli.cjs

@@ -9,6 +9,7 @@ require('./VariableReplacementService-DNYx0Dym.cjs');
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let __agiflowai_aicode_utils = require("@agiflowai/aicode-utils");
+let zod = require("zod");
 let __modelcontextprotocol_sdk_types_js = require("@modelcontextprotocol/sdk/types.js");
 let commander = require("commander");
 let __modelcontextprotocol_sdk_server_index_js = require("@modelcontextprotocol/sdk/server/index.js");
@@ -16,7 +17,7 @@ let __agiflowai_coding_agent_bridge = require("@agiflowai/coding-agent-bridge");
 let __agiflowai_hooks_adapter = require("@agiflowai/hooks-adapter");
 
 //#region package.json
-var version = "1.0.9";
+var version = "1.0.11";
 
 //#endregion
 //#region src/commands/boilerplate.ts
@@ -163,18 +164,30 @@ var server_default = "Use this MCP server to {% if isMonolith %}create your mono
 
 //#endregion
 //#region src/instructions/prompts/generate-boilerplate.md?raw
-var generate_boilerplate_default = "You are helping create a new boilerplate template configuration using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}\nYour task:\n\n1. **Gather Information**: Ask for any missing details:\n   - Framework/technology (e.g., \"React Vite\", \"Express API\", \"Next.js 15\")\n   - Template name (kebab-case, e.g., \"react-vite\", \"nextjs-15\")\n   - Boilerplate name (prefixed with \"scaffold-\", e.g., \"scaffold-vite-app\")\n   {% if not isMonolith %}- Target folder (e.g., \"apps\", \"packages\"){% else %}- Target folder (defaults to \".\" for monolith mode){% endif %}\n   - Project type (app, library, service, etc.)\n   - Required variables (at minimum: appName or packageName)\n   - Files to include in the template\n\n2. **Use MCP Tools** in order:\n   - `generate-boilerplate` - Creates the boilerplate configuration\n   - `generate-boilerplate-file` - Creates each template file\n   {% if not isMonolith %}- `list-boilerplates` - Verify it appears{% endif %}\n   - `use-boilerplate` - Test the boilerplate\n\nImportant:\n- Template naming: Use kebab-case (e.g., \"react-vite\", \"express-api\")\n- Boilerplate naming: Prefix with \"scaffold-\" (e.g., \"scaffold-vite-app\")\n{% if not isMonolith %}- Target folder: \"apps\" for applications, \"packages\" for libraries{% else %}- Target folder: \".\" for monolith projects (creates files at workspace root){% endif %}\n- Include files explicitly - avoid wildcards\n- Template syntax: use {{ variableName }}\n\n**Description Field Guidelines (CRITICAL)**:\nThe description should be a comprehensive multi-paragraph overview (3-5 sentences):\n- Paragraph 1: Core technology stack and primary value proposition\n- Paragraph 2: Target use cases and ideal project types\n- Paragraph 3: Key integrations or special features (if applicable)\n\nExample:\n\"A modern React SPA template powered by Vite for lightning-fast HMR, featuring TanStack Router for type-safe routing and TanStack Query for server state management.\nPerfect for building data-driven dashboards, admin panels, and interactive web applications requiring client-side routing and real-time data synchronization.\n\nIncludes Agiflow Config Management System integration with systematic environment variable naming (VITE_{CATEGORY}_{SUBCATEGORY}_{PROPERTY}) and auto-generated configuration templates for cloud deployment.\"\n\n**Instruction Field Guidelines (CRITICAL)**:\nThe instruction should be a detailed multi-section guide that helps AI understand the codebase:\n\n1. **File purposes** section: List each major file/directory with its purpose\n   Format: \"- path/to/file: Description of what this file does\"\n\n2. **How to use the scaffolded code** section: Step-by-step workflows\n   Format: Numbered list with specific examples\n   - How to add routes/pages\n   - How to fetch data\n   - How to handle authentication\n   - How to configure environment variables\n\n3. **Design patterns to follow** section: Key architectural decisions\n   Format: \"- Pattern Name: Explanation and when to use it\"\n   - Routing patterns\n   - State management patterns\n   - Data fetching patterns\n   - Error handling patterns\n   - Performance optimization patterns\n\nExample structure:\n\"[Framework] application template with [key technologies].\n\nFile purposes:\n- package.json: NPM package configuration with [framework] and dependencies\n- src/main.tsx: Application entry point with [setup details]\n- src/routes/: Route definitions following [pattern]\n[... list all major files ...]\n\nHow to use the scaffolded code:\n1. Routes: Create new routes by [specific instructions with example]\n2. Data Fetching: Use [specific pattern] for [use case]\n3. Authentication: Use [specific components/modules] for user management\n[... numbered steps for common tasks ...]\n\nDesign patterns to follow:\n- File-based Routing: Use directory structure in src/routes/ to define URL paths\n- Type-safe Routes: Leverage [framework] type inference for params\n- State Management: Use [library] for server state, [library] for client state\n[... list key patterns with explanations ...]\"\n\nTemplate File Content Guidelines:\n- Keep content MINIMAL and business-agnostic\n- Focus on structure and patterns, not business logic\n- Use placeholder/generic examples only\n- Include essential boilerplate code only\n- Let AI fill in specific logic later\n- Add clear headers with design patterns and coding standards\n";
+var generate_boilerplate_default = "{% if promptAsSkill %}---\nname: generate-boilerplate\ndescription: Create a new boilerplate template configuration for scaffolding new projects. Use this skill when the user wants to define a reusable project template (e.g., React app, Express API, Next.js starter) that can be used to bootstrap future projects. This is an admin/developer tool for creating the template definitions themselves, not for using existing templates. It generates scaffold.yaml configuration and template files with Liquid syntax for variable substitution.\n---\n\n{% endif %}You are helping create a new boilerplate template configuration using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}\nYour task:\n\n1. **Gather Information**: Ask for any missing details:\n   - Framework/technology (e.g., \"React Vite\", \"Express API\", \"Next.js 15\")\n   - Template name (kebab-case, e.g., \"react-vite\", \"nextjs-15\")\n   - Boilerplate name (prefixed with \"scaffold-\", e.g., \"scaffold-vite-app\")\n   {% if not isMonolith %}- Target folder (e.g., \"apps\", \"packages\"){% else %}- Target folder (defaults to \".\" for monolith mode){% endif %}\n   - Project type (app, library, service, etc.)\n   - Required variables (at minimum: appName or packageName)\n   - Files to include in the template\n\n2. **Use MCP Tools** in order:\n   - `generate-boilerplate` - Creates the boilerplate configuration\n   - `generate-boilerplate-file` - Creates each template file\n   {% if not isMonolith %}- `list-boilerplates` - Verify it appears{% endif %}\n   - `use-boilerplate` - Test the boilerplate\n\nImportant:\n- Template naming: Use kebab-case (e.g., \"react-vite\", \"express-api\")\n- Boilerplate naming: Prefix with \"scaffold-\" (e.g., \"scaffold-vite-app\")\n{% if not isMonolith %}- Target folder: \"apps\" for applications, \"packages\" for libraries{% else %}- Target folder: \".\" for monolith projects (creates files at workspace root){% endif %}\n- Include files explicitly - avoid wildcards\n- Template syntax: use {{ variableName }}\n\n**Description Field Guidelines (CRITICAL)**:\nThe description should be a comprehensive multi-paragraph overview (3-5 sentences):\n- Paragraph 1: Core technology stack and primary value proposition\n- Paragraph 2: Target use cases and ideal project types\n- Paragraph 3: Key integrations or special features (if applicable)\n\nExample:\n\"A modern React SPA template powered by Vite for lightning-fast HMR, featuring TanStack Router for type-safe routing and TanStack Query for server state management.\nPerfect for building data-driven dashboards, admin panels, and interactive web applications requiring client-side routing and real-time data synchronization.\n\nIncludes Agiflow Config Management System integration with systematic environment variable naming (VITE_{CATEGORY}_{SUBCATEGORY}_{PROPERTY}) and auto-generated configuration templates for cloud deployment.\"\n\n**Instruction Field Guidelines (CRITICAL)**:\nThe instruction should be a detailed multi-section guide that helps AI understand the codebase:\n\n1. **File purposes** section: List each major file/directory with its purpose\n   Format: \"- path/to/file: Description of what this file does\"\n\n2. **How to use the scaffolded code** section: Step-by-step workflows\n   Format: Numbered list with specific examples\n   - How to add routes/pages\n   - How to fetch data\n   - How to handle authentication\n   - How to configure environment variables\n\n3. **Design patterns to follow** section: Key architectural decisions\n   Format: \"- Pattern Name: Explanation and when to use it\"\n   - Routing patterns\n   - State management patterns\n   - Data fetching patterns\n   - Error handling patterns\n   - Performance optimization patterns\n\nExample structure:\n\"[Framework] application template with [key technologies].\n\nFile purposes:\n- package.json: NPM package configuration with [framework] and dependencies\n- src/main.tsx: Application entry point with [setup details]\n- src/routes/: Route definitions following [pattern]\n[... list all major files ...]\n\nHow to use the scaffolded code:\n1. Routes: Create new routes by [specific instructions with example]\n2. Data Fetching: Use [specific pattern] for [use case]\n3. Authentication: Use [specific components/modules] for user management\n[... numbered steps for common tasks ...]\n\nDesign patterns to follow:\n- File-based Routing: Use directory structure in src/routes/ to define URL paths\n- Type-safe Routes: Leverage [framework] type inference for params\n- State Management: Use [library] for server state, [library] for client state\n[... list key patterns with explanations ...]\"\n\nTemplate File Content Guidelines:\n- Keep content MINIMAL and business-agnostic\n- Focus on structure and patterns, not business logic\n- Use placeholder/generic examples only\n- Include essential boilerplate code only\n- Let AI fill in specific logic later\n- Add clear headers with design patterns and coding standards\n";
 
 //#endregion
 //#region src/prompts/GenerateBoilerplatePrompt.ts
 /**
+* Schema for GenerateBoilerplatePrompt constructor options
+*/
+const generateBoilerplatePromptOptionsSchema = zod.z.object({
+	isMonolith: zod.z.boolean().default(false).describe("Whether the project is a monolith"),
+	promptAsSkill: zod.z.boolean().default(false).describe("Render prompt with skill front matter")
+});
+/**
 * Prompt for generating boilerplates
 */
 var GenerateBoilerplatePrompt = class GenerateBoilerplatePrompt {
 	static PROMPT_NAME = "generate-boilerplate";
 	templateService = new require_TemplateService.TemplateService();
-	constructor(isMonolith = false) {
-		this.isMonolith = isMonolith;
+	options;
+	constructor(options = {}) {
+		try {
+			this.options = generateBoilerplatePromptOptionsSchema.parse(options);
+		} catch (error) {
+			throw new Error(`Invalid GenerateBoilerplatePrompt options: ${error instanceof Error ? error.message : String(error)}`);
+		}
 	}
 	/**
 	* Get the prompt definition for MCP
@@ -201,7 +214,8 @@ var GenerateBoilerplatePrompt = class GenerateBoilerplatePrompt {
 				type: "text",
 				text: this.templateService.renderString(generate_boilerplate_default, {
 					request,
-					isMonolith: this.isMonolith
+					isMonolith: this.options.isMonolith,
+					promptAsSkill: this.options.promptAsSkill
 				})
 			}
 		}];
@@ -210,18 +224,30 @@ var GenerateBoilerplatePrompt = class GenerateBoilerplatePrompt {
 
 //#endregion
 //#region src/instructions/prompts/generate-feature-scaffold.md?raw
-var generate_feature_scaffold_default = "You are helping create a new feature scaffold configuration using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}\nYour task:\n\n1. **Gather Information**: Ask for any missing details:\n   {% if not isMonolith %}- Template name (e.g., \"nextjs-15\", \"react-vite\"){% else %}- Template name (will be auto-detected from toolkit.yaml){% endif %}\n   - Feature name (prefixed with \"scaffold-\", e.g., \"scaffold-nextjs-page\")\n   - Feature type (page, component, service, etc.)\n   - Variables needed\n   - Files to include\n\n2. **Use MCP Tools** in order:\n   - `generate-feature-scaffold` - Creates the feature configuration\n   - `generate-boilerplate-file` - Creates each template file\n   - `list-scaffolding-methods` - Verify it appears\n   - `use-scaffold-method` - Test the feature\n\nImportant:\n- Feature names: prefix with \"scaffold-\"\n- Conditional includes: use \"file.tsx?withLayout=true\"\n- Template syntax: use {{ variableName }}\n{% if isMonolith %}- Template name will be auto-detected from toolkit.yaml{% endif %}\n\n**Description Field Guidelines (CRITICAL)**:\nThe description should explain what the feature scaffold generates (2-3 sentences):\n- Sentence 1: What type of code it generates (component, page, service, etc.)\n- Sentence 2: Key features or capabilities included\n- Sentence 3: Primary use cases or when to use it\n\nExample:\n\"Generate a new service class for TypeScript libraries following best practices. Creates a service class with interface, implementation, and unit tests. Perfect for creating reusable service modules with dependency injection patterns.\"\n\n**Instruction Field Guidelines (CRITICAL)**:\nThe instruction should provide specific guidance for using the generated feature:\n\n1. **Pattern explanation**: Describe the architectural pattern used\n2. **File organization**: Where files should be placed\n3. **Naming conventions**: How to name things (PascalCase, camelCase, etc.)\n4. **Usage guidelines**: How to use the generated code\n5. **Testing approach**: How to test the feature\n\nExample structure:\n\"[Feature type] follow a [pattern name] pattern with [key characteristics].\n[Explanation of how it works and integrates with the project].\nPlace [files] in [directory].\nFor [features with X], define [Y] in [Z] for better separation of concerns.\n[Feature names] should be [case style] and [suffix/prefix rules].\nWrite comprehensive [tests/docs] for all [public methods/exports].\"\n\nKeep it concise but informative - focus on the patterns and conventions that AI needs to understand to work with the generated code effectively.\n\nTemplate File Content Guidelines:\n- Keep content MINIMAL and business-agnostic\n- Focus on structure and patterns, not business logic\n- Use placeholder/generic examples only\n- Include essential boilerplate code only\n- Let AI fill in specific logic later\n- Add clear headers with design patterns and coding standards\n";
+var generate_feature_scaffold_default = "{% if promptAsSkill %}---\nname: generate-feature-scaffold\ndescription: Create a new feature scaffold configuration for adding features to existing projects. Use this skill when the user wants to define a reusable feature template (e.g., page, component, service, API route) that can be used to add functionality to projects of a specific type. This is an admin/developer tool for creating the feature scaffold definitions themselves, not for using existing scaffolds. It generates feature configurations in scaffold.yaml and template files with Liquid syntax and conditional includes.\n---\n\n{% endif %}You are helping create a new feature scaffold configuration using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}\nYour task:\n\n1. **Gather Information**: Ask for any missing details:\n   {% if not isMonolith %}- Template name (e.g., \"nextjs-15\", \"react-vite\"){% else %}- Template name (will be auto-detected from toolkit.yaml){% endif %}\n   - Feature name (prefixed with \"scaffold-\", e.g., \"scaffold-nextjs-page\")\n   - Feature type (page, component, service, etc.)\n   - Variables needed\n   - Files to include\n\n2. **Use MCP Tools** in order:\n   - `generate-feature-scaffold` - Creates the feature configuration\n   - `generate-boilerplate-file` - Creates each template file\n   - `list-scaffolding-methods` - Verify it appears\n   - `use-scaffold-method` - Test the feature\n\nImportant:\n- Feature names: prefix with \"scaffold-\"\n- Conditional includes: use \"file.tsx?withLayout=true\"\n- Template syntax: use {{ variableName }}\n{% if isMonolith %}- Template name will be auto-detected from toolkit.yaml{% endif %}\n\n**Description Field Guidelines (CRITICAL)**:\nThe description should explain what the feature scaffold generates (2-3 sentences):\n- Sentence 1: What type of code it generates (component, page, service, etc.)\n- Sentence 2: Key features or capabilities included\n- Sentence 3: Primary use cases or when to use it\n\nExample:\n\"Generate a new service class for TypeScript libraries following best practices. Creates a service class with interface, implementation, and unit tests. Perfect for creating reusable service modules with dependency injection patterns.\"\n\n**Instruction Field Guidelines (CRITICAL)**:\nThe instruction should provide specific guidance for using the generated feature:\n\n1. **Pattern explanation**: Describe the architectural pattern used\n2. **File organization**: Where files should be placed\n3. **Naming conventions**: How to name things (PascalCase, camelCase, etc.)\n4. **Usage guidelines**: How to use the generated code\n5. **Testing approach**: How to test the feature\n\nExample structure:\n\"[Feature type] follow a [pattern name] pattern with [key characteristics].\n[Explanation of how it works and integrates with the project].\nPlace [files] in [directory].\nFor [features with X], define [Y] in [Z] for better separation of concerns.\n[Feature names] should be [case style] and [suffix/prefix rules].\nWrite comprehensive [tests/docs] for all [public methods/exports].\"\n\nKeep it concise but informative - focus on the patterns and conventions that AI needs to understand to work with the generated code effectively.\n\nTemplate File Content Guidelines:\n- Keep content MINIMAL and business-agnostic\n- Focus on structure and patterns, not business logic\n- Use placeholder/generic examples only\n- Include essential boilerplate code only\n- Let AI fill in specific logic later\n- Add clear headers with design patterns and coding standards\n";
 
 //#endregion
 //#region src/prompts/GenerateFeatureScaffoldPrompt.ts
 /**
+* Schema for GenerateFeatureScaffoldPrompt constructor options
+*/
+const generateFeatureScaffoldPromptOptionsSchema = zod.z.object({
+	isMonolith: zod.z.boolean().default(false).describe("Whether the project is a monolith"),
+	promptAsSkill: zod.z.boolean().default(false).describe("Render prompt with skill front matter")
+});
+/**
 * Prompt for generating feature scaffolds
 */
 var GenerateFeatureScaffoldPrompt = class GenerateFeatureScaffoldPrompt {
 	static PROMPT_NAME = "generate-feature-scaffold";
 	templateService = new require_TemplateService.TemplateService();
-	constructor(isMonolith = false) {
-		this.isMonolith = isMonolith;
+	options;
+	constructor(options = {}) {
+		try {
+			this.options = generateFeatureScaffoldPromptOptionsSchema.parse(options);
+		} catch (error) {
+			throw new Error(`Invalid GenerateFeatureScaffoldPrompt options: ${error instanceof Error ? error.message : String(error)}`);
+		}
 	}
 	/**
 	* Get the prompt definition for MCP
@@ -248,7 +274,8 @@ var GenerateFeatureScaffoldPrompt = class GenerateFeatureScaffoldPrompt {
 				type: "text",
 				text: this.templateService.renderString(generate_feature_scaffold_default, {
 					request,
-					isMonolith: this.isMonolith
+					isMonolith: this.options.isMonolith,
+					promptAsSkill: this.options.promptAsSkill
 				})
 			}
 		}];
@@ -257,18 +284,30 @@ var GenerateFeatureScaffoldPrompt = class GenerateFeatureScaffoldPrompt {
 
 //#endregion
 //#region src/instructions/prompts/scaffold-application.md?raw
-var scaffold_application_default = "You are helping create a new {% if isMonolith %}monolith application{% else %}application{% endif %} using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}\nYour task is to scaffold a new application by following this workflow:\n\n## Step 1: {% if isMonolith %}Prepare to Create Application{% else %}List Available Boilerplates{% endif %}\n{% if isMonolith %}You will use the `use-boilerplate` tool to create your monolith application. The boilerplate name will be auto-detected from your toolkit.yaml file.{% else %}Use the `list-boilerplates` tool to see all available project templates.\n\n**What to look for:**\n- Boilerplate name (e.g., \"scaffold-nextjs-app\", \"scaffold-vite-app\")\n- Description of what the boilerplate creates\n- Target folder where projects will be created (e.g., \"apps\", \"packages\")\n- Required and optional variables in the variables_schema{% endif %}\n\n## Step 2: Gather Required Information\nBased on the {% if isMonolith %}toolkit.yaml{% else %}selected boilerplate's variables_schema{% endif %}, collect:\n{% if not isMonolith %}- **Project name**: Must be kebab-case (e.g., \"my-new-app\", not \"MyNewApp\")\n{% endif %}- **Required variables**: All variables marked as required: true\n- **Optional variables**: Variables with required: false (ask user if needed)\n\nCommon variables:\n- `appName` or `packageName`: The project name (kebab-case)\n- `description`: Brief description of what the project does\n- `author`: Author name\n\n## Step 3: Execute the Boilerplate\nUse the `use-boilerplate` tool with:\n{% if not isMonolith %}- `boilerplateName`: Exact name from list-boilerplates response\n{% endif %}- `variables`: Object matching the variables_schema exactly\n\n**Example:**\n```json\n{\n{% if not isMonolith %}  \"boilerplateName\": \"scaffold-nextjs-app\",\n{% endif %}  \"variables\": {\n    \"appName\": \"my-dashboard\",\n    \"description\": \"Admin dashboard for managing users\",\n    \"author\": \"John Doe\"\n  }\n}\n```\n\n## Important Guidelines:\n{% if not isMonolith %}- **Always call `list-boilerplates` first** to see available options and their schemas{% else %}- The boilerplate name is auto-detected from toolkit.yaml{% endif %}\n- **Use exact variable names** from the schema (case-sensitive)\n- **Provide all required variables** - the tool will fail if any are missing\n{% if not isMonolith %}- **Use kebab-case for project names** (e.g., \"user-dashboard\", not \"UserDashboard\")\n- The tool will create the project in the appropriate directory automatically{% else %}- The tool will create files at the workspace root{% endif %}\n- After creation, inform the user {% if isMonolith %}what files were created{% else %}where the project was created{% endif %}\n\n## Step 4: Review and Add Features (If Needed)\nAfter the boilerplate is created, **consider if additional features are needed**:\n1. **READ** the generated {% if isMonolith %}application{% else %}project{% endif %} structure to understand what was created\n2. **REVIEW** the user's request to see if they asked for specific features (e.g., \"with tool for X\", \"with prompt for Y\")\n3. **If features are needed**:\n   - Use `list-scaffolding-methods`{% if not isMonolith %} with the new project path{% endif %}\n   - Use `use-scaffold-method` to add tools, services, prompts, etc.\n   - **IMPLEMENT** the actual logic in the scaffolded feature files\n   - **REGISTER** the features in `src/server/index.ts`\n4. **Install dependencies**: Remind user to run `pnpm install`\n5. **Report** the complete setup including any features added\n\n## Example Workflow:\n{% if not isMonolith %}1. Call `list-boilerplates` → See available templates\n2. Ask user which template to use (or infer from request)\n3. Collect required variables based on schema\n4. Call `use-boilerplate` with boilerplateName and variables{% else %}1. Collect required variables based on toolkit.yaml variables_schema\n2. Call `use-boilerplate` with variables (boilerplateName auto-detected){% endif %}\n5. **Review if user requested specific features (tools, prompts, etc.)**\n6. **If features needed**: Add them using `list-scaffolding-methods` and `use-scaffold-method`\n7. **READ and IMPLEMENT** the scaffolded feature files with actual logic\n8. Report success and next steps to the user\n";
+var scaffold_application_default = "{% if promptAsSkill %}---\nname: scaffold-application\ndescription: Create a new application or project from a boilerplate template. Use this skill when the user wants to start a new project, create a new app, or bootstrap a new codebase from scratch. This skill lists available boilerplate templates (React, Next.js, Express, etc.), gathers required configuration variables, generates the complete project structure, and provides guidance on next steps including adding features.\n---\n\n{% endif %}You are helping create a new {% if isMonolith %}monolith application{% else %}application{% endif %} using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}\nYour task is to scaffold a new application by following this workflow:\n\n## Step 1: {% if isMonolith %}Prepare to Create Application{% else %}List Available Boilerplates{% endif %}\n{% if isMonolith %}You will use the `use-boilerplate` tool to create your monolith application. The boilerplate name will be auto-detected from your toolkit.yaml file.{% else %}Use the `list-boilerplates` tool to see all available project templates.\n\n**What to look for:**\n- Boilerplate name (e.g., \"scaffold-nextjs-app\", \"scaffold-vite-app\")\n- Description of what the boilerplate creates\n- Target folder where projects will be created (e.g., \"apps\", \"packages\")\n- Required and optional variables in the variables_schema{% endif %}\n\n## Step 2: Gather Required Information\nBased on the {% if isMonolith %}toolkit.yaml{% else %}selected boilerplate's variables_schema{% endif %}, collect:\n{% if not isMonolith %}- **Project name**: Must be kebab-case (e.g., \"my-new-app\", not \"MyNewApp\")\n{% endif %}- **Required variables**: All variables marked as required: true\n- **Optional variables**: Variables with required: false (ask user if needed)\n\nCommon variables:\n- `appName` or `packageName`: The project name (kebab-case)\n- `description`: Brief description of what the project does\n- `author`: Author name\n\n## Step 3: Execute the Boilerplate\nUse the `use-boilerplate` tool with:\n{% if not isMonolith %}- `boilerplateName`: Exact name from list-boilerplates response\n{% endif %}- `variables`: Object matching the variables_schema exactly\n\n**Example:**\n```json\n{\n{% if not isMonolith %}  \"boilerplateName\": \"scaffold-nextjs-app\",\n{% endif %}  \"variables\": {\n    \"appName\": \"my-dashboard\",\n    \"description\": \"Admin dashboard for managing users\",\n    \"author\": \"John Doe\"\n  }\n}\n```\n\n## Important Guidelines:\n{% if not isMonolith %}- **Always call `list-boilerplates` first** to see available options and their schemas{% else %}- The boilerplate name is auto-detected from toolkit.yaml{% endif %}\n- **Use exact variable names** from the schema (case-sensitive)\n- **Provide all required variables** - the tool will fail if any are missing\n{% if not isMonolith %}- **Use kebab-case for project names** (e.g., \"user-dashboard\", not \"UserDashboard\")\n- The tool will create the project in the appropriate directory automatically{% else %}- The tool will create files at the workspace root{% endif %}\n- After creation, inform the user {% if isMonolith %}what files were created{% else %}where the project was created{% endif %}\n\n## Step 4: Review and Add Features (If Needed)\nAfter the boilerplate is created, **consider if additional features are needed**:\n1. **READ** the generated {% if isMonolith %}application{% else %}project{% endif %} structure to understand what was created\n2. **REVIEW** the user's request to see if they asked for specific features (e.g., \"with tool for X\", \"with prompt for Y\")\n3. **If features are needed**:\n   - Use `list-scaffolding-methods`{% if not isMonolith %} with the new project path{% endif %}\n   - Use `use-scaffold-method` to add tools, services, prompts, etc.\n   - **IMPLEMENT** the actual logic in the scaffolded feature files\n   - **REGISTER** the features in `src/server/index.ts`\n4. **Install dependencies**: Remind user to run `pnpm install`\n5. **Report** the complete setup including any features added\n\n## Example Workflow:\n{% if not isMonolith %}1. Call `list-boilerplates` → See available templates\n2. Ask user which template to use (or infer from request)\n3. Collect required variables based on schema\n4. Call `use-boilerplate` with boilerplateName and variables{% else %}1. Collect required variables based on toolkit.yaml variables_schema\n2. Call `use-boilerplate` with variables (boilerplateName auto-detected){% endif %}\n5. **Review if user requested specific features (tools, prompts, etc.)**\n6. **If features needed**: Add them using `list-scaffolding-methods` and `use-scaffold-method`\n7. **READ and IMPLEMENT** the scaffolded feature files with actual logic\n8. Report success and next steps to the user\n";
 
 //#endregion
 //#region src/prompts/ScaffoldApplicationPrompt.ts
 /**
+* Schema for ScaffoldApplicationPrompt constructor options
+*/
+const scaffoldApplicationPromptOptionsSchema = zod.z.object({
+	isMonolith: zod.z.boolean().default(false).describe("Whether the project is a monolith"),
+	promptAsSkill: zod.z.boolean().default(false).describe("Render prompt with skill front matter")
+});
+/**
 * Prompt for scaffolding a new application using boilerplate templates
 */
 var ScaffoldApplicationPrompt = class ScaffoldApplicationPrompt {
 	static PROMPT_NAME = "scaffold-application";
 	templateService = new require_TemplateService.TemplateService();
-	constructor(isMonolith = false) {
-		this.isMonolith = isMonolith;
+	options;
+	constructor(options = {}) {
+		try {
+			this.options = scaffoldApplicationPromptOptionsSchema.parse(options);
+		} catch (error) {
+			throw new Error(`Invalid ScaffoldApplicationPrompt options: ${error instanceof Error ? error.message : String(error)}`);
+		}
 	}
 	/**
 	* Get the prompt definition for MCP
@@ -295,7 +334,8 @@ var ScaffoldApplicationPrompt = class ScaffoldApplicationPrompt {
 				type: "text",
 				text: this.templateService.renderString(scaffold_application_default, {
 					request,
-					isMonolith: this.isMonolith
+					isMonolith: this.options.isMonolith,
+					promptAsSkill: this.options.promptAsSkill
 				})
 			}
 		}];
@@ -304,18 +344,30 @@ var ScaffoldApplicationPrompt = class ScaffoldApplicationPrompt {
 
 //#endregion
 //#region src/instructions/prompts/scaffold-feature.md?raw
-var scaffold_feature_default = "You are helping add a new feature to an existing project using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}{% if projectPath %}Project path: {{ projectPath }}\n{% endif %}\nYour task is to scaffold a new feature by following this workflow:\n\n## Step 1: Identify the Project\nDetermine the project path where the feature will be added:\n- If projectPath is provided, use it\n- Otherwise, ask the user or infer from context (e.g., \"apps/my-app\", \"packages/my-lib\")\n{% if isMonolith %}- In monolith mode, you can use the current working directory (no projectPath needed){% else %}- The path should point to a directory containing a `project.json` file{% endif %}\n\n## Step 2: List Available Scaffolding Methods\nUse the `list-scaffolding-methods` tool{% if not isMonolith %} with the projectPath{% endif %}.\n\n**What to look for:**\n- Feature name (e.g., \"scaffold-nextjs-page\", \"scaffold-react-component\")\n- Description of what files/code it generates\n- Required and optional variables in the variables_schema\n- The template type (derived from project's sourceTemplate)\n\n**Example:**\n```json\n{% if isMonolith %}{}{% else %}{\n  \"projectPath\": \"apps/my-dashboard\"\n}{% endif %}\n```\n\n## Step 3: Gather Required Information\nBased on the selected scaffolding method's variables_schema, collect:\n- **Feature-specific variables**: Name, path, type, etc.\n- **Required variables**: All variables marked as required: true\n- **Optional variables**: Variables with required: false (ask user if needed)\n\nCommon variables:\n- `componentName` / `pageName` / `serviceName`: Name in PascalCase\n- `componentPath` / `pagePath`: Where to place the file (may use kebab-case)\n- Boolean flags: `withTests`, `withLayout`, `withStyles`, etc.\n\n## Step 4: Execute the Scaffolding Method\nUse the `use-scaffold-method` tool with:\n{% if not isMonolith %}- `projectPath`: Same path from step 1\n{% endif %}- `scaffold_feature_name`: Exact name from list-scaffolding-methods response\n- `variables`: Object matching the variables_schema exactly\n\n**Example:**\n```json\n{\n{% if not isMonolith %}  \"projectPath\": \"apps/my-dashboard\",\n{% endif %}  \"scaffold_feature_name\": \"scaffold-nextjs-page\",\n  \"variables\": {\n    \"pageName\": \"UserProfile\",\n    \"pagePath\": \"user/profile\",\n    \"withLayout\": true,\n    \"withTests\": false\n  }\n}\n```\n\n## Important Guidelines:\n- **Always call `list-scaffolding-methods` first**{% if not isMonolith %} with the projectPath{% endif %}\n- **Use exact variable names** from the schema (case-sensitive)\n- **Provide all required variables** - the tool will fail if any are missing\n- **Follow naming conventions**:\n  - Component/Page/Service names: PascalCase (e.g., \"UserProfile\")\n  - File paths: kebab-case or as specified in schema (e.g., \"user/profile\")\n- **Conditional files**: Files with `?condition=true` are only included when the variable is true\n- The tool will create files in the appropriate locations automatically\n- After creation, inform the user what files were created\n\n## Step 5: Review and Implement Generated Files\nAfter scaffolding completes, **you MUST**:\n1. **READ** all generated files to understand their structure\n2. **IMPLEMENT** the actual business logic:\n   - Replace TODO comments with real code\n   - Replace template placeholders with actual implementation\n   - Add the specific functionality described in the user's request\n3. **REGISTER** the feature in appropriate files:\n   - Import and register tools in `src/server/index.ts`\n   - Export new modules from `index.ts` files\n   - Update any necessary configuration files\n4. **TEST** to ensure the implementation works correctly\n5. **DO NOT SKIP** this step - scaffolded files are templates that need actual code\n\n## Example Workflow:\n1. Identify project path (provided or ask user){% if not isMonolith %}\n2. Call `list-scaffolding-methods` → See available features for this project{% else %}\n2. Call `list-scaffolding-methods` → See available features for your template{% endif %}\n3. Ask user which feature to add (or infer from request)\n4. Collect required variables based on schema\n5. Call `use-scaffold-method` with {% if not isMonolith %}projectPath, {% endif %}scaffold_feature_name, and variables\n6. **READ the generated files and IMPLEMENT the actual logic**\n7. **REGISTER the feature in server/index.ts and other config files**\n8. Report success and list created files with implementation details\n";
+var scaffold_feature_default = "{% if promptAsSkill %}---\nname: scaffold-feature\ndescription: Add a new feature to an existing project such as service, route, page, component, or API endpoint. Use this skill when the user wants to add functionality to an existing codebase using predefined scaffolding templates. This skill lists available scaffolding methods for the project's template type, gathers required variables, generates boilerplate files, and guides implementation of the actual business logic.\n---\n\n{% endif %}You are helping add a new feature to an existing project using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}{% if projectPath %}Project path: {{ projectPath }}\n{% endif %}\nYour task is to scaffold a new feature by following this workflow:\n\n## Step 1: Identify the Project\nDetermine the project path where the feature will be added:\n- If projectPath is provided, use it\n- Otherwise, ask the user or infer from context (e.g., \"apps/my-app\", \"packages/my-lib\")\n{% if isMonolith %}- In monolith mode, you can use the current working directory (no projectPath needed){% else %}- The path should point to a directory containing a `project.json` file{% endif %}\n\n## Step 2: List Available Scaffolding Methods\nUse the `list-scaffolding-methods` tool{% if not isMonolith %} with the projectPath{% endif %}.\n\n**What to look for:**\n- Feature name (e.g., \"scaffold-nextjs-page\", \"scaffold-react-component\")\n- Description of what files/code it generates\n- Required and optional variables in the variables_schema\n- The template type (derived from project's sourceTemplate)\n\n**Example:**\n```json\n{% if isMonolith %}{}{% else %}{\n  \"projectPath\": \"apps/my-dashboard\"\n}{% endif %}\n```\n\n## Step 3: Gather Required Information\nBased on the selected scaffolding method's variables_schema, collect:\n- **Feature-specific variables**: Name, path, type, etc.\n- **Required variables**: All variables marked as required: true\n- **Optional variables**: Variables with required: false (ask user if needed)\n\nCommon variables:\n- `componentName` / `pageName` / `serviceName`: Name in PascalCase\n- `componentPath` / `pagePath`: Where to place the file (may use kebab-case)\n- Boolean flags: `withTests`, `withLayout`, `withStyles`, etc.\n\n## Step 4: Execute the Scaffolding Method\nUse the `use-scaffold-method` tool with:\n{% if not isMonolith %}- `projectPath`: Same path from step 1\n{% endif %}- `scaffold_feature_name`: Exact name from list-scaffolding-methods response\n- `variables`: Object matching the variables_schema exactly\n\n**Example:**\n```json\n{\n{% if not isMonolith %}  \"projectPath\": \"apps/my-dashboard\",\n{% endif %}  \"scaffold_feature_name\": \"scaffold-nextjs-page\",\n  \"variables\": {\n    \"pageName\": \"UserProfile\",\n    \"pagePath\": \"user/profile\",\n    \"withLayout\": true,\n    \"withTests\": false\n  }\n}\n```\n\n## Important Guidelines:\n- **Always call `list-scaffolding-methods` first**{% if not isMonolith %} with the projectPath{% endif %}\n- **Use exact variable names** from the schema (case-sensitive)\n- **Provide all required variables** - the tool will fail if any are missing\n- **Follow naming conventions**:\n  - Component/Page/Service names: PascalCase (e.g., \"UserProfile\")\n  - File paths: kebab-case or as specified in schema (e.g., \"user/profile\")\n- **Conditional files**: Files with `?condition=true` are only included when the variable is true\n- The tool will create files in the appropriate locations automatically\n- After creation, inform the user what files were created\n\n## Step 5: Review and Implement Generated Files\nAfter scaffolding completes, **you MUST**:\n1. **READ** all generated files to understand their structure\n2. **IMPLEMENT** the actual business logic:\n   - Replace TODO comments with real code\n   - Replace template placeholders with actual implementation\n   - Add the specific functionality described in the user's request\n3. **REGISTER** the feature in appropriate files:\n   - Import and register tools in `src/server/index.ts`\n   - Export new modules from `index.ts` files\n   - Update any necessary configuration files\n4. **TEST** to ensure the implementation works correctly\n5. **DO NOT SKIP** this step - scaffolded files are templates that need actual code\n\n## Example Workflow:\n1. Identify project path (provided or ask user){% if not isMonolith %}\n2. Call `list-scaffolding-methods` → See available features for this project{% else %}\n2. Call `list-scaffolding-methods` → See available features for your template{% endif %}\n3. Ask user which feature to add (or infer from request)\n4. Collect required variables based on schema\n5. Call `use-scaffold-method` with {% if not isMonolith %}projectPath, {% endif %}scaffold_feature_name, and variables\n6. **READ the generated files and IMPLEMENT the actual logic**\n7. **REGISTER the feature in server/index.ts and other config files**\n8. Report success and list created files with implementation details\n";
 
 //#endregion
 //#region src/prompts/ScaffoldFeaturePrompt.ts
 /**
+* Schema for ScaffoldFeaturePrompt constructor options
+*/
+const scaffoldFeaturePromptOptionsSchema = zod.z.object({
+	isMonolith: zod.z.boolean().default(false).describe("Whether the project is a monolith"),
+	promptAsSkill: zod.z.boolean().default(false).describe("Render prompt with skill front matter")
+});
+/**
 * Prompt for scaffolding a new feature in an existing project
 */
 var ScaffoldFeaturePrompt = class ScaffoldFeaturePrompt {
 	static PROMPT_NAME = "scaffold-feature";
 	templateService = new require_TemplateService.TemplateService();
-	constructor(isMonolith = false) {
-		this.isMonolith = isMonolith;
+	options;
+	constructor(options = {}) {
+		try {
+			this.options = scaffoldFeaturePromptOptionsSchema.parse(options);
+		} catch (error) {
+			throw new Error(`Invalid ScaffoldFeaturePrompt options: ${error instanceof Error ? error.message : String(error)}`);
+		}
 	}
 	/**
 	* Get the prompt definition for MCP
@@ -348,7 +400,8 @@ var ScaffoldFeaturePrompt = class ScaffoldFeaturePrompt {
 				text: this.templateService.renderString(scaffold_feature_default, {
 					request,
 					projectPath,
-					isMonolith: this.isMonolith
+					isMonolith: this.options.isMonolith,
+					promptAsSkill: this.options.promptAsSkill
 				})
 			}
 		}];
@@ -358,7 +411,7 @@ var ScaffoldFeaturePrompt = class ScaffoldFeaturePrompt {
 //#endregion
 //#region src/server/index.ts
 function createServer(options = {}) {
-	const { adminEnabled = false, isMonolith = false } = options;
+	const { adminEnabled = false, isMonolith = false, promptAsSkill = false } = options;
 	const templatesPath = __agiflowai_aicode_utils.TemplatesManagerService.findTemplatesPathSync();
 	if (!templatesPath) throw new Error("Templates folder not found. Please create a \"templates\" folder in your workspace root, or specify \"templatesPath\" in toolkit.yaml to point to your templates directory.");
 	const listBoilerplatesTool = !isMonolith ? new require_stdio.ListBoilerplatesTool(templatesPath, isMonolith) : null;
@@ -369,10 +422,22 @@ function createServer(options = {}) {
 	const generateBoilerplateTool = adminEnabled ? new require_stdio.GenerateBoilerplateTool(templatesPath, isMonolith) : null;
 	const generateBoilerplateFileTool = adminEnabled ? new require_stdio.GenerateBoilerplateFileTool(templatesPath, isMonolith) : null;
 	const generateFeatureScaffoldTool = adminEnabled ? new require_stdio.GenerateFeatureScaffoldTool(templatesPath, isMonolith) : null;
-	const generateBoilerplatePrompt = adminEnabled ? new GenerateBoilerplatePrompt(isMonolith) : null;
-	const generateFeatureScaffoldPrompt = adminEnabled ? new GenerateFeatureScaffoldPrompt(isMonolith) : null;
-	const scaffoldApplicationPrompt = new ScaffoldApplicationPrompt(isMonolith);
-	const scaffoldFeaturePrompt = new ScaffoldFeaturePrompt(isMonolith);
+	const generateBoilerplatePrompt = adminEnabled ? new GenerateBoilerplatePrompt({
+		isMonolith,
+		promptAsSkill
+	}) : null;
+	const generateFeatureScaffoldPrompt = adminEnabled ? new GenerateFeatureScaffoldPrompt({
+		isMonolith,
+		promptAsSkill
+	}) : null;
+	const scaffoldApplicationPrompt = new ScaffoldApplicationPrompt({
+		isMonolith,
+		promptAsSkill
+	});
+	const scaffoldFeaturePrompt = new ScaffoldFeaturePrompt({
+		isMonolith,
+		promptAsSkill
+	});
 	const instructions = new require_TemplateService.TemplateService().renderString(server_default, {
 		adminEnabled,
 		isMonolith
@@ -484,7 +549,7 @@ async function startServer(handler) {
 			await handler.stop();
 			process.exit(0);
 		} catch (error) {
-			console.error("Error during shutdown:", error);
+			console.error("Error during shutdown:", error instanceof Error ? error.message : String(error));
 			process.exit(1);
 		}
 	};
@@ -494,7 +559,7 @@ async function startServer(handler) {
 /**
 * MCP Serve command
 */
-const mcpServeCommand = new commander.Command("mcp-serve").description("Start MCP server with specified transport").option("-t, --type <type>", "Transport type: stdio, http, or sse", "stdio").option("-p, --port <port>", "Port to listen on (http/sse only)", (val) => parseInt(val, 10), 3e3).option("--host <host>", "Host to bind to (http/sse only)", "localhost").option("--admin-enable", "Enable admin tools (generate-boilerplate)", false).action(async (options) => {
+const mcpServeCommand = new commander.Command("mcp-serve").description("Start MCP server with specified transport").option("-t, --type <type>", "Transport type: stdio, http, or sse", "stdio").option("-p, --port <port>", "Port to listen on (http/sse only)", (val) => parseInt(val, 10), 3e3).option("--host <host>", "Host to bind to (http/sse only)", "localhost").option("--admin-enable", "Enable admin tools (generate-boilerplate)", false).option("--prompt-as-skill", "Render prompts with skill front matter for Claude Code skills", false).action(async (options) => {
 	try {
 		const transportType = options.type.toLowerCase();
 		let isMonolith = false;
@@ -505,7 +570,8 @@ const mcpServeCommand = new commander.Command("mcp-serve").description("Start MC
 		}
 		const serverOptions = {
 			adminEnabled: options.adminEnable,
-			isMonolith
+			isMonolith,
+			promptAsSkill: options.promptAsSkill
 		};
 		if (transportType === "stdio") await startServer(new require_stdio.StdioTransportHandler(createServer(serverOptions)));
 		else if (transportType === "http") await startServer(new require_stdio.HttpTransportHandler(() => createServer(serverOptions), {

package/dist/cli.mjs

@@ -7,6 +7,7 @@ import { t as TemplateService } from "./TemplateService-CVDL2uqt.mjs";
 import "./VariableReplacementService-B9RA8D0a.mjs";
 import path from "node:path";
 import { ProjectConfigResolver, TemplatesManagerService, icons, messages, print, sections } from "@agiflowai/aicode-utils";
+import { z } from "zod";
 import { CallToolRequestSchema, GetPromptRequestSchema, ListPromptsRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 import { Command } from "commander";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
@@ -14,7 +15,7 @@ import { CLAUDE_CODE, GEMINI_CLI } from "@agiflowai/coding-agent-bridge";
 import { ClaudeCodeAdapter, GeminiCliAdapter, parseHookType } from "@agiflowai/hooks-adapter";
 
 //#region package.json
-var version = "1.0.9";
+var version = "1.0.11";
 
 //#endregion
 //#region src/commands/boilerplate.ts
@@ -161,18 +162,30 @@ var server_default = "Use this MCP server to {% if isMonolith %}create your mono
 
 //#endregion
 //#region src/instructions/prompts/generate-boilerplate.md?raw
-var generate_boilerplate_default = "You are helping create a new boilerplate template configuration using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}\nYour task:\n\n1. **Gather Information**: Ask for any missing details:\n   - Framework/technology (e.g., \"React Vite\", \"Express API\", \"Next.js 15\")\n   - Template name (kebab-case, e.g., \"react-vite\", \"nextjs-15\")\n   - Boilerplate name (prefixed with \"scaffold-\", e.g., \"scaffold-vite-app\")\n   {% if not isMonolith %}- Target folder (e.g., \"apps\", \"packages\"){% else %}- Target folder (defaults to \".\" for monolith mode){% endif %}\n   - Project type (app, library, service, etc.)\n   - Required variables (at minimum: appName or packageName)\n   - Files to include in the template\n\n2. **Use MCP Tools** in order:\n   - `generate-boilerplate` - Creates the boilerplate configuration\n   - `generate-boilerplate-file` - Creates each template file\n   {% if not isMonolith %}- `list-boilerplates` - Verify it appears{% endif %}\n   - `use-boilerplate` - Test the boilerplate\n\nImportant:\n- Template naming: Use kebab-case (e.g., \"react-vite\", \"express-api\")\n- Boilerplate naming: Prefix with \"scaffold-\" (e.g., \"scaffold-vite-app\")\n{% if not isMonolith %}- Target folder: \"apps\" for applications, \"packages\" for libraries{% else %}- Target folder: \".\" for monolith projects (creates files at workspace root){% endif %}\n- Include files explicitly - avoid wildcards\n- Template syntax: use {{ variableName }}\n\n**Description Field Guidelines (CRITICAL)**:\nThe description should be a comprehensive multi-paragraph overview (3-5 sentences):\n- Paragraph 1: Core technology stack and primary value proposition\n- Paragraph 2: Target use cases and ideal project types\n- Paragraph 3: Key integrations or special features (if applicable)\n\nExample:\n\"A modern React SPA template powered by Vite for lightning-fast HMR, featuring TanStack Router for type-safe routing and TanStack Query for server state management.\nPerfect for building data-driven dashboards, admin panels, and interactive web applications requiring client-side routing and real-time data synchronization.\n\nIncludes Agiflow Config Management System integration with systematic environment variable naming (VITE_{CATEGORY}_{SUBCATEGORY}_{PROPERTY}) and auto-generated configuration templates for cloud deployment.\"\n\n**Instruction Field Guidelines (CRITICAL)**:\nThe instruction should be a detailed multi-section guide that helps AI understand the codebase:\n\n1. **File purposes** section: List each major file/directory with its purpose\n   Format: \"- path/to/file: Description of what this file does\"\n\n2. **How to use the scaffolded code** section: Step-by-step workflows\n   Format: Numbered list with specific examples\n   - How to add routes/pages\n   - How to fetch data\n   - How to handle authentication\n   - How to configure environment variables\n\n3. **Design patterns to follow** section: Key architectural decisions\n   Format: \"- Pattern Name: Explanation and when to use it\"\n   - Routing patterns\n   - State management patterns\n   - Data fetching patterns\n   - Error handling patterns\n   - Performance optimization patterns\n\nExample structure:\n\"[Framework] application template with [key technologies].\n\nFile purposes:\n- package.json: NPM package configuration with [framework] and dependencies\n- src/main.tsx: Application entry point with [setup details]\n- src/routes/: Route definitions following [pattern]\n[... list all major files ...]\n\nHow to use the scaffolded code:\n1. Routes: Create new routes by [specific instructions with example]\n2. Data Fetching: Use [specific pattern] for [use case]\n3. Authentication: Use [specific components/modules] for user management\n[... numbered steps for common tasks ...]\n\nDesign patterns to follow:\n- File-based Routing: Use directory structure in src/routes/ to define URL paths\n- Type-safe Routes: Leverage [framework] type inference for params\n- State Management: Use [library] for server state, [library] for client state\n[... list key patterns with explanations ...]\"\n\nTemplate File Content Guidelines:\n- Keep content MINIMAL and business-agnostic\n- Focus on structure and patterns, not business logic\n- Use placeholder/generic examples only\n- Include essential boilerplate code only\n- Let AI fill in specific logic later\n- Add clear headers with design patterns and coding standards\n";
+var generate_boilerplate_default = "{% if promptAsSkill %}---\nname: generate-boilerplate\ndescription: Create a new boilerplate template configuration for scaffolding new projects. Use this skill when the user wants to define a reusable project template (e.g., React app, Express API, Next.js starter) that can be used to bootstrap future projects. This is an admin/developer tool for creating the template definitions themselves, not for using existing templates. It generates scaffold.yaml configuration and template files with Liquid syntax for variable substitution.\n---\n\n{% endif %}You are helping create a new boilerplate template configuration using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}\nYour task:\n\n1. **Gather Information**: Ask for any missing details:\n   - Framework/technology (e.g., \"React Vite\", \"Express API\", \"Next.js 15\")\n   - Template name (kebab-case, e.g., \"react-vite\", \"nextjs-15\")\n   - Boilerplate name (prefixed with \"scaffold-\", e.g., \"scaffold-vite-app\")\n   {% if not isMonolith %}- Target folder (e.g., \"apps\", \"packages\"){% else %}- Target folder (defaults to \".\" for monolith mode){% endif %}\n   - Project type (app, library, service, etc.)\n   - Required variables (at minimum: appName or packageName)\n   - Files to include in the template\n\n2. **Use MCP Tools** in order:\n   - `generate-boilerplate` - Creates the boilerplate configuration\n   - `generate-boilerplate-file` - Creates each template file\n   {% if not isMonolith %}- `list-boilerplates` - Verify it appears{% endif %}\n   - `use-boilerplate` - Test the boilerplate\n\nImportant:\n- Template naming: Use kebab-case (e.g., \"react-vite\", \"express-api\")\n- Boilerplate naming: Prefix with \"scaffold-\" (e.g., \"scaffold-vite-app\")\n{% if not isMonolith %}- Target folder: \"apps\" for applications, \"packages\" for libraries{% else %}- Target folder: \".\" for monolith projects (creates files at workspace root){% endif %}\n- Include files explicitly - avoid wildcards\n- Template syntax: use {{ variableName }}\n\n**Description Field Guidelines (CRITICAL)**:\nThe description should be a comprehensive multi-paragraph overview (3-5 sentences):\n- Paragraph 1: Core technology stack and primary value proposition\n- Paragraph 2: Target use cases and ideal project types\n- Paragraph 3: Key integrations or special features (if applicable)\n\nExample:\n\"A modern React SPA template powered by Vite for lightning-fast HMR, featuring TanStack Router for type-safe routing and TanStack Query for server state management.\nPerfect for building data-driven dashboards, admin panels, and interactive web applications requiring client-side routing and real-time data synchronization.\n\nIncludes Agiflow Config Management System integration with systematic environment variable naming (VITE_{CATEGORY}_{SUBCATEGORY}_{PROPERTY}) and auto-generated configuration templates for cloud deployment.\"\n\n**Instruction Field Guidelines (CRITICAL)**:\nThe instruction should be a detailed multi-section guide that helps AI understand the codebase:\n\n1. **File purposes** section: List each major file/directory with its purpose\n   Format: \"- path/to/file: Description of what this file does\"\n\n2. **How to use the scaffolded code** section: Step-by-step workflows\n   Format: Numbered list with specific examples\n   - How to add routes/pages\n   - How to fetch data\n   - How to handle authentication\n   - How to configure environment variables\n\n3. **Design patterns to follow** section: Key architectural decisions\n   Format: \"- Pattern Name: Explanation and when to use it\"\n   - Routing patterns\n   - State management patterns\n   - Data fetching patterns\n   - Error handling patterns\n   - Performance optimization patterns\n\nExample structure:\n\"[Framework] application template with [key technologies].\n\nFile purposes:\n- package.json: NPM package configuration with [framework] and dependencies\n- src/main.tsx: Application entry point with [setup details]\n- src/routes/: Route definitions following [pattern]\n[... list all major files ...]\n\nHow to use the scaffolded code:\n1. Routes: Create new routes by [specific instructions with example]\n2. Data Fetching: Use [specific pattern] for [use case]\n3. Authentication: Use [specific components/modules] for user management\n[... numbered steps for common tasks ...]\n\nDesign patterns to follow:\n- File-based Routing: Use directory structure in src/routes/ to define URL paths\n- Type-safe Routes: Leverage [framework] type inference for params\n- State Management: Use [library] for server state, [library] for client state\n[... list key patterns with explanations ...]\"\n\nTemplate File Content Guidelines:\n- Keep content MINIMAL and business-agnostic\n- Focus on structure and patterns, not business logic\n- Use placeholder/generic examples only\n- Include essential boilerplate code only\n- Let AI fill in specific logic later\n- Add clear headers with design patterns and coding standards\n";
 
 //#endregion
 //#region src/prompts/GenerateBoilerplatePrompt.ts
 /**
+* Schema for GenerateBoilerplatePrompt constructor options
+*/
+const generateBoilerplatePromptOptionsSchema = z.object({
+	isMonolith: z.boolean().default(false).describe("Whether the project is a monolith"),
+	promptAsSkill: z.boolean().default(false).describe("Render prompt with skill front matter")
+});
+/**
 * Prompt for generating boilerplates
 */
 var GenerateBoilerplatePrompt = class GenerateBoilerplatePrompt {
 	static PROMPT_NAME = "generate-boilerplate";
 	templateService = new TemplateService();
-	constructor(isMonolith = false) {
-		this.isMonolith = isMonolith;
+	options;
+	constructor(options = {}) {
+		try {
+			this.options = generateBoilerplatePromptOptionsSchema.parse(options);
+		} catch (error) {
+			throw new Error(`Invalid GenerateBoilerplatePrompt options: ${error instanceof Error ? error.message : String(error)}`);
+		}
 	}
 	/**
 	* Get the prompt definition for MCP
@@ -199,7 +212,8 @@ var GenerateBoilerplatePrompt = class GenerateBoilerplatePrompt {
 				type: "text",
 				text: this.templateService.renderString(generate_boilerplate_default, {
 					request,
-					isMonolith: this.isMonolith
+					isMonolith: this.options.isMonolith,
+					promptAsSkill: this.options.promptAsSkill
 				})
 			}
 		}];
@@ -208,18 +222,30 @@ var GenerateBoilerplatePrompt = class GenerateBoilerplatePrompt {
 
 //#endregion
 //#region src/instructions/prompts/generate-feature-scaffold.md?raw
-var generate_feature_scaffold_default = "You are helping create a new feature scaffold configuration using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}\nYour task:\n\n1. **Gather Information**: Ask for any missing details:\n   {% if not isMonolith %}- Template name (e.g., \"nextjs-15\", \"react-vite\"){% else %}- Template name (will be auto-detected from toolkit.yaml){% endif %}\n   - Feature name (prefixed with \"scaffold-\", e.g., \"scaffold-nextjs-page\")\n   - Feature type (page, component, service, etc.)\n   - Variables needed\n   - Files to include\n\n2. **Use MCP Tools** in order:\n   - `generate-feature-scaffold` - Creates the feature configuration\n   - `generate-boilerplate-file` - Creates each template file\n   - `list-scaffolding-methods` - Verify it appears\n   - `use-scaffold-method` - Test the feature\n\nImportant:\n- Feature names: prefix with \"scaffold-\"\n- Conditional includes: use \"file.tsx?withLayout=true\"\n- Template syntax: use {{ variableName }}\n{% if isMonolith %}- Template name will be auto-detected from toolkit.yaml{% endif %}\n\n**Description Field Guidelines (CRITICAL)**:\nThe description should explain what the feature scaffold generates (2-3 sentences):\n- Sentence 1: What type of code it generates (component, page, service, etc.)\n- Sentence 2: Key features or capabilities included\n- Sentence 3: Primary use cases or when to use it\n\nExample:\n\"Generate a new service class for TypeScript libraries following best practices. Creates a service class with interface, implementation, and unit tests. Perfect for creating reusable service modules with dependency injection patterns.\"\n\n**Instruction Field Guidelines (CRITICAL)**:\nThe instruction should provide specific guidance for using the generated feature:\n\n1. **Pattern explanation**: Describe the architectural pattern used\n2. **File organization**: Where files should be placed\n3. **Naming conventions**: How to name things (PascalCase, camelCase, etc.)\n4. **Usage guidelines**: How to use the generated code\n5. **Testing approach**: How to test the feature\n\nExample structure:\n\"[Feature type] follow a [pattern name] pattern with [key characteristics].\n[Explanation of how it works and integrates with the project].\nPlace [files] in [directory].\nFor [features with X], define [Y] in [Z] for better separation of concerns.\n[Feature names] should be [case style] and [suffix/prefix rules].\nWrite comprehensive [tests/docs] for all [public methods/exports].\"\n\nKeep it concise but informative - focus on the patterns and conventions that AI needs to understand to work with the generated code effectively.\n\nTemplate File Content Guidelines:\n- Keep content MINIMAL and business-agnostic\n- Focus on structure and patterns, not business logic\n- Use placeholder/generic examples only\n- Include essential boilerplate code only\n- Let AI fill in specific logic later\n- Add clear headers with design patterns and coding standards\n";
+var generate_feature_scaffold_default = "{% if promptAsSkill %}---\nname: generate-feature-scaffold\ndescription: Create a new feature scaffold configuration for adding features to existing projects. Use this skill when the user wants to define a reusable feature template (e.g., page, component, service, API route) that can be used to add functionality to projects of a specific type. This is an admin/developer tool for creating the feature scaffold definitions themselves, not for using existing scaffolds. It generates feature configurations in scaffold.yaml and template files with Liquid syntax and conditional includes.\n---\n\n{% endif %}You are helping create a new feature scaffold configuration using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}\nYour task:\n\n1. **Gather Information**: Ask for any missing details:\n   {% if not isMonolith %}- Template name (e.g., \"nextjs-15\", \"react-vite\"){% else %}- Template name (will be auto-detected from toolkit.yaml){% endif %}\n   - Feature name (prefixed with \"scaffold-\", e.g., \"scaffold-nextjs-page\")\n   - Feature type (page, component, service, etc.)\n   - Variables needed\n   - Files to include\n\n2. **Use MCP Tools** in order:\n   - `generate-feature-scaffold` - Creates the feature configuration\n   - `generate-boilerplate-file` - Creates each template file\n   - `list-scaffolding-methods` - Verify it appears\n   - `use-scaffold-method` - Test the feature\n\nImportant:\n- Feature names: prefix with \"scaffold-\"\n- Conditional includes: use \"file.tsx?withLayout=true\"\n- Template syntax: use {{ variableName }}\n{% if isMonolith %}- Template name will be auto-detected from toolkit.yaml{% endif %}\n\n**Description Field Guidelines (CRITICAL)**:\nThe description should explain what the feature scaffold generates (2-3 sentences):\n- Sentence 1: What type of code it generates (component, page, service, etc.)\n- Sentence 2: Key features or capabilities included\n- Sentence 3: Primary use cases or when to use it\n\nExample:\n\"Generate a new service class for TypeScript libraries following best practices. Creates a service class with interface, implementation, and unit tests. Perfect for creating reusable service modules with dependency injection patterns.\"\n\n**Instruction Field Guidelines (CRITICAL)**:\nThe instruction should provide specific guidance for using the generated feature:\n\n1. **Pattern explanation**: Describe the architectural pattern used\n2. **File organization**: Where files should be placed\n3. **Naming conventions**: How to name things (PascalCase, camelCase, etc.)\n4. **Usage guidelines**: How to use the generated code\n5. **Testing approach**: How to test the feature\n\nExample structure:\n\"[Feature type] follow a [pattern name] pattern with [key characteristics].\n[Explanation of how it works and integrates with the project].\nPlace [files] in [directory].\nFor [features with X], define [Y] in [Z] for better separation of concerns.\n[Feature names] should be [case style] and [suffix/prefix rules].\nWrite comprehensive [tests/docs] for all [public methods/exports].\"\n\nKeep it concise but informative - focus on the patterns and conventions that AI needs to understand to work with the generated code effectively.\n\nTemplate File Content Guidelines:\n- Keep content MINIMAL and business-agnostic\n- Focus on structure and patterns, not business logic\n- Use placeholder/generic examples only\n- Include essential boilerplate code only\n- Let AI fill in specific logic later\n- Add clear headers with design patterns and coding standards\n";
 
 //#endregion
 //#region src/prompts/GenerateFeatureScaffoldPrompt.ts
 /**
+* Schema for GenerateFeatureScaffoldPrompt constructor options
+*/
+const generateFeatureScaffoldPromptOptionsSchema = z.object({
+	isMonolith: z.boolean().default(false).describe("Whether the project is a monolith"),
+	promptAsSkill: z.boolean().default(false).describe("Render prompt with skill front matter")
+});
+/**
 * Prompt for generating feature scaffolds
 */
 var GenerateFeatureScaffoldPrompt = class GenerateFeatureScaffoldPrompt {
 	static PROMPT_NAME = "generate-feature-scaffold";
 	templateService = new TemplateService();
-	constructor(isMonolith = false) {
-		this.isMonolith = isMonolith;
+	options;
+	constructor(options = {}) {
+		try {
+			this.options = generateFeatureScaffoldPromptOptionsSchema.parse(options);
+		} catch (error) {
+			throw new Error(`Invalid GenerateFeatureScaffoldPrompt options: ${error instanceof Error ? error.message : String(error)}`);
+		}
 	}
 	/**
 	* Get the prompt definition for MCP
@@ -246,7 +272,8 @@ var GenerateFeatureScaffoldPrompt = class GenerateFeatureScaffoldPrompt {
 				type: "text",
 				text: this.templateService.renderString(generate_feature_scaffold_default, {
 					request,
-					isMonolith: this.isMonolith
+					isMonolith: this.options.isMonolith,
+					promptAsSkill: this.options.promptAsSkill
 				})
 			}
 		}];
@@ -255,18 +282,30 @@ var GenerateFeatureScaffoldPrompt = class GenerateFeatureScaffoldPrompt {
 
 //#endregion
 //#region src/instructions/prompts/scaffold-application.md?raw
-var scaffold_application_default = "You are helping create a new {% if isMonolith %}monolith application{% else %}application{% endif %} using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}\nYour task is to scaffold a new application by following this workflow:\n\n## Step 1: {% if isMonolith %}Prepare to Create Application{% else %}List Available Boilerplates{% endif %}\n{% if isMonolith %}You will use the `use-boilerplate` tool to create your monolith application. The boilerplate name will be auto-detected from your toolkit.yaml file.{% else %}Use the `list-boilerplates` tool to see all available project templates.\n\n**What to look for:**\n- Boilerplate name (e.g., \"scaffold-nextjs-app\", \"scaffold-vite-app\")\n- Description of what the boilerplate creates\n- Target folder where projects will be created (e.g., \"apps\", \"packages\")\n- Required and optional variables in the variables_schema{% endif %}\n\n## Step 2: Gather Required Information\nBased on the {% if isMonolith %}toolkit.yaml{% else %}selected boilerplate's variables_schema{% endif %}, collect:\n{% if not isMonolith %}- **Project name**: Must be kebab-case (e.g., \"my-new-app\", not \"MyNewApp\")\n{% endif %}- **Required variables**: All variables marked as required: true\n- **Optional variables**: Variables with required: false (ask user if needed)\n\nCommon variables:\n- `appName` or `packageName`: The project name (kebab-case)\n- `description`: Brief description of what the project does\n- `author`: Author name\n\n## Step 3: Execute the Boilerplate\nUse the `use-boilerplate` tool with:\n{% if not isMonolith %}- `boilerplateName`: Exact name from list-boilerplates response\n{% endif %}- `variables`: Object matching the variables_schema exactly\n\n**Example:**\n```json\n{\n{% if not isMonolith %}  \"boilerplateName\": \"scaffold-nextjs-app\",\n{% endif %}  \"variables\": {\n    \"appName\": \"my-dashboard\",\n    \"description\": \"Admin dashboard for managing users\",\n    \"author\": \"John Doe\"\n  }\n}\n```\n\n## Important Guidelines:\n{% if not isMonolith %}- **Always call `list-boilerplates` first** to see available options and their schemas{% else %}- The boilerplate name is auto-detected from toolkit.yaml{% endif %}\n- **Use exact variable names** from the schema (case-sensitive)\n- **Provide all required variables** - the tool will fail if any are missing\n{% if not isMonolith %}- **Use kebab-case for project names** (e.g., \"user-dashboard\", not \"UserDashboard\")\n- The tool will create the project in the appropriate directory automatically{% else %}- The tool will create files at the workspace root{% endif %}\n- After creation, inform the user {% if isMonolith %}what files were created{% else %}where the project was created{% endif %}\n\n## Step 4: Review and Add Features (If Needed)\nAfter the boilerplate is created, **consider if additional features are needed**:\n1. **READ** the generated {% if isMonolith %}application{% else %}project{% endif %} structure to understand what was created\n2. **REVIEW** the user's request to see if they asked for specific features (e.g., \"with tool for X\", \"with prompt for Y\")\n3. **If features are needed**:\n   - Use `list-scaffolding-methods`{% if not isMonolith %} with the new project path{% endif %}\n   - Use `use-scaffold-method` to add tools, services, prompts, etc.\n   - **IMPLEMENT** the actual logic in the scaffolded feature files\n   - **REGISTER** the features in `src/server/index.ts`\n4. **Install dependencies**: Remind user to run `pnpm install`\n5. **Report** the complete setup including any features added\n\n## Example Workflow:\n{% if not isMonolith %}1. Call `list-boilerplates` → See available templates\n2. Ask user which template to use (or infer from request)\n3. Collect required variables based on schema\n4. Call `use-boilerplate` with boilerplateName and variables{% else %}1. Collect required variables based on toolkit.yaml variables_schema\n2. Call `use-boilerplate` with variables (boilerplateName auto-detected){% endif %}\n5. **Review if user requested specific features (tools, prompts, etc.)**\n6. **If features needed**: Add them using `list-scaffolding-methods` and `use-scaffold-method`\n7. **READ and IMPLEMENT** the scaffolded feature files with actual logic\n8. Report success and next steps to the user\n";
+var scaffold_application_default = "{% if promptAsSkill %}---\nname: scaffold-application\ndescription: Create a new application or project from a boilerplate template. Use this skill when the user wants to start a new project, create a new app, or bootstrap a new codebase from scratch. This skill lists available boilerplate templates (React, Next.js, Express, etc.), gathers required configuration variables, generates the complete project structure, and provides guidance on next steps including adding features.\n---\n\n{% endif %}You are helping create a new {% if isMonolith %}monolith application{% else %}application{% endif %} using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}\nYour task is to scaffold a new application by following this workflow:\n\n## Step 1: {% if isMonolith %}Prepare to Create Application{% else %}List Available Boilerplates{% endif %}\n{% if isMonolith %}You will use the `use-boilerplate` tool to create your monolith application. The boilerplate name will be auto-detected from your toolkit.yaml file.{% else %}Use the `list-boilerplates` tool to see all available project templates.\n\n**What to look for:**\n- Boilerplate name (e.g., \"scaffold-nextjs-app\", \"scaffold-vite-app\")\n- Description of what the boilerplate creates\n- Target folder where projects will be created (e.g., \"apps\", \"packages\")\n- Required and optional variables in the variables_schema{% endif %}\n\n## Step 2: Gather Required Information\nBased on the {% if isMonolith %}toolkit.yaml{% else %}selected boilerplate's variables_schema{% endif %}, collect:\n{% if not isMonolith %}- **Project name**: Must be kebab-case (e.g., \"my-new-app\", not \"MyNewApp\")\n{% endif %}- **Required variables**: All variables marked as required: true\n- **Optional variables**: Variables with required: false (ask user if needed)\n\nCommon variables:\n- `appName` or `packageName`: The project name (kebab-case)\n- `description`: Brief description of what the project does\n- `author`: Author name\n\n## Step 3: Execute the Boilerplate\nUse the `use-boilerplate` tool with:\n{% if not isMonolith %}- `boilerplateName`: Exact name from list-boilerplates response\n{% endif %}- `variables`: Object matching the variables_schema exactly\n\n**Example:**\n```json\n{\n{% if not isMonolith %}  \"boilerplateName\": \"scaffold-nextjs-app\",\n{% endif %}  \"variables\": {\n    \"appName\": \"my-dashboard\",\n    \"description\": \"Admin dashboard for managing users\",\n    \"author\": \"John Doe\"\n  }\n}\n```\n\n## Important Guidelines:\n{% if not isMonolith %}- **Always call `list-boilerplates` first** to see available options and their schemas{% else %}- The boilerplate name is auto-detected from toolkit.yaml{% endif %}\n- **Use exact variable names** from the schema (case-sensitive)\n- **Provide all required variables** - the tool will fail if any are missing\n{% if not isMonolith %}- **Use kebab-case for project names** (e.g., \"user-dashboard\", not \"UserDashboard\")\n- The tool will create the project in the appropriate directory automatically{% else %}- The tool will create files at the workspace root{% endif %}\n- After creation, inform the user {% if isMonolith %}what files were created{% else %}where the project was created{% endif %}\n\n## Step 4: Review and Add Features (If Needed)\nAfter the boilerplate is created, **consider if additional features are needed**:\n1. **READ** the generated {% if isMonolith %}application{% else %}project{% endif %} structure to understand what was created\n2. **REVIEW** the user's request to see if they asked for specific features (e.g., \"with tool for X\", \"with prompt for Y\")\n3. **If features are needed**:\n   - Use `list-scaffolding-methods`{% if not isMonolith %} with the new project path{% endif %}\n   - Use `use-scaffold-method` to add tools, services, prompts, etc.\n   - **IMPLEMENT** the actual logic in the scaffolded feature files\n   - **REGISTER** the features in `src/server/index.ts`\n4. **Install dependencies**: Remind user to run `pnpm install`\n5. **Report** the complete setup including any features added\n\n## Example Workflow:\n{% if not isMonolith %}1. Call `list-boilerplates` → See available templates\n2. Ask user which template to use (or infer from request)\n3. Collect required variables based on schema\n4. Call `use-boilerplate` with boilerplateName and variables{% else %}1. Collect required variables based on toolkit.yaml variables_schema\n2. Call `use-boilerplate` with variables (boilerplateName auto-detected){% endif %}\n5. **Review if user requested specific features (tools, prompts, etc.)**\n6. **If features needed**: Add them using `list-scaffolding-methods` and `use-scaffold-method`\n7. **READ and IMPLEMENT** the scaffolded feature files with actual logic\n8. Report success and next steps to the user\n";
 
 //#endregion
 //#region src/prompts/ScaffoldApplicationPrompt.ts
 /**
+* Schema for ScaffoldApplicationPrompt constructor options
+*/
+const scaffoldApplicationPromptOptionsSchema = z.object({
+	isMonolith: z.boolean().default(false).describe("Whether the project is a monolith"),
+	promptAsSkill: z.boolean().default(false).describe("Render prompt with skill front matter")
+});
+/**
 * Prompt for scaffolding a new application using boilerplate templates
 */
 var ScaffoldApplicationPrompt = class ScaffoldApplicationPrompt {
 	static PROMPT_NAME = "scaffold-application";
 	templateService = new TemplateService();
-	constructor(isMonolith = false) {
-		this.isMonolith = isMonolith;
+	options;
+	constructor(options = {}) {
+		try {
+			this.options = scaffoldApplicationPromptOptionsSchema.parse(options);
+		} catch (error) {
+			throw new Error(`Invalid ScaffoldApplicationPrompt options: ${error instanceof Error ? error.message : String(error)}`);
+		}
 	}
 	/**
 	* Get the prompt definition for MCP
@@ -293,7 +332,8 @@ var ScaffoldApplicationPrompt = class ScaffoldApplicationPrompt {
 				type: "text",
 				text: this.templateService.renderString(scaffold_application_default, {
 					request,
-					isMonolith: this.isMonolith
+					isMonolith: this.options.isMonolith,
+					promptAsSkill: this.options.promptAsSkill
 				})
 			}
 		}];
@@ -302,18 +342,30 @@ var ScaffoldApplicationPrompt = class ScaffoldApplicationPrompt {
 
 //#endregion
 //#region src/instructions/prompts/scaffold-feature.md?raw
-var scaffold_feature_default = "You are helping add a new feature to an existing project using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}{% if projectPath %}Project path: {{ projectPath }}\n{% endif %}\nYour task is to scaffold a new feature by following this workflow:\n\n## Step 1: Identify the Project\nDetermine the project path where the feature will be added:\n- If projectPath is provided, use it\n- Otherwise, ask the user or infer from context (e.g., \"apps/my-app\", \"packages/my-lib\")\n{% if isMonolith %}- In monolith mode, you can use the current working directory (no projectPath needed){% else %}- The path should point to a directory containing a `project.json` file{% endif %}\n\n## Step 2: List Available Scaffolding Methods\nUse the `list-scaffolding-methods` tool{% if not isMonolith %} with the projectPath{% endif %}.\n\n**What to look for:**\n- Feature name (e.g., \"scaffold-nextjs-page\", \"scaffold-react-component\")\n- Description of what files/code it generates\n- Required and optional variables in the variables_schema\n- The template type (derived from project's sourceTemplate)\n\n**Example:**\n```json\n{% if isMonolith %}{}{% else %}{\n  \"projectPath\": \"apps/my-dashboard\"\n}{% endif %}\n```\n\n## Step 3: Gather Required Information\nBased on the selected scaffolding method's variables_schema, collect:\n- **Feature-specific variables**: Name, path, type, etc.\n- **Required variables**: All variables marked as required: true\n- **Optional variables**: Variables with required: false (ask user if needed)\n\nCommon variables:\n- `componentName` / `pageName` / `serviceName`: Name in PascalCase\n- `componentPath` / `pagePath`: Where to place the file (may use kebab-case)\n- Boolean flags: `withTests`, `withLayout`, `withStyles`, etc.\n\n## Step 4: Execute the Scaffolding Method\nUse the `use-scaffold-method` tool with:\n{% if not isMonolith %}- `projectPath`: Same path from step 1\n{% endif %}- `scaffold_feature_name`: Exact name from list-scaffolding-methods response\n- `variables`: Object matching the variables_schema exactly\n\n**Example:**\n```json\n{\n{% if not isMonolith %}  \"projectPath\": \"apps/my-dashboard\",\n{% endif %}  \"scaffold_feature_name\": \"scaffold-nextjs-page\",\n  \"variables\": {\n    \"pageName\": \"UserProfile\",\n    \"pagePath\": \"user/profile\",\n    \"withLayout\": true,\n    \"withTests\": false\n  }\n}\n```\n\n## Important Guidelines:\n- **Always call `list-scaffolding-methods` first**{% if not isMonolith %} with the projectPath{% endif %}\n- **Use exact variable names** from the schema (case-sensitive)\n- **Provide all required variables** - the tool will fail if any are missing\n- **Follow naming conventions**:\n  - Component/Page/Service names: PascalCase (e.g., \"UserProfile\")\n  - File paths: kebab-case or as specified in schema (e.g., \"user/profile\")\n- **Conditional files**: Files with `?condition=true` are only included when the variable is true\n- The tool will create files in the appropriate locations automatically\n- After creation, inform the user what files were created\n\n## Step 5: Review and Implement Generated Files\nAfter scaffolding completes, **you MUST**:\n1. **READ** all generated files to understand their structure\n2. **IMPLEMENT** the actual business logic:\n   - Replace TODO comments with real code\n   - Replace template placeholders with actual implementation\n   - Add the specific functionality described in the user's request\n3. **REGISTER** the feature in appropriate files:\n   - Import and register tools in `src/server/index.ts`\n   - Export new modules from `index.ts` files\n   - Update any necessary configuration files\n4. **TEST** to ensure the implementation works correctly\n5. **DO NOT SKIP** this step - scaffolded files are templates that need actual code\n\n## Example Workflow:\n1. Identify project path (provided or ask user){% if not isMonolith %}\n2. Call `list-scaffolding-methods` → See available features for this project{% else %}\n2. Call `list-scaffolding-methods` → See available features for your template{% endif %}\n3. Ask user which feature to add (or infer from request)\n4. Collect required variables based on schema\n5. Call `use-scaffold-method` with {% if not isMonolith %}projectPath, {% endif %}scaffold_feature_name, and variables\n6. **READ the generated files and IMPLEMENT the actual logic**\n7. **REGISTER the feature in server/index.ts and other config files**\n8. Report success and list created files with implementation details\n";
+var scaffold_feature_default = "{% if promptAsSkill %}---\nname: scaffold-feature\ndescription: Add a new feature to an existing project such as service, route, page, component, or API endpoint. Use this skill when the user wants to add functionality to an existing codebase using predefined scaffolding templates. This skill lists available scaffolding methods for the project's template type, gathers required variables, generates boilerplate files, and guides implementation of the actual business logic.\n---\n\n{% endif %}You are helping add a new feature to an existing project using the scaffold-mcp MCP tools.\n\n{% if request %}User request: {{ request }}\n{% endif %}{% if projectPath %}Project path: {{ projectPath }}\n{% endif %}\nYour task is to scaffold a new feature by following this workflow:\n\n## Step 1: Identify the Project\nDetermine the project path where the feature will be added:\n- If projectPath is provided, use it\n- Otherwise, ask the user or infer from context (e.g., \"apps/my-app\", \"packages/my-lib\")\n{% if isMonolith %}- In monolith mode, you can use the current working directory (no projectPath needed){% else %}- The path should point to a directory containing a `project.json` file{% endif %}\n\n## Step 2: List Available Scaffolding Methods\nUse the `list-scaffolding-methods` tool{% if not isMonolith %} with the projectPath{% endif %}.\n\n**What to look for:**\n- Feature name (e.g., \"scaffold-nextjs-page\", \"scaffold-react-component\")\n- Description of what files/code it generates\n- Required and optional variables in the variables_schema\n- The template type (derived from project's sourceTemplate)\n\n**Example:**\n```json\n{% if isMonolith %}{}{% else %}{\n  \"projectPath\": \"apps/my-dashboard\"\n}{% endif %}\n```\n\n## Step 3: Gather Required Information\nBased on the selected scaffolding method's variables_schema, collect:\n- **Feature-specific variables**: Name, path, type, etc.\n- **Required variables**: All variables marked as required: true\n- **Optional variables**: Variables with required: false (ask user if needed)\n\nCommon variables:\n- `componentName` / `pageName` / `serviceName`: Name in PascalCase\n- `componentPath` / `pagePath`: Where to place the file (may use kebab-case)\n- Boolean flags: `withTests`, `withLayout`, `withStyles`, etc.\n\n## Step 4: Execute the Scaffolding Method\nUse the `use-scaffold-method` tool with:\n{% if not isMonolith %}- `projectPath`: Same path from step 1\n{% endif %}- `scaffold_feature_name`: Exact name from list-scaffolding-methods response\n- `variables`: Object matching the variables_schema exactly\n\n**Example:**\n```json\n{\n{% if not isMonolith %}  \"projectPath\": \"apps/my-dashboard\",\n{% endif %}  \"scaffold_feature_name\": \"scaffold-nextjs-page\",\n  \"variables\": {\n    \"pageName\": \"UserProfile\",\n    \"pagePath\": \"user/profile\",\n    \"withLayout\": true,\n    \"withTests\": false\n  }\n}\n```\n\n## Important Guidelines:\n- **Always call `list-scaffolding-methods` first**{% if not isMonolith %} with the projectPath{% endif %}\n- **Use exact variable names** from the schema (case-sensitive)\n- **Provide all required variables** - the tool will fail if any are missing\n- **Follow naming conventions**:\n  - Component/Page/Service names: PascalCase (e.g., \"UserProfile\")\n  - File paths: kebab-case or as specified in schema (e.g., \"user/profile\")\n- **Conditional files**: Files with `?condition=true` are only included when the variable is true\n- The tool will create files in the appropriate locations automatically\n- After creation, inform the user what files were created\n\n## Step 5: Review and Implement Generated Files\nAfter scaffolding completes, **you MUST**:\n1. **READ** all generated files to understand their structure\n2. **IMPLEMENT** the actual business logic:\n   - Replace TODO comments with real code\n   - Replace template placeholders with actual implementation\n   - Add the specific functionality described in the user's request\n3. **REGISTER** the feature in appropriate files:\n   - Import and register tools in `src/server/index.ts`\n   - Export new modules from `index.ts` files\n   - Update any necessary configuration files\n4. **TEST** to ensure the implementation works correctly\n5. **DO NOT SKIP** this step - scaffolded files are templates that need actual code\n\n## Example Workflow:\n1. Identify project path (provided or ask user){% if not isMonolith %}\n2. Call `list-scaffolding-methods` → See available features for this project{% else %}\n2. Call `list-scaffolding-methods` → See available features for your template{% endif %}\n3. Ask user which feature to add (or infer from request)\n4. Collect required variables based on schema\n5. Call `use-scaffold-method` with {% if not isMonolith %}projectPath, {% endif %}scaffold_feature_name, and variables\n6. **READ the generated files and IMPLEMENT the actual logic**\n7. **REGISTER the feature in server/index.ts and other config files**\n8. Report success and list created files with implementation details\n";
 
 //#endregion
 //#region src/prompts/ScaffoldFeaturePrompt.ts
 /**
+* Schema for ScaffoldFeaturePrompt constructor options
+*/
+const scaffoldFeaturePromptOptionsSchema = z.object({
+	isMonolith: z.boolean().default(false).describe("Whether the project is a monolith"),
+	promptAsSkill: z.boolean().default(false).describe("Render prompt with skill front matter")
+});
+/**
 * Prompt for scaffolding a new feature in an existing project
 */
 var ScaffoldFeaturePrompt = class ScaffoldFeaturePrompt {
 	static PROMPT_NAME = "scaffold-feature";
 	templateService = new TemplateService();
-	constructor(isMonolith = false) {
-		this.isMonolith = isMonolith;
+	options;
+	constructor(options = {}) {
+		try {
+			this.options = scaffoldFeaturePromptOptionsSchema.parse(options);
+		} catch (error) {
+			throw new Error(`Invalid ScaffoldFeaturePrompt options: ${error instanceof Error ? error.message : String(error)}`);
+		}
 	}
 	/**
 	* Get the prompt definition for MCP
@@ -346,7 +398,8 @@ var ScaffoldFeaturePrompt = class ScaffoldFeaturePrompt {
 				text: this.templateService.renderString(scaffold_feature_default, {
 					request,
 					projectPath,
-					isMonolith: this.isMonolith
+					isMonolith: this.options.isMonolith,
+					promptAsSkill: this.options.promptAsSkill
 				})
 			}
 		}];
@@ -356,7 +409,7 @@ var ScaffoldFeaturePrompt = class ScaffoldFeaturePrompt {
 //#endregion
 //#region src/server/index.ts
 function createServer(options = {}) {
-	const { adminEnabled = false, isMonolith = false } = options;
+	const { adminEnabled = false, isMonolith = false, promptAsSkill = false } = options;
 	const templatesPath = TemplatesManagerService.findTemplatesPathSync();
 	if (!templatesPath) throw new Error("Templates folder not found. Please create a \"templates\" folder in your workspace root, or specify \"templatesPath\" in toolkit.yaml to point to your templates directory.");
 	const listBoilerplatesTool = !isMonolith ? new ListBoilerplatesTool(templatesPath, isMonolith) : null;
@@ -367,10 +420,22 @@ function createServer(options = {}) {
 	const generateBoilerplateTool = adminEnabled ? new GenerateBoilerplateTool(templatesPath, isMonolith) : null;
 	const generateBoilerplateFileTool = adminEnabled ? new GenerateBoilerplateFileTool(templatesPath, isMonolith) : null;
 	const generateFeatureScaffoldTool = adminEnabled ? new GenerateFeatureScaffoldTool(templatesPath, isMonolith) : null;
-	const generateBoilerplatePrompt = adminEnabled ? new GenerateBoilerplatePrompt(isMonolith) : null;
-	const generateFeatureScaffoldPrompt = adminEnabled ? new GenerateFeatureScaffoldPrompt(isMonolith) : null;
-	const scaffoldApplicationPrompt = new ScaffoldApplicationPrompt(isMonolith);
-	const scaffoldFeaturePrompt = new ScaffoldFeaturePrompt(isMonolith);
+	const generateBoilerplatePrompt = adminEnabled ? new GenerateBoilerplatePrompt({
+		isMonolith,
+		promptAsSkill
+	}) : null;
+	const generateFeatureScaffoldPrompt = adminEnabled ? new GenerateFeatureScaffoldPrompt({
+		isMonolith,
+		promptAsSkill
+	}) : null;
+	const scaffoldApplicationPrompt = new ScaffoldApplicationPrompt({
+		isMonolith,
+		promptAsSkill
+	});
+	const scaffoldFeaturePrompt = new ScaffoldFeaturePrompt({
+		isMonolith,
+		promptAsSkill
+	});
 	const instructions = new TemplateService().renderString(server_default, {
 		adminEnabled,
 		isMonolith
@@ -482,7 +547,7 @@ async function startServer(handler) {
 			await handler.stop();
 			process.exit(0);
 		} catch (error) {
-			console.error("Error during shutdown:", error);
+			console.error("Error during shutdown:", error instanceof Error ? error.message : String(error));
 			process.exit(1);
 		}
 	};
@@ -492,7 +557,7 @@ async function startServer(handler) {
 /**
 * MCP Serve command
 */
-const mcpServeCommand = new Command("mcp-serve").description("Start MCP server with specified transport").option("-t, --type <type>", "Transport type: stdio, http, or sse", "stdio").option("-p, --port <port>", "Port to listen on (http/sse only)", (val) => parseInt(val, 10), 3e3).option("--host <host>", "Host to bind to (http/sse only)", "localhost").option("--admin-enable", "Enable admin tools (generate-boilerplate)", false).action(async (options) => {
+const mcpServeCommand = new Command("mcp-serve").description("Start MCP server with specified transport").option("-t, --type <type>", "Transport type: stdio, http, or sse", "stdio").option("-p, --port <port>", "Port to listen on (http/sse only)", (val) => parseInt(val, 10), 3e3).option("--host <host>", "Host to bind to (http/sse only)", "localhost").option("--admin-enable", "Enable admin tools (generate-boilerplate)", false).option("--prompt-as-skill", "Render prompts with skill front matter for Claude Code skills", false).action(async (options) => {
 	try {
 		const transportType = options.type.toLowerCase();
 		let isMonolith = false;
@@ -503,7 +568,8 @@ const mcpServeCommand = new Command("mcp-serve").description("Start MCP server w
 		}
 		const serverOptions = {
 			adminEnabled: options.adminEnable,
-			isMonolith
+			isMonolith,
+			promptAsSkill: options.promptAsSkill
 		};
 		if (transportType === "stdio") await startServer(new StdioTransportHandler(createServer(serverOptions)));
 		else if (transportType === "http") await startServer(new HttpTransportHandler(() => createServer(serverOptions), {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agiflowai/scaffold-mcp",
   "description": "MCP server for scaffolding applications with boilerplate templates",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "license": "AGPL-3.0",
   "author": "AgiflowIO",
   "repository": {
@@ -49,9 +49,9 @@
     "pino-pretty": "^13.1.1",
     "zod": "3.25.76",
     "@agiflowai/aicode-utils": "1.0.9",
-    "@agiflowai/architect-mcp": "1.0.10",
-    "@agiflowai/hooks-adapter": "0.0.5",
-    "@agiflowai/coding-agent-bridge": "1.0.9"
+    "@agiflowai/architect-mcp": "1.0.11",
+    "@agiflowai/coding-agent-bridge": "1.0.10",
+    "@agiflowai/hooks-adapter": "0.0.6"
   },
   "devDependencies": {
     "@types/express": "^5.0.0",