fix: harden admin system fallback and benchmark review

JobTrackerApi.Tests/AuthAndSystemControllerTests.cs

@@ -133,6 +133,35 @@ public sealed class AuthAndSystemControllerTests
         Assert.Equal("person@example.com", result.GoogleLink.Email);
     }
 
+    [Fact]
+    public async Task Admin_system_email_settings_falls_back_when_override_store_is_unavailable()
+    {
+        var emailSettings = new Mock<IEmailSettingsResolver>();
+        emailSettings.Setup(x => x.GetAdminDtoAsync(It.IsAny<CancellationToken>())).ThrowsAsync(new InvalidOperationException("missing SystemEmailSettings"));
+
+        var cfg = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?>
+            {
+                ["Email:Enabled"] = "false",
+                ["Email:FromName"] = "Jobbjakt"
+            })
+            .Build();
+
+        var controller = new AdminSystemController(
+            cfg,
+            new AppPaths(cfg, new FakeHostEnv()),
+            null!,
+            Mock.Of<ISummarizerService>(),
+            new FakeEnv(),
+            emailSettings.Object);
+
+        var result = await controller.GetEmailSettings(CancellationToken.None);
+        var ok = Assert.IsType<OkObjectResult>(result.Result);
+        var dto = Assert.IsType<EmailSettingsAdminDto>(ok.Value);
+        Assert.False(dto.Enabled);
+        Assert.Contains("fallback", dto.FromName, StringComparison.OrdinalIgnoreCase);
+    }
+
     [Fact]
     public async Task Admin_system_probe_endpoint_runs_probe_once()
     {

JobTrackerApi.Tests/CvCorpusHarnessTests.cs

@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Security.Cryptography;
 using System.Text.Json;
 using JobTrackerApi.Controllers;
 using JobTrackerApi.Models;
@@ -29,11 +30,19 @@ public sealed class CvCorpusHarnessTests
                 || path.EndsWith(".txt", StringComparison.OrdinalIgnoreCase)
                 || path.EndsWith(".md", StringComparison.OrdinalIgnoreCase))
             .OrderBy(path => path, StringComparer.OrdinalIgnoreCase)
-            .Take(8)
             .ToList();
 
         if (files.Count == 0) return;
 
+        var outputRoot = ResolveOutputRoot();
+        var outputsDir = Path.Combine(outputRoot, "outputs");
+        var candidateFixturesDir = Path.Combine(outputRoot, "candidate-fixtures");
+        var approvedFixturesDir = ResolveApprovedFixturesRoot(outputRoot);
+        Directory.CreateDirectory(outputRoot);
+        Directory.CreateDirectory(outputsDir);
+        Directory.CreateDirectory(candidateFixturesDir);
+        Directory.CreateDirectory(approvedFixturesDir);
+
         var user = new ApplicationUser { Id = "user-1", ProfileCvText = "seed" };
         var userManager = TestHostFactory.CreateUserManager();
         userManager.Setup(x => x.GetUserAsync(It.IsAny<System.Security.Claims.ClaimsPrincipal>())).ReturnsAsync(user);
@@ -44,8 +53,8 @@ public sealed class CvCorpusHarnessTests
         aiService.Setup(x => x.SummarizeSectionAsync(It.Is<string>(instruction => instruction.Contains("Reconstruct this CV text extracted from a PDF", StringComparison.Ordinal)), It.IsAny<string>(), 2800, 900)).ReturnsAsync((string _, string text, int _, int __) => text);
 
         await using var db = TestHostFactory.CreateInMemoryDb();
-        var paths = CreatePaths();
-        var controller = new ProfileCvController(userManager.Object, aiService.Object, db, paths, NoOpCvAiClassifier.Instance)
+        var paths = CreatePaths(outputRoot);
+        var controller = new ProfileCvController(userManager.Object, aiService.Object, db, paths, null, NoOpCvAiClassifier.Instance)
         {
             ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
         };
@@ -55,7 +64,7 @@ public sealed class CvCorpusHarnessTests
         Assert.NotNull(extractMethod);
         Assert.NotNull(buildMethod);
 
-        var report = new List<object>();
+        var entries = new List<CvBenchmarkEntry>();
         foreach (var path in files)
         {
             await using var stream = File.OpenRead(path);
@@ -72,31 +81,212 @@ public sealed class CvCorpusHarnessTests
             Assert.False(string.IsNullOrWhiteSpace(text));
 
             var buildTask = (Task<StructuredCvProfile>)buildMethod!.Invoke(controller, new object[] { text, CancellationToken.None })!;
-            var structured = await buildTask;
+            var structured = StructuredCvProfileJson.Normalize(await buildTask);
             Assert.NotNull(structured);
 
-            report.Add(new
+            var slug = Slugify(fileName);
+            var normalizedJson = StructuredCvProfileJson.Serialize(structured);
+            var outputPath = Path.Combine(outputsDir, $"{slug}.json");
+            await File.WriteAllTextAsync(outputPath, PrettyJson(normalizedJson));
+
+            var approvedPath = Path.Combine(approvedFixturesDir, $"{slug}.json");
+            var candidateFixturePath = Path.Combine(candidateFixturesDir, $"{slug}.json");
+            string? diffSummary = null;
+            var approvedExists = File.Exists(approvedPath);
+            if (approvedExists)
             {
-                file = fileName,
-                characters = text.Length,
-                contactLocation = structured.Contact.Location,
-                firstJob = structured.Jobs.FirstOrDefault()?.Title,
-                firstJobLocation = structured.Jobs.FirstOrDefault()?.Location,
-                firstEducation = structured.Education.FirstOrDefault()?.Qualification,
-                firstEducationLocation = structured.Education.FirstOrDefault()?.Location,
-                suspiciousLocations = structured.Jobs.Select(job => job.Location)
+                var approvedJson = await File.ReadAllTextAsync(approvedPath);
+                diffSummary = SummarizeDiff(approvedJson, normalizedJson);
+            }
+            else
+            {
+                await File.WriteAllTextAsync(candidateFixturePath, PrettyJson(normalizedJson));
+                diffSummary = "No approved fixture yet — candidate fixture written.";
+            }
+
+            entries.Add(new CvBenchmarkEntry(
+                FileName: fileName,
+                Slug: slug,
+                Extension: extension,
+                Characters: text.Length,
+                OutputPath: outputPath,
+                ApprovedFixturePath: approvedExists ? approvedPath : null,
+                CandidateFixturePath: approvedExists ? null : candidateFixturePath,
+                ContactLocation: structured.Contact.Location,
+                FirstJob: structured.Jobs.FirstOrDefault()?.Title,
+                FirstJobLocation: structured.Jobs.FirstOrDefault()?.Location,
+                FirstEducation: structured.Education.FirstOrDefault()?.Qualification,
+                FirstEducationLocation: structured.Education.FirstOrDefault()?.Location,
+                QualificationLevels: structured.Education.Select(x => x.QualificationLevel).Where(x => !string.IsNullOrWhiteSpace(x)).Cast<string>().ToList(),
+                SuspiciousLocations: structured.Jobs.Select(job => job.Location)
                     .Concat(structured.Education.Select(education => education.Location))
                     .Append(structured.Contact.Location)
                     .Where(value => !string.IsNullOrWhiteSpace(value))
+                    .Cast<string>()
                     .Where(LooksSuspiciousLocation)
-                    .ToList()
-            });
+                    .ToList(),
+                CoverageScore: ComputeCoverageScore(structured),
+                ConfidenceScore: ComputeConfidenceScore(structured),
+                ConsistencyScore: ComputeConsistencyScore(structured),
+                DiffSummary: diffSummary
+            ));
         }
 
-        var reportPath = Path.Combine(Path.GetTempPath(), $"jobtracker-cv-corpus-{DateTime.UtcNow:yyyyMMddHHmmss}.json");
-        await File.WriteAllTextAsync(reportPath, JsonSerializer.Serialize(report, new JsonSerializerOptions { WriteIndented = true }));
+        var summary = new CvBenchmarkSummary(
+            CorpusRoot,
+            outputRoot,
+            DateTimeOffset.UtcNow,
+            entries.Count,
+            Math.Round(entries.Average(x => x.CoverageScore), 3),
+            Math.Round(entries.Average(x => x.ConfidenceScore), 3),
+            Math.Round(entries.Average(x => x.ConsistencyScore), 3),
+            entries.Count(x => x.SuspiciousLocations.Count > 0),
+            entries.Count(x => x.ApprovedFixturePath is null),
+            entries
+        );
 
-        Assert.True(report.Count > 0);
+        var indexPath = Path.Combine(outputRoot, "index.json");
+        var reportPath = Path.Combine(outputRoot, "report.md");
+        await File.WriteAllTextAsync(indexPath, JsonSerializer.Serialize(summary, new JsonSerializerOptions { WriteIndented = true }));
+        await File.WriteAllTextAsync(reportPath, RenderMarkdownReport(summary));
+
+        Assert.True(entries.Count > 0);
+    }
+
+    private sealed record CvBenchmarkEntry(
+        string FileName,
+        string Slug,
+        string Extension,
+        int Characters,
+        string OutputPath,
+        string? ApprovedFixturePath,
+        string? CandidateFixturePath,
+        string? ContactLocation,
+        string? FirstJob,
+        string? FirstJobLocation,
+        string? FirstEducation,
+        string? FirstEducationLocation,
+        List<string> QualificationLevels,
+        List<string> SuspiciousLocations,
+        double CoverageScore,
+        double ConfidenceScore,
+        double ConsistencyScore,
+        string? DiffSummary);
+
+    private sealed record CvBenchmarkSummary(
+        string CorpusRoot,
+        string OutputRoot,
+        DateTimeOffset GeneratedAtUtc,
+        int TotalFiles,
+        double AverageCoverage,
+        double AverageConfidence,
+        double AverageConsistency,
+        int FilesWithSuspiciousLocations,
+        int MissingApprovedFixtures,
+        List<CvBenchmarkEntry> Entries);
+
+    private static string ResolveOutputRoot()
+    {
+        var configured = Environment.GetEnvironmentVariable("CV_BENCHMARK_OUTPUT_DIR");
+        if (!string.IsNullOrWhiteSpace(configured)) return configured.Trim();
+        return Path.Combine(Path.GetTempPath(), "jobtracker-cv-benchmark", DateTime.UtcNow.ToString("yyyyMMddHHmmss"));
+    }
+
+    private static string ResolveApprovedFixturesRoot(string outputRoot)
+    {
+        var configured = Environment.GetEnvironmentVariable("CV_BENCHMARK_APPROVED_DIR");
+        if (!string.IsNullOrWhiteSpace(configured)) return configured.Trim();
+        return Path.Combine(outputRoot, "approved-fixtures");
+    }
+
+    private static string PrettyJson(string normalizedJson)
+    {
+        using var doc = JsonDocument.Parse(normalizedJson);
+        return JsonSerializer.Serialize(doc.RootElement, new JsonSerializerOptions { WriteIndented = true });
+    }
+
+    private static string SummarizeDiff(string approvedJson, string actualJson)
+    {
+        if (JsonDocument.Parse(approvedJson).RootElement.ToString() == JsonDocument.Parse(actualJson).RootElement.ToString())
+        {
+            return "Matches approved fixture.";
+        }
+
+        var approvedHash = Hash(approvedJson);
+        var actualHash = Hash(actualJson);
+        return $"Fixture differs (approved {approvedHash[..8]}, actual {actualHash[..8]}).";
+    }
+
+    private static string Hash(string value) => Convert.ToHexString(SHA256.HashData(System.Text.Encoding.UTF8.GetBytes(value))).ToLowerInvariant();
+
+    private static double ComputeCoverageScore(StructuredCvProfile structured)
+    {
+        var signals = new[]
+        {
+            !string.IsNullOrWhiteSpace(structured.Contact.FullName),
+            !string.IsNullOrWhiteSpace(structured.Contact.Email),
+            !string.IsNullOrWhiteSpace(structured.Contact.Location),
+            structured.Summary.Count > 0,
+            structured.Skills.Count > 0,
+            structured.Jobs.Count > 0,
+            structured.Education.Count > 0,
+            structured.Certifications.Count > 0 || structured.Projects.Count > 0 || structured.OtherSections.Count > 0,
+        };
+        return signals.Count(x => x) / (double)signals.Length;
+    }
+
+    private static double ComputeConfidenceScore(StructuredCvProfile structured)
+    {
+        var confidences = structured.Metadata.Fields.Values.Select(x => x.Confidence).Where(x => x.HasValue).Select(x => x!.Value).ToList();
+        return confidences.Count == 0 ? 0.55 : Math.Clamp(confidences.Average(), 0, 1);
+    }
+
+    private static double ComputeConsistencyScore(StructuredCvProfile structured)
+    {
+        var penalties = 0;
+        penalties += structured.Jobs.Count(job => LooksSuspiciousLocation(job.Location));
+        penalties += structured.Education.Count(education => LooksSuspiciousLocation(education.Location));
+        penalties += LooksSuspiciousLocation(structured.Contact.Location) ? 1 : 0;
+        penalties += structured.Education.Count(education => string.IsNullOrWhiteSpace(education.QualificationLevel) && !string.IsNullOrWhiteSpace(education.Qualification));
+        return Math.Max(0, 1 - (penalties * 0.12));
+    }
+
+    private static string RenderMarkdownReport(CvBenchmarkSummary summary)
+    {
+        var lines = new List<string>
+        {
+            "# CV benchmark report",
+            string.Empty,
+            $"- Generated: {summary.GeneratedAtUtc:O}",
+            $"- Corpus root: `{summary.CorpusRoot}`",
+            $"- Output root: `{summary.OutputRoot}`",
+            $"- Files: {summary.TotalFiles}",
+            $"- Average coverage: {summary.AverageCoverage:P0}",
+            $"- Average confidence: {summary.AverageConfidence:P0}",
+            $"- Average consistency: {summary.AverageConsistency:P0}",
+            $"- Files with suspicious locations: {summary.FilesWithSuspiciousLocations}",
+            $"- Missing approved fixtures: {summary.MissingApprovedFixtures}",
+            string.Empty,
+            "| File | Coverage | Confidence | Consistency | Suspicious locations | Fixture |",
+            "|---|---:|---:|---:|---:|---|",
+        };
+
+        lines.AddRange(summary.Entries.Select(entry =>
+            $"| {entry.FileName} | {entry.CoverageScore:P0} | {entry.ConfidenceScore:P0} | {entry.ConsistencyScore:P0} | {entry.SuspiciousLocations.Count} | {entry.DiffSummary} |"));
+
+        lines.Add(string.Empty);
+        lines.Add("## Notes");
+        lines.Add("- `outputs/*.json` contains the latest normalized parser output for each CV.");
+        lines.Add("- `candidate-fixtures/*.json` is created when no approved fixture exists yet.");
+        lines.Add("- To build a regression baseline, review a candidate fixture and copy it into the approved-fixtures directory used by the runner.");
+        return string.Join(Environment.NewLine, lines);
+    }
+
+    private static string Slugify(string value)
+    {
+        var cleaned = new string((value ?? string.Empty).ToLowerInvariant().Select(ch => char.IsLetterOrDigit(ch) ? ch : '-').ToArray());
+        while (cleaned.Contains("--", StringComparison.Ordinal)) cleaned = cleaned.Replace("--", "-", StringComparison.Ordinal);
+        return cleaned.Trim('-');
     }
 
     private static bool LooksSuspiciousLocation(string? value)
@@ -119,7 +309,7 @@ public sealed class CvCorpusHarnessTests
         };
     }
 
-    private static AppPaths CreatePaths()
+    private static AppPaths CreatePaths(string outputRoot)
     {
         var tempRoot = Path.Combine(Path.GetTempPath(), $"jobtracker-cv-corpus-{Guid.NewGuid():N}");
         Directory.CreateDirectory(tempRoot);
@@ -128,7 +318,8 @@ public sealed class CvCorpusHarnessTests
             .AddInMemoryCollection(new Dictionary<string, string?>
             {
                 ["Data:Root"] = tempRoot,
-                ["Data:CvArtifactsRoot"] = Path.Combine(tempRoot, "CvArtifacts")
+                ["Data:CvArtifactsRoot"] = Path.Combine(tempRoot, "CvArtifacts"),
+                ["Data:CvBenchmarksRoot"] = outputRoot,
             })
             .Build();
 

JobTrackerApi.Tests/JobApplicationsControllerTests.cs

@@ -27,7 +27,7 @@ public sealed class JobApplicationsControllerTests
         Assert.NotNull(type);
 
         var ctor = type!.GetConstructors().Single();
-        var parameters = ctor.GetParameters().Select(x => x.Name).ToArray();
+        var parameters = ctor.GetParameters().Select(x => x.Name).Where(x => x is not null).Select(x => x!).ToHashSet(StringComparer.OrdinalIgnoreCase);
         Assert.Contains("coverLetterText", parameters);
         Assert.Contains("notes", parameters);
     }

JobTrackerApi.Tests/ProfileCvControllerTests.cs

@@ -518,7 +518,12 @@ public sealed class ProfileCvControllerTests
         var paths = CreatePaths();
         var controller = CreateController(userManager.Object, aiService.Object, db, paths);
 
-        var result = await controller.RewriteSection(new ProfileCvController.RewriteSectionRequest(null, "harvard", null, 42, "harvard"));
+        var result = await controller.RewriteSection(new ProfileCvController.RewriteSectionRequest
+        {
+            Style = "harvard",
+            JobApplicationId = JsonDocument.Parse("42").RootElement.Clone(),
+            TemplateId = "harvard",
+        });
 
         var ok = Assert.IsType<OkObjectResult>(result);
         var json = JsonSerializer.Serialize(ok.Value);
