Merge branch 'development'

Author: lmajano

.github/workflows/release.yml

@@ -64,7 +64,7 @@ jobs:
           box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}
 
       - name: Commit Changelog To Master
-        uses: EndBug/add-and-commit@v9.1.4
+        uses: EndBug/add-and-commit@v10.0.0
         if: env.SNAPSHOT == 'false'
         with:
           author_name: Github Actions
@@ -118,7 +118,7 @@ jobs:
           box forgebox publish --force
 
       - name: Create Github Release
-        uses: taiki-e/create-gh-release-action@v1.9.2
+        uses: taiki-e/create-gh-release-action@v1.9.3
         continue-on-error: true
         if: env.SNAPSHOT == 'false'
         with:
@@ -165,7 +165,7 @@ jobs:
 
       # Commit it back to development
       - name: Commit Version Bump
-        uses: EndBug/add-and-commit@v9.1.4
+        uses: EndBug/add-and-commit@v10.0.0
         with:
           author_name: Github Actions
           author_email: info@ortussolutions.com

AI_INTEGRATION.md

@@ -202,10 +202,10 @@ graph LR
 
 Additionally, agent configuration files are created for you (paths defined in `AgentRegistry.cfc`):
 
-* `CLAUDE.md` - Claude Desktop/Code assistant
+* `CLAUDE.md` - Claude Desktop/Code assistant (points to `AGENTS.md` via `@AGENTS.md`)
 * `.github/copilot-instructions.md` - GitHub Copilot
 * `.cursorrules` - Cursor IDE
-* `AGENTS.md` - Codex & OpenCode (shared file)
+* `AGENTS.md` - Codex, OpenCode & Claude (shared file)
 * `GEMINI.md` - Gemini CLI
 
 ### Keeping Resources Updated
@@ -545,7 +545,7 @@ Override core or module guidelines to customize them for your needs:
 
 ```bash
 # Override a core guideline
-coldbox ai guidelines install coldbox --override
+coldbox ai guidelines override coldbox
 
 # Edit the override
 edit .ai/guidelines/overrides/coldbox.md
@@ -801,7 +801,7 @@ Override built-in skills to adapt them to your conventions:
 
 ```bash
 # Override a core skill
-coldbox ai skills install creating-handlers --override
+coldbox ai skills override creating-handlers
 
 # Edit the override
 edit .ai/skills/overrides/creating-handlers/SKILL.md
@@ -894,7 +894,7 @@ ColdBox AI Integration supports **6 major AI agents** with automatic configurati
 
 | Agent              | Config File                       | Description                    |
 | ------------------ | --------------------------------- | ------------------------------ |
-| **Claude**         | `CLAUDE.md`                       | Claude Desktop and Claude Code |
+| **Claude**         | `CLAUDE.md` → `AGENTS.md`         | Claude Desktop and Claude Code |
 | **GitHub Copilot** | `.github/copilot-instructions.md` | VS Code Copilot integration    |
 | **Cursor**         | `.cursorrules`                    | Cursor IDE rules               |
 | **Codex**          | `AGENTS.md` (shared)              | Codex AI assistant             |
@@ -916,7 +916,7 @@ coldbox ai agents add claude copilot cursor
 coldbox ai agents remove cursor
 
 # Regenerate all configurations
-coldbox ai agents refresh
+coldbox ai refresh
 ```
 
 Each agent configuration includes:
@@ -1082,15 +1082,7 @@ Custom server configuration in `.ai/manifest.json`:
 
 ### MCP Configuration
 
-Generate agent-specific MCP configurations:
-
-```bash
-# Generate .mcp.json for all agents
-coldbox ai mcp config
-
-# Agent-specific configuration
-coldbox ai mcp config --agent=claude
-```
+MCP server configurations are generated automatically as part of `coldbox ai install` and `coldbox ai refresh`.
 
 Example generated `.mcp.json`:
 
@@ -1123,7 +1115,7 @@ ColdBox AI Integration provides comprehensive CLI commands for managing your AI
 ```bash
 # Initial setup
 coldbox ai install                  # Interactive installation wizard
-coldbox ai install --agents=claude  # Install for specific agent
+coldbox ai install agent claude  # Install for specific agent
 
 # View configuration
 coldbox ai info                     # Show current configuration
