sfcc-dev-mcp 1.0.15 → 1.0.19

package/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to SFCC Development MCP Server
 
-Thank you for your interest in contributing to the SFCC Development MCP Server! This project provides MCP tools for Salesforce B2C Commerce Cloud development assistance, including documentation access, best practices guides, log analysis, and system object definitions.
+Thank you for your interest in contributing to the SFCC Development MCP Server! This project provides MCP tools for Salesforce B2C Commerce Cloud development assistance, including documentation access, bundled agent skills, log analysis, and system object definitions.
 
 ## Table of Contents
 
@@ -75,23 +75,11 @@ For testing full mode features, create a `dw.json` file in the project root:
 ## Project Structure
 
 ```
-src/
-├── main.ts                    # Entry point
-├── server.ts                  # MCP server implementation
-├── tool-definitions.ts        # MCP tool definitions
-├── types.ts                   # TypeScript type definitions
-├── config.ts                  # Configuration management
-├── best-practices-client.ts   # Best practices guide client
-├── docs-client.ts            # SFCC documentation client
-├── log-client.ts             # SFCC log analysis client
-├── ocapi-client.ts           # OCAPI system object client
-└── utils.ts                  # Utility functions
-
-docs/
-├── best-practices/           # Best practice guides
-└── dw_*/                    # SFCC API documentation
-
-tests/                        # Test files
+src/                          # TypeScript MCP server
+docs/                         # SFCC docs sources (dw_* namespaces, sfra, isml)
+ai-instructions/              # AGENTS.md + bundled skills (ai-instructions/skills/*/SKILL.md)
+docs-site/                    # React + Vite documentation site
+tests/                        # Jest + MCP (Aegis) tests
 scripts/                      # Build and utility scripts
 ```
 
@@ -125,7 +113,7 @@ scripts/                      # Build and utility scripts
 
 ### 3. Documentation
 
