@agiflowai/aicode-toolkit 1.0.22 → 1.0.24

package/README.md

@@ -2,7 +2,7 @@
 
 > CLI for initializing projects and managing AI Code Toolkit templates
 
-The main entry point for setting up AI Code Toolkit in your workspace. Handles project initialization, template management, and MCP server configuration.
+Use this CLI to initialize templates, generate `.toolkit/settings.yaml`, and sync agent-facing config files.
 
 ## Quick Start
 
@@ -28,9 +28,9 @@ npx @agiflowai/aicode-toolkit init
 ```
 
 This will:
-1. Create `templates/` folder in your workspace
-2. Download official templates (Next.js 15, TypeScript lib, MCP package)
-3. Detect installed AI coding agents (Claude Code, Cursor, etc.)
+1. Create `templates/`
+2. Download built-in templates
+3. Detect installed coding agents
 4. Optionally configure MCP servers
 
 **For new projects:**
@@ -43,10 +43,10 @@ npx @agiflowai/aicode-toolkit init --name my-app --project-type monolith
 ```
 
 This will:
-1. Create project directory
-2. Initialize git repository
+1. Create the project directory
+2. Initialize Git
 3. Download templates
-4. Create `toolkit.yaml` configuration
+4. Create `.toolkit/settings.yaml`
 
 **Options:**
 | Option | Description | Default |
@@ -99,13 +99,15 @@ architect-mcp:
   hook:
     claude-code:
       preToolUse:
-        args:
-          llm-tool: gemini-cli
-      postToolUse: {}
+        matcher: Edit|MultiEdit|Write
+      postToolUse:
+        matcher: Edit|MultiEdit|Write
 ```
 
-Generated hook entries fire on all tool calls (no matcher). Run `aicode sync --hooks`
-to write `.claude/settings.json`.
+Generated architect hook entries default to `Edit|MultiEdit|Write`. Run
+`aicode sync --hooks` to write `.claude/settings.json`.
+
+Both `.toolkit/settings.yaml` and `.toolkit/settings.local.yaml` now support ordered `fallbacks` lists in `scaffold-mcp` and `architect-mcp` config blocks; the first valid fallback is used when the singular fallback fields are unset.
 
 #### `mcp-config` section → `mcp-config.yaml`
 
@@ -171,7 +173,7 @@ npx @agiflowai/aicode-toolkit add \
 
 ## What Gets Installed
 
-When you run `init`, these official templates are downloaded:
+When you run `init`, these built-in templates are downloaded:
 
 | Template | Description |
 |----------|-------------|
@@ -190,11 +192,12 @@ Each template includes:
 
 ### Monolith
 
-Single application with `toolkit.yaml` at root:
+Single application with `.toolkit/settings.yaml` as the primary config:
 
 ```
 my-app/
-├── toolkit.yaml          # sourceTemplate: "nextjs-15"
+├── .toolkit/
+│   └── settings.yaml     # sourceTemplate: "nextjs-15"
 ├── templates/
 │   └── nextjs-15/
 ├── src/
@@ -222,7 +225,7 @@ my-workspace/
 
 ## Coding Agent Detection
 
-The CLI automatically detects installed AI coding agents:
+The CLI checks for these agent configs:
 
 | Agent | Config Location | Status |
 |-------|-----------------|--------|
@@ -232,7 +235,7 @@ The CLI automatically detects installed AI coding agents:
 | Codex CLI | `.codex/config.json` | Supported |
 | GitHub Copilot | VS Code settings | Supported |
 
-When detected, the CLI offers to configure MCP servers (scaffold-mcp, architect-mcp) automatically.
+If detected, the CLI can add MCP server config for them.
 
 ---
 

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_utils = require('./utils-r_182Nor.cjs');
+const require_utils = require('./utils-DMP5MQCv.cjs');
 const require_mcp = require('./mcp--A-5zuBI.cjs');
 let __agiflowai_aicode_utils = require("@agiflowai/aicode-utils");
 let node_fs_promises = require("node:fs/promises");
@@ -15,18 +15,18 @@ let js_yaml = require("js-yaml");
 js_yaml = require_utils.__toESM(js_yaml);
 
 //#region package.json
-var version = "1.0.21";
+var version = "1.0.23";
 
 //#endregion
 //#region src/commands/add.ts
 /**
 * Add command - add a template to templates folder
 */
