feat: merge master and resolve conflicts

- Resolved conflicts in DEVELOPMENT_PLAN.md by combining Phase 6 completion status
- Resolved conflicts in Program.cs by integrating CORS configuration into master structure
- Maintained frontend integration capabilities while keeping proper error handling and service structure

Author: hemanandr

DEVELOPMENT_PLAN.md

@@ -125,7 +125,7 @@ You can effectively work on **up to 6 parallel worktrees** without conflicts:
 |-------|----------|------|-------------|----------|---------|
 | #27 | P1 | 1d | 15-minute rollup job | 3 | ✅ **COMPLETE** |
 | #28 | P2 | 4-6h | Daily rollup job | 3 | ✅ **COMPLETE** |
-| #29 | P2 | 4-6h | Prune tool for raw data | 3 | 🔓 **UNLOCKED** |
+| #29 | P2 | 4-6h | Prune tool for raw data | 3 | ✅ **COMPLETE** |
 
 ### PHASE 6: Frontend Core (Week 2-3, Parallel) ✅ **COMPLETE**
 **UI foundation - EPIC #7**
@@ -166,9 +166,9 @@ You can effectively work on **up to 6 parallel worktrees** without conflicts:
 
 | Issue | Priority | Time | Description | Worktree |
 |-------|----------|------|-------------|----------|
-| #23 | P1 | 1d | Windows service host wrapper | 1 |
-| ENV-15 | P1 | 1d | Installer conventions, paths | 1 |
-| #24 | P1 | 4-6h | Inno Setup installer script | 1 |
+| #23 | P1 | 1d | ✅ **COMPLETE** - Windows service host wrapper | 1 |
+| ENV-15 | P1 | 1d | ✅ **COMPLETE** - Installer conventions, paths | 1 |
+| #24 | P1 | 4-6h | Inno Setup installer script | ✅ Complete |
 
 ### PHASE 8: Quality & Polish (Week 4)
 **Non-critical enhancements**
@@ -250,7 +250,7 @@ git worktree remove ../pulse-env-setup
 - **Phase 2**: ✅ **COMPLETE** - Database created, migrations run, config storage & settings implemented with full testing
 - **Phase 3**: ✅ **COMPLETE** - Can detect UP/DOWN state changes with continuous monitoring, outage tracking, and concurrent probe execution
 - **Phase 4**: ✅ **COMPLETE** - All 4 API endpoints implemented and tested: live status, history, config apply, and config versions.
-- **Phase 5**: ✅ **COMPLETE** - Issues #27 and #28 complete: 15-minute and daily rollups computed automatically every 5 minutes with watermark tracking
+- **Phase 5**: ✅ **COMPLETE** - Issues #27, #28, and #29 complete: 15-minute and daily rollups computed automatically every 5 minutes with watermark tracking, plus configurable raw data pruning with 60-day default retention
 - **Phase 6**: ✅ **COMPLETE** - UI loads, shows live status with real-time updates from backend, CORS integration working
 - **Phase 7**: Service installs and runs
 - **Phase 8**: All tests pass, code quality gates met

README.md

@@ -53,6 +53,50 @@ npm run dev
 - **[Data Model](./docs/data-model.cs)** - Entity Framework Core entities
 - **[Rollup Algorithms](./docs/rollup-spec.md)** - Data aggregation specifications
 
+## Installation & Deployment
+
+### Windows Installer
+
+Build and create a professional Windows installer:
+
+```bash
+# Build installer (includes build and packaging)
+.\build-installer.ps1
+
+# Build installer without rebuilding (faster for testing)
+.\build-installer.ps1 -SkipBuild
+
+# Open installer directory after build
+.\build-installer.ps1 -OpenInstaller
+```
+
+The installer will:
+- Install to `Program Files\ThingConnect.Pulse`
+- Create data directories in `ProgramData\ThingConnect.Pulse`
+- Register and start `ThingConnectPulseSvc` Windows service
+- Create Start Menu shortcuts
+- Ask before deleting data on uninstall
+
+### Development Installation
+
+For development and testing:
+
+```bash
+# Install as Windows service (development)
+.\install-service.ps1 install
+
+# Manage service
+.\install-service.ps1 start|stop|status
+
+# Uninstall service  
+.\install-service.ps1 uninstall
+```
+
+### Documentation
+
+- **[Installer Conventions](./docs/installer-map.md)** - Windows service installation specification
+- **[Logging Configuration](./docs/logging.md)** - Structured logging setup and policies
+
 ## API Endpoints
 
 The server provides REST API endpoints for configuration management and monitoring data:

