Conflict-Free Changelog Management System

AGENTS.md

@@ -182,7 +182,7 @@ dotnet build
 - Documentation: Update `/servers/Azure.Mcp.Server/docs/azmcp-commands.md` and add test prompts to `/servers/Azure.Mcp.Server/docs/e2eTestPrompts.md`
 - Tool validation: Run `ToolDescriptionEvaluator` for command descriptions (target: top 3 ranking, ≥0.4 confidence)
 - Spelling check: `.\eng\common\spelling\Invoke-Cspell.ps1`
-- Changelog: Update `CHANGELOG.md` with your changes
+- Changelog: Create changelog entry YAML file if the change is a new feature, bug fix, or breaking change. See `docs/changelog-entries.md` for instructions. Always use the `-ChangelogPath` parameter (e.g., `servers/Azure.Mcp.Server/CHANGELOG.md` or `servers/Fabric.Mcp.Server/CHANGELOG.md`).
 - One tool per PR: Submit single toolsets for faster review cycles
 
 ## Architecture and Project Structure
@@ -687,7 +687,7 @@ When adding new commands:
 1. **Update `/servers/Azure.Mcp.Server/docs/azmcp-commands.md`** with new command details
 2. **Add test prompts to `/servers/Azure.Mcp.Server/docs/e2eTestPrompts.md`** (maintain alphabetical order)
 3. **Update toolset README.md** with new functionality
-4. **Update CHANGELOG.md** with changes
+4. **Create changelog entry** if user-facing or critical change. See `docs/changelog-entries.md` for instructions. Always use the `-ChangelogPath` parameter (e.g., `servers/Azure.Mcp.Server/CHANGELOG.md` or `servers/Fabric.Mcp.Server/CHANGELOG.md`).
 5. **Add CODEOWNERS entry** for new toolset
 
 ### Spelling and Content Validation

CONTRIBUTING.md

@@ -18,9 +18,11 @@ If you are contributing significant changes, or if the issue is already assigned
     - [Adding a New Command](#adding-a-new-command)
   - [Testing](#testing)
     - [Unit Tests](#unit-tests)
+      - [Cancellation plumbing](#cancellation-plumbing)
     - [End-to-end Tests](#end-to-end-tests)
     - [Testing Local Build with VS Code](#testing-local-build-with-vs-code)
       - [Build the Server](#build-the-server)
+      - [Run the Azure MCP server in HTTP mode](#run-the-azure-mcp-server-in-http-mode)
       - [Configure mcp.json](#configure-mcpjson)
       - [Server Modes](#server-modes)
       - [Start from IDE](#start-from-ide)
@@ -91,6 +93,7 @@ If you are contributing significant changes, or if the issue is already assigned
       - `test-resources.bicep` - Infrastructure templates for testing
 - `eng/` - Shared tools, templates, CLI helpers
 - `docs/` - Central documentation and onboarding materials
+
 ## Development Workflow
 
 ### Development Process
@@ -115,6 +118,7 @@ If you are contributing significant changes, or if the issue is already assigned
 > - **Incremental progress**: Get your first tool merged to establish baseline, then build upon it
 >
 > If you're planning to contribute multiple tools, please:
+>
 > 1. Submit your most important or representative tool as your first PR to establish the code patterns.
 > 2. Use that baseline to inform your subsequent tool PRs.
 
@@ -140,9 +144,22 @@ If you are contributing significant changes, or if the issue is already assigned
    - Add test prompts for the new command in [/servers/Azure.Mcp.Server/docs/e2eTestPrompts.md](https://github.com/microsoft/mcp/blob/main/servers/Azure.Mcp.Server/docs/e2eTestPrompts.md)
    - Update [README.md](https://github.com/microsoft/mcp/blob/main/README.md) to mention the new command
 
-6. **Add CODEOWNERS entry** in [CODEOWNERS](https://github.com/microsoft/mcp/blob/main/.github/CODEOWNERS) [(example)](https://github.com/microsoft/mcp/commit/08f73efe826d5d47c0f93be5ed9e614740e82091)
-
-7. **Add new tool to consolidated mode**:
+6. **Create a changelog entry** (if your change is a new feature, bug fix, or breaking change):
+   - Use the generator script to create a changelog entry (see `docs/changelog-entries.md` for details):
+     ```powershell
+     # Interactive mode (prompts for server)
+     ./eng/scripts/New-ChangelogEntry.ps1
+
+     # Or with all parameters
+     ./eng/scripts/New-ChangelogEntry.ps1 -ChangelogPath "servers/Azure.Mcp.Server/CHANGELOG.md" -Description <your-change-description> -Section <changelog-section> -PR <pr-number>
+     ./eng/scripts/New-ChangelogEntry.ps1 -ChangelogPath "servers/Fabric.Mcp.Server/CHANGELOG.md" -Description <your-change-description> -Section <changelog-section> -PR <pr-number>
+     ```
+   - Or manually create a YAML file in `servers/{ServerName}/changelog-entries/`
+   - Not every PR needs a changelog entry - skip for internal refactoring, test-only changes, or minor updates. If unsure, add to the "Other Changes" section or ask a maintainer.
+
+7. **Add CODEOWNERS entry** in [CODEOWNERS](https://github.com/microsoft/mcp/blob/main/.github/CODEOWNERS) [(example)](https://github.com/microsoft/mcp/commit/08f73efe826d5d47c0f93be5ed9e614740e82091)
+
+8. **Add new tool to consolidated mode**:
    - Open `core/Azure.Mcp.Core/src/Areas/Server/Resources/consolidated-tools.json` file, where the tool grouping definition is stored for consolidated mode. In Agent mode, add it to the chat as context.
    - Paste the follow prompt for Copilot to generate the change to add the new tool:
       ```txt
@@ -157,7 +174,7 @@ If you are contributing significant changes, or if the issue is already assigned
       ```
    - Commit the change.
 
-8. **Create Pull Request**:
+9. **Create Pull Request**:
    - Reference the issue you created
    - Include tests in the `/tests` folder
    - Ensure all tests pass