-- Update best practice guides
+- Update bundled skills (ai-instructions/skills/*/SKILL.md)
 - Add new SFCC API documentation
 - Improve code comments and README
 
@@ -243,11 +231,11 @@ npm run lint:fix
 
 ## Documentation
 
-### Best Practice Guides
+### Agent Skills
 
-When adding or updating guides in `docs/best-practices/`:
+When adding or updating skills in `ai-instructions/skills/<skill>/SKILL.md`:
 
-1. Follow the existing markdown structure
+1. Include frontmatter (`name`, `description`)
 2. Include practical examples
 3. Reference relevant SFCC APIs
 4. Provide security considerations

package/README.md

@@ -10,9 +10,11 @@ An AI-powered Model Context Protocol (MCP) server that provides comprehensive ac
 - **🔍 Complete SFCC Documentation Access** - Search and explore all SFCC API classes and methods
 - **📚 Best Practices Guides** - Curated development guidelines for cartridges, hooks, controllers, client-side JavaScript, and more  
 - **🏗️ SFRA Documentation** - Enhanced access to Storefront Reference Architecture documentation
-- **📊 Log Analysis Tools** - Real-time error monitoring, debugging, and job log analysis for SFCC instances
+- **� ISML Template Reference** - Complete ISML element documentation with examples and best practices
+- **�📊 Log Analysis Tools** - Real-time error monitoring, debugging, and job log analysis for SFCC instances
 - **⚙️ System Object Definitions** - Explore custom attributes and site preferences
 - **🚀 Cartridge Generation** - Automated cartridge structure creation
+- **🧩 Agent Skill Bootstrap** - Install or merge AGENTS.md and bundled skills into the current project or a temp directory for AI assistants
 
 ## 🚀 Quick Start
 
@@ -51,35 +53,62 @@ Create a `dw.json` file with your SFCC credentials:
 }
 ```
 
+### Option 3: Auto-Discovery (Recommended for VS Code users)
+Simply open a VS Code workspace that contains a `dw.json` file - the server will automatically discover and use it:
+```json
+{
+  "mcpServers": {
+    "sfcc-dev": {
+      "command": "npx",
+      "args": ["sfcc-dev-mcp"]
+    }
+  }
+}
+```
+
+## 🔧 Configuration Discovery Priority
+
+The server discovers SFCC credentials in this order (highest priority first):
+
+| Priority | Source | Description |
+|----------|--------|-------------|
+| **1** | `--dw-json` CLI parameter | Explicit path to dw.json file |
+| **2** | Environment variables | `SFCC_HOSTNAME`, `SFCC_USERNAME`, `SFCC_PASSWORD`, `SFCC_CLIENT_ID`, `SFCC_CLIENT_SECRET` |
+| **3** | MCP workspace roots | Automatically discovers dw.json in your VS Code workspace folder(s) |
+
+> **Note**: The server no longer searches the current working directory by default, as MCP servers often start with `cwd` set to the user's home directory. The MCP workspace roots mechanism provides reliable project context.
+
 ## 🎯 Operating Modes
 
 | Mode | Tools Available | SFCC Credentials Required |
 |------|----------------|---------------------------|
-| **Documentation-Only** | 15 tools | ❌ No |
-| **Full Mode** | 36 tools | ✅ Yes |
+| **Documentation-Only** | 21 tools | ❌ No |
+| **Full Mode** | 38 tools | ✅ Yes |
 
 ### Documentation-Only Mode
 Perfect for learning and development - no SFCC instance required:
 - Complete SFCC API documentation (5 tools)
 - Best practices guides (4 tools) – cartridges, client-side JavaScript, controllers, hooks, security/performance 
 - SFRA documentation (5 tools)
+- ISML template documentation (5 tools)
 - Cartridge generation (1 tool)
+- Agent instruction bootstrap (1 tool) to copy/merge AGENTS.md and skills
 
 ### Full Mode  
 Complete development experience with live SFCC instance access:
-- All documentation-only features (15 tools)
+- All documentation-only features (21 tools)
 - Real-time log analysis (13 tools)
 - System object definitions (6 tools)
 - Code version management (2 tools)
 
-## � Architecture Overview
+## 🏗️ Architecture Overview
 
 This server is built around a **capability-gated, modular handler architecture** that cleanly separates tool routing from domain logic:
 
 ### Core Layers
-- **Tool Definitions** (`src/core/tool-definitions.ts`): Declarative schemas grouped by category (documentation, best practices, SFRA, logs, job logs, system objects, cartridge generation, code versions).
-- **Handlers** (`src/core/handlers/*.ts`): Each category has a handler extending a common base for timing, structured logging, and error normalization (e.g. `log-handler`, `docs-handler`, `system-object-handler`).
-- **Clients** (`src/clients/`): Encapsulate domain operations (OCAPI, SFRA docs, best practices, modular log analysis). Handlers delegate to these so orchestration and computation remain separate.
+- **Tool Schemas** (`src/core/tool-schemas/`): Modular, category-based tool definitions (documentation, best practices, SFRA, ISML, logs, job logs, system objects, cartridge, code versions). Re-exported via `tool-definitions.ts`.
+- **Handlers** (`src/core/handlers/`): Each category has a handler extending a common base for timing, structured logging, and error normalization (e.g. `log-handler`, `docs-handler`, `isml-handler`, `system-object-handler`).
+- **Clients** (`src/clients/`): Encapsulate domain operations (OCAPI, SFRA docs, ISML docs, best practices, modular log analysis, cartridge generation). Handlers delegate to these so orchestration and computation remain separate.
 - **Services** (`src/services/`): Dependency-injected abstractions for filesystem and path operations — improves testability and isolates side effects.
 - **Modular Log System** (`src/clients/logs/`): Reader (range/tail optimization), discovery, processor (line → structured entry), analyzer (patterns & health), formatter (human output) for maintainable evolution.
 - **Configuration Factory** (`src/config/configuration-factory.ts`): Determines capabilities (`canAccessLogs`, `canAccessOCAPI`) based on provided credentials and filters exposed tools accordingly (principle of least privilege).
@@ -91,17 +120,18 @@ This server is built around a **capability-gated, modular handler architecture**
 - **Performance**: Tail log reads + lightweight caching (`cache.ts`, `log-cache.ts`) reduce unnecessary I/O.
 
 ### Adding a New Tool (High-Level)
-1. Add schema object to the correct exported array in `tool-definitions.ts`.
-2. Implement domain logic in a client/service (avoid bloating handlers).
-3. Extend an existing handler or create a new one if it's a new category.
-4. (Only for a new category) register the new handler inside `registerHandlers()` in `server.ts`.
-5. Discover actual response shape with `npx mcp-aegis query` before writing tests.
-6. Add Jest unit tests + YAML MCP tests (docs vs full mode if credentials required).
-7. Update documentation (Development Guide + README counts if changed).
+1. Add schema to the appropriate file in `src/core/tool-schemas/` (or create new file for new category).
+2. Export new schema from `src/core/tool-schemas/index.ts` if adding a new file.
+3. Implement domain logic in a client/service (avoid bloating handlers).
+4. Extend an existing handler or create a new one if it's a new category.
+5. (Only for a new category) register the new handler inside `registerHandlers()` in `server.ts`.
+6. Discover actual response shape with `npx aegis query` before writing tests.
+7. Add Jest unit tests + YAML MCP tests (docs vs full mode if credentials required).
+8. Update documentation (AGENTS.md + README counts if changed).
 
 > For a deeper internal view, see the Development Guide in the docs site.
 
-## �🤖 AI Interface Setup
+## 🤖 AI Interface Setup
 
 Choose your preferred AI assistant:
 
@@ -163,6 +193,8 @@ node -e "console.log(require('os').tmpdir() + '/sfcc-mcp-logs')"
 
 **📚 [Complete Documentation](https://taurgis.github.io/sfcc-dev-mcp/)** - Comprehensive guides and references
 
+Documentation source lives in `docs-site-v2/` (VitePress). The legacy React site remains in `docs-site/`.
+
 Quick Links:
 - **[Installation Guide](https://taurgis.github.io/sfcc-dev-mcp/installation)** - Detailed installation options
 - **[AI Interface Setup](https://taurgis.github.io/sfcc-dev-mcp/ai-interfaces)** - Configure Claude Desktop, GitHub Copilot, or Cursor

package/ai-instructions/{github-copilot/copilot-instructions.md → AGENTS.md}

@@ -57,11 +57,11 @@ This project uses the **SFCC Development MCP Server** to provide accurate, up-to
 
 ## 🎯 Why Use the MCP Tools
 
-- **Accuracy**: Get current, verified SFCC API documentation and best practices
+- **Accuracy**: Get current, verified SFCC API documentation and skills
 - **Completeness**: Access comprehensive class information, methods, and properties
 - **Real-time**: Query live SFCC system objects and attributes from the actual instance
 - **Debugging**: Access actual SFCC logs for troubleshooting and error analysis
-- **Best Practices**: Get current SFCC development guidelines and security recommendations
+- **Skills**: Get current SFCC development guidelines and security recommendations
 
 ## 📋 Available Tool Categories
 
@@ -74,20 +74,30 @@ Use these tools for any SFCC API or class-related questions:
 - **`list_sfcc_classes`** - Get complete list of available SFCC classes
 - **`get_sfcc_class_documentation`** - Get raw documentation for any SFCC class
 
-### 📚 Best Practices & Guidelines
-Use these for implementation guidance and best practices:
-
-- **`get_available_best_practice_guides`** - See what guides are available
-- **`get_best_practice_guide`** - Get complete guides for cartridges, hooks, controllers, etc.
-- **`search_best_practices`** - Find specific guidance on topics like security, performance
-- **`get_hook_reference`** - Get comprehensive OCAPI/SCAPI hook references
-
 ### 🏗️ SFRA Documentation Tools
 Use these for SFRA (Storefront Reference Architecture) related questions:
 
 - **`get_available_sfra_documents`** - See what SFRA documents are available
 - **`get_sfra_document`** - Get complete SFRA class/module documentation (includes all properties and methods)
 - **`search_sfra_documentation`** - Search across all SFRA documentation
+- **`get_sfra_categories`** - Get all SFRA document categories with counts
+- **`get_sfra_documents_by_category`** - Get SFRA documents filtered by category
+
+### 📄 ISML Documentation Tools
+Use these for ISML (Internet Store Markup Language) template development:
+
+- **`list_isml_elements`** - Get list of all available ISML elements with summaries
+- **`get_isml_element`** - Get detailed documentation for a specific ISML element (syntax, attributes, examples)
+- **`search_isml_elements`** - Search across ISML element documentation
+- **`get_isml_elements_by_category`** - Get ISML elements filtered by category (control-flow, output, includes, scripting, cache, etc.)
+- **`get_isml_categories`** - Get all ISML element categories with descriptions and counts
+
+### 🧩 Agent Instructions / Skills
+Use this to install or merge bundled instructions (AGENTS.md + skills) into a workspace, user home, or temp directory.
+**IMPORTANT**: Always ask the user for permission before calling sync_agent_instructions. If they decline, call disable_agent_sync instead.
+
+- **`sync_agent_instructions`** - Copy/merge bundled AGENTS.md + skills into the chosen destination (ask user first!)
+- **`disable_agent_sync`** - Create mcp-dev.json with {"disableAgentSync": true} to permanently disable sync suggestions
 
 ### 🔧 System Object Definitions
 Use these for understanding SFCC data models and custom attributes:
@@ -99,17 +109,19 @@ Use these for understanding SFCC data models and custom attributes:
 - **`search_system_object_attribute_groups`** - Search for attribute groups (essential for finding site preference groups)
 - **`search_custom_object_attribute_definitions`** - Search for attributes in custom object types
 
-### � Code Version Management
+### 🔁 Code Version Management
 Use these for deployment and code version operations:
 
 - **`get_code_versions`** - Get all code versions on the SFCC instance
 - **`activate_code_version`** - Activate a specific code version (useful for code-switch fixes)
 
-### �📊 Log Analysis Tools
+### 📊 Log Analysis Tools
 Use these for debugging and troubleshooting:
 
-- **`get_latest_errors`** - Get recent error messages from SFCC logs
-- **`get_latest_warnings`** - Get recent warnings from SFCC logs
+- **`get_latest_error`** - Get recent error messages from SFCC logs
+- **`get_latest_warn`** - Get recent warnings from SFCC logs
+- **`get_latest_info`** - Get recent info messages from SFCC logs
+- **`get_latest_debug`** - Get recent debug messages from SFCC logs
 - **`search_logs`** - Search logs for specific patterns or keywords
 - **`summarize_logs`** - Get overview of log activity and issues
 - **`list_log_files`** - List available log files with metadata
@@ -122,7 +134,7 @@ Use these for debugging and troubleshooting:
 1. **API Documentation Questions**
    ```
    "What methods are available on dw.catalog.Product?"
-   → Use: get_sfcc_class_methods with className: "dw.catalog.Product"
+   → Use: get_sfcc_class_info with className: "dw.catalog.Product"
    ```
 
 2. **Finding the Right Class**
@@ -132,21 +144,18 @@ Use these for debugging and troubleshooting:
    ```
 
 3. **Implementation Best Practices**
-   ```
-   "How should I create a new cartridge?"
-   → Use: get_best_practice_guide with guideName: "cartridge_creation"
-   ```
+   Consult relevant bundled skills and documentation before implementing features.
 
 4. **Understanding System Objects**
    ```
    "What custom attributes are on the Product object?"
-   → Use: get_system_object_attribute_definitions with objectType: "Product"
+   → Use: search_system_object_attribute_definitions with objectType: "Product" and a searchRequest (e.g., match_all_query)
    ```
 
 5. **Debugging Issues**
    ```
    "Are there any recent errors in the logs?"
-   → Use: get_latest_errors
+   → Use: get_latest_error
    
    "What log files are available for today?"
    → Use: list_log_files
@@ -167,13 +176,7 @@ Use these for debugging and troubleshooting:
    → Use: get_code_versions
    
    "Need to do a code-switch fix for SCAPI endpoints"
-   → Use: activate_code_version with versionId: "target_version"
-   ```
-
-7. **Hook Development**
-   ```
-   "What SCAPI hooks are available?"
-   → Use: get_hook_reference with guideName: "scapi_hooks"
+   → Use: activate_code_version with codeVersionId: "target_version"
    ```
 
 ### ❌ DON'T Guess About:
@@ -195,19 +198,22 @@ Use these for debugging and troubleshooting:
    → get_sfcc_class_info with className: "dw.order.Order"
 
 3. Explore specific methods or properties:
-   → get_sfcc_class_methods with className: "dw.order.Order"
+   → get_sfcc_class_info with className: "dw.order.Order"
 ```
 
-### Implementing New Features
+### Understanding ISML Elements
 ```markdown
-1. Check best practices first:
-   → get_available_best_practice_guides
+1. First list available ISML elements:
+   → list_isml_elements
+
+2. Get detailed documentation for a specific element:
+   → get_isml_element with elementName: "isloop"
 
-2. Get specific implementation guide:
-   → get_best_practice_guide with guideName: "sfra_controllers"
+3. Search for elements by functionality:
+   → search_isml_elements with query: "cache"
 
-3. Search for specific guidance:
-   → search_best_practices with query: "validation"
+4. Browse elements by category:
+   → get_isml_elements_by_category with category: "control-flow"
 ```
 
 ### Debugging Problems
@@ -240,16 +246,16 @@ Use these for debugging and troubleshooting:
 
 Some tools require specific SFCC credentials:
 
-- **Documentation & Best Practices**: Always available
-- **Log Analysis**: Requires SFCC instance credentials (hostname, username, password)
-- **System Objects & Code Versions**: Requires OCAPI credentials (clientId, clientSecret)
+- **Documentation, SFRA, ISML, Agent Instructions**: Always available
+- **Log Analysis + Job Logs**: Requires hostname + WebDAV credentials (username/password OR clientId/clientSecret)
+- **System Objects & Code Versions**: Requires hostname + OCAPI credentials (clientId, clientSecret)
 
 If a tool isn't available, the MCP server will provide clear error messages about what credentials are needed.
 
 ## 💡 Pro Tips
 
 1. **Start Broad, Then Narrow**: Use search tools first, then get detailed information
-2. **Check Best Practices Early**: Always consult best practice guides before implementing
+2. **Check Skills Early**: Consult relevant skill packs before implementing
 3. **Use Real Data**: Query actual system objects rather than assuming structure
 4. **Debug with Logs**: Use log analysis tools for troubleshooting real issues
 5. **Stay Current**: MCP tools provide current information, not outdated documentation
@@ -259,7 +265,7 @@ If a tool isn't available, the MCP server will provide clear error messages abou
 - **Always prefer MCP tools** over guessing or using potentially outdated information
 - **Use specific tool calls** rather than making assumptions about SFCC APIs
 - **Check logs and system objects** from the actual SFCC instance when debugging
-- **Follow best practices** from the guides rather than improvising solutions
+- **Follow skills + docs** rather than improvising solutions
 - **Verify class and method names** using the documentation tools
 
 ---
@@ -283,21 +289,6 @@ Question Type: "How do I work with [X] in SFCC?"
     └── → get_sfcc_class_documentation (className: "dw.namespace.Class")
 ```
 
-#### **When User Asks About Implementation**
-```
-Implementation Question
-├── "How to create/build [X]?"
-│   ├── → get_available_best_practice_guides (discover available guides)
-│   └── → get_best_practice_guide (guideName: specific guide)
-├── "Best way to [X]?"
-│   └── → search_best_practices (query: key concept)
-├── "What hooks are available for [X]?"
-│   └── → get_hook_reference (guideName: "ocapi_hooks" or "scapi_hooks")
-└── "SFRA related question?"
-    ├── → get_available_sfra_documents (discover what's available)
-    └── → get_sfra_document (documentName: specific module)
-```
-
 #### **When User Reports Problems/Errors**
 ```
 Problem/Error Scenario
@@ -306,8 +297,7 @@ Problem/Error Scenario
 │   ├── → get_latest_error (check recent errors)
 │   └── → search_logs (pattern: error keywords)
 └── "Performance issues"
-    ├── → get_latest_warn (check warnings)
-    └── → search_best_practices (query: "performance")
+   └── → get_latest_warn (check warnings)
 ```
 
 #### **When User Asks About Data Models/Objects**
@@ -326,27 +316,6 @@ Data Model Questions
 
 ### 🎪 Common Usage Scenarios & Tool Chains
 
-#### **Scenario 1: Creating a New Controller**
-```markdown
-Sequential Tool Chain:
-1. → get_best_practice_guide (guideName: "sfra_controllers")
-2. → get_sfra_document (documentName: "server")
-3. → get_sfra_document (documentName: "request") 
-4. → get_sfra_document (documentName: "response")
-5. → search_best_practices (query: "security") // for validation patterns
-6. → search_best_practices (query: "performance") // for optimization
-```
-
-#### **Scenario 2: Implementing OCAPI Hook**
-```markdown
-Sequential Tool Chain:
-1. → get_best_practice_guide (guideName: "ocapi_hooks")
-2. → get_hook_reference (guideName: "ocapi_hooks")
-3. → search_sfcc_classes (query: relevant domain like "order", "customer")
-4. → get_sfcc_class_info (className: discovered class)
-5. → search_best_practices (query: "validation")
-```
-
 #### **Scenario 3: Debugging Cart Issues**
 ```markdown
 Parallel Information Gathering:
@@ -357,25 +326,6 @@ Parallel Information Gathering:
 5. → get_latest_error (date: today)
 ```
 
-#### **Scenario 4: Building Custom SCAPI Endpoint**
-```markdown
-Sequential Tool Chain:
-1. → get_best_practice_guide (guideName: "scapi_custom_endpoint")
-2. → get_hook_reference (guideName: "scapi_hooks")
-3. → search_best_practices (query: "security")
-4. → search_sfcc_classes (query: relevant business domain)
-5. → get_sfcc_class_info (className: discovered classes)
-```
-
-#### **Scenario 5: Working with Site Preferences**
-```markdown
-Sequential Discovery Chain:
-1. → search_system_object_attribute_groups (objectType: "SitePreferences")
-2. → search_site_preferences (groupId: discovered group, instanceType: "sandbox")
-3. → search_best_practices (query: "configuration")
-4. → get_sfcc_class_info (className: "dw.system.Site")
-```
-
 ### 🔍 Advanced Tool Usage Patterns
 
 #### **Complex Query Building for System Objects**
@@ -410,18 +360,15 @@ For Performance Investigation:
 #### **Information Layering Strategy**
 ```markdown
 1. **Start with Overview Tools**
-   - get_available_best_practice_guides
    - list_sfcc_classes
    - get_system_object_definitions
 
 2. **Narrow to Specific Tools**
-   - get_best_practice_guide
    - get_sfcc_class_info
    - search_system_object_attribute_definitions
 
 3. **Deep Dive with Detail Tools**
    - get_sfcc_class_documentation
-   - search_best_practices
    - search_logs
 ```
 
@@ -444,7 +391,7 @@ Use SEQUENTIALLY when:
 ```markdown
 Always Include:
 - Practical code examples using the discovered information
-- Security considerations from best practices
+- Security considerations from relevant skills/guidelines
 - Performance implications
 - Error handling patterns
 - Related classes/methods that might be relevant
@@ -497,7 +444,7 @@ Measure success by:
 #### **Tool Usage Analytics**
 ```markdown
 Track which combinations work well:
-- Documentation → Best Practices → Implementation
+- Documentation → Implementation
 - Error Investigation → System Analysis → Solution
 - Planning → Research → Validation → Implementation
 
@@ -523,43 +470,68 @@ Signs to update tool usage patterns:
 
 **MANDATORY**: Before generating ANY SFCC code involving ISML templates or models, you MUST use these MCP tools to ensure correct override paths and patterns:
 
+### 🚨 CRITICAL: Read ALL Relevant Skills
+
+**A single task often involves MULTIPLE skills.** For example, creating a controller that renders a template requires reading BOTH the controller skill AND the ISML skill.
+
+**Before writing ANY code, identify ALL artifact types being created/modified:**
+- Creating a controller? → Read `sfcc-sfra-controllers` skill
+- Creating/modifying ISML template? → Read `sfcc-isml-development` skill  
+- Creating/modifying storefront forms (XML + handling + CSRF)? → Read `sfcc-forms-development` skill
+- Creating/modifying a model? → Read `sfcc-sfra-models` skill
+- Adding client-side JS? → Read `sfcc-sfra-client-side-js` skill
+- Adding SCSS/styles? → Read `sfcc-sfra-scss` skill
+- Creating a service? → Read `sfcc-localserviceregistry` skill
+- Creating a job? → Read `sfcc-job-development` skill
+- Adding OCAPI hooks? → Read `sfcc-ocapi-hooks` skill
+- Adding SCAPI hooks? → Read `sfcc-scapi-hooks` skill
+- Implementing multi-language support? → Read `sfcc-localization` skill
+
+**Example:** User asks "Create a controller that shows a hello world page"
+- ✅ CORRECT: Read `sfcc-sfra-controllers` AND `sfcc-isml-development` skills
+- ❌ WRONG: Only read `sfcc-sfra-controllers` skill
+
+**Read skills in PARALLEL when possible to save time.**
+
 ### **Required MCP Tool Chain for SFCC Override Code**
 
 #### **For ISML Template Generation**:
 ```
-MANDATORY sequence before creating any ISML template:
-1. → get_best_practice_guide(guideName: "isml_templates")
-2. → Analyze the "Template Directory Structure" section
-3. → Confirm exact override path from best practices
-4. → Generate code only after path verification
+MANDATORY steps before creating any ISML template:
+1. Review the ISML templates guidance from the bundled skills.
+2. Review the localization skill for resource bundle patterns.
+3. Analyze the "Template Directory Structure" section.
+4. Confirm exact override path from the relevant skill guidance.
+5. Ensure all visible text uses Resource.msg() - never hardcode strings.
+6. Generate code only after path verification.
 ```
 
 #### **For Model Generation**:
 ```
-MANDATORY sequence before creating any SFRA model:
-1. → get_best_practice_guide(guideName: "sfra_models") 
-2. → Analyze the "Model Customization Strategies" section
-3. → Confirm proper superModule usage patterns
-4. → Generate code only after pattern verification
+MANDATORY steps before creating any SFRA model:
+1. Review the SFRA models guidance from the bundled skills.
+2. Analyze the "Model Customization Strategies" section.
+3. Confirm proper superModule usage patterns.
+4. Generate code only after pattern verification.
 ```
 
 #### **For Controller Generation**:
 ```
-MANDATORY sequence before creating any controller:
-1. → get_best_practice_guide(guideName: "sfra_controllers")
-2. → Analyze controller extension patterns
-3. → Confirm proper server.extend() usage
-4. → Generate code only after pattern verification
+MANDATORY steps before creating any controller:
+1. Review the SFRA controllers guidance from the bundled skills.
+2. Analyze controller extension patterns.
+3. Confirm proper server.extend() usage.
+4. Generate code only after pattern verification.
 ```
 
 ### **Override Path Verification Process**
 
 **NEVER generate SFCC override code without completing this checklist**:
 
-1. ✅ **Used MCP Tool**: Called appropriate `get_best_practice_guide` 
+1. ✅ **Used MCP Guidance**: Reviewed the relevant skill content
 2. ✅ **Path Confirmed**: Verified exact directory structure from guide
 3. ✅ **Pattern Validated**: Confirmed proper extension patterns (superModule, server.extend)
-4. ✅ **Security Checked**: Reviewed security guidelines from best practices
+4. ✅ **Security Checked**: Reviewed security guidance from skills
 5. ✅ **Structure Match**: Ensured override path exactly matches base cartridge structure
 
 ### **Common Override Mistakes - Prevent with MCP Tools**
@@ -572,9 +544,9 @@ function Account() {
 }
 ```
 
-✅ **CORRECT - Generated after MCP tool consultation**:
+✅ **CORRECT - Generated after skill review**:
 ```javascript
-// Proper pattern from get_best_practice_guide("sfra_models")
+// Proper pattern from the SFRA models skill
 var base = module.superModule;
 function Account() {
     base.call(this, ...arguments);
@@ -596,8 +568,8 @@ function Account() {
 **Before providing any SFCC code that involves templates or models**:
 
 1. **Check Path Structure**: Verify the override path matches the base cartridge exactly
-2. **Consult Best Practices**: Reference ISML Templates and SFRA Models best practice guides
-3. **Use MCP Tools**: Leverage `get_best_practice_guide` for "isml_templates" and "sfra_models"
+2. **Consult Skills**: Reference the ISML and SFRA skills for override patterns
+3. **Use MCP Guidance**: Review the ISML and SFRA skills
 4. **Validate Override Pattern**: Ensure proper use of `module.superModule` for models and `server.extend()` for controllers
 5. **Confirm Directory Structure**: Verify the complete directory path from cartridge root
 
@@ -617,7 +589,7 @@ cartridges/app_custom_mybrand/cartridge/templates/default/product/productDetails
 cartridges/app_custom_mybrand/cartridge/models/product/fullProduct.js
 ```
 
-**Remember**: Always consult the ISML Templates and SFRA Models best practice guides from this MCP server before generating any override code to ensure proper patterns and security practices.
+**Remember**: Always consult the ISML and SFRA skill content before generating any override code to ensure proper patterns and security practices.
 
 ---
 
@@ -630,14 +602,14 @@ cartridges/app_custom_mybrand/cartridge/models/product/fullProduct.js
 - [ ] Planned information layering strategy
 
 ### When Providing Implementation Guidance:
-- [ ] Started with best practice guides
+- [ ] Started with relevant skills
 - [ ] Retrieved current SFCC API information
 - [ ] Included security considerations
 - [ ] Added performance optimization notes
 - [ ] Included proper error handling
 
 ### When Debugging/Troubleshooting:
-- [ ] Checked system logs for actual errors (use `get_latest_error`, `get_latest_warn`) Note: Job logs are not supported yet
+- [ ] Checked system logs for actual errors (use `get_latest_error`, `get_latest_warn`)
 - [ ] Listed available log files to understand scope (use `list_log_files`)
 - [ ] Analyzed specific log files for detailed context (use `get_log_file_contents`)
 - [ ] Searched logs for patterns related to the issue (use `search_logs`)