ThingConnect.Pulse.Server/Controllers/TestPruneController.cs

@@ -0,0 +1,115 @@
+using Microsoft.AspNetCore.Mvc;
+using ThingConnect.Pulse.Server.Services.Prune;
+
+namespace ThingConnect.Pulse.Server.Controllers;
+
+/// <summary>
+/// Test controller for prune functionality (development only)
+/// </summary>
+[ApiController]
+[Route("api/test/prune")]
+public sealed class TestPruneController : ControllerBase
+{
+    private readonly IPruneService _pruneService;
+    private readonly ILogger<TestPruneController> _logger;
+
+    public TestPruneController(IPruneService pruneService, ILogger<TestPruneController> logger)
+    {
+        _pruneService = pruneService;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// Get current retention period
+    /// </summary>
+    [HttpGet("retention-days")]
+    public async Task<IActionResult> GetRetentionDaysAsync()
+    {
+        try
+        {
+            var days = await _pruneService.GetRetentionDaysAsync();
+            return Ok(new { retentionDays = days });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error getting retention days");
+            return StatusCode(500, new { message = "Error getting retention days", error = ex.Message });
+        }
+    }
+
+    /// <summary>
+    /// Set retention period in days
+    /// </summary>
+    [HttpPost("retention-days/{days:int}")]
+    public async Task<IActionResult> SetRetentionDaysAsync(int days)
+    {
+        try
+        {
+            if (days <= 0)
+            {
+                return BadRequest(new { message = "Retention days must be greater than 0" });
+            }
+
+            await _pruneService.SetRetentionDaysAsync(days);
+            return Ok(new { message = $"Retention period set to {days} days" });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error setting retention days to {Days}", days);
+            return StatusCode(500, new { message = "Error setting retention days", error = ex.Message });
+        }
+    }
+
+    /// <summary>
+    /// Dry-run prune operation - shows what would be deleted without actually deleting
+    /// </summary>
+    [HttpPost("dry-run")]
+    public async Task<IActionResult> DryRunPruneAsync()
+    {
+        try
+        {
+            _logger.LogInformation("Manual dry-run prune requested");
+            var wouldDeleteCount = await _pruneService.PruneRawDataAsync(dryRun: true);
+            var retentionDays = await _pruneService.GetRetentionDaysAsync();
+            
+            return Ok(new 
+            { 
+                message = "Dry-run prune completed",
+                wouldDeleteCount = wouldDeleteCount,
+                retentionDays = retentionDays,
+                cutoffDate = DateTimeOffset.UtcNow.AddDays(-retentionDays).ToString("O")
+            });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error during dry-run prune");
+            return StatusCode(500, new { message = "Error during dry-run prune", error = ex.Message });
+        }
+    }
+
+    /// <summary>
+    /// Execute actual prune operation - PERMANENTLY deletes old raw data
+    /// </summary>
+    [HttpPost("execute")]
+    public async Task<IActionResult> ExecutePruneAsync()
+    {
+        try
+        {
+            _logger.LogInformation("Manual prune execution requested");
+            var deletedCount = await _pruneService.PruneRawDataAsync(dryRun: false);
+            var retentionDays = await _pruneService.GetRetentionDaysAsync();
+            
+            return Ok(new 
+            { 
+                message = "Prune operation completed successfully",
+                deletedCount = deletedCount,
+                retentionDays = retentionDays
+            });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error during prune execution");
+            return StatusCode(500, new { message = "Error during prune execution", error = ex.Message });
+        }
+    }
+}

ThingConnect.Pulse.Server/Data/SeedData.cs

@@ -106,7 +106,7 @@ public static void Initialize(PulseDbContext context)
             Id = "test-config-001",
             AppliedTs = now,
             FileHash = "abcd1234",
-            FilePath = @"C:\ProgramData\ThingConnect.Pulse\config.yaml",
+            FilePath = @"C:\ProgramData\ThingConnect.Pulse\config\config.yaml",
             Actor = "system",
             Note = "Initial test configuration"
         };