@@ -1141,8 +1133,8 @@ coldbox ai refresh                  # Sync with installed modules
 ```bash
 coldbox ai guidelines list                    # List installed
 coldbox ai guidelines list --verbose          # With descriptions
-coldbox ai guidelines install coldbox qb      # Install specific
-coldbox ai guidelines uninstall qb            # Remove guideline
+coldbox ai guidelines add coldbox qb      # Install specific
+coldbox ai guidelines remove qb            # Remove guideline
 coldbox ai guidelines refresh                 # Update from modules
 ```
 
@@ -1151,8 +1143,8 @@ coldbox ai guidelines refresh                 # Update from modules
 ```bash
 coldbox ai skills list                        # List installed
 coldbox ai skills list --verbose              # With descriptions
-coldbox ai skills install creating-handlers   # Install specific
-coldbox ai skills uninstall creating-handlers # Remove skill
+coldbox ai skills add creating-handlers       # Install specific
+coldbox ai skills remove creating-handlers    # Remove skill
 coldbox ai skills refresh                     # Update from modules
 ```
 

README.md

@@ -519,7 +519,7 @@ The ColdBox CLI provides a comprehensive AI integration system that enhances you
 ```bash
 # Install AI integration
 coldbox ai install                    # Interactive setup
-coldbox ai install --agents=claude    # Setup with specific agent
+coldbox ai install agent=claude    # Setup with specific agent
 
 # View current configuration
 coldbox ai info                       # Show configuration summary
@@ -546,7 +546,7 @@ coldbox ai agents remove cursor       # Remove an agent
 coldbox ai agents refresh             # Regenerate all configurations
 ```
 
-**Supported Agents**: Claude (CLAUDE.md), GitHub Copilot (.github/copilot-instructions.md), Cursor (.cursorrules), Codex (AGENTS.md), Gemini (GEMINI.md), OpenCode (AGENTS.md)
+**Supported Agents**: Claude (CLAUDE.md → AGENTS.md), GitHub Copilot (.github/copilot-instructions.md), Cursor (.cursorrules), Codex (AGENTS.md), Gemini (GEMINI.md), OpenCode (AGENTS.md)
 
 #### Guidelines
 
@@ -558,9 +558,9 @@ coldbox ai guidelines list            # List all installed guidelines
 coldbox ai guidelines list --verbose  # Show details and descriptions
 
 # Manage guidelines
-coldbox ai guidelines install coldbox testbox        # Install by name
-coldbox ai guidelines install https://example.com/   # Install from URL
-coldbox ai guidelines uninstall testbox              # Remove guideline
+coldbox ai guidelines add coldbox testbox        # Install by name
+coldbox ai guidelines add https://example.com/   # Install from URL
+coldbox ai guidelines remove testbox              # Remove guideline
 coldbox ai guidelines refresh                        # Update from modules
 ```
 
@@ -576,8 +576,8 @@ coldbox ai skills list                # List all installed skills
 coldbox ai skills list --verbose      # Show details
 
 # Manage skills
-coldbox ai skills install creating-handlers async-programming
-coldbox ai skills uninstall async-programming
+coldbox ai skills add creating-handlers async-programming
+coldbox ai skills remove async-programming
 coldbox ai skills refresh             # Update from modules
 ```
 

box.json