@@ -787,7 +792,7 @@ public sealed class ProfileCvControllerTests
 
     private static ProfileCvController CreateController(UserManager<ApplicationUser> userManager, ISummarizerService aiService, JobTrackerContext db, AppPaths paths, ICvAiClassifier? cvAiClassifier = null)
     {
-        return new ProfileCvController(userManager, aiService, db, paths, cvAiClassifier ?? NoOpCvAiClassifier.Instance)
+        return new ProfileCvController(userManager, aiService, db, paths, null, cvAiClassifier ?? NoOpCvAiClassifier.Instance)
         {
             ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
         };

JobTrackerApi/Controllers/AdminSystemController.cs

@@ -35,6 +35,7 @@ public sealed class AdminSystemController : ControllerBase
     public sealed record DatabaseStatusDto(string Provider, bool LooksConfigured, bool CanConnect, string? Target, bool UsesFileStorage, string? Warning);
     public sealed record RuntimeStatusDto(string Framework, string OSDescription, string ProcessArchitecture, string? MachineName);
     public sealed record AuthStatusDto(bool Required, bool HasJwtKey, bool GoogleConfigured, bool GmailConfigured);
+    public sealed record CvBenchmarkStatusDto(string? IndexJson, string? ReportMarkdown, string RootPath, DateTimeOffset? LastUpdatedAtUtc);
     public sealed record SystemStatusDto(
         string Environment,
         string ContentRoot,
@@ -64,6 +65,50 @@ public sealed class AdminSystemController : ControllerBase
         return trimmed;
     }
 
+    private EmailSettingsSnapshot BuildFallbackEmailSettingsSnapshot()
+    {
+        var host = (_cfg["Email:SmtpHost"] ?? string.Empty).Trim();
+        var user = (_cfg["Email:SmtpUser"] ?? string.Empty).Trim();
+        var password = (_cfg["Email:SmtpPassword"] ?? string.Empty).Trim();
+        var from = (_cfg["Email:From"] ?? user).Trim();
+        var fromName = (_cfg["Email:FromName"] ?? "Jobbjakt").Trim();
+        var port = _cfg.GetValue("Email:SmtpPort", 587);
+        if (port <= 0) port = 587;
+        var enableSsl = _cfg.GetValue("Email:SmtpEnableSsl", true);
+        var timeoutMs = _cfg.GetValue("Email:SmtpTimeoutMs", 15000);
+        if (timeoutMs <= 0) timeoutMs = 15000;
+        var enabled = _cfg.GetValue("Email:Enabled", false);
+
+        return new EmailSettingsSnapshot(
+            Enabled: enabled,
+            Host: host,
+            Port: port,
+            User: user,
+            Password: password,
+            From: from,
+            FromName: fromName,
+            EnableSsl: enableSsl,
+            TimeoutMs: timeoutMs,
+            UsesOverrides: false,
+            HasPassword: !string.IsNullOrWhiteSpace(password));
+    }
+
+    private EmailSettingsAdminDto BuildFallbackEmailSettings(string? reason = null)
+    {
+        var snapshot = BuildFallbackEmailSettingsSnapshot();
+        return new EmailSettingsAdminDto(
+            Enabled: snapshot.Enabled,
+            Host: snapshot.Host,
+            Port: snapshot.Port,
+            User: snapshot.User,
+            From: snapshot.From,
+            FromName: string.IsNullOrWhiteSpace(reason) ? snapshot.FromName : $"{snapshot.FromName} (fallback)",
+            EnableSsl: snapshot.EnableSsl,
+            TimeoutMs: snapshot.TimeoutMs,
+            UsesOverrides: snapshot.UsesOverrides,
+            HasPassword: snapshot.HasPassword);
+    }
+
     [HttpPost("ai/probe")]
     [HttpPost("summarizer/probe")]
     public async Task<IActionResult> RunSummarizerProbe(CancellationToken cancellationToken)
@@ -75,7 +120,14 @@ public sealed class AdminSystemController : ControllerBase
     [HttpGet("email-settings")]
     public async Task<ActionResult<EmailSettingsAdminDto>> GetEmailSettings(CancellationToken cancellationToken)
     {
-        return Ok(await _emailSettings.GetAdminDtoAsync(cancellationToken));
+        try
+        {
+            return Ok(await _emailSettings.GetAdminDtoAsync(cancellationToken));
+        }
+        catch (Exception ex)
+        {
+            return Ok(BuildFallbackEmailSettings(ex.Message));
+        }
     }
 
     [HttpPut("email-settings")]
@@ -86,6 +138,22 @@ public sealed class AdminSystemController : ControllerBase
         return Ok(await _emailSettings.UpdateAsync(request, cancellationToken));
     }
 
+    [HttpGet("cv-benchmark")]
+    public async Task<ActionResult<CvBenchmarkStatusDto>> GetCvBenchmarkStatus(CancellationToken cancellationToken)
+    {
+        var indexPath = Path.Combine(_paths.CvBenchmarksRoot, "index.json");
+        var reportPath = Path.Combine(_paths.CvBenchmarksRoot, "report.md");
+        var indexJson = System.IO.File.Exists(indexPath) ? await System.IO.File.ReadAllTextAsync(indexPath, cancellationToken) : null;
+        var reportMarkdown = System.IO.File.Exists(reportPath) ? await System.IO.File.ReadAllTextAsync(reportPath, cancellationToken) : null;
+        var lastUpdated = new[]
+        {
+            System.IO.File.Exists(indexPath) ? System.IO.File.GetLastWriteTimeUtc(indexPath) : (DateTime?)null,
+            System.IO.File.Exists(reportPath) ? System.IO.File.GetLastWriteTimeUtc(reportPath) : (DateTime?)null,
+        }.Where(value => value.HasValue).Select(value => value!.Value).DefaultIfEmpty().Max();
+
+        return Ok(new CvBenchmarkStatusDto(indexJson, reportMarkdown, _paths.CvBenchmarksRoot, lastUpdated == default ? null : new DateTimeOffset(DateTime.SpecifyKind(lastUpdated, DateTimeKind.Utc))));
+    }
+
     [HttpGet]
     public async Task<ActionResult<SystemStatusDto>> Get(CancellationToken cancellationToken)
     {
@@ -128,6 +196,10 @@ public sealed class AdminSystemController : ControllerBase
                 OllamaReachable: null,
                 OllamaModel: null,
                 OllamaModelAvailable: null,
+                OllamaVersion: null,
+                OllamaInstalledModels: Array.Empty<string>(),
+                OllamaLoadedModels: Array.Empty<string>(),
+                OllamaLoadedCount: 0,
                 HealthLatencyMs: null,
                 ProbeLatencyMs: null,
                 LastProbeAt: null,
@@ -211,7 +283,15 @@ public sealed class AdminSystemController : ControllerBase
 
         var gmailConfigured = !string.IsNullOrWhiteSpace((_cfg["Google:GmailClientSecret"] ?? string.Empty).Trim())
             && !string.IsNullOrWhiteSpace((_cfg["Google:GmailRedirectUri"] ?? string.Empty).Trim());
-        var emailSettings = await _emailSettings.GetSnapshotAsync(cancellationToken);
+        EmailSettingsSnapshot emailSettings;
+        try
+        {
+            emailSettings = await _emailSettings.GetSnapshotAsync(cancellationToken);
+        }
+        catch (Exception)
+        {
+            emailSettings = BuildFallbackEmailSettingsSnapshot();
+        }
 
         return Ok(new SystemStatusDto(
             Environment: _env.EnvironmentName,

JobTrackerApi/Controllers/ProfileCvController.cs

@@ -64,18 +64,42 @@ public sealed class ProfileCvController : ControllerBase
     private readonly ICvAiClassifier _cvAiClassifier;
     private readonly JobTrackerContext _db;
     private readonly AppPaths _paths;
+    private readonly ILogger<ProfileCvController> _logger;
+    private readonly ICvTemplateRenderer _cvTemplateRenderer;
+    private readonly ICvPdfExporter _cvPdfExporter;
 
-    public ProfileCvController(UserManager<ApplicationUser> users, ISummarizerService aiService, JobTrackerContext db, AppPaths paths, ICvAiClassifier? cvAiClassifier = null)
+    public ProfileCvController(UserManager<ApplicationUser> users, ISummarizerService aiService, JobTrackerContext db, AppPaths paths, ILogger<ProfileCvController>? logger = null, ICvAiClassifier? cvAiClassifier = null, ICvTemplateRenderer? cvTemplateRenderer = null, ICvPdfExporter? cvPdfExporter = null)
     {
         _users = users;
         _aiService = aiService;
         _cvAiClassifier = cvAiClassifier ?? NoOpCvAiClassifier.Instance;
         _db = db;
         _paths = paths;
+        _logger = logger ?? Microsoft.Extensions.Logging.Abstractions.NullLogger<ProfileCvController>.Instance;
+        _cvTemplateRenderer = cvTemplateRenderer ?? new CvTemplateRenderer();
+        _cvPdfExporter = cvPdfExporter ?? new ThrowingCvPdfExporter();
     }
 
-    public sealed record RewriteSectionRequest(string? SectionName, string? Style, string? TargetRole, int? JobApplicationId, string? TemplateId);
+    private sealed class ThrowingCvPdfExporter : ICvPdfExporter
+    {
+        public Task<CvPdfArtifact> ExportAsync(TailoredCvRenderResult renderResult, CancellationToken cancellationToken)
+        {
+            throw new InvalidOperationException("CV PDF export is not configured for this controller instance.");
+        }
+    }
+
+    public sealed class RewriteSectionRequest
+    {
+        public string? SectionName { get; set; }
+        public string? Style { get; set; }
+        public string? TargetRole { get; set; }
+        public JsonElement? JobApplicationId { get; set; }
+        public string? TemplateId { get; set; }
+        public string? SourceText { get; set; }
+    }
     public sealed record ParseCvRequest(string? Text);
+    public sealed record CvTemplateDescriptor(string Id, string Title, string Tone, string AccentColor, string PreviewTagline, string PreviewSummary, List<string> PreviewBullets);
+    public sealed record ProfileCvPreviewDto(string TemplateId, string Html, string SuggestedFileName, string FullText, string RewrittenText, string? SectionName, StructuredCvProfile StructuredCv, TailoredCvDocument Document, string? TargetRole, int? JobApplicationId);
 
     private sealed record ExtractionPipelineResult(string RawText, string NormalizedText, StructuredCvProfile StructuredCv);
     private sealed record ClassifiedCvBlock(int Index, string OriginalBlock, string SectionName, string Content, CvBlockClassificationResult? Classification);
@@ -275,46 +299,63 @@ public sealed class ProfileCvController : ControllerBase
         var user = await _users.GetUserAsync(User);
         if (user is null) return Unauthorized();
 
-        var sourceText = string.IsNullOrWhiteSpace(user.ProfileCvText) ? null : user.ProfileCvText.Trim();
         var structuredCv = StructuredCvProfileJson.Deserialize(user.ProfileCvStructureJson);
+        var sourceText = string.IsNullOrWhiteSpace(request.SourceText)
+            ? (string.IsNullOrWhiteSpace(user.ProfileCvText) ? null : user.ProfileCvText.Trim())
+            : request.SourceText.Trim();
         if (string.IsNullOrWhiteSpace(sourceText) && structuredCv.Sections.Count == 0)
         {
             return BadRequest("Add or import CV text before rewriting your CV.");
         }
 
-        var sectionName = string.IsNullOrWhiteSpace(request.SectionName) ? null : request.SectionName.Trim();
+        var sectionName = NormalizeRewriteSectionName(request.SectionName);
         var style = string.IsNullOrWhiteSpace(request.Style) ? "ats-minimal" : request.Style.Trim();
-        var templateId = string.IsNullOrWhiteSpace(request.TemplateId) ? "ats-minimal" : request.TemplateId.Trim();
+        var templateId = NormalizeTemplateId(request.TemplateId ?? style);
         var targetRole = string.IsNullOrWhiteSpace(request.TargetRole) ? null : request.TargetRole.Trim();
-        var jobContext = request.JobApplicationId.HasValue
-            ? await _db.JobApplications.AsNoTracking().Where(job => job.Id == request.JobApplicationId.Value && job.OwnerUserId == user.Id).Select(job => new
-            {
-                job.Id,
-                job.JobTitle,
-                job.Description,
-                job.ShortSummary,
-                CompanyName = job.Company != null ? job.Company.Name : null
-            }).FirstOrDefaultAsync(HttpContext.RequestAborted)
+        var jobApplicationId = ParseFlexibleNullableInt(request.JobApplicationId);
+        var jobContext = jobApplicationId.HasValue
+            ? await _db.JobApplications
+                .AsNoTracking()
+                .Include(job => job.Company)
+                .Where(job => job.Id == jobApplicationId.Value && job.OwnerUserId == user.Id)
+                .Select(job => new
+                {
+                    job.Id,
+                    job.JobTitle,
+                    job.Description,
+                    job.TranslatedDescription,
+                    job.ShortSummary,
+                    job.Notes,
+                    job.JobUrl,
+                    job.Status,
+                    CompanyName = job.Company != null ? job.Company.Name : null,
+                    RecruiterName = job.Company != null ? job.Company.RecruiterName : null,
+                    RecruiterEmail = job.Company != null ? job.Company.RecruiterEmail : null
+                })
+                .FirstOrDefaultAsync(HttpContext.RequestAborted)
             : null;
 
         var effectiveTargetRole = targetRole ?? jobContext?.JobTitle;
         var rewriteSource = BuildRewriteSourceText(sectionName, sourceText, structuredCv);
         var templateGuidance = DescribeRewriteTemplate(templateId);
         var roleGuidance = jobContext is not null
-            ? $"Target this toward the saved job '{jobContext.JobTitle}' at '{jobContext.CompanyName ?? "Unknown company"}'. Use the job context below to sharpen wording without inventing facts.\nJob summary: {jobContext.ShortSummary ?? "-"}\nJob description: {jobContext.Description ?? "-"}"
+            ? $"Target this toward the saved job '{jobContext.JobTitle}' at '{jobContext.CompanyName ?? "Unknown company"}'. Use the full job record below to sharpen wording without inventing facts.\nJob status: {jobContext.Status}\nJob summary: {jobContext.ShortSummary ?? "-"}\nJob description: {jobContext.Description ?? "-"}\nTranslated description: {jobContext.TranslatedDescription ?? "-"}\nNotes: {jobContext.Notes ?? "-"}\nJob URL: {jobContext.JobUrl ?? "-"}\nRecruiter name: {jobContext.RecruiterName ?? "-"}\nRecruiter email: {jobContext.RecruiterEmail ?? "-"}"
             : effectiveTargetRole is not null
                 ? $"Target role: {effectiveTargetRole}. Keep it broadly reusable but clearly aligned to that role family."
                 : "Keep it broadly reusable for future tailoring.";
 
         var subject = sectionName is null ? "this CV" : $"the '{sectionName}' section of this CV";
+        var instruction = $"Rewrite only {subject}. Preserve facts, avoid inventing employers, titles, qualifications, dates, locations, or metrics. Style guidance: {style}. Template direction: {templateGuidance}. {roleGuidance} Return only the rewritten text with clean headings and bullets when useful.";
         var rewritten = await _aiService.SummarizeSectionAsync(
-            $"Rewrite only {subject}. Preserve facts, avoid inventing employers, titles, qualifications, dates, locations, or metrics. Style guidance: {style}. Template direction: {templateGuidance}. {roleGuidance} Return only the rewritten text with clean headings and bullets when useful.",
+            instruction,
             rewriteSource,
             sectionName is null ? 1800 : 900,
             sectionName is null ? 400 : 180);
 
         if (string.IsNullOrWhiteSpace(rewritten))
         {
+            _logger.LogWarning("CV rewrite returned empty output. Section={SectionName} Template={TemplateId} TargetRole={TargetRole} JobApplicationId={JobApplicationId} HasSourceText={HasSourceText} StructuredSections={StructuredSectionCount}",
+                sectionName ?? "<whole-cv>", templateId, effectiveTargetRole ?? "<none>", jobApplicationId, !string.IsNullOrWhiteSpace(sourceText), structuredCv.Sections.Count);
             return StatusCode(StatusCodes.Status502BadGateway, "The AI service could not rewrite your CV right now.");
         }
 
@@ -329,6 +370,73 @@ public sealed class ProfileCvController : ControllerBase
         });
     }
 
+    [HttpGet("templates")]
+    public ActionResult<IEnumerable<CvTemplateDescriptor>> GetTemplates()
+    {
+        return Ok(GetCvTemplateDescriptors());
+    }
+
+    [HttpPost("rewrite-preview")]
+    public async Task<ActionResult<ProfileCvPreviewDto>> BuildRewritePreview([FromBody] RewriteSectionRequest request)
+    {
+        var user = await _users.GetUserAsync(User);
+        if (user is null) return Unauthorized();
+
+        var structuredCv = StructuredCvProfileJson.Deserialize(user.ProfileCvStructureJson);
+        var sourceText = string.IsNullOrWhiteSpace(request.SourceText)
+            ? (string.IsNullOrWhiteSpace(user.ProfileCvText) ? null : user.ProfileCvText.Trim())
+            : request.SourceText.Trim();
+        if (string.IsNullOrWhiteSpace(sourceText) && structuredCv.Sections.Count == 0)
+        {
+            return BadRequest("Add or import CV text before rewriting your CV.");
+        }
+
+        var sectionName = NormalizeRewriteSectionName(request.SectionName);
+        var style = string.IsNullOrWhiteSpace(request.Style) ? "ats-minimal" : request.Style.Trim();
+        var templateId = NormalizeTemplateId(request.TemplateId ?? style);
+        var jobApplicationId = ParseFlexibleNullableInt(request.JobApplicationId);
+        var job = jobApplicationId.HasValue
+            ? await _db.JobApplications.AsNoTracking().Include(job => job.Company)
+                .FirstOrDefaultAsync(job => job.Id == jobApplicationId.Value && job.OwnerUserId == user.Id, HttpContext.RequestAborted)
+            : null;
+        var effectiveTargetRole = string.IsNullOrWhiteSpace(request.TargetRole)
+            ? job?.JobTitle
+            : request.TargetRole.Trim();
+
+        var rewriteResult = await RewriteSection(request);
+        if (rewriteResult is not OkObjectResult ok) return StatusCode((rewriteResult as ObjectResult)?.StatusCode ?? 500, (rewriteResult as ObjectResult)?.Value);
+
+        var rewrittenText = JsonDocument.Parse(JsonSerializer.Serialize(ok.Value)).RootElement.GetProperty("text").GetString()?.Trim() ?? string.Empty;
+        var baseText = string.IsNullOrWhiteSpace(sourceText)
+            ? string.Join("\n\n", structuredCv.Sections.Select(section => $"## {section.Name}\n{section.Content}"))
+            : sourceText!;
+        var fullText = sectionName is null ? rewrittenText : ReplaceOrAppendCvSection(baseText, sectionName, rewrittenText);
+        var previewStructured = await BuildStructuredCvAsync(fullText, HttpContext.RequestAborted);
+        var document = BuildMasterCvDocument(previewStructured, templateId, effectiveTargetRole, job?.JobTitle, job?.Company?.Name);
+        var rendered = RenderProfileCv(document, user, effectiveTargetRole ?? user.DisplayName ?? "General CV", job?.Company?.Name);
+
+        return Ok(new ProfileCvPreviewDto(rendered.TemplateId, rendered.Html, rendered.SuggestedFileName, fullText, rewrittenText, sectionName, previewStructured, document, effectiveTargetRole, job?.Id));
+    }
+
+    [HttpPost("export-pdf")]
+    public async Task<IActionResult> ExportProfileCvPdf([FromBody] RewriteSectionRequest request, CancellationToken cancellationToken)
+    {
+        var previewResult = await BuildRewritePreview(request);
+        if (previewResult.Result is ObjectResult errorResult && errorResult.StatusCode >= 400)
+        {
+            return StatusCode(errorResult.StatusCode ?? 500, errorResult.Value);
+        }
+
+        var ok = previewResult.Result as OkObjectResult;
+        if (ok?.Value is not ProfileCvPreviewDto preview)
+        {
+            return StatusCode(StatusCodes.Status500InternalServerError, "The CV preview could not be prepared for PDF export.");
+        }
+
+        var artifact = await _cvPdfExporter.ExportAsync(new TailoredCvRenderResult(preview.TemplateId, preview.SuggestedFileName, preview.Html), cancellationToken);
+        return File(artifact.Bytes, "application/pdf", artifact.FileName);
+    }
+
     [HttpPost("parse")]
     public async Task<ActionResult<object>> Parse([FromBody] ParseCvRequest? request)
     {
@@ -400,10 +508,167 @@ public sealed class ProfileCvController : ControllerBase
             "harvard" => "Harvard template: refined, traditional, strong hierarchy, restrained and credible.",
             "auckland" => "Auckland template: modern sidebar layout, crisp highlights, confident but readable.",
             "edinburgh" => "Edinburgh template: polished editorial layout with stronger visual personality and premium spacing.",
-            _ => "ATS Minimal template: clean, compact, scanner-friendly, and easy to tailor.",
+            "monarch" => "Monarch template: executive, premium, high-contrast emphasis on summary and leadership signals.",
+            "fjord" => "Fjord template: calm technical layout with clear information density and practical scanability.",
+            _ => "ATS Minimal template: clean, compact, scanner-friendly, and easy to tailor."
         };
     }
 