-const addCommand = new commander.Command("add").description("Add a template to templates folder").requiredOption("--name <name>", "Template name").requiredOption("--url <url>", "URL of the template repository to download").option("--path <path>", "Override templates folder path (uses toolkit.yaml config by default)").option("--type <type>", "Template type: boilerplate or scaffold", "boilerplate").action(async (options) => {
+const addCommand = new commander.Command("add").description("Add a template to templates folder").requiredOption("--name <name>", "Template name").requiredOption("--url <url>", "URL of the template repository to download").option("--path <path>", "Override templates folder path (uses .toolkit/settings.yaml or legacy toolkit.yaml config by default)").option("--type <type>", "Template type: boilerplate or scaffold", "boilerplate").action(async (options) => {
 	try {
 		const foundTemplatesPath = options.path ? node_path.default.resolve(options.path) : await __agiflowai_aicode_utils.TemplatesManagerService.findTemplatesPath();
 		if (!foundTemplatesPath) {
-			__agiflowai_aicode_utils.messages.error("Templates folder not found. Create a templates folder or specify templatesPath in toolkit.yaml");
+			__agiflowai_aicode_utils.messages.error("Templates folder not found. Create a templates folder or specify templatesPath in .toolkit/settings.yaml");
 			process.exit(1);
 		}
 		const templatesPath = foundTemplatesPath;
@@ -81,7 +81,7 @@ const addCommand = new commander.Command("add").description("Add a template to t
 
 //#endregion
 //#region src/templates/settings.yaml.liquid?raw
-var settings_yaml_default = "# .toolkit/settings.yaml\n# Toolkit configuration for aicode-toolkit\n#\n# Local overrides go in .toolkit/settings.local.yaml (add to .gitignore).\n# Local settings are shallow-merged over this file — useful for per-developer\n# LLM tool preferences or API keys without committing them.\n\n# ---------------------------------------------------------------------------\n# Project identity\n# ---------------------------------------------------------------------------\n{% if projectType %}\nprojectType: {{ projectType }}\n{% else %}\n# projectType: monolith\n{% endif %}\n{% if templatesPath %}\ntemplatesPath: {{ templatesPath }}\n{% else %}\n# templatesPath: ./templates\n{% endif %}\n{% if sourceTemplate %}\nsourceTemplate: {{ sourceTemplate }}\n{% else %}\n# sourceTemplate: react-vite\n{% endif %}\nversion: '1.0'\n\n# ---------------------------------------------------------------------------\n# scaffold-mcp — configuration for the scaffold-mcp CLI\n# CLI flags always take precedence over values set here.\n# ---------------------------------------------------------------------------\n\nscaffold-mcp:\n\n  # -------------------------------------------------------------------------\n  # mcp-serve — defaults for `scaffold-mcp mcp-serve`\n  # -------------------------------------------------------------------------\n  mcp-serve:\n    # type: stdio\n    # port: 3000\n    # host: localhost\n    # adminEnable: false\n    # promptAsSkill: false\n    {% if fallbackTool %}\n    fallbackTool: {{ fallbackTool }}\n    {% if fallbackToolConfig %}\n    fallbackToolConfig:\n      {% for pair in fallbackToolConfig %}\n      {{ pair[0] }}: {{ pair[1] }}\n      {% endfor %}\n    {% else %}\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n    {% else %}\n    # fallbackTool: gemini-cli\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n    # Extra CLI args merged into the mcp-serve command (key: value → --key value)\n    # args:\n    #   review-tool: gemini-cli\n\n  # -------------------------------------------------------------------------\n  # hook — defaults for `scaffold-mcp hook`\n  # Keyed by agent name, then by hook method.\n  # Supported agents  : claude-code | gemini-cli\n  # Supported methods : preToolUse | postToolUse | userPromptSubmit | taskCompleted | stop\n  # -------------------------------------------------------------------------\n  hook:\n\n    claude-code:\n      preToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n      postToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n    gemini-cli:\n      postToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n# ---------------------------------------------------------------------------\n# architect-mcp — configuration for the architect-mcp CLI\n# CLI flags always take precedence over values set here.\n# ---------------------------------------------------------------------------\n\narchitect-mcp:\n\n  # -------------------------------------------------------------------------\n  # mcp-serve — defaults for `architect-mcp mcp-serve`\n  # -------------------------------------------------------------------------\n  mcp-serve:\n    # type: stdio\n    # port: 3000\n    # host: localhost\n    # adminEnable: false\n    {% if fallbackTool %}\n    fallbackTool: {{ fallbackTool }}\n    {% if fallbackToolConfig %}\n    fallbackToolConfig:\n      {% for pair in fallbackToolConfig %}\n      {{ pair[0] }}: {{ pair[1] }}\n      {% endfor %}\n    {% else %}\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n    {% else %}\n    # fallbackTool: gemini-cli\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n    # designPatternTool: gemini-cli\n    # designPatternToolConfig:\n    #   model: gemini-2.0-flash\n    # reviewTool: gemini-cli\n    # reviewToolConfig:\n    #   model: gemini-2.0-flash\n    # Extra CLI args merged into the mcp-serve command (key: value → --key value)\n    # args:\n    #   review-tool: gemini-cli\n\n  # -------------------------------------------------------------------------\n  # hook — defaults for `architect-mcp hook`\n  # Keyed by agent name, then by hook method.\n  # Supported agents  : claude-code | gemini-cli\n  # Supported methods : preToolUse | postToolUse\n  # -------------------------------------------------------------------------\n  hook:\n\n    claude-code:\n      preToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n      postToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n    gemini-cli:\n      preToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n      postToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n# ---------------------------------------------------------------------------\n# mcp-config — generates mcp-config.yaml via `aicode sync --mcp`\n# Servers listed here become entries in mcp-config.yaml.\n# Run `aicode sync` to write the output file.\n# ---------------------------------------------------------------------------\n\n# mcp-config:\n#   servers:\n#     scaffold-mcp:\n#       command: bun\n#       args:\n#         - run\n#         - packages/scaffold-mcp/src/cli.ts\n#         - mcp-serve\n#         - --admin-enable\n#         - --prompt-as-skill\n#       instruction: \"Use this server for generating boilerplate code, scaffolding new projects, and adding features to existing projects.\"\n#     architect-mcp:\n#       command: bun\n#       args:\n#         - run\n#         - packages/architect-mcp/src/cli.ts\n#         - mcp-serve\n#       instruction: \"Use this server for design pattern guidance and code review.\"\n#   skills:\n#     paths:\n#       - docs/skills\n";
+var settings_yaml_default = "# .toolkit/settings.yaml\n# Toolkit configuration for aicode-toolkit\n#\n# Local overrides go in .toolkit/settings.local.yaml (add to .gitignore).\n# Local settings are shallow-merged over this file — useful for per-developer\n# LLM tool preferences or API keys without committing them.\n#\n# All fields are optional. Uncomment and edit what you need.\n\n# ---------------------------------------------------------------------------\n# Project identity\n# ---------------------------------------------------------------------------\n\n{% comment %}Project type: monolith (single app) or monorepo (multiple packages/apps){% endcomment %}\n{% if projectType %}\nprojectType: {{ projectType }}\n{% else %}\n# projectType: monolith\n{% endif %}\n\n{% comment %}Path to the scaffold templates directory, relative to workspace root.{% endcomment %}\n{% if templatesPath %}\ntemplatesPath: {{ templatesPath }}\n{% else %}\n# templatesPath: ./templates\n{% endif %}\n\n{% comment %}Active template name (monolith only — monorepo reads from project.json).{% endcomment %}\n{% if sourceTemplate %}\nsourceTemplate: {{ sourceTemplate }}\n{% else %}\n# sourceTemplate: react-vite\n{% endif %}\n\n# Config schema version.\n# version: '1.0'\n\n# ---------------------------------------------------------------------------\n# scaffold-mcp — configuration for the scaffold-mcp CLI\n# CLI flags always take precedence over values set here.\n# ---------------------------------------------------------------------------\n\nscaffold-mcp:\n\n  # -------------------------------------------------------------------------\n  # mcp-serve — defaults for `scaffold-mcp mcp-serve`\n  # -------------------------------------------------------------------------\n  mcp-serve:\n    # Transport type: stdio | http | sse  (default: stdio)\n    # type: stdio\n\n    # Port for http/sse transport (default: 3000)\n    # port: 3000\n\n    # Host to bind for http/sse transport (default: localhost)\n    # host: localhost\n\n    # Enable admin tools such as generate-boilerplate (default: false)\n    # adminEnable: false\n\n    # Render prompts with skill front matter for Claude Code (default: false)\n    # promptAsSkill: false\n\n    # Fallback LLM tool used when scaffold-mcp needs AI assistance.\n    # Supported: claude-code | gemini-cli | codex\n    {% if fallbackTool %}\n    fallbackTool: {{ fallbackTool }}\n    {% if fallbackToolConfig %}\n    # Config passed to the fallback LLM tool.\n    fallbackToolConfig:\n      {% for pair in fallbackToolConfig %}\n      {{ pair[0] }}: {{ pair[1] }}\n      {% endfor %}\n    {% else %}\n    # Config passed to the fallback LLM tool.\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n    {% else %}\n    # fallbackTool: gemini-cli\n    # Config passed to the fallback LLM tool.\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n\n    # Ordered fallback chain used when fallbackTool is not set.\n    # The first valid entry wins.\n    # fallbacks:\n    #   - tool: gemini-cli\n    #     config:\n    #       model: gemini-2.0-flash\n    #   - tool: codex\n    #     config:\n    #       model: gpt-5.2-mini\n\n    # Extra CLI args merged into the mcp-serve command (key: value → --key value)\n    # args:\n    #   review-tool: gemini-cli\n\n  # -------------------------------------------------------------------------\n  # hook — defaults for `scaffold-mcp hook`\n  # Keyed by agent name, then by hook method.\n  # Supported agents  : claude-code | gemini-cli\n  # Supported methods : preToolUse | postToolUse | userPromptSubmit | taskCompleted | stop\n  # CLI flags --fallback-tool and --fallback-tool-config still take precedence.\n  # -------------------------------------------------------------------------\n  hook:\n\n    claude-code:\n      preToolUse:\n        # LLM tool to use for this hook. Supported: claude-code | gemini-cli | codex\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # fallbacks:\n        #   - tool: codex\n        #     config:\n        #       model: gpt-5.2-mini\n        # matcher: Edit|MultiEdit|Write\n        # Extra CLI args appended to the generated hook command (key: value → --key value)\n        # args:\n        #   llm-tool: gemini-cli\n\n      postToolUse:\n        # matcher: Edit|MultiEdit|Write\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # fallbacks:\n        #   - tool: codex\n        #     config:\n        #       model: gpt-5.2-mini\n        # args:\n        #   llm-tool: gemini-cli\n\n      userPromptSubmit:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n      taskCompleted:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n      stop:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n    gemini-cli:\n      preToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n      postToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n# ---------------------------------------------------------------------------\n# architect-mcp — configuration for the architect-mcp CLI\n# CLI flags always take precedence over values set here.\n# ---------------------------------------------------------------------------\n\narchitect-mcp:\n\n  # -------------------------------------------------------------------------\n  # mcp-serve — defaults for `architect-mcp mcp-serve`\n  # -------------------------------------------------------------------------\n  mcp-serve:\n    # Transport type: stdio | http | sse  (default: stdio)\n    # type: stdio\n\n    # Port for http/sse transport (default: 3000)\n    # port: 3000\n\n    # Host to bind for http/sse transport (default: localhost)\n    # host: localhost\n\n    # Enable admin tools such as add-design-pattern and add-rule (default: false)\n    # adminEnable: false\n\n    # Fallback LLM tool used for both design-pattern and review when specific tools are not set.\n    # Supported: claude-code | gemini-cli | codex\n    {% if fallbackTool %}\n    fallbackTool: {{ fallbackTool }}\n    {% if fallbackToolConfig %}\n    # Config passed to the fallback LLM tool.\n    fallbackToolConfig:\n      {% for pair in fallbackToolConfig %}\n      {{ pair[0] }}: {{ pair[1] }}\n      {% endfor %}\n    {% else %}\n    # Config passed to the fallback LLM tool.\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n    {% else %}\n    # fallbackTool: gemini-cli\n    # Config passed to the fallback LLM tool.\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n\n    # Ordered fallback chain used when fallbackTool is not set.\n    # The first valid entry wins.\n    # fallbacks:\n    #   - tool: gemini-cli\n    #     config:\n    #       model: gemini-2.0-flash\n    #   - tool: codex\n    #     config:\n    #       model: gpt-5.2-mini\n\n    # LLM tool used specifically for get-file-design-pattern analysis.\n    # Overrides fallbackTool for design pattern operations.\n    # designPatternTool: gemini-cli\n\n    # Config passed to the design pattern LLM tool.\n    # designPatternToolConfig:\n    #   model: gemini-2.0-flash\n\n    # LLM tool used specifically for review-code-change analysis.\n    # Overrides fallbackTool for code review operations.\n    # reviewTool: gemini-cli\n\n    # Config passed to the review LLM tool.\n    # reviewToolConfig:\n    #   model: gemini-2.0-flash\n\n    # Extra CLI args merged into the mcp-serve command (key: value → --key value)\n    # args:\n    #   review-tool: gemini-cli\n\n  # -------------------------------------------------------------------------\n  # hook — defaults for `architect-mcp hook`\n  # Keyed by agent name, then by hook method.\n  # Supported agents  : claude-code | gemini-cli\n  # Supported methods : preToolUse | postToolUse\n  # CLI flags --llm-tool, --fallback-tool, and --tool-config still take precedence.\n  # -------------------------------------------------------------------------\n  hook:\n\n    claude-code:\n      preToolUse:\n        # Static pattern matching is usually enough here. Leave llm-tool unset unless\n        # you want extra pattern filtering via LLM.\n        {% if fallbackTool %}\n        fallback-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        fallback-tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # fallback-tool: gemini-cli\n        # fallback-tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # fallbacks:\n        #   - tool: codex\n        #     config:\n        #       model: gpt-5.2-mini\n        # matcher: Edit|MultiEdit|Write\n        # Extra CLI args appended to the generated hook command (key: value → --key value)\n        # args:\n        #   llm-tool: gemini-cli\n\n      postToolUse:\n        # matcher: Edit|MultiEdit|Write\n        # Set llm-tool only if you want LLM-based review. A cheap model is recommended.\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # fallbacks:\n        #   - tool: codex\n        #     config:\n        #       model: gpt-5.2-mini\n        # args:\n        #   llm-tool: gemini-cli\n\n    gemini-cli:\n      preToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n      postToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n# ---------------------------------------------------------------------------\n# mcp-config — generates mcp-config.yaml via `aicode sync --mcp`\n# Servers listed here become entries in mcp-config.yaml.\n# Run `aicode sync` to write the output file.\n# ---------------------------------------------------------------------------\n\n# mcp-config:\n#   servers:\n#     scaffold-mcp:\n#       command: bun\n#       args:\n#         - run\n#         - packages/scaffold-mcp/src/cli.ts\n#         - mcp-serve\n#         - --admin-enable\n#         - --prompt-as-skill\n#       instruction: \"Use this server for generating boilerplate code, scaffolding new projects, and adding features to existing projects.\"\n#     architect-mcp:\n#       command: bun\n#       args:\n#         - run\n#         - packages/architect-mcp/src/cli.ts\n#         - mcp-serve\n#       instruction: \"Use this server for design pattern guidance and code review.\"\n#   skills:\n#     paths:\n#       - docs/skills\n";
 
 //#endregion
 //#region src/states/init-machine.ts
@@ -223,7 +223,7 @@ const initMachine = (0, xstate.createMachine)({
 		checkingSkipTemplates: { always: [{
 			target: "promptingMcpSelection",
 			guard: ({ context }) => !context.options.skipTemplates
-		}, { target: "checkingSkipMcp" }] },
+		}, { target: "creatingConfig" }] },
 		promptingMcpSelection: { invoke: {
 			src: "promptMcpSelection",
 			onDone: {
@@ -729,11 +729,15 @@ const initActors = {
 	}),
 	createConfig: (0, xstate.fromPromise)(async ({ input: actorInput }) => {
 		if (actorInput.projectType === __agiflowai_aicode_utils.ProjectType.MONOLITH) {
-			const relativeTemplatesPath = node_path.default.relative(actorInput.workspaceRoot, actorInput.templatesPath);
+			const { relativeTemplatesPath, sourceTemplate } = resolveGeneratedSettingsValues({
+				workspaceRoot: actorInput.workspaceRoot,
+				templatesPath: actorInput.templatesPath,
+				selectedTemplates: actorInput.selectedTemplates
+			});
 			const content = await new liquidjs.Liquid().parseAndRender(settings_yaml_default, {
 				projectType: "monolith",
-				templatesPath: relativeTemplatesPath || "templates",
-				sourceTemplate: actorInput.selectedTemplates[0]
+				templatesPath: relativeTemplatesPath,
+				sourceTemplate
 			});
 			const toolkitDir = node_path.default.join(actorInput.workspaceRoot, ".toolkit");
 			const settingsPath = node_path.default.join(toolkitDir, "settings.yaml");
@@ -874,6 +878,13 @@ const initActors = {
 		}
 	})
 };
+function resolveGeneratedSettingsValues(input$1) {
+	const resolvedTemplatesPath = input$1.templatesPath ?? node_path.default.join(input$1.workspaceRoot, __agiflowai_aicode_utils.TemplatesManagerService.getTemplatesFolderName());
+	return {
+		relativeTemplatesPath: node_path.default.relative(input$1.workspaceRoot, resolvedTemplatesPath) || "templates",
+		sourceTemplate: input$1.selectedTemplates?.[0]
+	};
+}
 /**
 * Init command - improved V2 implementation
 */
@@ -940,6 +951,9 @@ const MCP_CONFIG_FILE = "mcp-config.yaml";
 function hasHookConfig(config) {
 	return !!(config["scaffold-mcp"]?.hook?.["claude-code"] || config["architect-mcp"]?.hook?.["claude-code"]);
 }
+function getSettingsMcpConfig(config) {
+	return config["mcp-config"];
+}
 function argsToFlags(args) {
 	const flags = [];
 	for (const [key, value] of Object.entries(args)) {
@@ -974,12 +988,40 @@ function buildHookCommand(server, hookType, extraFlags) {
 		...extraFlags
 	].join(" ");
 }
-function addHookEntry(output, event, command) {
+function resolveArchitectClaudeMatcher(methodConfig) {
+	return methodConfig?.matcher ?? "Edit|MultiEdit|Write";
+}
+function buildMcpConfigYaml(config) {
+	const settingsMcpConfig = getSettingsMcpConfig(config);
+	const servers = settingsMcpConfig?.servers ?? {};
+	const serverEntries = Object.entries(servers);
+	if (serverEntries.length === 0 && !settingsMcpConfig?.skills?.paths?.length) return null;
+	return {
+		...serverEntries.length > 0 ? { mcpServers: Object.fromEntries(serverEntries.map(([name, server]) => {
+			const instructionConfig = server.instruction ? { instruction: server.instruction } : void 0;
+			const mergedConfig = server.config || instructionConfig ? {
+				...server.config ?? {},
+				...instructionConfig ?? {}
+			} : void 0;
+			return [name, {
+				command: server.command,
+				...server.args ? { args: server.args } : {},
+				...server.env ? { env: server.env } : {},
+				...mergedConfig ? { config: mergedConfig } : {}
+			}];
+		})) } : {},
+		...settingsMcpConfig?.skills?.paths?.length ? { skills: settingsMcpConfig.skills } : {}
+	};
+}
+function addHookEntry(output, event, command, matcher) {
 	if (!output[event]) output[event] = [];
-	output[event].push({ hooks: [{
-		type: "command",
-		command
-	}] });
+	output[event].push({
+		...matcher ? { matcher } : {},
+		hooks: [{
+			type: "command",
+			command
+		}]
+	});
 }
 function isMcpConfigYaml(value) {
 	return typeof value === "object" && value !== null;
@@ -1020,7 +1062,8 @@ async function writeClaudeSettings(config, workspaceRoot) {
 			if (methodConfig === void 0) continue;
 			const extraFlags = methodConfig?.args ? argsToFlags(methodConfig?.args) : [];
 			const command = buildHookCommand(scaffoldServer, `claude-code.${method}`, extraFlags);
-			addHookEntry(hooksOutput, METHOD_TO_EVENT[method], command);
+			const matcher = methodConfig?.matcher;
+			addHookEntry(hooksOutput, METHOD_TO_EVENT[method], command, matcher);
 			hasAny = true;
 		}
 		const architectAgent = config["architect-mcp"]?.hook?.["claude-code"];
@@ -1029,7 +1072,8 @@ async function writeClaudeSettings(config, workspaceRoot) {
 			if (methodConfig === void 0) continue;
 			const extraFlags = methodConfig?.args ? argsToFlags(methodConfig?.args) : [];
 			const command = buildHookCommand(architectServer, `claude-code.${method}`, extraFlags);
-			addHookEntry(hooksOutput, METHOD_TO_EVENT[method], command);
+			const matcher = resolveArchitectClaudeMatcher(methodConfig);
+			addHookEntry(hooksOutput, METHOD_TO_EVENT[method], command, matcher);
 			hasAny = true;
 		}
 		if (!hasAny) {
@@ -1045,17 +1089,36 @@ async function writeClaudeSettings(config, workspaceRoot) {
 		throw new Error(`Failed to write ${CLAUDE_SETTINGS_DIR}/${CLAUDE_SETTINGS_FILE}: ${message}`);
 	}
 }
+async function writeMcpConfig(config, workspaceRoot) {
+	try {
+		const mcpConfig = buildMcpConfigYaml(config);
+		if (!mcpConfig) {
+			__agiflowai_aicode_utils.print.warning("No mcp-config.servers or mcp-config.skills config found — skipping mcp-config.yaml");
+			return;
+		}
+		await (0, node_fs_promises.writeFile)(node_path.default.join(workspaceRoot, MCP_CONFIG_FILE), js_yaml.default.dump(mcpConfig, { indent: 2 }), "utf-8");
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		throw new Error(`Failed to write ${MCP_CONFIG_FILE}: ${message}`);
+	}
+}
 /**
 * Generate .claude/settings.json from .toolkit/settings.yaml and mcp-config.yaml
 */
-const syncCommand = new commander.Command("sync").description("Generate .claude/settings.json from .toolkit/settings.yaml and mcp-config.yaml").action(async () => {
+const syncCommand = new commander.Command("sync").description("Generate .claude/settings.json from .toolkit/settings.yaml and mcp-config.yaml").option("--hooks", "Write .claude/settings.json only").option("--mcp", "Write mcp-config.yaml only").action(async (options) => {
 	try {
 		const [workspaceRoot, config] = await Promise.all([__agiflowai_aicode_utils.TemplatesManagerService.getWorkspaceRoot(), __agiflowai_aicode_utils.TemplatesManagerService.readToolkitConfig()]);
-		if (!config) throw new Error("No .toolkit/settings.yaml found. Run `aicode init` first.");
-		if (hasHookConfig(config)) {
+		if (!config) throw new Error("No toolkit settings config found (.toolkit/settings.yaml or legacy toolkit.yaml). Run `aicode init` first.");
+		const shouldWriteHooks = options.hooks || !options.hooks && !options.mcp;
+		const shouldWriteMcp = options.mcp || !options.hooks && !options.mcp;
+		if (shouldWriteHooks) if (hasHookConfig(config)) {
 			await writeClaudeSettings(config, workspaceRoot);
 			__agiflowai_aicode_utils.print.success("Written .claude/settings.json");
-		} else __agiflowai_aicode_utils.print.warning("No hook.claude-code config found in settings.yaml — skipping");
+		} else __agiflowai_aicode_utils.print.warning("No hook.claude-code config found in toolkit settings — skipping");
+		if (shouldWriteMcp) if (buildMcpConfigYaml(config)) {
+			await writeMcpConfig(config, workspaceRoot);
+			__agiflowai_aicode_utils.print.success("Written mcp-config.yaml");
+		} else __agiflowai_aicode_utils.print.warning("No mcp-config.servers or mcp-config.skills config found — skipping mcp-config.yaml");
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
 		__agiflowai_aicode_utils.print.error(`sync failed: ${message}`);

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { r as MCP_SERVER_INFO, t as MCPServer } from "./mcp-CBcPdzNG.mjs";
-import { a as SPEC_TOOL_INFO, c as NewProjectService, i as TemplateSelectionService, l as CodingAgentService, o as SpecTool, s as SpecToolService, t as displayBanner } from "./utils-QWjfWNVp.mjs";
+import { a as SPEC_TOOL_INFO, c as NewProjectService, i as TemplateSelectionService, l as CodingAgentService, o as SpecTool, s as SpecToolService, t as displayBanner } from "./utils-BTSpNlWu.mjs";
 import { ProjectType, TemplatesManagerService, cloneRepository, cloneSubdirectory, detectProjectType, ensureDir, findWorkspaceRoot, icons, messages, parseGitHubUrl, pathExists, print, sections } from "@agiflowai/aicode-utils";
 import { mkdir as mkdir$1, readFile as readFile$1, writeFile as writeFile$1 } from "node:fs/promises";
 import path from "node:path";
@@ -12,18 +12,18 @@ import { assign, createActor, createMachine, fromPromise } from "xstate";
 import yaml from "js-yaml";
 
 //#region package.json
-var version = "1.0.21";
+var version = "1.0.23";
 
 //#endregion
 //#region src/commands/add.ts
 /**
 * Add command - add a template to templates folder
 */
-const addCommand = new Command("add").description("Add a template to templates folder").requiredOption("--name <name>", "Template name").requiredOption("--url <url>", "URL of the template repository to download").option("--path <path>", "Override templates folder path (uses toolkit.yaml config by default)").option("--type <type>", "Template type: boilerplate or scaffold", "boilerplate").action(async (options) => {
+const addCommand = new Command("add").description("Add a template to templates folder").requiredOption("--name <name>", "Template name").requiredOption("--url <url>", "URL of the template repository to download").option("--path <path>", "Override templates folder path (uses .toolkit/settings.yaml or legacy toolkit.yaml config by default)").option("--type <type>", "Template type: boilerplate or scaffold", "boilerplate").action(async (options) => {
 	try {
 		const foundTemplatesPath = options.path ? path.resolve(options.path) : await TemplatesManagerService.findTemplatesPath();
 		if (!foundTemplatesPath) {
-			messages.error("Templates folder not found. Create a templates folder or specify templatesPath in toolkit.yaml");
+			messages.error("Templates folder not found. Create a templates folder or specify templatesPath in .toolkit/settings.yaml");
 			process.exit(1);
 		}
 		const templatesPath = foundTemplatesPath;
@@ -78,7 +78,7 @@ const addCommand = new Command("add").description("Add a template to templates f
 
 //#endregion
 //#region src/templates/settings.yaml.liquid?raw
-var settings_yaml_default = "# .toolkit/settings.yaml\n# Toolkit configuration for aicode-toolkit\n#\n# Local overrides go in .toolkit/settings.local.yaml (add to .gitignore).\n# Local settings are shallow-merged over this file — useful for per-developer\n# LLM tool preferences or API keys without committing them.\n\n# ---------------------------------------------------------------------------\n# Project identity\n# ---------------------------------------------------------------------------\n{% if projectType %}\nprojectType: {{ projectType }}\n{% else %}\n# projectType: monolith\n{% endif %}\n{% if templatesPath %}\ntemplatesPath: {{ templatesPath }}\n{% else %}\n# templatesPath: ./templates\n{% endif %}\n{% if sourceTemplate %}\nsourceTemplate: {{ sourceTemplate }}\n{% else %}\n# sourceTemplate: react-vite\n{% endif %}\nversion: '1.0'\n\n# ---------------------------------------------------------------------------\n# scaffold-mcp — configuration for the scaffold-mcp CLI\n# CLI flags always take precedence over values set here.\n# ---------------------------------------------------------------------------\n\nscaffold-mcp:\n\n  # -------------------------------------------------------------------------\n  # mcp-serve — defaults for `scaffold-mcp mcp-serve`\n  # -------------------------------------------------------------------------\n  mcp-serve:\n    # type: stdio\n    # port: 3000\n    # host: localhost\n    # adminEnable: false\n    # promptAsSkill: false\n    {% if fallbackTool %}\n    fallbackTool: {{ fallbackTool }}\n    {% if fallbackToolConfig %}\n    fallbackToolConfig:\n      {% for pair in fallbackToolConfig %}\n      {{ pair[0] }}: {{ pair[1] }}\n      {% endfor %}\n    {% else %}\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n    {% else %}\n    # fallbackTool: gemini-cli\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n    # Extra CLI args merged into the mcp-serve command (key: value → --key value)\n    # args:\n    #   review-tool: gemini-cli\n\n  # -------------------------------------------------------------------------\n  # hook — defaults for `scaffold-mcp hook`\n  # Keyed by agent name, then by hook method.\n  # Supported agents  : claude-code | gemini-cli\n  # Supported methods : preToolUse | postToolUse | userPromptSubmit | taskCompleted | stop\n  # -------------------------------------------------------------------------\n  hook:\n\n    claude-code:\n      preToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n      postToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n    gemini-cli:\n      postToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n# ---------------------------------------------------------------------------\n# architect-mcp — configuration for the architect-mcp CLI\n# CLI flags always take precedence over values set here.\n# ---------------------------------------------------------------------------\n\narchitect-mcp:\n\n  # -------------------------------------------------------------------------\n  # mcp-serve — defaults for `architect-mcp mcp-serve`\n  # -------------------------------------------------------------------------\n  mcp-serve:\n    # type: stdio\n    # port: 3000\n    # host: localhost\n    # adminEnable: false\n    {% if fallbackTool %}\n    fallbackTool: {{ fallbackTool }}\n    {% if fallbackToolConfig %}\n    fallbackToolConfig:\n      {% for pair in fallbackToolConfig %}\n      {{ pair[0] }}: {{ pair[1] }}\n      {% endfor %}\n    {% else %}\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n    {% else %}\n    # fallbackTool: gemini-cli\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n    # designPatternTool: gemini-cli\n    # designPatternToolConfig:\n    #   model: gemini-2.0-flash\n    # reviewTool: gemini-cli\n    # reviewToolConfig:\n    #   model: gemini-2.0-flash\n    # Extra CLI args merged into the mcp-serve command (key: value → --key value)\n    # args:\n    #   review-tool: gemini-cli\n\n  # -------------------------------------------------------------------------\n  # hook — defaults for `architect-mcp hook`\n  # Keyed by agent name, then by hook method.\n  # Supported agents  : claude-code | gemini-cli\n  # Supported methods : preToolUse | postToolUse\n  # -------------------------------------------------------------------------\n  hook:\n\n    claude-code:\n      preToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n      postToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n    gemini-cli:\n      preToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n      postToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n# ---------------------------------------------------------------------------\n# mcp-config — generates mcp-config.yaml via `aicode sync --mcp`\n# Servers listed here become entries in mcp-config.yaml.\n# Run `aicode sync` to write the output file.\n# ---------------------------------------------------------------------------\n\n# mcp-config:\n#   servers:\n#     scaffold-mcp:\n#       command: bun\n#       args:\n#         - run\n#         - packages/scaffold-mcp/src/cli.ts\n#         - mcp-serve\n#         - --admin-enable\n#         - --prompt-as-skill\n#       instruction: \"Use this server for generating boilerplate code, scaffolding new projects, and adding features to existing projects.\"\n#     architect-mcp:\n#       command: bun\n#       args:\n#         - run\n#         - packages/architect-mcp/src/cli.ts\n#         - mcp-serve\n#       instruction: \"Use this server for design pattern guidance and code review.\"\n#   skills:\n#     paths:\n#       - docs/skills\n";
+var settings_yaml_default = "# .toolkit/settings.yaml\n# Toolkit configuration for aicode-toolkit\n#\n# Local overrides go in .toolkit/settings.local.yaml (add to .gitignore).\n# Local settings are shallow-merged over this file — useful for per-developer\n# LLM tool preferences or API keys without committing them.\n#\n# All fields are optional. Uncomment and edit what you need.\n\n# ---------------------------------------------------------------------------\n# Project identity\n# ---------------------------------------------------------------------------\n\n{% comment %}Project type: monolith (single app) or monorepo (multiple packages/apps){% endcomment %}\n{% if projectType %}\nprojectType: {{ projectType }}\n{% else %}\n# projectType: monolith\n{% endif %}\n\n{% comment %}Path to the scaffold templates directory, relative to workspace root.{% endcomment %}\n{% if templatesPath %}\ntemplatesPath: {{ templatesPath }}\n{% else %}\n# templatesPath: ./templates\n{% endif %}\n\n{% comment %}Active template name (monolith only — monorepo reads from project.json).{% endcomment %}\n{% if sourceTemplate %}\nsourceTemplate: {{ sourceTemplate }}\n{% else %}\n# sourceTemplate: react-vite\n{% endif %}\n\n# Config schema version.\n# version: '1.0'\n\n# ---------------------------------------------------------------------------\n# scaffold-mcp — configuration for the scaffold-mcp CLI\n# CLI flags always take precedence over values set here.\n# ---------------------------------------------------------------------------\n\nscaffold-mcp:\n\n  # -------------------------------------------------------------------------\n  # mcp-serve — defaults for `scaffold-mcp mcp-serve`\n  # -------------------------------------------------------------------------\n  mcp-serve:\n    # Transport type: stdio | http | sse  (default: stdio)\n    # type: stdio\n\n    # Port for http/sse transport (default: 3000)\n    # port: 3000\n\n    # Host to bind for http/sse transport (default: localhost)\n    # host: localhost\n\n    # Enable admin tools such as generate-boilerplate (default: false)\n    # adminEnable: false\n\n    # Render prompts with skill front matter for Claude Code (default: false)\n    # promptAsSkill: false\n\n    # Fallback LLM tool used when scaffold-mcp needs AI assistance.\n    # Supported: claude-code | gemini-cli | codex\n    {% if fallbackTool %}\n    fallbackTool: {{ fallbackTool }}\n    {% if fallbackToolConfig %}\n    # Config passed to the fallback LLM tool.\n    fallbackToolConfig:\n      {% for pair in fallbackToolConfig %}\n      {{ pair[0] }}: {{ pair[1] }}\n      {% endfor %}\n    {% else %}\n    # Config passed to the fallback LLM tool.\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n    {% else %}\n    # fallbackTool: gemini-cli\n    # Config passed to the fallback LLM tool.\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n\n    # Ordered fallback chain used when fallbackTool is not set.\n    # The first valid entry wins.\n    # fallbacks:\n    #   - tool: gemini-cli\n    #     config:\n    #       model: gemini-2.0-flash\n    #   - tool: codex\n    #     config:\n    #       model: gpt-5.2-mini\n\n    # Extra CLI args merged into the mcp-serve command (key: value → --key value)\n    # args:\n    #   review-tool: gemini-cli\n\n  # -------------------------------------------------------------------------\n  # hook — defaults for `scaffold-mcp hook`\n  # Keyed by agent name, then by hook method.\n  # Supported agents  : claude-code | gemini-cli\n  # Supported methods : preToolUse | postToolUse | userPromptSubmit | taskCompleted | stop\n  # CLI flags --fallback-tool and --fallback-tool-config still take precedence.\n  # -------------------------------------------------------------------------\n  hook:\n\n    claude-code:\n      preToolUse:\n        # LLM tool to use for this hook. Supported: claude-code | gemini-cli | codex\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # fallbacks:\n        #   - tool: codex\n        #     config:\n        #       model: gpt-5.2-mini\n        # matcher: Edit|MultiEdit|Write\n        # Extra CLI args appended to the generated hook command (key: value → --key value)\n        # args:\n        #   llm-tool: gemini-cli\n\n      postToolUse:\n        # matcher: Edit|MultiEdit|Write\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # fallbacks:\n        #   - tool: codex\n        #     config:\n        #       model: gpt-5.2-mini\n        # args:\n        #   llm-tool: gemini-cli\n\n      userPromptSubmit:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n      taskCompleted:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n      stop:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # args:\n        #   llm-tool: gemini-cli\n\n    gemini-cli:\n      preToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n      postToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n# ---------------------------------------------------------------------------\n# architect-mcp — configuration for the architect-mcp CLI\n# CLI flags always take precedence over values set here.\n# ---------------------------------------------------------------------------\n\narchitect-mcp:\n\n  # -------------------------------------------------------------------------\n  # mcp-serve — defaults for `architect-mcp mcp-serve`\n  # -------------------------------------------------------------------------\n  mcp-serve:\n    # Transport type: stdio | http | sse  (default: stdio)\n    # type: stdio\n\n    # Port for http/sse transport (default: 3000)\n    # port: 3000\n\n    # Host to bind for http/sse transport (default: localhost)\n    # host: localhost\n\n    # Enable admin tools such as add-design-pattern and add-rule (default: false)\n    # adminEnable: false\n\n    # Fallback LLM tool used for both design-pattern and review when specific tools are not set.\n    # Supported: claude-code | gemini-cli | codex\n    {% if fallbackTool %}\n    fallbackTool: {{ fallbackTool }}\n    {% if fallbackToolConfig %}\n    # Config passed to the fallback LLM tool.\n    fallbackToolConfig:\n      {% for pair in fallbackToolConfig %}\n      {{ pair[0] }}: {{ pair[1] }}\n      {% endfor %}\n    {% else %}\n    # Config passed to the fallback LLM tool.\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n    {% else %}\n    # fallbackTool: gemini-cli\n    # Config passed to the fallback LLM tool.\n    # fallbackToolConfig:\n    #   model: gemini-2.0-flash\n    {% endif %}\n\n    # Ordered fallback chain used when fallbackTool is not set.\n    # The first valid entry wins.\n    # fallbacks:\n    #   - tool: gemini-cli\n    #     config:\n    #       model: gemini-2.0-flash\n    #   - tool: codex\n    #     config:\n    #       model: gpt-5.2-mini\n\n    # LLM tool used specifically for get-file-design-pattern analysis.\n    # Overrides fallbackTool for design pattern operations.\n    # designPatternTool: gemini-cli\n\n    # Config passed to the design pattern LLM tool.\n    # designPatternToolConfig:\n    #   model: gemini-2.0-flash\n\n    # LLM tool used specifically for review-code-change analysis.\n    # Overrides fallbackTool for code review operations.\n    # reviewTool: gemini-cli\n\n    # Config passed to the review LLM tool.\n    # reviewToolConfig:\n    #   model: gemini-2.0-flash\n\n    # Extra CLI args merged into the mcp-serve command (key: value → --key value)\n    # args:\n    #   review-tool: gemini-cli\n\n  # -------------------------------------------------------------------------\n  # hook — defaults for `architect-mcp hook`\n  # Keyed by agent name, then by hook method.\n  # Supported agents  : claude-code | gemini-cli\n  # Supported methods : preToolUse | postToolUse\n  # CLI flags --llm-tool, --fallback-tool, and --tool-config still take precedence.\n  # -------------------------------------------------------------------------\n  hook:\n\n    claude-code:\n      preToolUse:\n        # Static pattern matching is usually enough here. Leave llm-tool unset unless\n        # you want extra pattern filtering via LLM.\n        {% if fallbackTool %}\n        fallback-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        fallback-tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # fallback-tool: gemini-cli\n        # fallback-tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # fallbacks:\n        #   - tool: codex\n        #     config:\n        #       model: gpt-5.2-mini\n        # matcher: Edit|MultiEdit|Write\n        # Extra CLI args appended to the generated hook command (key: value → --key value)\n        # args:\n        #   llm-tool: gemini-cli\n\n      postToolUse:\n        # matcher: Edit|MultiEdit|Write\n        # Set llm-tool only if you want LLM-based review. A cheap model is recommended.\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n        # fallbacks:\n        #   - tool: codex\n        #     config:\n        #       model: gpt-5.2-mini\n        # args:\n        #   llm-tool: gemini-cli\n\n    gemini-cli:\n      preToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n      postToolUse:\n        {% if fallbackTool %}\n        llm-tool: {{ fallbackTool }}\n        {% if fallbackToolConfig %}\n        tool-config:\n          {% for pair in fallbackToolConfig %}\n          {{ pair[0] }}: {{ pair[1] }}\n          {% endfor %}\n        {% endif %}\n        {% else %}\n        # llm-tool: gemini-cli\n        # tool-config:\n        #   model: gemini-2.0-flash\n        {% endif %}\n\n# ---------------------------------------------------------------------------\n# mcp-config — generates mcp-config.yaml via `aicode sync --mcp`\n# Servers listed here become entries in mcp-config.yaml.\n# Run `aicode sync` to write the output file.\n# ---------------------------------------------------------------------------\n\n# mcp-config:\n#   servers:\n#     scaffold-mcp:\n#       command: bun\n#       args:\n#         - run\n#         - packages/scaffold-mcp/src/cli.ts\n#         - mcp-serve\n#         - --admin-enable\n#         - --prompt-as-skill\n#       instruction: \"Use this server for generating boilerplate code, scaffolding new projects, and adding features to existing projects.\"\n#     architect-mcp:\n#       command: bun\n#       args:\n#         - run\n#         - packages/architect-mcp/src/cli.ts\n#         - mcp-serve\n#       instruction: \"Use this server for design pattern guidance and code review.\"\n#   skills:\n#     paths:\n#       - docs/skills\n";
 
 //#endregion
 //#region src/states/init-machine.ts
@@ -220,7 +220,7 @@ const initMachine = createMachine({
 		checkingSkipTemplates: { always: [{
 			target: "promptingMcpSelection",
 			guard: ({ context }) => !context.options.skipTemplates
-		}, { target: "checkingSkipMcp" }] },
+		}, { target: "creatingConfig" }] },
 		promptingMcpSelection: { invoke: {
 			src: "promptMcpSelection",
 			onDone: {
@@ -726,11 +726,15 @@ const initActors = {
 	}),
 	createConfig: fromPromise(async ({ input: actorInput }) => {
 		if (actorInput.projectType === ProjectType.MONOLITH) {
-			const relativeTemplatesPath = path.relative(actorInput.workspaceRoot, actorInput.templatesPath);
+			const { relativeTemplatesPath, sourceTemplate } = resolveGeneratedSettingsValues({
+				workspaceRoot: actorInput.workspaceRoot,
+				templatesPath: actorInput.templatesPath,
+				selectedTemplates: actorInput.selectedTemplates
+			});
 			const content = await new Liquid().parseAndRender(settings_yaml_default, {
 				projectType: "monolith",
-				templatesPath: relativeTemplatesPath || "templates",
-				sourceTemplate: actorInput.selectedTemplates[0]
+				templatesPath: relativeTemplatesPath,
+				sourceTemplate
 			});
 			const toolkitDir = path.join(actorInput.workspaceRoot, ".toolkit");
 			const settingsPath = path.join(toolkitDir, "settings.yaml");
@@ -871,6 +875,13 @@ const initActors = {
 		}
 	})
 };
+function resolveGeneratedSettingsValues(input$1) {
+	const resolvedTemplatesPath = input$1.templatesPath ?? path.join(input$1.workspaceRoot, TemplatesManagerService.getTemplatesFolderName());
+	return {
+		relativeTemplatesPath: path.relative(input$1.workspaceRoot, resolvedTemplatesPath) || "templates",
+		sourceTemplate: input$1.selectedTemplates?.[0]
+	};
+}
 /**
 * Init command - improved V2 implementation
 */
@@ -937,6 +948,9 @@ const MCP_CONFIG_FILE = "mcp-config.yaml";
 function hasHookConfig(config) {
 	return !!(config["scaffold-mcp"]?.hook?.["claude-code"] || config["architect-mcp"]?.hook?.["claude-code"]);
 }
+function getSettingsMcpConfig(config) {
+	return config["mcp-config"];
+}
 function argsToFlags(args) {
 	const flags = [];
 	for (const [key, value] of Object.entries(args)) {
@@ -971,12 +985,40 @@ function buildHookCommand(server, hookType, extraFlags) {
 		...extraFlags
 	].join(" ");
 }
-function addHookEntry(output, event, command) {
+function resolveArchitectClaudeMatcher(methodConfig) {
+	return methodConfig?.matcher ?? "Edit|MultiEdit|Write";
+}
+function buildMcpConfigYaml(config) {
+	const settingsMcpConfig = getSettingsMcpConfig(config);
+	const servers = settingsMcpConfig?.servers ?? {};
+	const serverEntries = Object.entries(servers);
+	if (serverEntries.length === 0 && !settingsMcpConfig?.skills?.paths?.length) return null;
+	return {
+		...serverEntries.length > 0 ? { mcpServers: Object.fromEntries(serverEntries.map(([name, server]) => {
+			const instructionConfig = server.instruction ? { instruction: server.instruction } : void 0;
+			const mergedConfig = server.config || instructionConfig ? {
+				...server.config ?? {},
+				...instructionConfig ?? {}
+			} : void 0;
+			return [name, {
+				command: server.command,
+				...server.args ? { args: server.args } : {},
+				...server.env ? { env: server.env } : {},
+				...mergedConfig ? { config: mergedConfig } : {}
+			}];
+		})) } : {},
+		...settingsMcpConfig?.skills?.paths?.length ? { skills: settingsMcpConfig.skills } : {}
+	};
+}
+function addHookEntry(output, event, command, matcher) {
 	if (!output[event]) output[event] = [];
-	output[event].push({ hooks: [{
-		type: "command",
-		command
-	}] });
+	output[event].push({
+		...matcher ? { matcher } : {},
+		hooks: [{
+			type: "command",
+			command
+		}]
+	});
 }
 function isMcpConfigYaml(value) {
 	return typeof value === "object" && value !== null;
@@ -1017,7 +1059,8 @@ async function writeClaudeSettings(config, workspaceRoot) {
 			if (methodConfig === void 0) continue;
 			const extraFlags = methodConfig?.args ? argsToFlags(methodConfig?.args) : [];
 			const command = buildHookCommand(scaffoldServer, `claude-code.${method}`, extraFlags);
-			addHookEntry(hooksOutput, METHOD_TO_EVENT[method], command);
+			const matcher = methodConfig?.matcher;
+			addHookEntry(hooksOutput, METHOD_TO_EVENT[method], command, matcher);
 			hasAny = true;
 		}
 		const architectAgent = config["architect-mcp"]?.hook?.["claude-code"];
@@ -1026,7 +1069,8 @@ async function writeClaudeSettings(config, workspaceRoot) {
 			if (methodConfig === void 0) continue;
 			const extraFlags = methodConfig?.args ? argsToFlags(methodConfig?.args) : [];
 			const command = buildHookCommand(architectServer, `claude-code.${method}`, extraFlags);
-			addHookEntry(hooksOutput, METHOD_TO_EVENT[method], command);
+			const matcher = resolveArchitectClaudeMatcher(methodConfig);
+			addHookEntry(hooksOutput, METHOD_TO_EVENT[method], command, matcher);
 			hasAny = true;
 		}
 		if (!hasAny) {
@@ -1042,17 +1086,36 @@ async function writeClaudeSettings(config, workspaceRoot) {
 		throw new Error(`Failed to write ${CLAUDE_SETTINGS_DIR}/${CLAUDE_SETTINGS_FILE}: ${message}`);
 	}
 }
+async function writeMcpConfig(config, workspaceRoot) {
+	try {
+		const mcpConfig = buildMcpConfigYaml(config);
+		if (!mcpConfig) {
+			print.warning("No mcp-config.servers or mcp-config.skills config found — skipping mcp-config.yaml");
+			return;
+		}
+		await writeFile$1(path.join(workspaceRoot, MCP_CONFIG_FILE), yaml.dump(mcpConfig, { indent: 2 }), "utf-8");
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		throw new Error(`Failed to write ${MCP_CONFIG_FILE}: ${message}`);
+	}
+}
 /**
 * Generate .claude/settings.json from .toolkit/settings.yaml and mcp-config.yaml
 */
-const syncCommand = new Command("sync").description("Generate .claude/settings.json from .toolkit/settings.yaml and mcp-config.yaml").action(async () => {
+const syncCommand = new Command("sync").description("Generate .claude/settings.json from .toolkit/settings.yaml and mcp-config.yaml").option("--hooks", "Write .claude/settings.json only").option("--mcp", "Write mcp-config.yaml only").action(async (options) => {
 	try {
 		const [workspaceRoot, config] = await Promise.all([TemplatesManagerService.getWorkspaceRoot(), TemplatesManagerService.readToolkitConfig()]);
-		if (!config) throw new Error("No .toolkit/settings.yaml found. Run `aicode init` first.");
-		if (hasHookConfig(config)) {
+		if (!config) throw new Error("No toolkit settings config found (.toolkit/settings.yaml or legacy toolkit.yaml). Run `aicode init` first.");
+		const shouldWriteHooks = options.hooks || !options.hooks && !options.mcp;
+		const shouldWriteMcp = options.mcp || !options.hooks && !options.mcp;
+		if (shouldWriteHooks) if (hasHookConfig(config)) {
 			await writeClaudeSettings(config, workspaceRoot);
 			print.success("Written .claude/settings.json");
-		} else print.warning("No hook.claude-code config found in settings.yaml — skipping");
+		} else print.warning("No hook.claude-code config found in toolkit settings — skipping");
+		if (shouldWriteMcp) if (buildMcpConfigYaml(config)) {
+			await writeMcpConfig(config, workspaceRoot);
+			print.success("Written mcp-config.yaml");
+		} else print.warning("No mcp-config.servers or mcp-config.skills config found — skipping mcp-config.yaml");
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
 		print.error(`sync failed: ${message}`);

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_utils = require('./utils-r_182Nor.cjs');
+const require_utils = require('./utils-DMP5MQCv.cjs');
 require('./mcp--A-5zuBI.cjs');
 
 exports.BANNER_GRADIENT = require_utils.BANNER_GRADIENT;

package/dist/index.mjs

@@ -1,4 +1,4 @@
 import "./mcp-CBcPdzNG.mjs";
-import { c as NewProjectService, d as THEME, i as TemplateSelectionService, l as CodingAgentService, n as displayCompactBanner, r as TemplatesService, t as displayBanner, u as BANNER_GRADIENT } from "./utils-QWjfWNVp.mjs";
+import { c as NewProjectService, d as THEME, i as TemplateSelectionService, l as CodingAgentService, n as displayCompactBanner, r as TemplatesService, t as displayBanner, u as BANNER_GRADIENT } from "./utils-BTSpNlWu.mjs";
 
 export { BANNER_GRADIENT, CodingAgentService, NewProjectService, THEME, TemplateSelectionService, TemplatesService, displayBanner, displayCompactBanner };

package/dist/{utils-QWjfWNVp.mjs → utils-BTSpNlWu.mjs}

@@ -462,7 +462,7 @@ var NewProjectService = class {
 
 //#endregion
 //#region src/instructions/specs/openspec.md?raw
-var openspec_default = "When working on this project, follow the OpenSpec spec-driven development workflow{% if scaffoldMcp or architectMcp %} integrated with MCP tools{% endif %}.\n\n{% if scaffoldMcp %}\n\n## {% if scaffoldMcp %}1{% else %}1{% endif %}. Create Proposals with scaffold-mcp\n\nWhen implementing new features or changes, use scaffold-mcp MCP tools:\n\n**For new projects/features:**\n1. Use `list-boilerplates` MCP tool to see available templates\n2. Use `use-boilerplate` MCP tool to scaffold new projects{% if projectType == 'monolith' %} (set `monolith: true`){% elsif projectType == 'monorepo' %} (omit `monolith` parameter){% endif %}\n3. Use `list-scaffolding-methods` MCP tool to understand which methods can be used to add features\n4. Create OpenSpec proposal with available scaffolding methods in mind: \"Create an OpenSpec proposal for [feature description]\"\n\n**For adding features to existing code:**\n1. Use `list-scaffolding-methods` MCP tool with projectPath to see available features{% if projectType == 'monolith' %} (`projectPath` = workspace root){% elsif projectType == 'monorepo' %} (`projectPath` = project directory with project.json){% endif %}\n2. Review available methods and plan which ones to use for the feature\n3. Use `use-scaffold-method` MCP tool to generate boilerplate code\n4. Create OpenSpec proposal to capture the specs\n{% if projectType %}\n\n**Path Mapping ({% if projectType == 'monolith' %}Monolith{% else %}Monorepo{% endif %} Project):**\n{% if projectType == 'monolith' %}\n*This is a monolith project:*\n- Single project at workspace root\n- Config file: `toolkit.yaml` at root\n- All code in workspace root (src/, lib/, etc.)\n- When scaffolding: Use `monolith: true` parameter\n- When using scaffold methods: `projectPath` = workspace root\n\nExample: For workspace at `/path/to/project`:\n- Project config: `/path/to/project/toolkit.yaml`\n- Source code: `/path/to/project/src/`\n- OpenSpec: `/path/to/project/openspec/`\n{% else %}\n*This is a monorepo project:*\n- Multiple projects in subdirectories\n- Config file: `project.json` in each project\n- Projects in apps/, packages/, libs/, etc.\n- When scaffolding: Omit `monolith` parameter (defaults to false)\n- When using scaffold methods: `projectPath` = path to specific project\n\nExample: For workspace at `/path/to/workspace`:\n- App config: `/path/to/workspace/apps/my-app/project.json`\n- App source: `/path/to/workspace/apps/my-app/src/`\n- OpenSpec: `/path/to/workspace/openspec/` (workspace-level)\n{% endif %}\n{% endif %}\n\nAI will scaffold: openspec/changes/[feature-name]/ with proposal.md, tasks.md, and spec deltas\n{% endif %}\n{% if architectMcp %}\n\n## {% if scaffoldMcp %}2{% else %}1{% endif %}. Review & Validate with architect-mcp\n\nBefore and after editing files, use architect-mcp MCP tools:\n\n**Before editing:**\n- Use `get-file-design-pattern` MCP tool to understand:\n  - Applicable design patterns from architect.yaml\n  - Coding rules from RULES.yaml (must_do, should_do, must_not_do)\n  - Code examples showing the patterns\n\n**After editing:**\n- Use `review-code-change` MCP tool to check for:\n  - Must not do violations (critical issues)\n  - Must do missing (required patterns not followed)\n  - Should do suggestions (best practices)\n\n**Validate OpenSpec specs:**\n- Use `openspec validate [feature-name]` to check spec formatting\n- Iterate with AI until specs are agreed upon\n{% endif %}\n\n## {% if scaffoldMcp and architectMcp %}3{% elsif scaffoldMcp or architectMcp %}2{% else %}1{% endif %}. Implement{% if architectMcp %} with MCP-Guided Development{% endif %}\n\nDuring implementation:\n1. Ask AI to implement: \"Apply the OpenSpec change [feature-name]\"\n{% if architectMcp %}\n2. **Before each file edit**: Use `get-file-design-pattern` to understand patterns\n3. AI implements tasks from tasks.md following design patterns\n4. **After each file edit**: Use `review-code-change` to verify compliance\n5. Fix any violations before proceeding\n{% else %}\n2. AI implements tasks from tasks.md following the agreed specs\n{% endif %}\n\n## {% if scaffoldMcp and architectMcp %}4{% elsif scaffoldMcp or architectMcp %}3{% else %}2{% endif %}. Archive Completed Changes\n{% if scaffoldMcp or architectMcp %}\n\n## MCP Tools Reference\n{% endif %}\n{% if scaffoldMcp %}\n\n### scaffold-mcp\n- `list-boilerplates` - List available project templates\n- `use-boilerplate` - Create new project from template\n- `list-scaffolding-methods` - List features for existing project\n- `use-scaffold-method` - Add feature to existing project\n{% endif %}\n{% if architectMcp %}\n\n### architect-mcp\n- `get-file-design-pattern` - Get design patterns for file\n- `review-code-change` - Review code for violations\n{% endif %}\n\n## Workflow Summary\n\n{% if scaffoldMcp %}\n1. **Plan**: Use scaffold-mcp to generate boilerplate + OpenSpec proposal for specs\n{% else %}\n1. **Plan**: Create OpenSpec proposal with specs\n{% endif %}\n{% if architectMcp %}\n{% if scaffoldMcp %}2{% else %}2{% endif %}. **Design**: Use architect-mcp to understand patterns before editing\n{% endif %}\n{% if scaffoldMcp and architectMcp %}3{% elsif scaffoldMcp or architectMcp %}{% if architectMcp %}3{% else %}2{% endif %}{% else %}2{% endif %}. **Implement**: Follow specs{% if architectMcp %} and patterns{% endif %}\n{% if architectMcp %}\n{% if scaffoldMcp %}4{% else %}4{% endif %}. **Review**: Use architect-mcp to validate code quality\n{% endif %}\n{% if scaffoldMcp and architectMcp %}5{% elsif scaffoldMcp or architectMcp %}{% if architectMcp %}5{% else %}3{% endif %}{% else %}3{% endif %}. **Archive**: Merge specs into source of truth\n";
+var openspec_default = "When working on this project, follow the OpenSpec spec-driven development workflow{% if scaffoldMcp or architectMcp %} integrated with MCP tools{% endif %}.\n\n{% if scaffoldMcp %}\n\n## {% if scaffoldMcp %}1{% else %}1{% endif %}. Create Proposals with scaffold-mcp\n\nWhen implementing new features or changes, use scaffold-mcp MCP tools:\n\n**For new projects/features:**\n1. Use `list-boilerplates` MCP tool to see available templates\n2. Use `use-boilerplate` MCP tool to scaffold new projects{% if projectType == 'monolith' %} (set `monolith: true`){% elsif projectType == 'monorepo' %} (omit `monolith` parameter){% endif %}\n3. Use `list-scaffolding-methods` MCP tool to understand which methods can be used to add features\n4. Create OpenSpec proposal with available scaffolding methods in mind: \"Create an OpenSpec proposal for [feature description]\"\n\n**For adding features to existing code:**\n1. Use `list-scaffolding-methods` MCP tool with projectPath to see available features{% if projectType == 'monolith' %} (`projectPath` = workspace root){% elsif projectType == 'monorepo' %} (`projectPath` = project directory with project.json){% endif %}\n2. Review available methods and plan which ones to use for the feature\n3. Use `use-scaffold-method` MCP tool to generate boilerplate code\n4. Create OpenSpec proposal to capture the specs\n{% if projectType %}\n\n**Path Mapping ({% if projectType == 'monolith' %}Monolith{% else %}Monorepo{% endif %} Project):**\n{% if projectType == 'monolith' %}\n*This is a monolith project:*\n- Single project at workspace root\n- Config file: `.toolkit/settings.yaml` at root\n- All code in workspace root (src/, lib/, etc.)\n- When scaffolding: Use `monolith: true` parameter\n- When using scaffold methods: `projectPath` = workspace root\n\nExample: For workspace at `/path/to/project`:\n- Project config: `/path/to/project/.toolkit/settings.yaml`\n- Source code: `/path/to/project/src/`\n- OpenSpec: `/path/to/project/openspec/`\n{% else %}\n*This is a monorepo project:*\n- Multiple projects in subdirectories\n- Config file: `project.json` in each project\n- Projects in apps/, packages/, libs/, etc.\n- When scaffolding: Omit `monolith` parameter (defaults to false)\n- When using scaffold methods: `projectPath` = path to specific project\n\nExample: For workspace at `/path/to/workspace`:\n- App config: `/path/to/workspace/apps/my-app/project.json`\n- App source: `/path/to/workspace/apps/my-app/src/`\n- OpenSpec: `/path/to/workspace/openspec/` (workspace-level)\n{% endif %}\n{% endif %}\n\nAI will scaffold: openspec/changes/[feature-name]/ with proposal.md, tasks.md, and spec deltas\n{% endif %}\n{% if architectMcp %}\n\n## {% if scaffoldMcp %}2{% else %}1{% endif %}. Review & Validate with architect-mcp\n\nBefore and after editing files, use architect-mcp MCP tools:\n\n**Before editing:**\n- Use `get-file-design-pattern` MCP tool to understand:\n  - Applicable design patterns from architect.yaml\n  - Coding rules from RULES.yaml (must_do, should_do, must_not_do)\n  - Code examples showing the patterns\n\n**After editing:**\n- Use `review-code-change` MCP tool to check for:\n  - Must not do violations (critical issues)\n  - Must do missing (required patterns not followed)\n  - Should do suggestions (best practices)\n\n**Validate OpenSpec specs:**\n- Use `openspec validate [feature-name]` to check spec formatting\n- Iterate with AI until specs are agreed upon\n{% endif %}\n\n## {% if scaffoldMcp and architectMcp %}3{% elsif scaffoldMcp or architectMcp %}2{% else %}1{% endif %}. Implement{% if architectMcp %} with MCP-Guided Development{% endif %}\n\nDuring implementation:\n1. Ask AI to implement: \"Apply the OpenSpec change [feature-name]\"\n{% if architectMcp %}\n2. **Before each file edit**: Use `get-file-design-pattern` to understand patterns\n3. AI implements tasks from tasks.md following design patterns\n4. **After each file edit**: Use `review-code-change` to verify compliance\n5. Fix any violations before proceeding\n{% else %}\n2. AI implements tasks from tasks.md following the agreed specs\n{% endif %}\n\n## {% if scaffoldMcp and architectMcp %}4{% elsif scaffoldMcp or architectMcp %}3{% else %}2{% endif %}. Archive Completed Changes\n{% if scaffoldMcp or architectMcp %}\n\n## MCP Tools Reference\n{% endif %}\n{% if scaffoldMcp %}\n\n### scaffold-mcp\n- `list-boilerplates` - List available project templates\n- `use-boilerplate` - Create new project from template\n- `list-scaffolding-methods` - List features for existing project\n- `use-scaffold-method` - Add feature to existing project\n{% endif %}\n{% if architectMcp %}\n\n### architect-mcp\n- `get-file-design-pattern` - Get design patterns for file\n- `review-code-change` - Review code for violations\n{% endif %}\n\n## Workflow Summary\n\n{% if scaffoldMcp %}\n1. **Plan**: Use scaffold-mcp to generate boilerplate + OpenSpec proposal for specs\n{% else %}\n1. **Plan**: Create OpenSpec proposal with specs\n{% endif %}\n{% if architectMcp %}\n{% if scaffoldMcp %}2{% else %}2{% endif %}. **Design**: Use architect-mcp to understand patterns before editing\n{% endif %}\n{% if scaffoldMcp and architectMcp %}3{% elsif scaffoldMcp or architectMcp %}{% if architectMcp %}3{% else %}2{% endif %}{% else %}2{% endif %}. **Implement**: Follow specs{% if architectMcp %} and patterns{% endif %}\n{% if architectMcp %}\n{% if scaffoldMcp %}4{% else %}4{% endif %}. **Review**: Use architect-mcp to validate code quality\n{% endif %}\n{% if scaffoldMcp and architectMcp %}5{% elsif scaffoldMcp or architectMcp %}{% if architectMcp %}5{% else %}3{% endif %}{% else %}3{% endif %}. **Archive**: Merge specs into source of truth\n";
 
 //#endregion
 //#region src/specs/openspec.ts

package/dist/{utils-r_182Nor.cjs → utils-DMP5MQCv.cjs}

@@ -494,7 +494,7 @@ var NewProjectService = class {
 
 //#endregion
 //#region src/instructions/specs/openspec.md?raw
-var openspec_default = "When working on this project, follow the OpenSpec spec-driven development workflow{% if scaffoldMcp or architectMcp %} integrated with MCP tools{% endif %}.\n\n{% if scaffoldMcp %}\n\n## {% if scaffoldMcp %}1{% else %}1{% endif %}. Create Proposals with scaffold-mcp\n\nWhen implementing new features or changes, use scaffold-mcp MCP tools:\n\n**For new projects/features:**\n1. Use `list-boilerplates` MCP tool to see available templates\n2. Use `use-boilerplate` MCP tool to scaffold new projects{% if projectType == 'monolith' %} (set `monolith: true`){% elsif projectType == 'monorepo' %} (omit `monolith` parameter){% endif %}\n3. Use `list-scaffolding-methods` MCP tool to understand which methods can be used to add features\n4. Create OpenSpec proposal with available scaffolding methods in mind: \"Create an OpenSpec proposal for [feature description]\"\n\n**For adding features to existing code:**\n1. Use `list-scaffolding-methods` MCP tool with projectPath to see available features{% if projectType == 'monolith' %} (`projectPath` = workspace root){% elsif projectType == 'monorepo' %} (`projectPath` = project directory with project.json){% endif %}\n2. Review available methods and plan which ones to use for the feature\n3. Use `use-scaffold-method` MCP tool to generate boilerplate code\n4. Create OpenSpec proposal to capture the specs\n{% if projectType %}\n\n**Path Mapping ({% if projectType == 'monolith' %}Monolith{% else %}Monorepo{% endif %} Project):**\n{% if projectType == 'monolith' %}\n*This is a monolith project:*\n- Single project at workspace root\n- Config file: `toolkit.yaml` at root\n- All code in workspace root (src/, lib/, etc.)\n- When scaffolding: Use `monolith: true` parameter\n- When using scaffold methods: `projectPath` = workspace root\n\nExample: For workspace at `/path/to/project`:\n- Project config: `/path/to/project/toolkit.yaml`\n- Source code: `/path/to/project/src/`\n- OpenSpec: `/path/to/project/openspec/`\n{% else %}\n*This is a monorepo project:*\n- Multiple projects in subdirectories\n- Config file: `project.json` in each project\n- Projects in apps/, packages/, libs/, etc.\n- When scaffolding: Omit `monolith` parameter (defaults to false)\n- When using scaffold methods: `projectPath` = path to specific project\n\nExample: For workspace at `/path/to/workspace`:\n- App config: `/path/to/workspace/apps/my-app/project.json`\n- App source: `/path/to/workspace/apps/my-app/src/`\n- OpenSpec: `/path/to/workspace/openspec/` (workspace-level)\n{% endif %}\n{% endif %}\n\nAI will scaffold: openspec/changes/[feature-name]/ with proposal.md, tasks.md, and spec deltas\n{% endif %}\n{% if architectMcp %}\n\n## {% if scaffoldMcp %}2{% else %}1{% endif %}. Review & Validate with architect-mcp\n\nBefore and after editing files, use architect-mcp MCP tools:\n\n**Before editing:**\n- Use `get-file-design-pattern` MCP tool to understand:\n  - Applicable design patterns from architect.yaml\n  - Coding rules from RULES.yaml (must_do, should_do, must_not_do)\n  - Code examples showing the patterns\n\n**After editing:**\n- Use `review-code-change` MCP tool to check for:\n  - Must not do violations (critical issues)\n  - Must do missing (required patterns not followed)\n  - Should do suggestions (best practices)\n\n**Validate OpenSpec specs:**\n- Use `openspec validate [feature-name]` to check spec formatting\n- Iterate with AI until specs are agreed upon\n{% endif %}\n\n## {% if scaffoldMcp and architectMcp %}3{% elsif scaffoldMcp or architectMcp %}2{% else %}1{% endif %}. Implement{% if architectMcp %} with MCP-Guided Development{% endif %}\n\nDuring implementation:\n1. Ask AI to implement: \"Apply the OpenSpec change [feature-name]\"\n{% if architectMcp %}\n2. **Before each file edit**: Use `get-file-design-pattern` to understand patterns\n3. AI implements tasks from tasks.md following design patterns\n4. **After each file edit**: Use `review-code-change` to verify compliance\n5. Fix any violations before proceeding\n{% else %}\n2. AI implements tasks from tasks.md following the agreed specs\n{% endif %}\n\n## {% if scaffoldMcp and architectMcp %}4{% elsif scaffoldMcp or architectMcp %}3{% else %}2{% endif %}. Archive Completed Changes\n{% if scaffoldMcp or architectMcp %}\n\n## MCP Tools Reference\n{% endif %}\n{% if scaffoldMcp %}\n\n### scaffold-mcp\n- `list-boilerplates` - List available project templates\n- `use-boilerplate` - Create new project from template\n- `list-scaffolding-methods` - List features for existing project\n- `use-scaffold-method` - Add feature to existing project\n{% endif %}\n{% if architectMcp %}\n\n### architect-mcp\n- `get-file-design-pattern` - Get design patterns for file\n- `review-code-change` - Review code for violations\n{% endif %}\n\n## Workflow Summary\n\n{% if scaffoldMcp %}\n1. **Plan**: Use scaffold-mcp to generate boilerplate + OpenSpec proposal for specs\n{% else %}\n1. **Plan**: Create OpenSpec proposal with specs\n{% endif %}\n{% if architectMcp %}\n{% if scaffoldMcp %}2{% else %}2{% endif %}. **Design**: Use architect-mcp to understand patterns before editing\n{% endif %}\n{% if scaffoldMcp and architectMcp %}3{% elsif scaffoldMcp or architectMcp %}{% if architectMcp %}3{% else %}2{% endif %}{% else %}2{% endif %}. **Implement**: Follow specs{% if architectMcp %} and patterns{% endif %}\n{% if architectMcp %}\n{% if scaffoldMcp %}4{% else %}4{% endif %}. **Review**: Use architect-mcp to validate code quality\n{% endif %}\n{% if scaffoldMcp and architectMcp %}5{% elsif scaffoldMcp or architectMcp %}{% if architectMcp %}5{% else %}3{% endif %}{% else %}3{% endif %}. **Archive**: Merge specs into source of truth\n";
+var openspec_default = "When working on this project, follow the OpenSpec spec-driven development workflow{% if scaffoldMcp or architectMcp %} integrated with MCP tools{% endif %}.\n\n{% if scaffoldMcp %}\n\n## {% if scaffoldMcp %}1{% else %}1{% endif %}. Create Proposals with scaffold-mcp\n\nWhen implementing new features or changes, use scaffold-mcp MCP tools:\n\n**For new projects/features:**\n1. Use `list-boilerplates` MCP tool to see available templates\n2. Use `use-boilerplate` MCP tool to scaffold new projects{% if projectType == 'monolith' %} (set `monolith: true`){% elsif projectType == 'monorepo' %} (omit `monolith` parameter){% endif %}\n3. Use `list-scaffolding-methods` MCP tool to understand which methods can be used to add features\n4. Create OpenSpec proposal with available scaffolding methods in mind: \"Create an OpenSpec proposal for [feature description]\"\n\n**For adding features to existing code:**\n1. Use `list-scaffolding-methods` MCP tool with projectPath to see available features{% if projectType == 'monolith' %} (`projectPath` = workspace root){% elsif projectType == 'monorepo' %} (`projectPath` = project directory with project.json){% endif %}\n2. Review available methods and plan which ones to use for the feature\n3. Use `use-scaffold-method` MCP tool to generate boilerplate code\n4. Create OpenSpec proposal to capture the specs\n{% if projectType %}\n\n**Path Mapping ({% if projectType == 'monolith' %}Monolith{% else %}Monorepo{% endif %} Project):**\n{% if projectType == 'monolith' %}\n*This is a monolith project:*\n- Single project at workspace root\n- Config file: `.toolkit/settings.yaml` at root\n- All code in workspace root (src/, lib/, etc.)\n- When scaffolding: Use `monolith: true` parameter\n- When using scaffold methods: `projectPath` = workspace root\n\nExample: For workspace at `/path/to/project`:\n- Project config: `/path/to/project/.toolkit/settings.yaml`\n- Source code: `/path/to/project/src/`\n- OpenSpec: `/path/to/project/openspec/`\n{% else %}\n*This is a monorepo project:*\n- Multiple projects in subdirectories\n- Config file: `project.json` in each project\n- Projects in apps/, packages/, libs/, etc.\n- When scaffolding: Omit `monolith` parameter (defaults to false)\n- When using scaffold methods: `projectPath` = path to specific project\n\nExample: For workspace at `/path/to/workspace`:\n- App config: `/path/to/workspace/apps/my-app/project.json`\n- App source: `/path/to/workspace/apps/my-app/src/`\n- OpenSpec: `/path/to/workspace/openspec/` (workspace-level)\n{% endif %}\n{% endif %}\n\nAI will scaffold: openspec/changes/[feature-name]/ with proposal.md, tasks.md, and spec deltas\n{% endif %}\n{% if architectMcp %}\n\n## {% if scaffoldMcp %}2{% else %}1{% endif %}. Review & Validate with architect-mcp\n\nBefore and after editing files, use architect-mcp MCP tools:\n\n**Before editing:**\n- Use `get-file-design-pattern` MCP tool to understand:\n  - Applicable design patterns from architect.yaml\n  - Coding rules from RULES.yaml (must_do, should_do, must_not_do)\n  - Code examples showing the patterns\n\n**After editing:**\n- Use `review-code-change` MCP tool to check for:\n  - Must not do violations (critical issues)\n  - Must do missing (required patterns not followed)\n  - Should do suggestions (best practices)\n\n**Validate OpenSpec specs:**\n- Use `openspec validate [feature-name]` to check spec formatting\n- Iterate with AI until specs are agreed upon\n{% endif %}\n\n## {% if scaffoldMcp and architectMcp %}3{% elsif scaffoldMcp or architectMcp %}2{% else %}1{% endif %}. Implement{% if architectMcp %} with MCP-Guided Development{% endif %}\n\nDuring implementation:\n1. Ask AI to implement: \"Apply the OpenSpec change [feature-name]\"\n{% if architectMcp %}\n2. **Before each file edit**: Use `get-file-design-pattern` to understand patterns\n3. AI implements tasks from tasks.md following design patterns\n4. **After each file edit**: Use `review-code-change` to verify compliance\n5. Fix any violations before proceeding\n{% else %}\n2. AI implements tasks from tasks.md following the agreed specs\n{% endif %}\n\n## {% if scaffoldMcp and architectMcp %}4{% elsif scaffoldMcp or architectMcp %}3{% else %}2{% endif %}. Archive Completed Changes\n{% if scaffoldMcp or architectMcp %}\n\n## MCP Tools Reference\n{% endif %}\n{% if scaffoldMcp %}\n\n### scaffold-mcp\n- `list-boilerplates` - List available project templates\n- `use-boilerplate` - Create new project from template\n- `list-scaffolding-methods` - List features for existing project\n- `use-scaffold-method` - Add feature to existing project\n{% endif %}\n{% if architectMcp %}\n\n### architect-mcp\n- `get-file-design-pattern` - Get design patterns for file\n- `review-code-change` - Review code for violations\n{% endif %}\n\n## Workflow Summary\n\n{% if scaffoldMcp %}\n1. **Plan**: Use scaffold-mcp to generate boilerplate + OpenSpec proposal for specs\n{% else %}\n1. **Plan**: Create OpenSpec proposal with specs\n{% endif %}\n{% if architectMcp %}\n{% if scaffoldMcp %}2{% else %}2{% endif %}. **Design**: Use architect-mcp to understand patterns before editing\n{% endif %}\n{% if scaffoldMcp and architectMcp %}3{% elsif scaffoldMcp or architectMcp %}{% if architectMcp %}3{% else %}2{% endif %}{% else %}2{% endif %}. **Implement**: Follow specs{% if architectMcp %} and patterns{% endif %}\n{% if architectMcp %}\n{% if scaffoldMcp %}4{% else %}4{% endif %}. **Review**: Use architect-mcp to validate code quality\n{% endif %}\n{% if scaffoldMcp and architectMcp %}5{% elsif scaffoldMcp or architectMcp %}{% if architectMcp %}5{% else %}3{% endif %}{% else %}3{% endif %}. **Archive**: Merge specs into source of truth\n";
 
 //#endregion
 //#region src/specs/openspec.ts

package/package.json

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