@@ -1,6 +1,6 @@
 {
     "name":"ColdBox CLI",
-    "version":"8.8.0",
+    "version":"8.9.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/commandbox-modules/coldbox-cli/@build.version@/coldbox-cli-@build.version@.zip",
     "slug":"coldbox-cli",
     "author":"Ortus Solutions, Corp",

changelog.md

@@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Updates
+
+- `CLAUDE.md` now contains `@AGENTS.md` to point Claude to the shared `AGENTS.md` file, avoiding duplicate content
+
+### Fixed
+
+- Fix fwreinit not recognizing webroot setting in server.json
+- Fixes for invalid commands in readmes and ai guideline.
+- Updated html helper guideline to reflect the new helper syntax and added more examples.
+
 ## [8.8.0] - 2026-03-12
 
 - Fix invalid aliases

commands/coldbox/reinit.cfc

@@ -18,19 +18,19 @@ component aliases="fwreinit" {
 
 	/**
 	 * @password The FWReinit password
-	 * @name     Name of the CommandBox server to reinit
+	 * @name     Name of the CommandBox server to reinit, will default to the name listed in server.json file
 	 * @showUrl  Show the Url to reinit
 	 **/
 	function run(
 		password = "1",
-		name     = "",
+		name     = getDefaultServerName(),
 		showUrl  = true
 	){
-		var serverInfo = serverService.getServerInfoByDiscovery( getCWD(), arguments.name );
+		var serverInfo = serverService.getServerInfoByDiscovery( name = arguments.name );
 
 		if ( !structCount( serverInfo ) ) {
 			print.boldRedLine(
-				"No server configurations found for '#getCWD()#', so have no clue what to reinit buddy!"
+				"No server configurations found for '#getCWD()#' and '#arguments.name#', so have no clue what to reinit buddy!"
 			);
 		} else {
 			var thisURL = "#serverInfo.host#:#serverInfo.port#/?fwreinit=#arguments.password#";
@@ -50,4 +50,9 @@ component aliases="fwreinit" {
 		}
 	}
 
+	private function getDefaultServerName(){
+		var serverInfo = serverService.getServerInfoByDiscovery( serverConfigFile = "server.json" );
+		return serverInfo.keyExists( "name" ) ? serverInfo.name : "";
+	}
+
 }

models/AgentRegistry.cfc

@@ -28,7 +28,10 @@ component singleton {
 			"gemini"   : "GEMINI.md",
 			"opencode" : "AGENTS.md"
 		}
-		AGENT_OPTIONS = [
+		// Demarcation markers that wrap the ColdBox CLI-managed section
+		MANAGED_SECTION_START = "<!-- COLDBOX-CLI:START -->"
+		MANAGED_SECTION_END   = "<!-- COLDBOX-CLI:END -->"
+		AGENT_OPTIONS         = [
 			{
 				display : "Claude (Anthropic) - Recommended for general development",
 				value   : "claude"
@@ -126,6 +129,68 @@ component singleton {
 	// Private Helpers
 	// ========================================
 
+	/**
+	 * Merges newly generated managed content with any user-authored content from an existing file.
+	 *
+	 * The managed section is delimited by COLDBOX-CLI:START and COLDBOX-CLI:END HTML comment
+	 * markers. On refresh, only the content between those markers is replaced; everything after
+	 * the end marker (i.e. the user's custom documentation) is preserved unchanged.
+	 *
+	 * Behavior:
+	 * - File does not exist → return newContent as-is (first-time write).
+	 * - File exists but has no end marker → return newContent as-is (old format, no user section to preserve).
+	 * - File exists with end marker → replace managed section, keep user section intact.
+	 *
+	 * @filePath   Absolute path to the existing agent config file (may not exist yet).
+	 * @newContent Freshly generated content that includes both START and END markers.
+	 *
+	 * @return Combined content with updated managed section and preserved user section.
+	 */
+	private string function mergeUserContent(
+		required string filePath,
+		required string newContent
+	){
+		var endMarker = static.MANAGED_SECTION_END
+
+		// Nothing to preserve — first-time write
+		if ( !fileExists( filePath ) ) {
+			return newContent
+		}
+
+		var existingContent = fileRead( filePath )
+
+		// Find the end marker in the existing file
+		var endPos = findNoCase( endMarker, existingContent )
+
+		// Old-format file (no markers) — write fresh content, no user section to preserve
+		if ( !endPos ) {
+			return newContent
+		}
+
+		// Extract user content: everything that comes after the end marker
+		var userStartPos = endPos + len( endMarker )
+		var userContent  = mid(
+			existingContent,
+			userStartPos,
+			len( existingContent ) - userStartPos + 1
+		)
+
+		// Find the end marker position in the newly generated content
+		var newEndPos = findNoCase( endMarker, newContent )
+		if ( !newEndPos ) {
+			// New template has no end marker — return new content plus preserved user section
+			return newContent & userContent
+		}
+
+		// Slice off the managed portion of the new content (up to and including the end marker)
+		var managedContent = left(
+			newContent,
+			newEndPos + len( endMarker ) - 1
+		)
+
+		return managedContent & userContent
+	}
+
 	/**
 	 * Configure a single agent
 	 *
@@ -153,8 +218,20 @@ component singleton {
 			directoryCreate( configDir )
 		}
 
-		// Write agent config file
-		fileWrite( configPath, content )
+		// For Claude, write the full content to AGENTS.md and make CLAUDE.md point to it
+		if ( arguments.agent == "claude" ) {
+			var agentsFilePath = getDirectoryFromPath( configPath ) & "AGENTS.md"
+			var mergedContent  = mergeUserContent( agentsFilePath, content )
+			fileWrite( agentsFilePath, mergedContent )
+			fileWrite( configPath, "@AGENTS.md" )
+			return
+		}
+
+		// Write agent config file, preserving any user-authored content outside the managed section
+		fileWrite(
+			configPath,
+			mergeUserContent( configPath, content )
+		)
 	}
 
 	/**