+    private static string NormalizeTemplateId(string? value)
+    {
+        var normalized = (value ?? string.Empty).Trim().ToLowerInvariant();
+        return normalized switch
+        {
+            "base" => "ats-minimal",
+            "legacy-text" => "ats-minimal",
+            "harvard" => "harvard",
+            "auckland" => "auckland",
+            "edinburgh" => "edinburgh",
+            "monarch" => "monarch",
+            "fjord" => "fjord",
+            _ => "ats-minimal"
+        };
+    }
+
+    private static string? NormalizeRewriteSectionName(string? value)
+    {
+        var trimmed = value?.Trim();
+        if (string.IsNullOrWhiteSpace(trimmed)) return null;
+        return SectionAliases.TryGetValue(trimmed, out var canonical) ? canonical : trimmed;
+    }
+
+    private static int? ParseFlexibleNullableInt(JsonElement? value)
+    {
+        if (value is null) return null;
+        if (value.Value.ValueKind == JsonValueKind.Number && value.Value.TryGetInt32(out var number)) return number;
+        if (value.Value.ValueKind == JsonValueKind.String)
+        {
+            var raw = value.Value.GetString();
+            if (int.TryParse(raw, out var parsed)) return parsed;
+        }
+        return null;
+    }
+
+    private static string ReplaceOrAppendCvSection(string source, string sectionName, string sectionDraft)
+    {
+        var trimmedSource = (source ?? string.Empty).Trim();
+        var trimmedDraft = (sectionDraft ?? string.Empty).Trim();
+        if (string.IsNullOrWhiteSpace(trimmedDraft)) return trimmedSource;
+        if (string.IsNullOrWhiteSpace(trimmedSource)) return $"## {sectionName}\n{trimmedDraft}";
+
+        var normalizedHeading = sectionName.Trim().ToLowerInvariant();
+        var headingPattern = new Regex(@"^(##\s+|#\s+)?(?<name>[A-Z][A-Za-z &/]+):?\s*$", RegexOptions.Multiline);
+        var matches = headingPattern.Matches(trimmedSource).ToList();
+        var targetIndex = matches.FindIndex(match => string.Equals(match.Groups["name"].Value.Trim(), normalizedHeading, StringComparison.OrdinalIgnoreCase));
+        if (targetIndex < 0)
+        {
+            return $"{trimmedSource}\n\n## {sectionName}\n{trimmedDraft}".Trim();
+        }
+
+        var start = matches[targetIndex].Index;
+        var end = targetIndex + 1 < matches.Count ? matches[targetIndex + 1].Index : trimmedSource.Length;
+        var before = trimmedSource[..start].TrimEnd();
+        var after = trimmedSource[end..].TrimStart();
+        return string.Join("\n\n", new[] { before, $"## {sectionName}\n{trimmedDraft}", after }.Where(part => !string.IsNullOrWhiteSpace(part))).Trim();
+    }
+
+    private static IReadOnlyList<CvTemplateDescriptor> GetCvTemplateDescriptors()
+    {
+        return new[]
+        {
+            new CvTemplateDescriptor("ats-minimal", "ATS Minimal", "Scanner-friendly", "slate", "Compact, direct, and easy to parse.", "Best for broad application flows and recruiter scanning.", new List<string> { "Tight hierarchy", "Keyword-friendly", "Low visual risk" }),
+            new CvTemplateDescriptor("harvard", "Harvard", "Traditional", "brick", "Formal and restrained.", "Good for conservative hiring flows or academic-adjacent applications.", new List<string> { "Classic serif rhythm", "Strong chronology", "Credible tone" }),
+            new CvTemplateDescriptor("auckland", "Auckland", "Modern sidebar", "emerald", "Sharper highlights with a contemporary cadence.", "Pulls key strengths into a faster visual scan.", new List<string> { "Sidebar details", "Compact highlights", "Modern contrast" }),
+            new CvTemplateDescriptor("edinburgh", "Edinburgh", "Editorial", "plum", "More personality without losing clarity.", "Useful when the CV should feel polished and distinctive.", new List<string> { "Premium spacing", "Stronger personality", "Readable density" }),
+            new CvTemplateDescriptor("monarch", "Monarch", "Executive", "#7c2d12", "High-contrast leadership emphasis.", "Works well for senior, strategic, or client-facing roles.", new List<string> { "Executive summary weight", "Premium accenting", "Decision-maker friendly" }),
+            new CvTemplateDescriptor("fjord", "Fjord", "Technical", "#0f4c5c", "Calm, dense, technical layout.", "Optimized for engineering resumes with richer project and skills detail.", new List<string> { "Technical depth", "Dense but readable", "Practical hierarchy" }),
+        };
+    }
+
+    private TailoredCvRenderResult RenderProfileCv(TailoredCvDocument document, ApplicationUser user, string targetRole, string? companyName)
+    {
+        var candidateName = string.Join(" ", new[] { user.FirstName?.Trim(), user.LastName?.Trim() }.Where(value => !string.IsNullOrWhiteSpace(value)));
+        if (string.IsNullOrWhiteSpace(candidateName)) candidateName = user.DisplayName?.Trim();
+        if (string.IsNullOrWhiteSpace(candidateName)) candidateName = user.UserName?.Trim();
+        if (string.IsNullOrWhiteSpace(candidateName)) candidateName = user.Email?.Trim();
+        if (string.IsNullOrWhiteSpace(candidateName)) candidateName = "Your Name";
+        return _cvTemplateRenderer.Render(document, document.TemplateId, candidateName!, targetRole, companyName, user.AvatarImageDataUrl);
+    }
+
+    private static TailoredCvDocument BuildMasterCvDocument(StructuredCvProfile structuredCv, string templateId, string? targetRole, string? fallbackHeadline, string? companyName)
+    {
+        var normalized = StructuredCvProfileJson.Normalize(structuredCv);
+        var customSections = new List<TailoredCvCustomSection>();
+        if (normalized.Certifications.Count > 0)
+        {
+            customSections.Add(new TailoredCvCustomSection
+            {
+                Title = "Certifications",
+                Items = normalized.Certifications.Select(certification => string.Join(" | ", new[] { certification.Name, certification.Issuer, certification.Location, certification.Date }.Where(value => !string.IsNullOrWhiteSpace(value)))).Where(value => !string.IsNullOrWhiteSpace(value)).ToList(),
+            });
+        }
+        if (normalized.Projects.Count > 0)
+        {
+            customSections.Add(new TailoredCvCustomSection
+            {
+                Title = "Projects",
+                Items = normalized.Projects.Select(project => string.Join(" | ", new[] { project.Name, project.Role, project.Location, FormatDateRangeForSection(project.Start, project.End, false) }.Where(value => !string.IsNullOrWhiteSpace(value)))).Where(value => !string.IsNullOrWhiteSpace(value)).ToList(),
+            });
+        }
+        if (normalized.Languages.Count > 0)
+        {
+            customSections.Add(new TailoredCvCustomSection
+            {
+                Title = "Languages",
+                Items = normalized.Languages.Select(language => string.Join(": ", new[] { language.Name, language.Level }.Where(value => !string.IsNullOrWhiteSpace(value)))).Where(value => !string.IsNullOrWhiteSpace(value)).ToList(),
+            });
+        }
+        customSections.AddRange(normalized.OtherSections.Select(section => new TailoredCvCustomSection { Title = section.Title, Items = section.Items }));
+
+        return TailoredCvDraftJson.Normalize(new TailoredCvDocument
+        {
+            TemplateId = templateId,
+            Headline = normalized.Contact.Headline ?? targetRole ?? fallbackHeadline ?? companyName,
+            Summary = normalized.Summary,
+            SelectedSkills = normalized.Skills,
+            Experience = normalized.Jobs.Select(job => new TailoredCvExperienceItem
+            {
+                Title = job.Title,
+                Company = job.Company,
+                Location = job.Location,
+                Start = job.Start,
+                End = job.End,
+                IsCurrent = job.IsCurrent,
+                Bullets = job.Bullets,
+            }).ToList(),
+            Education = normalized.Education.Select(education => new TailoredCvEducationItem
+            {
+                Qualification = education.Qualification,
+                QualificationLevel = education.QualificationLevel,
+                Institution = education.Institution,
+                Location = education.Location,
+                Start = education.Start,
+                End = education.End,
+                Details = education.Details,
+            }).ToList(),
+            CustomSections = customSections,
+            RenderOptions = new TailoredCvRenderOptions
+            {
+                ShowPhoto = true,
+                AccentColor = templateId switch
+                {
+                    "harvard" => "brick",
+                    "auckland" => "emerald",
+                    "edinburgh" => "plum",
+                    "monarch" => "#7c2d12",
+                    "fjord" => "#0f4c5c",
+                    _ => "slate",
+                },
+                SectionOrder = new List<string> { "summary", "skills", "experience", "education", "custom" },
+            }
+        });
+    }
+
     private async Task<StructuredCvProfile> BuildStructuredCvAsync(string text, CancellationToken cancellationToken)
     {
         var parseSource = NormalizeTextForStructuredParsing(text);
@@ -601,7 +866,7 @@ public sealed class ProfileCvController : ControllerBase
     private async Task<StructuredCvProfile?> TryExtractStructuredCvAsync(string text, CancellationToken cancellationToken)
     {
         var structuredJson = await _aiService.SummarizeSectionAsync(
-            "Extract this CV into structured JSON. Return only valid JSON with this exact top-level shape: { \"version\": \"1\", \"contact\": { \"fullName\": string|null, \"headline\": string|null, \"email\": string|null, \"phone\": string|null, \"location\": string|null, \"website\": string|null, \"linkedin\": string|null }, \"summary\": string[], \"jobs\": [{ \"title\": string|null, \"company\": string|null, \"location\": string|null, \"start\": string|null, \"end\": string|null, \"isCurrent\": boolean, \"bullets\": string[], \"skills\": string[] }], \"education\": [{ \"qualification\": string|null, \"institution\": string|null, \"location\": string|null, \"start\": string|null, \"end\": string|null, \"details\": string[] }], \"skills\": string[], \"languages\": [{ \"name\": string|null, \"level\": string|null, \"notes\": string|null }], \"interests\": string[], \"otherSections\": [{ \"title\": string|null, \"items\": string[] }] }. Preserve facts only. Do not invent anything. If a field is unknown, use null or an empty array. Keep wording close to the source. Put unmatched content in otherSections.",
+            "Extract this CV into structured JSON. Return only valid JSON with this exact top-level shape: { \"version\": \"1\", \"contact\": { \"fullName\": string|null, \"headline\": string|null, \"email\": string|null, \"phone\": string|null, \"location\": string|null, \"website\": string|null, \"linkedin\": string|null }, \"summary\": string[], \"jobs\": [{ \"title\": string|null, \"company\": string|null, \"location\": string|null, \"start\": string|null, \"end\": string|null, \"isCurrent\": boolean, \"bullets\": string[], \"skills\": string[] }], \"education\": [{ \"qualification\": string|null, \"qualificationLevel\": \"Secondary\"|\"Diploma/Certificate\"|\"Bachelor\"|\"Master\"|\"PhD\"|\"Other\"|null, \"institution\": string|null, \"location\": string|null, \"start\": string|null, \"end\": string|null, \"details\": string[] }], \"certifications\": [{ \"name\": string|null, \"issuer\": string|null, \"location\": string|null, \"date\": string|null, \"details\": string[] }], \"projects\": [{ \"name\": string|null, \"role\": string|null, \"location\": string|null, \"start\": string|null, \"end\": string|null, \"bullets\": string[], \"skills\": string[] }], \"skills\": string[], \"languages\": [{ \"name\": string|null, \"level\": string|null, \"notes\": string|null }], \"interests\": string[], \"otherSections\": [{ \"title\": string|null, \"items\": string[] }] }. Preserve facts only. Do not invent anything. If a field is unknown, use null or an empty array. Keep wording close to the source. Profile location should only be the candidate's current/home location. Education location must be the institution location. Work location must be employer/job location. Never place skill lists such as Python or Ruby into location fields. Preserve the original qualification text in education. Set qualificationLevel to the normalized enum when you can infer it, otherwise null. Put unmatched content in otherSections.",
             text,
             3200,
             900);
@@ -720,9 +985,20 @@ public sealed class ProfileCvController : ControllerBase
         profile.Contact.Website = NullIfWhitespace(Regex.Match(rawSource, @"\b(?:https?://)?(?:www\.)?[A-Z0-9.-]+\.[A-Z]{2,}(?:/[A-Z0-9._~:/?#\[\]@!$&'()*+,;=-]*)?", RegexOptions.IgnoreCase).Value);
         profile.Contact.LinkedIn = NullIfWhitespace(Regex.Match(rawSource, @"(?:linkedin(?:\.com)?/[A-Z0-9._~:/?#\[\]@!$&'()*+,;=-]+)", RegexOptions.IgnoreCase).Value);
         profile.Contact.FullName = GuessFullName(rawSource) ?? GuessFullNameFromEmail(profile.Contact.Email);
-        profile.Contact.Location = NullIfWhitespace(Regex.Match(rawSource, @"\b[A-Z][a-z]+(?:[\s-][A-Z][a-z]+)*,\s*[A-Z][a-z]+(?:\s+[A-Z][a-z]+)*\b").Value);
 
         var sections = ParseSections(normalized);
+        var contactSection = sections.FirstOrDefault(section => section.Name == "Contact");
+        if (!string.IsNullOrWhiteSpace(contactSection.Content))
+        {
+            var contactFallback = StructuredCvProfileJson.FromSections(new[] { new StructuredCvSection { Name = "Contact", Content = contactSection.Content } });
+            profile.Contact.Location = contactFallback.Contact.Location;
+            profile.Contact.Headline ??= contactFallback.Contact.Headline;
+        }
+        else
+        {
+            profile.Contact.Location = NullIfWhitespace(Regex.Match(rawSource, @"\b[A-Z][a-z]+(?:[\s-][A-Z][a-z]+)*(?:,\s*[A-Z][a-z]+(?:\s+[A-Z][a-z]+)*){1,2}\b").Value);
+        }
+
         var summarySection = sections.FirstOrDefault(section => section.Name == "Professional Summary");
         var flattenedSummary = Regex.Match(
             rawSource,
@@ -777,6 +1053,18 @@ public sealed class ProfileCvController : ControllerBase
             profile.Education = ParseEducationHeuristically(educationSection.Content);
         }
 
+        var certificationsSection = sections.FirstOrDefault(section => section.Name == "Certifications");
+        if (!string.IsNullOrWhiteSpace(certificationsSection.Content))
+        {
+            profile.Certifications = StructuredCvProfileJson.FromSections(new[] { new StructuredCvSection { Name = "Certifications", Content = certificationsSection.Content } }).Certifications;
+        }
+
+        var projectsSection = sections.FirstOrDefault(section => section.Name == "Projects");
+        if (!string.IsNullOrWhiteSpace(projectsSection.Content))
+        {
+            profile.Projects = StructuredCvProfileJson.FromSections(new[] { new StructuredCvSection { Name = "Projects", Content = projectsSection.Content } }).Projects;
+        }
+
         var experienceSection = sections.FirstOrDefault(section => section.Name == "Work Experience");
         if (!string.IsNullOrWhiteSpace(experienceSection.Content))
         {
@@ -861,6 +1149,7 @@ public sealed class ProfileCvController : ControllerBase
             items.Add(new StructuredCvEducation
             {
                 Qualification = TitleCasePreservingAcronyms(qualificationLine),
+                QualificationLevel = InferQualificationLevel(qualificationLine),
                 Institution = TitleCasePreservingAcronyms(institutionLine),
                 Start = dateMatch.Success ? dateMatch.Groups[1].Value : null,
                 End = dateMatch.Success ? dateMatch.Groups[2].Value : null,
@@ -913,6 +1202,18 @@ public sealed class ProfileCvController : ControllerBase
         return string.Join(" ", words);
     }
 
+    private static string? InferQualificationLevel(string? value)
+    {
+        var candidate = value?.Trim();
+        if (string.IsNullOrWhiteSpace(candidate)) return null;
+        if (Regex.IsMatch(candidate, @"\b(phd|doctorate|dphil)\b", RegexOptions.IgnoreCase)) return "PhD";
+        if (Regex.IsMatch(candidate, @"\b(master(?:'s)?|msc|m\.sc|ma|m\.a|mba|meng)\b", RegexOptions.IgnoreCase)) return "Master";
+        if (Regex.IsMatch(candidate, @"\b(bachelor(?:'s)?|bsc|b\.sc|ba|b\.a|beng|degree)\b", RegexOptions.IgnoreCase)) return "Bachelor";
+        if (Regex.IsMatch(candidate, @"\b(diploma|certificate|certification|nvq|btec|level\s*\d+|apprenticeship|associate)\b", RegexOptions.IgnoreCase)) return "Diploma/Certificate";
+        if (Regex.IsMatch(candidate, @"\b(gcse|a-?level|secondary|high school)\b", RegexOptions.IgnoreCase)) return "Secondary";
+        return "Other";
+    }
+
     private static int CountWords(string? text)
     {
         if (string.IsNullOrWhiteSpace(text)) return 0;

JobTrackerApi/Services/AppPaths.cs

@@ -9,6 +9,7 @@ namespace JobTrackerApi.Services
         public string AttachmentsRoot { get; }
         public string CvArtifactsRoot { get; }
         public string CvExportsRoot { get; }
+        public string CvBenchmarksRoot { get; }
 
         public AppPaths(IConfiguration cfg, IHostEnvironment env)
         {
@@ -39,6 +40,13 @@ namespace JobTrackerApi.Services
 
             Directory.CreateDirectory(cvExportsRoot);
             CvExportsRoot = cvExportsRoot;
+
+            var cvBenchmarksRoot = (cfg["Data:CvBenchmarksRoot"] ?? "").Trim();
+            if (string.IsNullOrWhiteSpace(cvBenchmarksRoot)) cvBenchmarksRoot = Path.Combine(DataRoot, "CvBenchmarks");
+            if (!Path.IsPathRooted(cvBenchmarksRoot)) cvBenchmarksRoot = Path.Combine(env.ContentRootPath, cvBenchmarksRoot);
+
+            Directory.CreateDirectory(cvBenchmarksRoot);
+            CvBenchmarksRoot = cvBenchmarksRoot;
         }
 
         public string GetDbPath(string fileName = "jobtracker.db") => Path.Combine(DataRoot, fileName);

JobTrackerApi/Services/CvTemplateRenderer.cs

@@ -24,6 +24,8 @@ public sealed class CvTemplateRenderer : ICvTemplateRenderer
             "harvard" => RenderHarvard(normalized, candidateName, jobTitle, companyName),
             "auckland" => RenderSidebar(normalized, candidateName, jobTitle, companyName, photoDataUrl, "Auckland", roundedPhoto: false, curvedHeader: false),
             "edinburgh" => RenderSidebar(normalized, candidateName, jobTitle, companyName, photoDataUrl, "Edinburgh", roundedPhoto: true, curvedHeader: true),
+            "monarch" => RenderMonarch(normalized, candidateName, jobTitle, companyName, photoDataUrl),
+            "fjord" => RenderFjord(normalized, candidateName, jobTitle, companyName, photoDataUrl),
             _ => RenderAtsMinimal(normalized, candidateName, jobTitle, companyName, photoDataUrl)
         };
         return new TailoredCvRenderResult(effectiveTemplateId, suggestedFileName, html);
@@ -39,6 +41,8 @@ public sealed class CvTemplateRenderer : ICvTemplateRenderer
             "harvard" => "harvard",
             "auckland" => "auckland",
             "edinburgh" => "edinburgh",
+            "monarch" => "monarch",
+            "fjord" => "fjord",
             _ => "ats-minimal"
         };
     }
@@ -201,6 +205,106 @@ public sealed class CvTemplateRenderer : ICvTemplateRenderer
 </html>";
     }
 
+    private static string RenderMonarch(TailoredCvDocument document, string candidateName, string jobTitle, string? companyName, string? photoDataUrl)
+    {
+        var accent = ResolveAccent(document.RenderOptions.AccentColor);
+        var showPhoto = document.RenderOptions.ShowPhoto && !string.IsNullOrWhiteSpace(photoDataUrl);
+        var photoMarkup = showPhoto ? $"<div class=\"monarch-photo\"><img src=\"{EncodeAttribute(photoDataUrl)}\" alt=\"Profile photo\" /></div>" : string.Empty;
+        var body = RenderMainSections(document, accent, headingStyle: "sidebar");
+        var companyMarkup = string.IsNullOrWhiteSpace(companyName) ? string.Empty : $"<div class=\"monarch-company\">Tailored toward {Encode(companyName)}</div>";
+        return $@"<!DOCTYPE html>
+<html lang=""en"">
+<head>
+  <meta charset=""utf-8"" />
+  <title>{Encode(candidateName)} — Monarch</title>
+  <style>
+    :root {{ --accent:{accent}; --ink:#1c1917; --muted:#57534e; --paper:#fffdf8; --panel:#f7efe6; --line:#d6c1a8; }}
+    * {{ box-sizing:border-box; }}
+    body {{ margin:0; background:#efe7dc; color:var(--ink); font-family:'Times New Roman', Georgia, serif; -webkit-print-color-adjust:exact; print-color-adjust:exact; }}
+    .page {{ width:210mm; min-height:297mm; margin:0 auto; background:var(--paper); padding:16mm; }}
+    .monarch-shell {{ border:1px solid var(--line); padding:10mm; position:relative; }}
+    .monarch-shell::before {{ content:''; position:absolute; inset:6mm; border:1px solid color-mix(in srgb, var(--line) 70%, white); pointer-events:none; }}
+    .monarch-header {{ display:grid; grid-template-columns:1fr auto; gap:6mm; align-items:center; margin-bottom:8mm; }}
+    .monarch-kicker {{ display:inline-block; text-transform:uppercase; letter-spacing:.3em; font-size:8pt; color:var(--accent); margin-bottom:2mm; }}
+    .monarch-name {{ margin:0; font-size:28pt; line-height:1.05; }}
+    .monarch-headline {{ margin-top:2mm; font-size:11pt; color:var(--muted); max-width:130mm; }}
+    .monarch-company {{ margin-top:2mm; font-size:9pt; color:var(--accent); text-transform:uppercase; letter-spacing:.16em; }}
+    .monarch-photo {{ width:30mm; height:38mm; border:1px solid var(--line); background:var(--panel); overflow:hidden; }}
+    .monarch-photo img {{ width:100%; height:100%; object-fit:cover; display:block; }}
+    .monarch-summary {{ margin-bottom:5mm; padding:4mm 5mm; background:var(--panel); border-left:3px solid var(--accent); font-size:10pt; color:var(--muted); }}
+    {BaseSectionCss(accent, "harvard")}
+    .section-title {{ text-transform:uppercase; letter-spacing:.12em; font-size:10pt; }}
+    @page {{ size:A4; margin:0; }}
+  </style>
+</head>
+<body>
+  <main class=""page"">
+    <section class=""monarch-shell"">
+      <header class=""monarch-header"">
+        <div>
+          <span class=""monarch-kicker"">Executive CV</span>
+          <h1 class=""monarch-name"">{Encode(candidateName)}</h1>
+          <div class=""monarch-headline"">{Encode(document.Headline ?? jobTitle)}</div>
+          {companyMarkup}
+        </div>
+        {photoMarkup}
+      </header>
+      {(!string.IsNullOrWhiteSpace(jobTitle) ? $"<div class=\"monarch-summary\">Primary role target: {Encode(jobTitle)}</div>" : string.Empty)}
+      {body}
+    </section>
+  </main>
+</body>
+</html>";
+    }
+
+    private static string RenderFjord(TailoredCvDocument document, string candidateName, string jobTitle, string? companyName, string? photoDataUrl)
+    {
+        var accent = ResolveAccent(document.RenderOptions.AccentColor);
+        var showPhoto = document.RenderOptions.ShowPhoto && !string.IsNullOrWhiteSpace(photoDataUrl);
+        var body = RenderMainSections(document, accent, headingStyle: "sidebar");
+        var photoMarkup = showPhoto ? $"<div class=\"fjord-photo\"><img src=\"{EncodeAttribute(photoDataUrl)}\" alt=\"Profile photo\" /></div>" : string.Empty;
+        var companyMarkup = string.IsNullOrWhiteSpace(companyName) ? string.Empty : $"<span>{Encode(companyName)}</span>";
+        return $@"<!DOCTYPE html>
+<html lang=""en"">
+<head>
+  <meta charset=""utf-8"" />
+  <title>{Encode(candidateName)} — Fjord</title>
+  <style>
+    :root {{ --accent:{accent}; --ink:#102a43; --muted:#486581; --panel:#e6f1f3; --line:#9fb3c8; --paper:#fbfdff; }}
+    * {{ box-sizing:border-box; }}
+    body {{ margin:0; background:#d9e8ef; color:var(--ink); font-family:Arial, Helvetica, sans-serif; -webkit-print-color-adjust:exact; print-color-adjust:exact; }}
+    .page {{ width:210mm; min-height:297mm; margin:0 auto; background:var(--paper); padding:0; }}
+    .fjord-grid {{ display:grid; grid-template-columns:72mm 1fr; min-height:297mm; }}
+    .fjord-rail {{ background:linear-gradient(180deg, var(--accent), color-mix(in srgb, var(--accent) 15%, white)); color:white; padding:16mm 8mm; }}
+    .fjord-name {{ margin:0; font-size:21pt; line-height:1.08; }}
+    .fjord-headline {{ margin-top:2mm; font-size:10pt; opacity:.95; }}
+    .fjord-meta {{ margin-top:4mm; font-size:8.5pt; display:flex; flex-direction:column; gap:1.2mm; opacity:.9; }}
+    .fjord-photo {{ width:28mm; height:28mm; border-radius:50%; overflow:hidden; border:2px solid rgba(255,255,255,.65); margin-top:6mm; }}
+    .fjord-photo img {{ width:100%; height:100%; object-fit:cover; display:block; }}
+    .fjord-main {{ padding:14mm 14mm 14mm 10mm; }}
+    {BaseSectionCss(accent, "sidebar")}
+    .section {{ margin-top:5mm; }}
+    .skills {{ gap:1.5mm; }}
+    .skill-pill {{ background:var(--panel); border-color:transparent; color:var(--ink); }}
+    @page {{ size:A4; margin:0; }}
+  </style>
+</head>
+<body>
+  <main class=""page"">
+    <section class=""fjord-grid"">
+      <aside class=""fjord-rail"">
+        <h1 class=""fjord-name"">{Encode(candidateName)}</h1>
+        <div class=""fjord-headline"">{Encode(document.Headline ?? jobTitle)}</div>
+        <div class=""fjord-meta""><span>{Encode(jobTitle)}</span>{companyMarkup}<span>Template: Fjord</span></div>
+        {photoMarkup}
+      </aside>
+      <section class=""fjord-main"">{body}</section>
+    </section>
+  </main>
+</body>
+</html>";
+    }
+
     private static string RenderMainSections(TailoredCvDocument document, string accent, string headingStyle)
     {
         var sectionOrder = document.RenderOptions.SectionOrder.Count == 0
@@ -291,7 +395,10 @@ public sealed class CvTemplateRenderer : ICvTemplateRenderer
                 .Where(x => !string.IsNullOrWhiteSpace(x))
                 .Select(Encode));
             items.Append("<article class=\"entry\">");
-            items.Append($"<div class=\"entry-title\">{Encode(entry.Qualification)}</div>");
+            var title = string.IsNullOrWhiteSpace(entry.QualificationLevel)
+                ? entry.Qualification
+                : $"{entry.Qualification} ({entry.QualificationLevel})";
+            items.Append($"<div class=\"entry-title\">{Encode(title)}</div>");
             if (!string.IsNullOrWhiteSpace(subtitle)) items.Append($"<div class=\"entry-subtitle\">{subtitle}</div>");
             if (entry.Details.Count > 0) items.Append($"<ul class=\"education-list\">{string.Join(string.Empty, entry.Details.Select(detail => $"<li>{Encode(detail)}</li>"))}</ul>");
             items.Append("</article>");

JobTrackerApi/Services/SummarizerService.cs

@@ -25,6 +25,10 @@ namespace JobTrackerApi.Services
         bool? OllamaReachable,
         string? OllamaModel,
         bool? OllamaModelAvailable,
+        string? OllamaVersion,
+        IReadOnlyList<string>? OllamaInstalledModels,
+        IReadOnlyList<string>? OllamaLoadedModels,
+        int? OllamaLoadedCount,
         double? HealthLatencyMs,
         double? ProbeLatencyMs,
         DateTimeOffset? LastProbeAt,
@@ -66,6 +70,7 @@ namespace JobTrackerApi.Services
 
     public interface ISummarizerService : IAiService
     {
+        new Task<string?> SummarizeSectionAsync(string instruction, string text, int maxLength = 180, int minLength = 40);
     }
 
     public class SummarizerService : ISummarizerService
@@ -318,6 +323,10 @@ namespace JobTrackerApi.Services
             bool? ollamaReachable = null;
             string? ollamaModel = null;
             bool? ollamaModelAvailable = null;
+            string? ollamaVersion = null;
+            List<string>? ollamaInstalledModels = null;
+            List<string>? ollamaLoadedModels = null;
+            int? ollamaLoadedCount = null;
             double? healthLatencyMs = null;
             var healthy = false;
             string? healthError = null;
@@ -344,6 +353,16 @@ namespace JobTrackerApi.Services
                     if (doc.RootElement.TryGetProperty("ollama_reachable", out var ollamaReachableEl) && ollamaReachableEl.ValueKind is JsonValueKind.True or JsonValueKind.False) ollamaReachable = ollamaReachableEl.GetBoolean();
                     if (doc.RootElement.TryGetProperty("ollama_model", out var ollamaModelEl)) ollamaModel = ollamaModelEl.GetString();
                     if (doc.RootElement.TryGetProperty("ollama_model_available", out var ollamaModelAvailableEl) && ollamaModelAvailableEl.ValueKind is JsonValueKind.True or JsonValueKind.False) ollamaModelAvailable = ollamaModelAvailableEl.GetBoolean();
+                    if (doc.RootElement.TryGetProperty("ollama_version", out var ollamaVersionEl)) ollamaVersion = ollamaVersionEl.GetString();
+                    if (doc.RootElement.TryGetProperty("ollama_installed_models", out var ollamaInstalledModelsEl) && ollamaInstalledModelsEl.ValueKind == JsonValueKind.Array)
+                    {
+                        ollamaInstalledModels = ollamaInstalledModelsEl.EnumerateArray().Where(x => x.ValueKind == JsonValueKind.String).Select(x => x.GetString()).Where(x => !string.IsNullOrWhiteSpace(x)).Cast<string>().ToList();
+                    }
+                    if (doc.RootElement.TryGetProperty("ollama_loaded_models", out var ollamaLoadedModelsEl) && ollamaLoadedModelsEl.ValueKind == JsonValueKind.Array)
+                    {
+                        ollamaLoadedModels = ollamaLoadedModelsEl.EnumerateArray().Where(x => x.ValueKind == JsonValueKind.String).Select(x => x.GetString()).Where(x => !string.IsNullOrWhiteSpace(x)).Cast<string>().ToList();
+                    }
+                    if (doc.RootElement.TryGetProperty("ollama_loaded_count", out var ollamaLoadedCountEl) && ollamaLoadedCountEl.ValueKind == JsonValueKind.Number) ollamaLoadedCount = ollamaLoadedCountEl.GetInt32();
                 }
                 else
                 {
@@ -406,6 +425,10 @@ namespace JobTrackerApi.Services
                 OllamaReachable: ollamaReachable,
                 OllamaModel: ollamaModel,
                 OllamaModelAvailable: ollamaModelAvailable,
+                OllamaVersion: ollamaVersion,
+                OllamaInstalledModels: ollamaInstalledModels,
+                OllamaLoadedModels: ollamaLoadedModels,
+                OllamaLoadedCount: ollamaLoadedCount,
                 HealthLatencyMs: healthLatencyMs,
                 ProbeLatencyMs: probeLatencyMs,
                 LastProbeAt: lastProbeAt,

Models/StructuredCvProfile.cs

@@ -8,6 +8,8 @@ public sealed class StructuredCvProfile
     public List<string> Summary { get; set; } = new();
     public List<StructuredCvJob> Jobs { get; set; } = new();
     public List<StructuredCvEducation> Education { get; set; } = new();
+    public List<StructuredCvCertification> Certifications { get; set; } = new();
+    public List<StructuredCvProject> Projects { get; set; } = new();
     public List<string> Skills { get; set; } = new();
     public List<StructuredCvLanguage> Languages { get; set; } = new();
     public List<string> Interests { get; set; } = new();
@@ -60,6 +62,7 @@ public sealed class StructuredCvJob
 public sealed class StructuredCvEducation
 {
     public string? Qualification { get; set; }
+    public string? QualificationLevel { get; set; }
     public string? Institution { get; set; }
     public string? Location { get; set; }
     public string? Start { get; set; }
@@ -67,6 +70,26 @@ public sealed class StructuredCvEducation
     public List<string> Details { get; set; } = new();
 }
 
+public sealed class StructuredCvCertification
+{
+    public string? Name { get; set; }
+    public string? Issuer { get; set; }
+    public string? Location { get; set; }
+    public string? Date { get; set; }
+    public List<string> Details { get; set; } = new();
+}
+
+public sealed class StructuredCvProject
+{
+    public string? Name { get; set; }
+    public string? Role { get; set; }
+    public string? Location { get; set; }
+    public string? Start { get; set; }
+    public string? End { get; set; }
+    public List<string> Bullets { get; set; } = new();
+    public List<string> Skills { get; set; } = new();
+}
+
 public sealed class StructuredCvLanguage
 {
     public string? Name { get; set; }

Models/StructuredCvProfileJson.cs

@@ -67,6 +67,8 @@ public static class StructuredCvProfileJson
             : primary.Summary.Concat(secondary.Summary).Distinct(StringComparer.OrdinalIgnoreCase).ToList();
         if (primary.Jobs.Count == 0) primary.Jobs = secondary.Jobs;
         if (primary.Education.Count == 0) primary.Education = secondary.Education;
+        if (primary.Certifications.Count == 0) primary.Certifications = secondary.Certifications;
+        if (primary.Projects.Count == 0) primary.Projects = secondary.Projects;
         primary.Skills = primary.Skills.Count == 0
             ? secondary.Skills
             : primary.Skills.Concat(secondary.Skills).Distinct(StringComparer.OrdinalIgnoreCase).ToList();
@@ -132,6 +134,14 @@ public static class StructuredCvProfileJson
                 case "education":
                     profile.Education = ParseEducation(section.Content);
                     break;
+                case "certifications":
+                case "certificates":
+                    profile.Certifications = ParseCertifications(section.Content);
+                    break;
+                case "projects":
+                case "selected projects":
+                    profile.Projects = ParseProjects(section.Content);
+                    break;
                 default:
                     profile.OtherSections.Add(new StructuredCvOtherSection
                     {
@@ -165,6 +175,18 @@ public static class StructuredCvProfileJson
                 || !string.IsNullOrWhiteSpace(education.Institution)
                 || education.Details.Count > 0)
             .ToList();
+        profile.Certifications = (profile.Certifications ?? new List<StructuredCvCertification>())
+            .Select(NormalizeCertification)
+            .Where(certification => !string.IsNullOrWhiteSpace(certification.Name)
+                || !string.IsNullOrWhiteSpace(certification.Issuer)
+                || certification.Details.Count > 0)
+            .ToList();
+        profile.Projects = (profile.Projects ?? new List<StructuredCvProject>())
+            .Select(NormalizeProject)
+            .Where(project => !string.IsNullOrWhiteSpace(project.Name)
+                || !string.IsNullOrWhiteSpace(project.Role)
+                || project.Bullets.Count > 0)
+            .ToList();
         profile.Skills = CleanList(profile.Skills);
         profile.Languages = (profile.Languages ?? new List<StructuredCvLanguage>())
             .Select(NormalizeLanguage)
@@ -299,6 +321,8 @@ public static class StructuredCvProfileJson
         if (trimmed.Any(char.IsDigit) || trimmed.Length > 80) return null;
 
         var normalized = Regex.Replace(trimmed, @"\s+[A-Z](?:\s+[A-Z]){2,}(?:\b.*)?$", string.Empty).Trim();
+        normalized = Regex.Replace(normalized, @"\b(?:remote|hybrid)\b.*$", string.Empty, RegexOptions.IgnoreCase).Trim();
+        normalized = Regex.Replace(normalized, @"\b(?:sales representative|developer|engineer|manager|consultant|analyst|designer|specialist|technician)\b.*$", string.Empty, RegexOptions.IgnoreCase).Trim();
         normalized = Regex.Replace(normalized, @"\s+", " ").Trim(' ', '|', ';', ':');
         var parts = normalized.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
         if (parts.Length == 0 || parts.Length > 4) return null;
@@ -421,10 +445,24 @@ public static class StructuredCvProfileJson
         return string.IsNullOrWhiteSpace(trimmed) ? null : trimmed;
     }
 
+    private static string? NormalizeQualificationLevel(string? explicitValue, string? qualificationText)
+    {
+        var candidate = TrimOrNull(explicitValue) ?? TrimOrNull(qualificationText);
+        if (candidate is null) return null;
+
+        if (Regex.IsMatch(candidate, @"\b(phd|doctorate|dphil)\b", RegexOptions.IgnoreCase)) return "PhD";
+        if (Regex.IsMatch(candidate, @"\b(master(?:'s)?|msc|m\.sc|ma|m\.a|mba|meng|meng)\b", RegexOptions.IgnoreCase)) return "Master";
+        if (Regex.IsMatch(candidate, @"\b(bachelor(?:'s)?|bsc|b\.sc|ba|b\.a|beng|llb|undergraduate degree)\b", RegexOptions.IgnoreCase)) return "Bachelor";
+        if (Regex.IsMatch(candidate, @"\b(diploma|certificate|certification|nvq|btec|level\s*\d+|apprenticeship|associate degree)\b", RegexOptions.IgnoreCase)) return "Diploma/Certificate";
+        if (Regex.IsMatch(candidate, @"\b(gcse|a-?level|secondary|high school|gymnasium)\b", RegexOptions.IgnoreCase)) return "Secondary";
+        return "Other";
+    }
+
     private static StructuredCvEducation NormalizeEducation(StructuredCvEducation? education)
     {
         education ??= new StructuredCvEducation();
         education.Qualification = NormalizeQualification(education.Qualification);
+        education.QualificationLevel = NormalizeQualificationLevel(education.QualificationLevel, education.Qualification);
         education.Institution = NormalizeInstitution(education.Institution);
         education.Location = NormalizeLocationValue(education.Location);
         education.Start = NormalizeDateValue(education.Start);
@@ -438,12 +476,41 @@ public static class StructuredCvProfileJson
             if (qualificationLooksInstitutional && institutionLooksQualification)
             {
                 (education.Qualification, education.Institution) = (education.Institution, education.Qualification);
+                education.QualificationLevel = NormalizeQualificationLevel(education.QualificationLevel, education.Qualification);
             }
         }
 
         return education;
     }
 
+    private static StructuredCvCertification NormalizeCertification(StructuredCvCertification? certification)
+    {
+        certification ??= new StructuredCvCertification();
+        certification.Name = NormalizeQualification(certification.Name);
+        certification.Issuer = NormalizeInstitution(certification.Issuer);
+        certification.Location = NormalizeLocationValue(certification.Location);
+        certification.Date = NormalizeDateValue(certification.Date);
+        certification.Details = CleanList(certification.Details);
+        return certification;
+    }
+
+    private static StructuredCvProject NormalizeProject(StructuredCvProject? project)
+    {
+        project ??= new StructuredCvProject();
+        project.Name = NormalizeQualification(project.Name);
+        project.Role = NormalizeJobTitle(project.Role);
+        project.Location = NormalizeLocationValue(project.Location);
+        project.Start = NormalizeDateValue(project.Start);
+        project.End = NormalizeDateValue(project.End);
+        project.Bullets = CleanList(project.Bullets)
+            .Select(NormalizeBullet)
+            .Where(bullet => bullet is not null)
+            .Select(bullet => bullet!)
+            .ToList();
+        project.Skills = CleanList(project.Skills);
+        return project;
+    }
+
     private static StructuredCvLanguage NormalizeLanguage(StructuredCvLanguage? language)
     {
         language ??= new StructuredCvLanguage();
@@ -512,12 +579,42 @@ public static class StructuredCvProfileJson
                 AddIf(lines, $"### {education.Qualification}".Trim());
                 var meta = string.Join(" | ", new[] { education.Institution, education.Location, FormatDateRange(education.Start, education.End, false) }.Where(value => !string.IsNullOrWhiteSpace(value)));
                 AddIf(lines, meta);
+                if (!string.IsNullOrWhiteSpace(education.QualificationLevel)) AddIf(lines, $"Level: {education.QualificationLevel}");
                 lines.AddRange(education.Details.Select(detail => $"- {detail}"));
                 if (lines.Count > 0 && !string.IsNullOrWhiteSpace(lines[^1])) lines.Add(string.Empty);
             }
             AddSectionIfAny(sections, "Education", lines);
         }
 
+        if (profile.Certifications.Count > 0)
+        {
+            var lines = new List<string>();
+            foreach (var certification in profile.Certifications)
+            {
+                AddIf(lines, $"### {certification.Name}".Trim());
+                var meta = string.Join(" | ", new[] { certification.Issuer, certification.Location, certification.Date }.Where(value => !string.IsNullOrWhiteSpace(value)));
+                AddIf(lines, meta);
+                lines.AddRange(certification.Details.Select(detail => $"- {detail}"));
+                if (lines.Count > 0 && !string.IsNullOrWhiteSpace(lines[^1])) lines.Add(string.Empty);
+            }
+            AddSectionIfAny(sections, "Certifications", lines);
+        }
+
+        if (profile.Projects.Count > 0)
+        {
+            var lines = new List<string>();
+            foreach (var project in profile.Projects)
+            {
+                AddIf(lines, $"### {project.Name}".Trim());
+                var meta = string.Join(" | ", new[] { project.Role, project.Location, FormatDateRange(project.Start, project.End, false) }.Where(value => !string.IsNullOrWhiteSpace(value)));
+                AddIf(lines, meta);
+                lines.AddRange(project.Bullets.Select(bullet => $"- {bullet}"));
+                if (project.Skills.Count > 0) AddIf(lines, $"Skills: {string.Join(", ", project.Skills)}");
+                if (lines.Count > 0 && !string.IsNullOrWhiteSpace(lines[^1])) lines.Add(string.Empty);
+            }
+            AddSectionIfAny(sections, "Projects", lines);
+        }
+
         AddSectionIfAny(sections, "Skills", profile.Skills);
 
         if (profile.Languages.Count > 0)
@@ -692,9 +789,76 @@ public static class StructuredCvProfileJson
         if (metadataWithoutDates.Count > 1) education.Location = metadataWithoutDates[1].NullIfWhitespace();
 
         education.Details = lines.Skip(1).Where(IsBullet).Select(line => line.Trim().TrimStart('-', '•', '*', ' ')).Where(line => !string.IsNullOrWhiteSpace(line)).ToList();
+        education.QualificationLevel = NormalizeQualificationLevel(null, education.Qualification);
         return string.IsNullOrWhiteSpace(education.Qualification) && string.IsNullOrWhiteSpace(education.Institution) && education.Details.Count == 0 ? null : education;
     }
 
+    private static List<StructuredCvCertification> ParseCertifications(string content)
+    {
+        var blocks = SplitBlocks(content);
+        return blocks.Select(ParseCertificationBlock).Where(certification => certification is not null).Select(certification => certification!).ToList();
+    }
+
+    private static StructuredCvCertification? ParseCertificationBlock(string block)
+    {
+        var lines = block.Replace("\r\n", "\n").Split('\n', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries).ToList();
+        if (lines.Count == 0) return null;
+
+        var certification = new StructuredCvCertification();
+        if (lines[0].StartsWith("###", StringComparison.Ordinal)) lines[0] = lines[0].TrimStart('#', ' ');
+        certification.Name = lines[0].NullIfWhitespace();
+
+        var metadata = lines.Skip(1).TakeWhile(line => !IsBullet(line)).ToList();
+        certification.Date = metadata.Select(line => Regex.Match(line, @"(?:(?:\w+\s+)?\d{4}|Present|Current)", RegexOptions.IgnoreCase).Value.NullIfWhitespace()).FirstOrDefault(value => value is not null);
+        var metadataWithoutDates = metadata
+            .Select(line => string.IsNullOrWhiteSpace(certification.Date) ? line : line.Replace(certification.Date, string.Empty))
+            .Select(line => line.Trim(' ', '|', ',', '-'))
+            .Where(line => !string.IsNullOrWhiteSpace(line))
+            .ToList();
+        if (metadataWithoutDates.Count > 0) certification.Issuer = metadataWithoutDates[0].NullIfWhitespace();
+        if (metadataWithoutDates.Count > 1) certification.Location = metadataWithoutDates[1].NullIfWhitespace();
+        certification.Details = lines.Skip(1).Where(IsBullet).Select(line => line.Trim().TrimStart('-', '•', '*', ' ')).Where(line => !string.IsNullOrWhiteSpace(line)).ToList();
+        return string.IsNullOrWhiteSpace(certification.Name) && string.IsNullOrWhiteSpace(certification.Issuer) ? null : certification;
+    }
+
+    private static List<StructuredCvProject> ParseProjects(string content)
+    {
+        var blocks = SplitBlocks(content);
+        return blocks.Select(ParseProjectBlock).Where(project => project is not null).Select(project => project!).ToList();
+    }
+
+    private static StructuredCvProject? ParseProjectBlock(string block)
+    {
+        var lines = block.Replace("\r\n", "\n").Split('\n', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries).ToList();
+        if (lines.Count == 0) return null;
+
+        var project = new StructuredCvProject();
+        if (lines[0].StartsWith("###", StringComparison.Ordinal)) lines[0] = lines[0].TrimStart('#', ' ');
+        project.Name = lines[0].NullIfWhitespace();
+        var metadata = lines.Skip(1).TakeWhile(line => !IsBullet(line) && !line.StartsWith("Skills:", StringComparison.OrdinalIgnoreCase)).ToList();
+        var dateValue = metadata.Select(line => Regex.Match(line, @"(?:(?:\w+\s+)?\d{4}|Present|Current)(?:\s*[-–]\s*(?:(?:\w+\s+)?\d{4}|Present|Current))?", RegexOptions.IgnoreCase).Value.NullIfWhitespace()).FirstOrDefault(value => value is not null);
+        if (!string.IsNullOrWhiteSpace(dateValue))
+        {
+            var parts = Regex.Split(dateValue, "\\s*[-–]\\s*");
+            project.Start = parts.FirstOrDefault().NullIfWhitespace();
+            project.End = parts.Skip(1).FirstOrDefault().NullIfWhitespace();
+        }
+
+        var metadataWithoutDates = metadata
+            .Select(line => string.IsNullOrWhiteSpace(dateValue) ? line : line.Replace(dateValue, string.Empty))
+            .Select(line => line.Trim(' ', '|', ',', '-'))
+            .Where(line => !string.IsNullOrWhiteSpace(line))
+            .ToList();
+        if (metadataWithoutDates.Count > 0) project.Role = metadataWithoutDates[0].NullIfWhitespace();
+        if (metadataWithoutDates.Count > 1) project.Location = metadataWithoutDates[1].NullIfWhitespace();
+        project.Bullets = lines.Where(IsBullet).Select(line => line.Trim().TrimStart('-', '•', '*', ' ')).Where(line => !string.IsNullOrWhiteSpace(line)).ToList();
+        project.Skills = lines
+            .Where(line => line.StartsWith("Skills:", StringComparison.OrdinalIgnoreCase))
+            .SelectMany(line => SplitList(line[(line.IndexOf(':') + 1)..]))
+            .ToList();
+        return string.IsNullOrWhiteSpace(project.Name) && string.IsNullOrWhiteSpace(project.Role) && project.Bullets.Count == 0 ? null : project;
+    }
+
     private static List<string> SplitBlocks(string content)
     {
         var normalized = content.Replace("\r\n", "\n").Trim();

Models/TailoredCvDraft.cs

@@ -47,6 +47,7 @@ public sealed class TailoredCvExperienceItem
 public sealed class TailoredCvEducationItem
 {
     public string? Qualification { get; set; }
+    public string? QualificationLevel { get; set; }
     public string? Institution { get; set; }
     public string? Location { get; set; }
     public string? Start { get; set; }

Models/TailoredCvDraftJson.cs

@@ -128,7 +128,7 @@ public static class TailoredCvDraftJson
             var block = new List<string>();
             foreach (var item in normalized.Education)
             {
-                AddLine(block, item.Qualification);
+                AddLine(block, string.IsNullOrWhiteSpace(item.QualificationLevel) ? item.Qualification : $"{item.Qualification} ({item.QualificationLevel})");
                 var meta = string.Join(" | ", new[]
                 {
                     item.Institution,
@@ -170,6 +170,7 @@ public static class TailoredCvDraftJson
     {
         item ??= new TailoredCvEducationItem();
         item.Qualification = TrimOrNull(item.Qualification);
+        item.QualificationLevel = TrimOrNull(item.QualificationLevel);
         item.Institution = TrimOrNull(item.Institution);
         item.Location = TrimOrNull(item.Location);
         item.Start = TrimOrNull(item.Start);

docs/cv-builder-parser-benchmark.md

@@ -0,0 +1,224 @@
+# CV builder, parser, benchmark, and Ollama admin integration
+
+## What changed
+
+This branch upgrades the Profile CV flow from a text-only rewrite helper into a template-driven CV builder backed by the server-side renderer/PDF pipeline, strengthens CV normalization around location and qualification handling, adds a repeatable local corpus benchmark workflow, and expands the admin system page with richer Ollama visibility.
+
+## Profile CV builder
+
+### New backend capabilities
+
+`JobTrackerApi/Controllers/ProfileCvController.cs`
+
+- Hardened `POST /api/profile-cv/rewrite-section`
+  - accepts flexible `jobApplicationId` payloads (number or blank string)
+  - uses richer saved-job context for tailoring
+  - logs empty AI responses with useful context
+- Added `GET /api/profile-cv/templates`
+- Added `POST /api/profile-cv/rewrite-preview`
+  - rewrites either the whole CV or one selected section
+  - rebuilds structured CV from the rewritten full text
+  - maps the result into the shared template renderer
+  - returns rendered HTML, file name, rewritten text, and full replacement text
+- Added `POST /api/profile-cv/export-pdf`
+  - uses the same rendered HTML and the shared Playwright exporter
+
+### Frontend flow
+
+`job-tracker-ui/src/pages/ProfilePage.tsx`
+
+- Replaced the old rewrite draft box with a template-driven builder section.
+- Users can:
+  - choose from 6 templates
+  - optionally target one section
+  - target by free-text role or saved job
+  - inspect the rewritten content
+  - inspect the actual rendered preview
+  - download a PDF
+  - replace the master CV with the rebuilt full-text result
+
+## Templates
+
+Shared renderer: `JobTrackerApi/Services/CvTemplateRenderer.cs`
+
+Available templates:
+- `ats-minimal`
+- `harvard`
+- `auckland`
+- `edinburgh`
+- `monarch`
+- `fjord`
+
+### Adding a new template
+
+1. Add the new template id to `NormalizeTemplateId()` in:
+   - `JobTrackerApi/Services/CvTemplateRenderer.cs`
+   - `JobTrackerApi/Controllers/ProfileCvController.cs`
+2. Add a render branch in `CvTemplateRenderer.Render()`.
+3. Add a descriptor to `GetCvTemplateDescriptors()`.
+4. Add the matching card entry in `job-tracker-ui/src/pages/ProfilePage.tsx` if you want a custom preview card.
+
+## PDF generation
+
+The master CV builder now reuses the existing server-side pipeline:
+
+1. rewrite full text / section
+2. rebuild structured CV
+3. map to `TailoredCvDocument`
+4. render HTML via `ICvTemplateRenderer`
+5. export PDF via `ICvPdfExporter` / Playwright
+
+This keeps PDF output visually aligned with the selected template and avoids a separate client-only print implementation.
+
+## Parser and structured CV changes
+
+### Shared schema
+
+`Models/StructuredCvProfile.cs`
+
+Added:
+- `education[].qualificationLevel`
+- top-level `certifications[]`
+- top-level `projects[]`
+
+`qualification` remains the original preserved text.
+
+### Normalization improvements
+
+`Models/StructuredCvProfileJson.cs`
+
+- tighter location sanitization to avoid skill or role spillover into location fields
+- qualification level normalization to one of:
+  - `Secondary`
+  - `Diploma/Certificate`
+  - `Bachelor`
+  - `Master`
+  - `PhD`
+  - `Other`
+- first-class normalization for certifications and projects
+- section reconstruction now includes certifications and projects
+
+### Extraction prompt improvements
+
+`JobTrackerApi/Controllers/ProfileCvController.cs`
+
+The LLM extraction prompt now explicitly asks for:
+- qualification level enum
+- certifications
+- projects
+- strict location separation rules
+- preservation of original qualification text
+
+## Benchmark workflow
+
+### Runner
+
+Use:
+
+```bash
+./scripts/run-cv-benchmark.sh
+```
+
+Optional overrides:
+
+```bash
+CV_BENCHMARK_OUTPUT_DIR=/absolute/output/path \
+CV_BENCHMARK_APPROVED_DIR=/absolute/approved/fixtures/path \
+./scripts/run-cv-benchmark.sh
+```
+
+### Inputs
+
+The runner scans:
+
+- `/home/pi/cvs`
+
+Supported corpus file types:
+- PDF
+- DOCX
+- TXT
+- MD
+
+### Outputs
+
+The runner writes:
+
+- `index.json` — machine-readable summary
+- `report.md` — markdown overview
+- `outputs/*.json` — latest normalized structured output per CV
+- `candidate-fixtures/*.json` — created when no approved fixture exists yet
+
+Approved fixtures are local by design and should be reviewed manually before being promoted into the approved fixture path you use for regression comparisons.
+
+### Admin review
+
+`GET /api/admin/system/cv-benchmark`
+
+The admin system page surfaces:
+- benchmark root path
+- last benchmark update time
+- latest markdown summary
+
+## Ollama admin visibility
+
+### Python health endpoint
+
+`tools/summarizer/app.py`
+
+`GET /health` now returns additional Ollama metadata when configured/reachable:
+- `ollama_version`
+- `ollama_installed_models`
+- `ollama_loaded_models`
+- `ollama_loaded_count`
+
+### Backend propagation
+
+`JobTrackerApi/Services/SummarizerService.cs`
+
+The backend metrics shape now carries those fields through to admin consumers.
+
+### Admin UI
+
+`job-tracker-ui/src/pages/AdminSystemPage.tsx`
+
+The system page now shows:
+- Ollama version
+- loaded model count
+- installed model chips
+- loaded model chips
+- benchmark summary panel
+
+## Verification used on this branch
+
+### Backend
+
+```bash
+dotnet test JobTrackerApi.Tests/JobTrackerApi.Tests.csproj --filter ProfileCvControllerTests
+dotnet test JobTrackerApi.Tests/JobTrackerApi.Tests.csproj --filter "ProfileCvControllerTests|AuthAndSystemControllerTests|JobApplicationsApplicationPackageTests"
+dotnet test JobTrackerApi.Tests/JobTrackerApi.Tests.csproj --filter CvCorpusHarnessTests
+```
+
+### Frontend
+
+```bash
+cd job-tracker-ui && CI=true npm test -- --runInBand --watch=false src/profile-page.test.tsx
+cd job-tracker-ui && CI=true npm test -- --runInBand --watch=false src/admin-system-page.test.tsx
+cd job-tracker-ui && CI=true npm test -- --runInBand --watch=false src/profile-page.test.tsx src/admin-system-page.test.tsx src/job-details-generated-drafts.test.tsx
+```
+
+### Benchmark runner
+
+```bash
+CV_BENCHMARK_OUTPUT_DIR="$(pwd)/tmp/cv-benchmarks/latest" \
+CV_BENCHMARK_APPROVED_DIR="$(pwd)/tmp/cv-benchmarks/approved" \
+./scripts/run-cv-benchmark.sh
+```
+
+### Python service tests
+
+The summarizer Python unit tests were updated for the new health payload, but this machine currently lacks `pip` / `venv` support (`python3 -m venv` fails because `python3.12-venv` is not installed), so test execution is environment-blocked here. Once Python packaging is available, run:
+
+```bash
+cd tools/summarizer
+python3 -m pytest -q tests/test_app.py
+```

job-tracker-ui/src/admin-system-page.test.tsx

@@ -43,6 +43,14 @@ describe('AdminSystemPage', () => {
               gpuName: null,
               ocrAvailable: true,
               ocrLanguages: 'eng',
+              ollamaConfigured: true,
+              ollamaReachable: true,
+              ollamaModel: 'qwen2.5:7b',
+              ollamaModelAvailable: true,
+              ollamaVersion: '0.7.0',
+              ollamaInstalledModels: ['qwen2.5:7b', 'nomic-embed-text'],
+              ollamaLoadedModels: ['qwen2.5:7b'],
+              ollamaLoadedCount: 1,
               healthLatencyMs: 12.4,
               probeLatencyMs: 25.8,
               lastProbeAt: '2026-03-23T10:00:00Z',
@@ -82,6 +90,48 @@ describe('AdminSystemPage', () => {
           },
         } as any);
       }
+      if (url === '/admin/system/cv-benchmark') {
+        return Promise.resolve({
+          data: {
+            rootPath: '/data/CvBenchmarks/latest',
+            lastUpdatedAtUtc: '2026-03-23T10:10:00Z',
+            reportMarkdown: '# CV benchmark report\n\n- Files: 4',
+            indexJson: JSON.stringify({
+              CorpusRoot: '/home/pi/cvs',
+              OutputRoot: '/data/CvBenchmarks/latest',
+              GeneratedAtUtc: '2026-03-23T10:10:00Z',
+              TotalFiles: 4,
+              AverageCoverage: 0.72,
+              AverageConfidence: 0.66,
+              AverageConsistency: 0.94,
+              FilesWithSuspiciousLocations: 1,
+              MissingApprovedFixtures: 4,
+              Entries: [
+                {
+                  FileName: 'cv.txt',
+                  Slug: 'cv-txt',
+                  Extension: '.txt',
+                  Characters: 2000,
+                  OutputPath: '/data/CvBenchmarks/latest/outputs/cv-txt.json',
+                  ApprovedFixturePath: null,
+                  CandidateFixturePath: '/data/CvBenchmarks/latest/candidate-fixtures/cv-txt.json',
+                  ContactLocation: 'San Francisco, Hobbies',
+                  FirstJob: '* July',
+                  FirstJobLocation: null,
+                  FirstEducation: '* September',
+                  FirstEducationLocation: null,
+                  QualificationLevels: ['Other'],
+                  SuspiciousLocations: [],
+                  CoverageScore: 0.5,
+                  ConfidenceScore: 0.65,
+                  ConsistencyScore: 0.8,
+                  DiffSummary: 'No approved fixture yet — candidate fixture written.',
+                },
+              ],
+            }),
+          },
+        } as any);
+      }
       return Promise.resolve({ data: {} } as any);
     });
     mockedApi.put.mockResolvedValue({
@@ -118,6 +168,11 @@ describe('AdminSystemPage', () => {
     expect(screen.getByText(/25.8 ms probe/i)).toBeTruthy();
     expect(screen.getByText('OCR eng')).toBeTruthy();
     expect(screen.getAllByText(/ollama configured/i).length).toBeGreaterThan(0);
+    expect(screen.getByText(/ollama version/i)).toBeTruthy();
+    expect(screen.getByText(/model · qwen2.5:7b/i)).toBeTruthy();
+    expect(screen.getByText(/cv benchmark review/i)).toBeTruthy();
+    expect(screen.getByText(/top parser findings/i)).toBeTruthy();
+    expect(screen.getByText(/suspicious contact location: san francisco, hobbies/i)).toBeTruthy();
     expect(screen.getByText('OCR avg latency')).toBeTruthy();
     expect(screen.getByText('88.4 ms')).toBeTruthy();
   });

job-tracker-ui/src/pages/AdminSystemPage.tsx

@@ -26,6 +26,14 @@ type AiServiceMetrics = {
   gpuName?: string | null;
   ocrAvailable?: boolean | null;
   ocrLanguages?: string | null;
+  ollamaConfigured?: boolean | null;
+  ollamaReachable?: boolean | null;
+  ollamaModel?: string | null;
+  ollamaModelAvailable?: boolean | null;
+  ollamaVersion?: string | null;
+  ollamaInstalledModels?: string[] | null;
+  ollamaLoadedModels?: string[] | null;
+  ollamaLoadedCount?: number | null;
   healthLatencyMs?: number | null;
   probeLatencyMs?: number | null;
   lastProbeAt?: string | null;
@@ -60,6 +68,47 @@ type EditableEmailSettings = {
   hasPassword: boolean;
 };
 
+type CvBenchmarkEntry = {
+  FileName: string;
+  Slug: string;
+  Extension: string;
+  Characters: number;
+  OutputPath: string;
+  ApprovedFixturePath?: string | null;
+  CandidateFixturePath?: string | null;
+  ContactLocation?: string | null;
+  FirstJob?: string | null;
+  FirstJobLocation?: string | null;
+  FirstEducation?: string | null;
+  FirstEducationLocation?: string | null;
+  QualificationLevels: string[];
+  SuspiciousLocations: string[];
+  CoverageScore: number;
+  ConfidenceScore: number;
+  ConsistencyScore: number;
+  DiffSummary?: string | null;
+};
+
+type CvBenchmarkIndex = {
+  CorpusRoot: string;
+  OutputRoot: string;
+  GeneratedAtUtc: string;
+  TotalFiles: number;
+  AverageCoverage: number;
+  AverageConfidence: number;
+  AverageConsistency: number;
+  FilesWithSuspiciousLocations: number;
+  MissingApprovedFixtures: number;
+  Entries: CvBenchmarkEntry[];
+};
+
+type CvBenchmarkStatus = {
+  indexJson?: string | null;
+  reportMarkdown?: string | null;
+  rootPath: string;
+  lastUpdatedAtUtc?: string | null;
+};
+
 type SystemStatus = {
   environment: string;
   contentRoot: string;
@@ -121,6 +170,26 @@ function formatDate(value?: string | null) {
   return value ? new Date(value).toLocaleString() : "-";
 }
 
+function formatPercent(value?: number | null) {
+  return typeof value === "number" ? `${Math.round(value * 100)}%` : "-";
+}
+
+function parseBenchmarkIndex(indexJson?: string | null): CvBenchmarkIndex | null {
+  if (!indexJson?.trim()) return null;
+  try {
+    return JSON.parse(indexJson) as CvBenchmarkIndex;
+  } catch {
+    return null;
+  }
+}
+
+function benchmarkTone(value?: number | null) {
+  if (typeof value !== "number") return "default" as const;
+  if (value >= 0.8) return "success" as const;
+  if (value >= 0.6) return "warning" as const;
+  return "error" as const;
+}
+
 function SummaryCard({ title, value, subtitle, tone = "default" }: { title: string; value: string; subtitle?: string; tone?: "default" | "success" | "warning" | "error" }) {
   const color = tone === "success" ? "success.main" : tone === "warning" ? "warning.main" : tone === "error" ? "error.main" : "text.primary";
   return (
@@ -141,6 +210,7 @@ export default function AdminSystemPage() {
   const [tab, setTab] = useState(0);
   const [status, setStatus] = useState<SystemStatus | null>(null);
   const [emailSettings, setEmailSettings] = useState<EditableEmailSettings | null>(null);
+  const [benchmarkStatus, setBenchmarkStatus] = useState<CvBenchmarkStatus | null>(null);
   const [smtpPassword, setSmtpPassword] = useState("");
   const [clearPassword, setClearPassword] = useState(false);
   const [loading, setLoading] = useState(false);
@@ -156,18 +226,21 @@ export default function AdminSystemPage() {
     setLoading(true);
     setError(null);
     try {
-      const [statusRes, emailRes] = await Promise.all([
+      const [statusRes, emailRes, benchmarkRes] = await Promise.all([
         api.get<SystemStatus>("/admin/system"),
         api.get<EditableEmailSettings>("/admin/system/email-settings"),
+        api.get<CvBenchmarkStatus>("/admin/system/cv-benchmark").catch(() => ({ data: null } as any)),
       ]);
       setStatus(statusRes.data);
       setEmailSettings(emailRes.data);
+      setBenchmarkStatus(benchmarkRes.data ?? null);
       setSmtpPassword("");
       setClearPassword(false);
     } catch (e: any) {
       setError(getApiErrorMessage(e, "Failed to load system status."));
       setStatus(null);
       setEmailSettings(null);
+      setBenchmarkStatus(null);
     } finally {
       setLoading(false);
     }
@@ -191,6 +264,34 @@ export default function AdminSystemPage() {
     return "success" as const;
   }, [status]);
 
+  const benchmarkIndex = useMemo(() => parseBenchmarkIndex(benchmarkStatus?.indexJson), [benchmarkStatus?.indexJson]);
+  const weakestEntries = useMemo(() => {
+    if (!benchmarkIndex) return [] as CvBenchmarkEntry[];
+    return [...benchmarkIndex.Entries]
+      .sort((a, b) => (a.CoverageScore + a.ConfidenceScore + a.ConsistencyScore) - (b.CoverageScore + b.ConfidenceScore + b.ConsistencyScore))
+      .slice(0, 6);
+  }, [benchmarkIndex]);
+
+  const benchmarkFindings = useMemo(() => {
+    if (!benchmarkIndex) return [] as Array<{ file: string; issue: string }>;
+    return benchmarkIndex.Entries.flatMap((entry) => {
+      const findings: Array<{ file: string; issue: string }> = [];
+      if (entry.ContactLocation && /(culture|education|arial|hobbies|cooperate|ag, ni|bold)/i.test(entry.ContactLocation)) {
+        findings.push({ file: entry.FileName, issue: `Suspicious contact location: ${entry.ContactLocation}` });
+      }
+      if (entry.FirstEducation && entry.FirstEducation.length > 120) {
+        findings.push({ file: entry.FileName, issue: "Education qualification looks over-captured." });
+      }
+      if ((entry.FirstJob ?? "").length > 120) {
+        findings.push({ file: entry.FileName, issue: "Work title looks over-captured." });
+      }
+      if ((entry.QualificationLevels ?? []).includes("Other")) {
+        findings.push({ file: entry.FileName, issue: "Qualification level fell back to Other." });
+      }
+      return findings;
+    }).slice(0, 10);
+  }, [benchmarkIndex]);
+
   const sendTestEmail = async () => {
     setSendingTestEmail(true);
     try {
@@ -367,6 +468,8 @@ export default function AdminSystemPage() {
                 <DetailRow label={t("adminSystemOllamaReachable")} value={status?.ai.ollamaReachable ? t("yes") : t("noWord")} />
                 <DetailRow label={t("adminSystemOllamaModel")} value={status?.ai.ollamaModel || "-"} />
                 <DetailRow label={t("adminSystemOllamaModelAvailable")} value={status?.ai.ollamaModelAvailable ? t("yes") : t("noWord")} />
+                <DetailRow label="Ollama version" value={status?.ai.ollamaVersion || "-"} />
+                <DetailRow label="Loaded models" value={status?.ai.ollamaLoadedCount ?? 0} />
                 <DetailRow label={t("adminSystemHealthLatency")} value={status?.ai.healthLatencyMs != null ? `${status.ai.healthLatencyMs} ms` : "-"} />
                 <DetailRow label={t("adminSystemProbeLatency")} value={status?.ai.probeLatencyMs != null ? `${status.ai.probeLatencyMs} ms` : "-"} />
                 <DetailRow label={t("adminSystemLastProbe")} value={formatDate(status?.ai.lastProbeAt)} />
@@ -395,8 +498,79 @@ export default function AdminSystemPage() {
               <Chip label={status?.auth.gmailConfigured ? t("adminSystemGmailReady") : t("adminSystemGmailIncomplete")} variant="outlined" size="small" />
               <Chip label={status?.ai.gpuAvailable ? t("adminSystemGpuVisible") : t("adminSystemCpuMode")} color={status?.ai.gpuAvailable ? "success" : "default"} size="small" />
               <Chip label={status?.ai.ocrAvailable ? `OCR ${status.ai.ocrLanguages || "enabled"}` : t("adminSystemOcrUnavailable")} variant="outlined" size="small" />
+              {(status?.ai.ollamaInstalledModels ?? []).slice(0, 4).map((model) => (
+                <Chip key={model} label={`Model · ${model}`} variant="outlined" size="small" />
+              ))}
+              {(status?.ai.ollamaLoadedModels ?? []).slice(0, 3).map((model) => (
+                <Chip key={`loaded-${model}`} label={`Loaded · ${model}`} color="primary" variant="outlined" size="small" />
+              ))}
             </Box>
           </Paper>
+
+          <Paper sx={{ p: 2, borderRadius: 3 }}>
+            <Typography variant="h6" sx={{ fontWeight: 900, mb: 1 }}>CV benchmark review</Typography>
+            <Stack spacing={0.75}>
+              <DetailRow label="Benchmark root" value={benchmarkStatus?.rootPath || "-"} />
+              <DetailRow label="Last benchmark update" value={formatDate(benchmarkStatus?.lastUpdatedAtUtc)} />
+              <DetailRow label="Corpus root" value={benchmarkIndex?.CorpusRoot || "-"} />
+            </Stack>
+
+            {benchmarkIndex ? (
+              <>
+                <Box sx={{ mt: 2, display: "grid", gridTemplateColumns: { xs: "1fr 1fr", md: "repeat(5, 1fr)" }, gap: 1.25 }}>
+                  <SummaryCard title="Files" value={String(benchmarkIndex.TotalFiles)} subtitle="Corpus inputs" />
+                  <SummaryCard title="Coverage" value={formatPercent(benchmarkIndex.AverageCoverage)} subtitle="Structured field coverage" tone={benchmarkTone(benchmarkIndex.AverageCoverage)} />
+                  <SummaryCard title="Confidence" value={formatPercent(benchmarkIndex.AverageConfidence)} subtitle="Field metadata confidence" tone={benchmarkTone(benchmarkIndex.AverageConfidence)} />
+                  <SummaryCard title="Consistency" value={formatPercent(benchmarkIndex.AverageConsistency)} subtitle="Normalization consistency" tone={benchmarkTone(benchmarkIndex.AverageConsistency)} />
+                  <SummaryCard title="Missing approved" value={String(benchmarkIndex.MissingApprovedFixtures)} subtitle="Needs fixture review" tone={benchmarkIndex.MissingApprovedFixtures > 0 ? "warning" : "success"} />
+                </Box>
+
+                <Box sx={{ mt: 2.5, display: "grid", gridTemplateColumns: { xs: "1fr", xl: "1.1fr 0.9fr" }, gap: 2 }}>
+                  <Paper variant="outlined" sx={{ p: 1.5, borderRadius: 3 }}>
+                    <Typography variant="subtitle1" sx={{ fontWeight: 900, mb: 1 }}>Top parser findings</Typography>
+                    <Stack spacing={1}>
+                      {benchmarkFindings.length > 0 ? benchmarkFindings.map((finding) => (
+                        <Box key={`${finding.file}:${finding.issue}`} sx={{ p: 1.25, borderRadius: 2, backgroundColor: "background.default", border: "1px solid", borderColor: "divider" }}>
+                          <Typography variant="caption" sx={{ color: "text.secondary" }}>{finding.file}</Typography>
+                          <Typography variant="body2">{finding.issue}</Typography>
+                        </Box>
+                      )) : <Typography variant="body2" sx={{ color: "text.secondary" }}>No standout benchmark anomalies in the current run.</Typography>}
+                    </Stack>
+                  </Paper>
+
+                  <Paper variant="outlined" sx={{ p: 1.5, borderRadius: 3 }}>
+                    <Typography variant="subtitle1" sx={{ fontWeight: 900, mb: 1 }}>Weakest files in current run</Typography>
+                    <Stack spacing={1}>
+                      {weakestEntries.map((entry) => (
+                        <Box key={entry.Slug} sx={{ p: 1.25, borderRadius: 2, backgroundColor: "background.default", border: "1px solid", borderColor: "divider" }}>
+                          <Typography variant="body2" sx={{ fontWeight: 800 }}>{entry.FileName}</Typography>
+                          <Box sx={{ display: "flex", gap: 0.75, flexWrap: "wrap", mt: 0.75 }}>
+                            <Chip size="small" label={`Coverage ${formatPercent(entry.CoverageScore)}`} color={benchmarkTone(entry.CoverageScore)} />
+                            <Chip size="small" label={`Confidence ${formatPercent(entry.ConfidenceScore)}`} color={benchmarkTone(entry.ConfidenceScore)} />
+                            <Chip size="small" label={`Consistency ${formatPercent(entry.ConsistencyScore)}`} color={benchmarkTone(entry.ConsistencyScore)} />
+                          </Box>
+                          <Typography variant="caption" sx={{ display: "block", color: "text.secondary", mt: 0.75 }}>{entry.DiffSummary || "-"}</Typography>
+                        </Box>
+                      ))}
+                    </Stack>
+                  </Paper>
+                </Box>
+
+                <Box sx={{ mt: 2, p: 1.5, borderRadius: 2, backgroundColor: "background.default", border: "1px solid", borderColor: "divider", maxHeight: 280, overflow: "auto" }}>
+                  <Typography variant="subtitle2" sx={{ fontWeight: 800, mb: 1 }}>Latest markdown summary</Typography>
+                  <Typography variant="body2" sx={{ whiteSpace: "pre-wrap", fontFamily: "ui-monospace, SFMono-Regular, monospace" }}>
+                    {benchmarkStatus?.reportMarkdown || "-"}
+                  </Typography>
+                </Box>
+              </>
+            ) : (
+              <Box sx={{ mt: 1.5, p: 1.5, borderRadius: 2, backgroundColor: "background.default", border: "1px solid", borderColor: "divider" }}>
+                <Typography variant="body2" sx={{ whiteSpace: "pre-wrap", fontFamily: "ui-monospace, SFMono-Regular, monospace" }}>
+                  {benchmarkStatus?.reportMarkdown || "Run scripts/run-cv-benchmark.sh to generate the latest corpus report and fixture candidates."}
+                </Typography>
+              </Box>
+            )}
+          </Paper>
         </>
       ) : (
         <Box sx={{ display: "grid", gap: 2 }}>

job-tracker-ui/src/pages/ProfilePage.tsx

@@ -26,7 +26,7 @@ import { JobApplication } from "../types";
 
 
 type CvSectionOption = "" | "Professional Summary" | "Core Skills" | "Experience Highlights" | "Selected Achievements" | "Projects";
-type CvSectionStyle = "ats-minimal" | "harvard" | "auckland" | "edinburgh";
+type CvSectionStyle = "ats-minimal" | "harvard" | "auckland" | "edinburgh" | "monarch" | "fjord";
 
 type ExtractionRun = {
   id: number;
@@ -60,6 +60,18 @@ type RewriteTemplateOption = {
   sampleBullets: string[];
 };
 
+type CvBuilderPreview = {
+  templateId: CvSectionStyle;
+  html: string;
+  suggestedFileName: string;
+  fullText: string;
+  rewrittenText: string;
+  structuredCv: StructuredCvProfile;
+  sectionName?: string | null;
+  targetRole?: string | null;
+  jobApplicationId?: number | null;
+};
+
 type MeResponse = {
   provider?: "local" | "google" | "external";
   id?: string;
@@ -122,6 +134,26 @@ const REWRITE_TEMPLATES: RewriteTemplateOption[] = [
     sampleMeta: "Premium spacing · stronger visual voice",
     sampleBullets: ["Useful when the CV should feel more distinctive.", "Still keeps wording grounded and factual."]
   },
+  {
+    id: "monarch",
+    title: "Monarch",
+    eyebrow: "Executive",
+    accent: "#7c2d12",
+    blurb: "High-contrast premium presentation for leadership-heavy applications.",
+    sampleHeading: "Executive Profile",
+    sampleMeta: "Leadership clarity · premium hierarchy",
+    sampleBullets: ["Adds more top-level summary emphasis.", "Well suited to senior strategic roles."]
+  },
+  {
+    id: "fjord",
+    title: "Fjord",
+    eyebrow: "Technical",
+    accent: "#0f4c5c",
+    blurb: "Calm, high-density layout for engineering resumes and project-heavy CVs.",
+    sampleHeading: "Projects & Systems",
+    sampleMeta: "Technical depth · practical readability",
+    sampleBullets: ["Gives projects and skills more weight.", "Better for technical detail without chaos."]
+  },
 ];
 
 function initialsFrom(values: Array<string | undefined>) {
@@ -208,7 +240,7 @@ export default function ProfilePage() {
   const [cvSectionStyle, setCvSectionStyle] = useState<CvSectionStyle>("ats-minimal");
   const [cvSectionTargetRole, setCvSectionTargetRole] = useState("");
   const [selectedRewriteJobId, setSelectedRewriteJobId] = useState<string>("");
-  const [cvSectionDraft, setCvSectionDraft] = useState("");
+  const [rewritePreview, setRewritePreview] = useState<CvBuilderPreview | null>(null);
   const [rewritePreviewTemplate, setRewritePreviewTemplate] = useState<RewriteTemplateOption | null>(null);
   const [savedJobs, setSavedJobs] = useState<JobApplication[]>([]);
   const [parsingCvSections, setParsingCvSections] = useState(false);
@@ -263,6 +295,7 @@ export default function ProfilePage() {
   const latestRun = extractionRuns[0];
   const selectedRewriteTemplate = REWRITE_TEMPLATES.find((option) => option.id === cvSectionStyle) ?? REWRITE_TEMPLATES[0];
   const selectedRewriteJob = savedJobs.find((job) => String(job.id) === selectedRewriteJobId) ?? null;
+  const rewriteReady = Boolean(rewritePreview?.html && rewritePreview.fullText.trim());
 
   return (
     <Paper sx={{ mt: 0, p: 2.5 }}>
@@ -742,39 +775,22 @@ export default function ProfilePage() {
               ))}
             </Box>
           </Box>
-          <Box sx={{ mt: 2, p: 2, borderRadius: 3, border: "1px solid", borderColor: "divider", background: "linear-gradient(180deg, rgba(15,23,42,0.03) 0%, rgba(15,23,42,0) 100%)" }}>
-            <Box sx={{ display: "flex", justifyContent: "space-between", gap: 2, flexWrap: "wrap", alignItems: "center", mb: 1.5 }}>
+          <Box sx={{ mt: 2, p: 2.25, borderRadius: 4, border: "1px solid", borderColor: "divider", background: "linear-gradient(180deg, rgba(15,23,42,0.04) 0%, rgba(15,23,42,0) 100%)" }}>
+            <Box sx={{ display: "flex", justifyContent: "space-between", gap: 2, flexWrap: "wrap", alignItems: "center", mb: 1.75 }}>
               <Box>
-                <Typography variant="subtitle1" sx={{ fontWeight: 800 }}>CV style rewrite studio</Typography>
-                <Typography variant="body2" sx={{ color: "text.secondary" }}>{t("profileCvSectionToolsHelp")}</Typography>
+                <Typography variant="subtitle1" sx={{ fontWeight: 900 }}>Template-driven CV builder</Typography>
+                <Typography variant="body2" sx={{ color: "text.secondary", maxWidth: 720 }}>
+                  Choose a template, optionally target one section, and tailor the output toward a saved job or free-text role target. The preview below renders the actual PDF layout before you apply it.
+                </Typography>
+              </Box>
+              <Box sx={{ display: "flex", gap: 1, flexWrap: "wrap", alignItems: "center" }}>
+                <Chip size="small" variant="outlined" label={cvSection || "Whole CV rewrite"} />
+                {selectedRewriteJob ? <Chip size="small" color="primary" variant="outlined" label={`Saved job · ${selectedRewriteJob.jobTitle}`} /> : null}
+                {rewriteReady ? <Chip size="small" color="success" label="Preview ready" /> : null}
               </Box>
-              <Button
-                variant="contained"
-                disabled={!isLocal || (!profileCvText.trim() && structuredCv.sections.length === 0) || rewritingSection || uploadingCv || improvingCv || rebuildingCv}
-                onClick={async () => {
-                  setRewritingSection(true);
-                  try {
-                    const res = await api.post<{ text?: string }>("/profile-cv/rewrite-section", {
-                      sectionName: cvSection || null,
-                      style: cvSectionStyle,
-                      templateId: cvSectionStyle,
-                      targetRole: cvSectionTargetRole.trim() || null,
-                      jobApplicationId: selectedRewriteJob ? selectedRewriteJob.id : null,
-                    });
-                    setCvSectionDraft(res.data?.text ?? "");
-                    toast(t("profileCvSectionRewritten"), "success");
-                  } catch (e: any) {
-                    toast(String(e?.response?.data || e?.message || t("profileCvSectionRewriteFailed")), "error");
-                  } finally {
-                    setRewritingSection(false);
-                  }
-                }}
-              >
-                {rewritingSection ? t("profileCvSectionRewriting") : t("profileCvSectionRewrite")}
-              </Button>
             </Box>
 
-            <Box sx={{ display: "grid", gridTemplateColumns: { xs: "1fr", md: "repeat(4, minmax(0, 1fr))" }, gap: 1.5, mb: 2 }}>
+            <Box sx={{ display: "grid", gridTemplateColumns: { xs: "1fr", md: "repeat(3, minmax(0, 1fr))" }, gap: 1.5, mb: 2 }}>
               {REWRITE_TEMPLATES.map((option) => {
                 const selected = option.id === cvSectionStyle;
                 return (
@@ -791,25 +807,27 @@ export default function ProfilePage() {
                     }}
                     sx={{
                       p: 1.5,
-                      borderRadius: 3,
+                      borderRadius: 3.5,
                       cursor: "pointer",
                       border: "1px solid",
                       borderColor: selected ? "primary.main" : "divider",
-                      boxShadow: selected ? "0 0 0 1px rgba(25,118,210,0.15)" : "none",
-                      backgroundColor: selected ? "rgba(25,118,210,0.06)" : "background.paper",
+                      boxShadow: selected ? "0 0 0 1px rgba(25,118,210,0.18), 0 12px 30px rgba(15,23,42,0.08)" : "0 6px 18px rgba(15,23,42,0.04)",
+                      background: selected ? `linear-gradient(180deg, ${option.accent}12 0%, rgba(255,255,255,0.96) 100%)` : "background.paper",
+                      transition: "transform 120ms ease, box-shadow 120ms ease, border-color 120ms ease",
+                      '&:hover': { transform: 'translateY(-2px)' },
                     }}
                   >
                     <Box sx={{ display: "flex", justifyContent: "space-between", alignItems: "flex-start", gap: 1, mb: 1 }}>
                       <Box>
-                        <Typography variant="overline" sx={{ color: option.accent, fontWeight: 800 }}>{option.eyebrow}</Typography>
-                        <Typography variant="subtitle2" sx={{ fontWeight: 800 }}>{option.title}</Typography>
+                        <Typography variant="overline" sx={{ color: option.accent, fontWeight: 900, letterSpacing: '0.14em' }}>{option.eyebrow}</Typography>
+                        <Typography variant="subtitle2" sx={{ fontWeight: 900 }}>{option.title}</Typography>
                       </Box>
                       <IconButton size="small" onClick={(event) => { event.stopPropagation(); setRewritePreviewTemplate(option); }}>
                         <ZoomInOutlinedIcon fontSize="small" />
                       </IconButton>
                     </Box>
-                    <Box sx={{ p: 1.25, borderRadius: 2.5, border: "1px solid", borderColor: "divider", backgroundColor: "background.default", minHeight: 148 }}>
-                      <Typography variant="caption" sx={{ display: "block", color: option.accent, fontWeight: 700, mb: 0.5 }}>{option.sampleHeading}</Typography>
+                    <Box sx={{ p: 1.25, borderRadius: 3, border: "1px solid", borderColor: "divider", backgroundColor: "background.default", minHeight: 160 }}>
+                      <Typography variant="caption" sx={{ display: "block", color: option.accent, fontWeight: 800, mb: 0.5 }}>{option.sampleHeading}</Typography>
                       <Typography variant="caption" sx={{ display: "block", color: "text.secondary", mb: 1 }}>{option.sampleMeta}</Typography>
                       {option.sampleBullets.map((bullet) => (
                         <Typography key={bullet} variant="caption" sx={{ display: "block", color: "text.primary", mb: 0.5 }}>• {bullet}</Typography>
@@ -821,7 +839,7 @@ export default function ProfilePage() {
               })}
             </Box>
 
-            <Box sx={{ display: "grid", gridTemplateColumns: { xs: "1fr", md: "1fr 1fr" }, gap: 1.5, mb: 1.5 }}>
+            <Box sx={{ display: "grid", gridTemplateColumns: { xs: "1fr", md: "1fr 1fr" }, gap: 1.5, mb: 1.75 }}>
               <FormControl fullWidth size="small">
                 <InputLabel>{t("profileCvSectionLabel")}</InputLabel>
                 <Select value={cvSection} label={t("profileCvSectionLabel")} onChange={(e) => setCvSection(e.target.value as CvSectionOption)}>
@@ -833,7 +851,13 @@ export default function ProfilePage() {
                   <MenuItem value="Projects">{t("profileCvSectionProjects")}</MenuItem>
                 </Select>
               </FormControl>
-              <TextField label={t("profileCvSectionTargetRole")} value={cvSectionTargetRole} onChange={(e) => setCvSectionTargetRole(e.target.value)} fullWidth helperText={selectedRewriteJob ? `Using saved job context: ${selectedRewriteJob.jobTitle}` : undefined} />
+              <TextField
+                label={t("profileCvSectionTargetRole")}
+                value={cvSectionTargetRole}
+                onChange={(e) => setCvSectionTargetRole(e.target.value)}
+                fullWidth
+                helperText={selectedRewriteJob ? `Using saved job context: ${selectedRewriteJob.jobTitle}` : "Leave empty to let the selected job drive tailoring."}
+              />
               <FormControl fullWidth size="small" sx={{ gridColumn: { xs: "1 / -1", md: "1 / -1" } }}>
                 <InputLabel>Saved job context</InputLabel>
                 <Select value={selectedRewriteJobId} label="Saved job context" onChange={(e) => setSelectedRewriteJobId(String(e.target.value))}>
@@ -845,27 +869,121 @@ export default function ProfilePage() {
               </FormControl>
             </Box>
 
-            <Paper sx={{ p: 1.5, borderRadius: 3, border: "1px solid", borderColor: "divider", backgroundColor: "background.paper" }}>
-              <Box sx={{ display: "flex", justifyContent: "space-between", gap: 2, flexWrap: "wrap", alignItems: "center", mb: 1 }}>
-                <Box>
-                  <Typography variant="subtitle2" sx={{ fontWeight: 800 }}>Rewrite preview</Typography>
-                  <Typography variant="body2" sx={{ color: "text.secondary" }}>{selectedRewriteTemplate.title} · {cvSection || "Whole CV"}</Typography>
+            <Box sx={{ display: "flex", justifyContent: "space-between", gap: 2, flexWrap: "wrap", alignItems: "center", mb: 1.5 }}>
+              <Box>
+                <Typography variant="subtitle2" sx={{ fontWeight: 900 }}>Builder output</Typography>
+                <Typography variant="body2" sx={{ color: "text.secondary" }}>
+                  {selectedRewriteTemplate.title} · {rewritePreview?.targetRole || selectedRewriteJob?.jobTitle || cvSectionTargetRole || "General reuse"}
+                </Typography>
+              </Box>
+              <Box sx={{ display: "flex", gap: 1, flexWrap: "wrap" }}>
+                <Button
+                  variant="contained"
+                  disabled={!isLocal || (!profileCvText.trim() && structuredCv.sections.length === 0) || rewritingSection || uploadingCv || improvingCv || rebuildingCv}
+                  onClick={async () => {
+                    setRewritingSection(true);
+                    try {
+                      const res = await api.post<CvBuilderPreview>("/profile-cv/rewrite-preview", {
+                        sectionName: cvSection || null,
+                        style: cvSectionStyle,
+                        templateId: cvSectionStyle,
+                        targetRole: cvSectionTargetRole.trim() || null,
+                        jobApplicationId: selectedRewriteJob ? selectedRewriteJob.id : null,
+                        sourceText: profileCvText.trim() || null,
+                      });
+                      setRewritePreview(res.data);
+                      toast(t("profileCvSectionRewritten"), "success");
+                    } catch (e: any) {
+                      toast(String(e?.response?.data || e?.message || t("profileCvSectionRewriteFailed")), "error");
+                    } finally {
+                      setRewritingSection(false);
+                    }
+                  }}
+                >
+                  {rewritingSection ? t("profileCvSectionRewriting") : rewriteReady ? "Refresh preview" : "Build preview"}
+                </Button>
+                <Button
+                  variant="outlined"
+                  disabled={!rewriteReady}
+                  onClick={async () => {
+                    try {
+                      const response = await api.post("/profile-cv/export-pdf", {
+                        sectionName: cvSection || null,
+                        style: cvSectionStyle,
+                        templateId: cvSectionStyle,
+                        targetRole: cvSectionTargetRole.trim() || null,
+                        jobApplicationId: selectedRewriteJob ? selectedRewriteJob.id : null,
+                        sourceText: profileCvText.trim() || null,
+                      }, { responseType: "blob" });
+                      const blob = new Blob([response.data], { type: "application/pdf" });
+                      const url = window.URL.createObjectURL(blob);
+                      const link = document.createElement("a");
+                      link.href = url;
+                      link.download = rewritePreview?.suggestedFileName || `${cvSectionStyle}-cv.pdf`;
+                      document.body.appendChild(link);
+                      link.click();
+                      link.remove();
+                      window.URL.revokeObjectURL(url);
+                      toast("CV PDF downloaded.", "success");
+                    } catch (e: any) {
+                      toast(String(e?.response?.data || e?.message || "Failed to export the CV PDF."), "error");
+                    }
+                  }}
+                >
+                  Download PDF
+                </Button>
+              </Box>
+            </Box>
+
+            <Box sx={{ display: "grid", gridTemplateColumns: { xs: "1fr", xl: "0.9fr 1.1fr" }, gap: 1.5 }}>
+              <Paper sx={{ p: 1.5, borderRadius: 3, border: "1px solid", borderColor: "divider", backgroundColor: "background.paper" }}>
+                <Box sx={{ display: "flex", justifyContent: "space-between", gap: 1, alignItems: "center", mb: 1 }}>
+                  <Typography variant="subtitle2" sx={{ fontWeight: 800 }}>{rewritePreview?.sectionName || "Full rewritten CV text"}</Typography>
+                  {rewriteReady ? <Chip size="small" color="success" label={`${(rewritePreview?.fullText || "").trim().split(/\s+/).filter(Boolean).length} words`} /> : null}
                 </Box>
-                {cvSectionDraft.trim() ? <Chip size="small" color="success" label="Draft ready" /> : null}
-              </Box>
-              <Box sx={{ minHeight: 180, borderRadius: 2.5, backgroundColor: "background.default", border: "1px dashed", borderColor: "divider", p: 1.5 }}>
-                {cvSectionDraft.trim() ? (
-                  <Typography variant="body2" sx={{ whiteSpace: "pre-wrap" }}>{cvSectionDraft}</Typography>
-                ) : (
-                  <Typography variant="body2" sx={{ color: "text.secondary" }}>Choose a CV style, optionally aim it at a saved job, and generate a rewrite preview here.</Typography>
-                )}
-              </Box>
-              <Box sx={{ mt: 1, display: "flex", justifyContent: "flex-end", gap: 1, flexWrap: "wrap" }}>
-                <Button variant="text" disabled={!cvSectionDraft.trim()} onClick={() => navigator.clipboard.writeText(cvSectionDraft)}>{t("profileCopyCvText")}</Button>
-                <Button variant="outlined" disabled={!cvSectionDraft.trim()} onClick={() => setProfileCvText((prev) => cvSection ? `${prev.trim()}\n\n${cvSection}\n${cvSectionDraft.trim()}`.trim() : cvSectionDraft.trim())}>{cvSection ? t("profileCvSectionAppend") : "Use as full CV"}</Button>
-                <Button variant="contained" disabled={!cvSectionDraft.trim()} onClick={() => setProfileCvText((prev) => cvSection ? replaceCvSection(prev, cvSection, cvSectionDraft) : cvSectionDraft.trim())}>{cvSection ? t("profileCvSectionReplace") : "Replace full CV"}</Button>
-              </Box>
-            </Paper>
+                <Box sx={{ minHeight: 220, maxHeight: 520, overflow: "auto", borderRadius: 2.5, backgroundColor: "background.default", border: "1px dashed", borderColor: "divider", p: 1.5 }}>
+                  {rewriteReady ? (
+                    <Typography variant="body2" sx={{ whiteSpace: "pre-wrap" }}>{rewritePreview?.sectionName ? rewritePreview?.rewrittenText : rewritePreview?.fullText}</Typography>
+                  ) : (
+                    <Typography variant="body2" sx={{ color: "text.secondary" }}>Choose a template and generate a live preview. The builder will show rewritten content here and render the PDF layout beside it.</Typography>
+                  )}
+                </Box>
+                <Box sx={{ mt: 1.25, display: "flex", justifyContent: "flex-end", gap: 1, flexWrap: "wrap" }}>
+                  <Button variant="text" disabled={!rewriteReady} onClick={() => navigator.clipboard.writeText(rewritePreview?.fullText ?? "")}>{t("profileCopyCvText")}</Button>
+                  <Button
+                    variant="contained"
+                    disabled={!rewriteReady}
+                    onClick={() => {
+                      setProfileCvText(rewritePreview?.fullText ?? "");
+                      if (rewritePreview?.structuredCv) setStructuredCv(normalizeStructuredCv(rewritePreview.structuredCv));
+                    }}
+                  >
+                    Replace master CV
+                  </Button>
+                </Box>
+              </Paper>
+
+              <Paper sx={{ p: 1.5, borderRadius: 3, border: "1px solid", borderColor: "divider", backgroundColor: "background.paper" }}>
+                <Box sx={{ display: "flex", justifyContent: "space-between", gap: 1, alignItems: "center", mb: 1 }}>
+                  <Box>
+                    <Typography variant="subtitle2" sx={{ fontWeight: 800 }}>Styled preview</Typography>
+                    <Typography variant="body2" sx={{ color: "text.secondary" }}>{selectedRewriteTemplate.title} · print-ready layout</Typography>
+                  </Box>
+                  {rewriteReady ? <Chip size="small" variant="outlined" label={rewritePreview?.suggestedFileName || "preview.pdf"} /> : null}
+                </Box>
+                <Box sx={{ borderRadius: 2.5, border: "1px solid", borderColor: "divider", backgroundColor: "background.default", overflow: "hidden", minHeight: 520 }}>
+                  {rewriteReady ? (
+                    <iframe title="Profile CV preview" srcDoc={rewritePreview?.html} style={{ width: "100%", minHeight: 520, border: 0, background: "white" }} />
+                  ) : (
+                    <Box sx={{ minHeight: 520, display: "grid", placeItems: "center", p: 3 }}>
+                      <Typography variant="body2" sx={{ color: "text.secondary", textAlign: "center", maxWidth: 360 }}>
+                        The visual preview uses the same server-rendered HTML that the PDF exporter prints. Build a preview to inspect layout, spacing, and hierarchy before you apply it.
+                      </Typography>
+                    </Box>
+                  )}
+                </Box>
+              </Paper>
+            </Box>
 
             <Dialog open={Boolean(rewritePreviewTemplate)} onClose={() => setRewritePreviewTemplate(null)} maxWidth="sm" fullWidth>
               <DialogTitle>{rewritePreviewTemplate?.title ?? "Template preview"}</DialogTitle>

job-tracker-ui/src/profile-page.test.tsx

@@ -146,8 +146,8 @@ beforeEach(() => {
         },
       } as any);
     }
-    if (url === '/profile-cv/rewrite-section') {
-      return Promise.resolve({ data: { text: 'Professional Summary\nClearer, sharper positioning for backend platform roles.' } } as any);
+    if (url === '/profile-cv/rewrite-preview') {
+      return Promise.resolve({ data: { templateId: 'harvard', html: '<html><body>Preview</body></html>', suggestedFileName: 'harvard-preview.pdf', fullText: 'Professional Summary\nClearer, sharper positioning for backend platform roles.', rewrittenText: 'Professional Summary\nClearer, sharper positioning for backend platform roles.', structuredCv, sectionName: null, jobApplicationId: 42, targetRole: 'Senior Backend Engineer' } } as any);
     }
     if (url === '/profile-cv/reprocess') {
       return Promise.resolve({ data: { reprocessed: true } } as any);
@@ -228,16 +228,16 @@ test('profile page keeps raw extraction collapsed until expanded', async () => {
 test('profile page rewrite tools use selected template and saved job context', async () => {
   renderPage();
 
-  expect(await screen.findByText(/cv style rewrite studio/i)).toBeInTheDocument();
+  expect(await screen.findByText(/template-driven cv builder/i)).toBeInTheDocument();
   fireEvent.click(screen.getByText(/harvard/i));
   fireEvent.mouseDown(screen.getAllByRole('combobox')[1]);
   fireEvent.click(await screen.findByText(/senior backend engineer · acme systems/i));
 
-  const rewriteButton = screen.getByRole('button', { name: /rewrite section/i });
+  const rewriteButton = screen.getByRole('button', { name: /build preview/i });
   fireEvent.click(rewriteButton);
 
   await waitFor(() => {
-    expect(mockedApi.post).toHaveBeenCalledWith('/profile-cv/rewrite-section', expect.objectContaining({
+    expect(mockedApi.post).toHaveBeenCalledWith('/profile-cv/rewrite-preview', expect.objectContaining({
       sectionName: null,
       style: 'harvard',
       templateId: 'harvard',
@@ -245,7 +245,7 @@ test('profile page rewrite tools use selected template and saved job context', a
     }));
   });
 
-  expect(await screen.findByText(/draft ready/i)).toBeInTheDocument();
+  expect(await screen.findByText(/preview ready/i)).toBeInTheDocument();
   expect(screen.getByText(/clearer, sharper positioning for backend platform roles/i)).toBeInTheDocument();
 });
 

job-tracker-ui/src/profileCv.ts

@@ -44,6 +44,7 @@ export type StructuredCvJob = {
 
 export type StructuredCvEducation = {
   qualification?: string;
+  qualificationLevel?: string;
   institution?: string;
   location?: string;
   start?: string;
@@ -51,6 +52,24 @@ export type StructuredCvEducation = {
   details: string[];
 };
 
+export type StructuredCvCertification = {
+  name?: string;
+  issuer?: string;
+  location?: string;
+  date?: string;
+  details: string[];
+};
+
+export type StructuredCvProject = {
+  name?: string;
+  role?: string;
+  location?: string;
+  start?: string;
+  end?: string;
+  bullets: string[];
+  skills: string[];
+};
+
 export type StructuredCvLanguage = {
   name?: string;
   level?: string;
@@ -69,6 +88,8 @@ export type StructuredCvProfile = {
   summary: string[];
   jobs: StructuredCvJob[];
   education: StructuredCvEducation[];
+  certifications: StructuredCvCertification[];
+  projects: StructuredCvProject[];
   skills: string[];
   languages: StructuredCvLanguage[];
   interests: string[];
@@ -95,6 +116,8 @@ export function emptyStructuredCv(): StructuredCvProfile {
     summary: [],
     jobs: [],
     education: [],
+    certifications: [],
+    projects: [],
     skills: [],
     languages: [],
     interests: [],
@@ -214,6 +237,7 @@ export function normalizeStructuredCv(value: unknown): StructuredCvProfile {
     education: Array.isArray(source.education)
       ? source.education.map((education: any) => ({
           qualification: normalizeString(education?.qualification),
+          qualificationLevel: normalizeString(education?.qualificationLevel),
           institution: normalizeString(education?.institution),
           location: normalizeString(education?.location),
           start: normalizeString(education?.start),
@@ -221,6 +245,26 @@ export function normalizeStructuredCv(value: unknown): StructuredCvProfile {
           details: normalizeList(education?.details),
         }))
       : [],
+    certifications: Array.isArray(source.certifications)
+      ? source.certifications.map((certification: any) => ({
+          name: normalizeString(certification?.name),
+          issuer: normalizeString(certification?.issuer),
+          location: normalizeString(certification?.location),
+          date: normalizeString(certification?.date),
+          details: normalizeList(certification?.details),
+        }))
+      : [],
+    projects: Array.isArray(source.projects)
+      ? source.projects.map((project: any) => ({
+          name: normalizeString(project?.name),
+          role: normalizeString(project?.role),
+          location: normalizeString(project?.location),
+          start: normalizeString(project?.start),
+          end: normalizeString(project?.end),
+          bullets: normalizeList(project?.bullets),
+          skills: normalizeList(project?.skills),
+        }))
+      : [],
     skills: normalizeList(source.skills),
     languages: Array.isArray(source.languages)
       ? source.languages.map((language: any) => ({

job-tracker-ui/src/types.ts

@@ -40,6 +40,7 @@ export interface TailoredCvExperienceItem {
 
 export interface TailoredCvEducationItem {
   qualification?: string | null;
+  qualificationLevel?: string | null;
   institution?: string | null;
   location?: string | null;
   start?: string | null;

scripts/run-cv-benchmark.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+OUTPUT_DIR="${CV_BENCHMARK_OUTPUT_DIR:-$ROOT_DIR/tmp/cv-benchmarks/latest}"
+APPROVED_DIR="${CV_BENCHMARK_APPROVED_DIR:-$ROOT_DIR/tmp/cv-benchmarks/approved-fixtures}"
+
+mkdir -p "$OUTPUT_DIR" "$APPROVED_DIR"
+
+echo "CV benchmark output: $OUTPUT_DIR"
+echo "Approved fixtures: $APPROVED_DIR"
+
+CV_BENCHMARK_OUTPUT_DIR="$OUTPUT_DIR" \
+CV_BENCHMARK_APPROVED_DIR="$APPROVED_DIR" \
+  dotnet test "$ROOT_DIR/JobTrackerApi.Tests/JobTrackerApi.Tests.csproj" --filter CvCorpusHarnessTests
+
+if [[ -f "$OUTPUT_DIR/report.md" ]]; then
+  echo
+  echo "Benchmark report written to: $OUTPUT_DIR/report.md"
+fi
+if [[ -f "$OUTPUT_DIR/index.json" ]]; then
+  echo "Benchmark index written to: $OUTPUT_DIR/index.json"
+fi

tools/summarizer/README.md

@@ -30,11 +30,31 @@ pip install -r requirements.txt
 python -m uvicorn app:app --host 127.0.0.1 --port 8001 --workers 1
 ```
 
+If the host is missing `python3-venv` or `pip`, use the bootstrap script instead:
+
+```bash
+./scripts/bootstrap-and-test.sh bootstrap
+```
+
 ## Docker
 The Dockerfile installs Tesseract OCR so scanned PDFs and supported images can be processed inside the container.
 
+## Tests
+
+Run the summarizer unit tests with:
+
+```bash
+./scripts/bootstrap-and-test.sh test
+```
+
+The script:
+- creates `.venv` with stdlib `venv` when available
+- falls back to user-space `virtualenv` when host `venv` support is missing
+- installs `requirements-dev.txt`
+- writes pytest cache under `tmp/pytest-cache` to avoid stale root-owned `.pytest_cache` directories
+
 ## API
-- `GET /health` — health check and runtime capabilities
+- `GET /health` — health check and runtime capabilities, including Ollama version/model metadata when configured
 - `POST /summarize` — JSON body `{ "text": "...", "max_length": 150, "min_length": 30 }`
 - `POST /extract-text` — multipart file upload, returns extracted text and OCR metadata
 - `POST /cv/classify-block` — JSON body `{ "block": "..." }`, uses Ollama when `OLLAMA_MODEL` is configured

tools/summarizer/app.py

@@ -63,6 +63,12 @@ def _key(text: str, max_length: int, min_length: int, top_skills: int) -> str:
     return f"{h}:{max_length}:{min_length}:{top_skills}"
 
 
+def _ollama_json(path: str):
+    req = urllib_request.Request(f"{OLLAMA_BASE_URL}{path}", method="GET")
+    with urllib_request.urlopen(req, timeout=5) as response:
+        return json.loads(response.read().decode("utf-8"))
+
+
 def _ollama_status():
     configured = bool(OLLAMA_MODEL)
     if not configured:
@@ -71,27 +77,43 @@ def _ollama_status():
             "ollama_reachable": False,
             "ollama_model": None,
             "ollama_model_available": False,
+            "ollama_version": None,
+            "ollama_installed_models": [],
+            "ollama_loaded_models": [],
+            "ollama_loaded_count": 0,
         }
 
-    req = urllib_request.Request(f"{OLLAMA_BASE_URL}/api/tags", method="GET")
     try:
-        with urllib_request.urlopen(req, timeout=5) as response:
-            body = json.loads(response.read().decode("utf-8"))
+        tags_body = _ollama_json("/api/tags")
+        version_body = _ollama_json("/api/version")
+        try:
+            ps_body = _ollama_json("/api/ps")
+        except Exception:
+            ps_body = {"models": []}
     except Exception:
         return {
             "ollama_configured": True,
             "ollama_reachable": False,
             "ollama_model": OLLAMA_MODEL,
             "ollama_model_available": False,
+            "ollama_version": None,
+            "ollama_installed_models": [],
+            "ollama_loaded_models": [],
+            "ollama_loaded_count": 0,
         }
 
-    models = body.get("models") or []
-    names = {item.get("name") for item in models if isinstance(item, dict)}
+    models = tags_body.get("models") or []
+    names = sorted({item.get("name") for item in models if isinstance(item, dict) and item.get("name")})
+    loaded_models = sorted({item.get("name") for item in (ps_body.get("models") or []) if isinstance(item, dict) and item.get("name")})
     return {
         "ollama_configured": True,
         "ollama_reachable": True,
         "ollama_model": OLLAMA_MODEL,
         "ollama_model_available": OLLAMA_MODEL in names,
+        "ollama_version": version_body.get("version"),
+        "ollama_installed_models": names,
+        "ollama_loaded_models": loaded_models,
+        "ollama_loaded_count": len(loaded_models),
     }
 
 

tools/summarizer/pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+cache_dir = tmp/pytest-cache

tools/summarizer/scripts/bootstrap-and-test.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+VENV_DIR="$ROOT_DIR/.venv"
+PYTHON_BIN="${PYTHON_BIN:-python3}"
+VIRTUALENV_BIN="${VIRTUALENV_BIN:-$HOME/.local/bin/virtualenv}"
+
+ensure_user_pip() {
+  if "$PYTHON_BIN" -m pip --version >/dev/null 2>&1; then
+    return 0
+  fi
+
+  mkdir -p /tmp/jobtracker-python-bootstrap
+  cd /tmp/jobtracker-python-bootstrap
+  if [[ ! -f get-pip.py ]]; then
+    curl -fsSLo get-pip.py https://bootstrap.pypa.io/get-pip.py
+  fi
+  "$PYTHON_BIN" get-pip.py --user --break-system-packages
+}
+
+ensure_venv() {
+  if [[ -x "$VENV_DIR/bin/python" && -x "$VENV_DIR/bin/pip" ]]; then
+    return 0
+  fi
+
+  if "$PYTHON_BIN" -m venv "$VENV_DIR" >/dev/null 2>&1; then
+    return 0
+  fi
+
+  ensure_user_pip
+  if [[ ! -x "$VIRTUALENV_BIN" ]]; then
+    "$PYTHON_BIN" -m pip install --user --break-system-packages virtualenv
+  fi
+  "$VIRTUALENV_BIN" "$VENV_DIR"
+}
+
+install_requirements() {
+  "$VENV_DIR/bin/pip" install -r "$ROOT_DIR/requirements-dev.txt"
+}
+
+run_tests() {
+  mkdir -p "$ROOT_DIR/tmp/pytest-cache"
+  cd "$ROOT_DIR"
+  AI_SERVICE_SKIP_MODEL_LOAD=1 "$VENV_DIR/bin/python" -m pytest -q -o cache_dir=tmp/pytest-cache tests/test_app.py
+}
+
+case "${1:-test}" in
+  bootstrap)
+    ensure_venv
+    install_requirements
+    ;;
+  test)
+    ensure_venv
+    install_requirements
+    run_tests
+    ;;
+  *)
+    echo "Usage: $0 [bootstrap|test]" >&2
+    exit 2
+    ;;
+esac

tools/summarizer/tests/test_app.py

@@ -32,6 +32,8 @@ def test_health_reports_runtime_without_ollama(monkeypatch):
     assert payload["device"] == "cpu"
     assert payload["ollama_configured"] is False
     assert payload["ollama_model"] is None
+    assert payload["ollama_installed_models"] == []
+    assert payload["ollama_loaded_models"] == []
 
 
 def test_classify_block_returns_structured_json(monkeypatch):