Revert "Suppress environment prefix in email subjects on Production"

This reverts commit 06dd0140d6.

.gitea/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build and Push Docker Images Staging
 on:
   push:
     branches:
-      - staging
+      - production
 
 env:
   GIT_HOST: git.easysoft.ro
@@ -16,7 +16,7 @@ env:
   CV_CLEANUP_JOB_IMAGE: apps/myai-cv-cleanup-job
   CV_SEARCH_JOB_IMAGE: apps/myai-cv-search-job
   PAGE_FETCHER_API_IMAGE: apps/myai-page-fetcher-api
-  IMAGE_TAG: staging
+  IMAGE_TAG: production
 
 jobs:
   build:
@@ -98,9 +98,3 @@ jobs:
       - name: Push Page Fetcher API image
         run: |
           docker push "${REGISTRY_HOST}/${PAGE_FETCHER_API_IMAGE}:${IMAGE_TAG}"
-
-      - name: Reclaim disk space
-        if: always()
-        run: |
-          docker image prune -af
-          docker builder prune -af

Apis/api/Controllers/CvMatcherController.cs

@@ -170,10 +170,11 @@ public sealed class CvMatcherController : ControllerBase
                 !string.IsNullOrWhiteSpace(request.JobDescription));
             var res = await _cvApi.MatchJob(request, ct);
             var attachmentPath = TryGetCachedCvPath(request.CvDocumentId);
-            var language = NormalizeLanguage(request.Language);
             var jobLabel = !string.IsNullOrWhiteSpace(request.JobUrl)
                 ? request.JobUrl
-                : _emailSender.GetManualJobLabel(language);
+                : "Manual job description";
+
+            var language = NormalizeLanguage(request.Language);
 
             string? jobSearchLink = null;
             if (!string.IsNullOrWhiteSpace(request.Email) && !string.IsNullOrWhiteSpace(request.CvDocumentId))

Apis/api/Services/Contracts/IEmailSender.cs

@@ -61,11 +61,5 @@ namespace Api.Services.Contracts
         /// <param name="expiryDays">Number of days until the job-search link expires (shown in the footer copy).</param>
         /// <returns>Rendered HTML body string.</returns>
         string BuildMatchEmailBody(string cvDocumentId, JobMatchResponse result, string? jobLabel, string language, string? jobSearchLink = null, int expiryDays = 7);
-
-        /// <summary>
-        /// Returns the localised label for a manually-entered job description (no URL provided).
-        /// </summary>
-        /// <param name="language">Two-letter language code.</param>
-        string GetManualJobLabel(string language);
     }
 }

Apis/api/Services/EmailApiEmailSender.cs

@@ -138,7 +138,7 @@ public sealed class EmailApiEmailSender : IEmailSender
               </tr>
               <tr style="background:#f8f9fa">
                 <td style="font-weight:600;border:1px solid #dee2e6;color:#495057">IP Address</td>
-                <td style="border:1px solid #dee2e6">{userIp ?? _emailTemplates.Get("email.notification.unknown-ip", "en")}</td>
+                <td style="border:1px solid #dee2e6">{userIp ?? "Unknown"}</td>
               </tr>
             </table>
             """;
@@ -215,8 +215,8 @@ public sealed class EmailApiEmailSender : IEmailSender
         // email.match.body is now stored as HTML in the database
         var body = _emailTemplates.Render("email.match.body", language,
             ("cvDocumentId", cvDocumentId),
-            ("jobLabel", jobLabel ?? _emailTemplates.Get("email.match.fallback-na", language)),
+            ("jobLabel", jobLabel ?? "N/A"),
-            ("jobUrl", result.JobUrl ?? _emailTemplates.Get("email.match.fallback-na", language)),
+            ("jobUrl", result.JobUrl ?? "N/A"),
             ("score", result.Score.ToString()),
             ("summary", WebUtility.HtmlEncode(result.Summary ?? string.Empty)),
             ("strengths", strengths),
@@ -238,8 +238,5 @@ public sealed class EmailApiEmailSender : IEmailSender
     public string BuildMatchEmailSubject(int score, string? jobLabel, string language) =>
         _emailTemplates.Render("email.match.subject", language,
             ("score", score.ToString()),
-            ("jobLabel", jobLabel ?? _emailTemplates.Get("email.match.subject-fallback-label", language)));
+            ("jobLabel", jobLabel ?? "Job"));
-
-    public string GetManualJobLabel(string language) =>
-        _emailTemplates.Get("email.match.manual-job-label", language);
 }

Apis/cv-matcher-api/Services/CvMatcherService.cs

@@ -141,9 +141,7 @@ public sealed class CvMatcherService : ICvMatcherService
             """;
 
         var json = await _ai.CreateChatCompletionAsync(systemPrompt, userPrompt, 0.2m, ct);
-        var errorSummary = await _aiPrompts.GetAsync("parse-error.summary", language, ct);
+        var result = ParseResult(json);
-        var errorRec     = await _aiPrompts.GetAsync("parse-error.recommendation", language, ct);
-        var result = ParseResult(json, errorSummary, errorRec);
         result.JobDocumentId = job.Id;
         result.JobUrl = job.SourceUrl;
         result.Cached = false;
@@ -155,10 +153,7 @@ public sealed class CvMatcherService : ICvMatcherService
     /// Deserialises the LLM's JSON output into a <see cref="JobMatchResponse"/>.
     /// Returns a safe fallback response instead of throwing when the JSON cannot be parsed.
     /// </summary>
-    private static JobMatchResponse ParseResult(
+    private static JobMatchResponse ParseResult(string json)
-        string json,
-        string? errorSummary = null,
-        string? errorRec = null)
     {
         try
         {
@@ -173,8 +168,8 @@ public sealed class CvMatcherService : ICvMatcherService
         return new JobMatchResponse
         {
             Score = 0,
-            Summary = errorSummary ?? "The AI response could not be parsed as structured JSON.",
+            Summary = "The AI response could not be parsed as structured JSON.",
-            Recommendations = [errorRec ?? "Inspect the raw model output and tune the scoring prompt."]
+            Recommendations = ["Inspect the raw model output and tune the scoring prompt."]
         };
     }
 

Apis/cv-matcher-data/Migrations/20260608193046_AddParseErrorPrompts.Designer.cs

@@ -1,138 +0,0 @@
-// <auto-generated />
-using System;
-using CvMatcher.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace CvMatcher.Data.Migrations
-{
-    [DbContext(typeof(CvMatcherDbContext))]
-    [Migration("20260608193046_AddParseErrorPrompts")]
-    partial class AddParseErrorPrompts
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasDefaultSchema("cvMatcher")
-                .HasAnnotation("ProductVersion", "10.0.7")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("CvMatcher.Data.Entities.AiPromptEntity", b =>
-                {
-                    b.Property<string>("Key")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Language")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(500)
-                        .HasColumnType("nvarchar(500)")
-                        .HasDefaultValue("");
-
-                    b.Property<DateTime>("UpdatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Key", "Language");
-
-                    b.ToTable("AiPrompts", "cvMatcher");
-                });
-
-            modelBuilder.Entity("CvMatcher.Data.Entities.CvMatchResultEntity", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ClientIpAddress")
-                        .HasMaxLength(45)
-                        .HasColumnType("nvarchar(45)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CvDocumentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("JobDocumentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Language")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("ResultJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("Score")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CvDocumentId", "JobDocumentId", "Language")
-                        .IsUnique();
-
-                    b.ToTable("Results", "cvMatcher");
-                });
-
-            modelBuilder.Entity("CvMatcher.Data.Entities.CvMatcherChatCacheEntity", b =>
-                {
-                    b.Property<string>("CacheKey")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("Model")
-                        .IsRequired()
-                        .HasMaxLength(120)
-                        .HasColumnType("nvarchar(120)");
-
-                    b.Property<string>("ResponseText")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<decimal>("Temperature")
-                        .HasColumnType("decimal(4,2)");
-
-                    b.HasKey("CacheKey");
-
-                    b.ToTable("ChatCache", "cvMatcher");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Apis/cv-matcher-data/Migrations/20260608193046_AddParseErrorPrompts.cs

@@ -1,67 +0,0 @@
-using CvMatcher.Data;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CvMatcher.Data.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddParseErrorPrompts : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "AiPrompts",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["parse-error.summary", "en", "The AI response could not be parsed. Please try again.", "Summary shown in match email when the AI returns an unparseable response"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "AiPrompts",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["parse-error.summary", "ro", "Răspunsul AI nu a putut fi interpretat. Vă rugăm să încercați din nou.", "Sumar afișat în emailul de potrivire când AI returnează un răspuns care nu poate fi interpretat"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "AiPrompts",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["parse-error.recommendation", "en", "If the problem persists, try a different job link or description.", "Recommendation shown in match email when the AI returns an unparseable response"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "AiPrompts",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["parse-error.recommendation", "ro", "Dacă problema persistă, încercați un alt link sau descriere de job.", "Recomandare afișată în emailul de potrivire când AI returnează un răspuns care nu poate fi interpretat"]);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "AiPrompts",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["parse-error.summary", "en"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "AiPrompts",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["parse-error.summary", "ro"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "AiPrompts",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["parse-error.recommendation", "en"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "AiPrompts",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["parse-error.recommendation", "ro"]);
-        }
-    }
-}

Apis/cv-matcher-data/Migrations/20260609133623_FixKeywordExtractionPrompt.Designer.cs

@@ -1,138 +0,0 @@
-// <auto-generated />
-using System;
-using CvMatcher.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace CvMatcher.Data.Migrations
-{
-    [DbContext(typeof(CvMatcherDbContext))]
-    [Migration("20260609133623_FixKeywordExtractionPrompt")]
-    partial class FixKeywordExtractionPrompt
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasDefaultSchema("cvMatcher")
-                .HasAnnotation("ProductVersion", "10.0.7")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("CvMatcher.Data.Entities.AiPromptEntity", b =>
-                {
-                    b.Property<string>("Key")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Language")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(500)
-                        .HasColumnType("nvarchar(500)")
-                        .HasDefaultValue("");
-
-                    b.Property<DateTime>("UpdatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Key", "Language");
-
-                    b.ToTable("AiPrompts", "cvMatcher");
-                });
-
-            modelBuilder.Entity("CvMatcher.Data.Entities.CvMatchResultEntity", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("ClientIpAddress")
-                        .HasMaxLength(45)
-                        .HasColumnType("nvarchar(45)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("CvDocumentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)");
-
-                    b.Property<string>("JobDocumentId")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<string>("Language")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("ResultJson")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("Score")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CvDocumentId", "JobDocumentId", "Language")
-                        .IsUnique();
-
-                    b.ToTable("Results", "cvMatcher");
-                });
-
-            modelBuilder.Entity("CvMatcher.Data.Entities.CvMatcherChatCacheEntity", b =>
-                {
-                    b.Property<string>("CacheKey")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("Model")
-                        .IsRequired()
-                        .HasMaxLength(120)
-                        .HasColumnType("nvarchar(120)");
-
-                    b.Property<string>("ResponseText")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<decimal>("Temperature")
-                        .HasColumnType("decimal(4,2)");
-
-                    b.HasKey("CacheKey");
-
-                    b.ToTable("ChatCache", "cvMatcher");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Apis/cv-matcher-data/Migrations/20260609133623_FixKeywordExtractionPrompt.cs

@@ -1,93 +0,0 @@
-using CvMatcher.Data;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CvMatcher.Data.Migrations
-{
-    /// <inheritdoc />
-    public partial class FixKeywordExtractionPrompt : Migration
-    {
-        // Full prompt values — only the 'keywords' instruction changes vs. the previous migration.
-        // Stored in full so Down() can restore the previous version exactly.
-
-        private const string EnNew =
-            "You are a strict CV-to-job matching engine. Return JSON only. Score realistically from 0 to 100. Penalize missing required skills. Do not invent experience. Use concise business language. All text fields in the JSON response must be in English.\n" +
-            "JSON shape: {\"score\":number,\"summary\":\"one-line summary in English\",\"strengths\":[\"strength 1 in English\"],\"gaps\":[\"gap 1 in English\"],\"recommendations\":[\"recommendation 1 in English\"],\"evidence\":[\"evidence 1 in English\"],\"keywords\":[\"Senior .NET Developer\",\"C#\",\"Azure\"],\"location\":\"City, Country\"}.\n" +
-            "For 'keywords': extract 2-4 job-board search terms that represent the candidate's professional identity as shown in their CV — their seniority level and primary role title (e.g. 'Software Architect', 'Engineering Manager', 'Senior .NET Developer') plus 1-2 core technologies they genuinely emphasize throughout the CV. Derive these entirely from the CV — do not use the job title or job technologies unless they independently match the candidate's actual positioning. Avoid generic terms like 'developer', 'engineer', 'cloud', or 'leadership'.\n" +
-            "For 'location': extract the candidate's city and country from the CV (e.g. 'Cluj-Napoca, Romania'). Use an empty string if not found.";
-
-        private const string EnPrev =
-            "You are a strict CV-to-job matching engine. Return JSON only. Score realistically from 0 to 100. Penalize missing required skills. Do not invent experience. Use concise business language. All text fields in the JSON response must be in English.\n" +
-            "JSON shape: {\"score\":number,\"summary\":\"one-line summary in English\",\"strengths\":[\"strength 1 in English\"],\"gaps\":[\"gap 1 in English\"],\"recommendations\":[\"recommendation 1 in English\"],\"evidence\":[\"evidence 1 in English\"],\"keywords\":[\"Senior .NET Developer\",\"C#\",\"Azure\"],\"location\":\"City, Country\"}.\n" +
-            "For 'keywords': extract 2-4 short, concrete terms a recruiter would search for on a job board — the candidate's primary role title and key technologies (e.g. 'Senior .NET Developer', 'C#', 'Azure'). Avoid abstract concepts like 'leadership', 'cloud', or 'microservices'.\n" +
-            "For 'location': extract the candidate's city and country from the CV (e.g. 'Cluj-Napoca, Romania'). Use an empty string if not found.";
-
-        private const string RoNew =
-            "Ești un motor strict de potrivire CV-job. Returnează doar JSON. Punctează realist între 0 și 100. Penalizează abilitățile lipsă necesare. Nu inventa experiență. Folosește limbaj profesional concis. Toate câmpurile text din răspunsul JSON trebuie să fie în limba română.\n" +
-            "JSON shape: {\"score\":number,\"summary\":\"rezumat pe o linie în română\",\"strengths\":[\"punct forte 1 în română\"],\"gaps\":[\"lipsă 1 în română\"],\"recommendations\":[\"recomandare 1 în română\"],\"evidence\":[\"dovadă 1 în română\"],\"keywords\":[\"Senior .NET Developer\",\"C#\",\"Azure\"],\"location\":\"Oraș, Țară\"}.\n" +
-            "Pentru 'keywords': extrage 2-4 termeni de căutare pe site-uri de joburi care reprezintă identitatea profesională a candidatului conform CV-ului — nivelul de senioritate și titlul principal de rol (ex. 'Software Architect', 'Engineering Manager', 'Senior .NET Developer') și 1-2 tehnologii de bază pe care candidatul le evidențiază cu adevărat în CV. Derivă aceștia exclusiv din CV — nu folosi titlul jobului sau tehnologiile din job dacă nu corespund poziționării reale a candidatului. Evită termeni generici precum 'developer', 'engineer', 'cloud' sau 'leadership'.\n" +
-            "Pentru 'location': extrage orașul și țara candidatului din CV (ex. 'Cluj-Napoca, România'). Folosește string gol dacă nu se găsește.";
-
-        private const string RoPrev =
-            "Ești un motor strict de potrivire CV-job. Returnează doar JSON. Punctează realist între 0 și 100. Penalizează abilitățile lipsă necesare. Nu inventa experiență. Folosește limbaj profesional concis. Toate câmpurile text din răspunsul JSON trebuie să fie în limba română.\n" +
-            "JSON shape: {\"score\":number,\"summary\":\"rezumat pe o linie în română\",\"strengths\":[\"punct forte 1 în română\"],\"gaps\":[\"lipsă 1 în română\"],\"recommendations\":[\"recomandare 1 în română\"],\"evidence\":[\"dovadă 1 în română\"],\"keywords\":[\"Senior .NET Developer\",\"C#\",\"Azure\"],\"location\":\"Oraș, Țară\"}.\n" +
-            "Pentru 'keywords': extrage 2-4 termeni scurți și concreți pe care un recrutor i-ar căuta pe un site de joburi — titlul principal al rolului și tehnologiile cheie (ex. 'Senior .NET Developer', 'C#', 'Azure'). Evită concepte abstracte precum 'leadership', 'cloud' sau 'microservicii'.\n" +
-            "Pentru 'location': extrage orașul și țara candidatului din CV (ex. 'Cluj-Napoca, România'). Folosește string gol dacă nu se găsește.";
-
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            // Update English prompt: keywords must now be derived from the CV only,
-            // not influenced by the job description being matched against.
-            migrationBuilder.UpdateData(
-                schema: MigrationConstants.SchemaName,
-                table: "AiPrompts",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["ai.cv-match.system-prompt", "en"],
-                columns: ["Value", "Description"],
-                values: [
-                    EnNew,
-                    "System prompt for CV-to-job matching in English. Keywords represent the candidate's CV identity (seniority + role + core tech), not the job being matched."
-                ]);
-
-            // Update Romanian prompt: same improvement.
-            migrationBuilder.UpdateData(
-                schema: MigrationConstants.SchemaName,
-                table: "AiPrompts",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["ai.cv-match.system-prompt", "ro"],
-                columns: ["Value", "Description"],
-                values: [
-                    RoNew,
-                    "System prompt pentru potrivire CV-job în română. Cuvintele cheie reprezintă identitatea CV-ului candidatului (senioritate + rol + tehnologii cheie), nu jobul cu care se face potrivirea."
-                ]);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.UpdateData(
-                schema: MigrationConstants.SchemaName,
-                table: "AiPrompts",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["ai.cv-match.system-prompt", "en"],
-                columns: ["Value", "Description"],
-                values: [
-                    EnPrev,
-                    "System prompt for CV-to-job matching in English. Extracts job-board-friendly keywords (role title + key tech) and candidate location."
-                ]);
-
-            migrationBuilder.UpdateData(
-                schema: MigrationConstants.SchemaName,
-                table: "AiPrompts",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["ai.cv-match.system-prompt", "ro"],
-                columns: ["Value", "Description"],
-                values: [
-                    RoPrev,
-                    "System prompt pentru potrivire CV-job în limba română. Extrage cuvinte cheie prietenoase pentru site-uri de joburi (titlu rol + tehnologii cheie) și locația candidatului."
-                ]);
-        }
-    }
-}

Apis/email-api/Services/SmtpEmailDispatcher.cs

@@ -58,7 +58,7 @@ public sealed class SmtpEmailDispatcher
         if (!string.IsNullOrWhiteSpace(req.ReplyTo))
             msg.ReplyTo.Add(MailboxAddress.Parse(req.ReplyTo));
 
-        msg.Subject = req.Subject.Trim();
+        msg.Subject = $"[{_environmentName}] {req.Subject}".Trim();
 
         var shellStart = _templates.Get("email.html-shell.start", "*");
         var shellEnd = _templates.Get("email.html-shell.end", "*");

Apis/email-data/Migrations/20260608190611_AddManualJobLabelTemplate.Designer.cs

@@ -1,69 +0,0 @@
-// <auto-generated />
-using System;
-using Email.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace Email.Data.Migrations
-{
-    [DbContext(typeof(EmailDbContext))]
-    [Migration("20260608190611_AddManualJobLabelTemplate")]
-    partial class AddManualJobLabelTemplate
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasDefaultSchema("email")
-                .HasAnnotation("ProductVersion", "10.0.7")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("Email.Data.Entities.EmailTemplateEntity", b =>
-                {
-                    b.Property<string>("Key")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Language")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(500)
-                        .HasColumnType("nvarchar(500)")
-                        .HasDefaultValue("");
-
-                    b.Property<string>("OperatorCopy")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)")
-                        .HasDefaultValue("");
-
-                    b.Property<DateTime>("UpdatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Key", "Language");
-
-                    b.ToTable("Templates", "email");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Apis/email-data/Migrations/20260608190611_AddManualJobLabelTemplate.cs

@@ -1,43 +0,0 @@
-using Email.Data;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Email.Data.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddManualJobLabelTemplate : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.match.manual-job-label", "en", "Manual job description", "Label used in the match email subject and body when no job URL was provided"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.match.manual-job-label", "ro", "Descriere manuală a jobului", "Etichetă folosită în subiectul și corpul emailului când nu a fost furnizat un URL de job"]);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.match.manual-job-label", "en"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.match.manual-job-label", "ro"]);
-        }
-    }
-}

Apis/email-data/Migrations/20260608192938_AddFallbackStringTemplates.Designer.cs

@@ -1,69 +0,0 @@
-// <auto-generated />
-using System;
-using Email.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace Email.Data.Migrations
-{
-    [DbContext(typeof(EmailDbContext))]
-    [Migration("20260608192938_AddFallbackStringTemplates")]
-    partial class AddFallbackStringTemplates
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasDefaultSchema("email")
-                .HasAnnotation("ProductVersion", "10.0.7")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("Email.Data.Entities.EmailTemplateEntity", b =>
-                {
-                    b.Property<string>("Key")
-                        .HasMaxLength(128)
-                        .HasColumnType("nvarchar(128)");
-
-                    b.Property<string>("Language")
-                        .HasMaxLength(8)
-                        .HasColumnType("nvarchar(8)");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(500)
-                        .HasColumnType("nvarchar(500)")
-                        .HasDefaultValue("");
-
-                    b.Property<string>("OperatorCopy")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(256)
-                        .HasColumnType("nvarchar(256)")
-                        .HasDefaultValue("");
-
-                    b.Property<DateTime>("UpdatedAt")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime2")
-                        .HasDefaultValueSql("SYSUTCDATETIME()");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Key", "Language");
-
-                    b.ToTable("Templates", "email");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Apis/email-data/Migrations/20260608192938_AddFallbackStringTemplates.cs

@@ -1,163 +0,0 @@
-using Email.Data;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Email.Data.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddFallbackStringTemplates : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.match.fallback-na", "en", "N/A", "Fallback when a match email field (job label or URL) has no value"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.match.fallback-na", "ro", "N/A", "Fallback când un câmp al emailului de potrivire (etichetă job sau URL) nu are valoare"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.match.subject-fallback-label", "en", "Job", "Fallback job label used in match email subject when no specific label is available"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.match.subject-fallback-label", "ro", "Job", "Etichetă fallback pentru subiectul emailului de potrivire când nu există o etichetă specifică"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.notification.unknown-ip", "en", "Unknown", "Fallback IP address label in operator notification emails"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.notification.unknown-ip", "ro", "Necunoscut", "Etichetă fallback pentru adresa IP în emailurile de notificare operator"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.search-results.keywords-empty", "en", "none detected", "Text shown in job search results email when no CV keywords were extracted"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.search-results.keywords-empty", "ro", "niciunul detectat", "Text afișat în emailul cu rezultatele căutării când nu au fost extrase cuvinte cheie din CV"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.search-results.providers-empty", "en", "none", "Text shown in job search results email when no providers were searched"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.search-results.providers-empty", "ro", "niciunul", "Text afișat în emailul cu rezultatele căutării când nu au fost căutați furnizori"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.search-results.location-empty", "en", "-", "Fallback location display in job search results email scan summary"]);
-
-            migrationBuilder.InsertData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                columns: ["Key", "Language", "Value", "Description"],
-                values: ["email.search-results.location-empty", "ro", "-", "Afișaj fallback pentru locație în sumarului de scanare al emailului cu rezultatele căutării"]);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.match.fallback-na", "en"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.match.fallback-na", "ro"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.match.subject-fallback-label", "en"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.match.subject-fallback-label", "ro"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.notification.unknown-ip", "en"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.notification.unknown-ip", "ro"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.search-results.keywords-empty", "en"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.search-results.keywords-empty", "ro"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.search-results.providers-empty", "en"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.search-results.providers-empty", "ro"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.search-results.location-empty", "en"]);
-
-            migrationBuilder.DeleteData(
-                schema: MigrationConstants.SchemaName,
-                table: "Templates",
-                keyColumns: ["Key", "Language"],
-                keyValues: ["email.search-results.location-empty", "ro"]);
-        }
-    }
-}

Directory.Packages.props

@@ -23,7 +23,6 @@
     <PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
-    <PackageVersion Include="Serilog.Formatting.Compact" Version="3.0.0" />
     <PackageVersion Include="Serilog.Sinks.Email" Version="4.2.1" />
     <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
     <!-- Swagger -->

Helpers/startup-helpers/StartupExtensions.cs

@@ -39,10 +39,11 @@ public static class StartupExtensions
                 .ReadFrom.Configuration(context.Configuration)
                 .ReadFrom.Services(services)
                 .Enrich.FromLogContext()
-                .Enrich.WithProperty("Application", serviceName)
+                .Enrich.WithMachineName()
-                .Enrich.WithProperty("Environment", context.HostingEnvironment.EnvironmentName)
+                .Enrich.WithEnvironmentName()
+                .Enrich.WithProperty("Service", serviceName)
                 .Enrich.WithProperty("AppVersion", appVersion)
-                .WriteTo.Console(new Serilog.Formatting.Compact.CompactJsonFormatter());
+                .WriteTo.Console(new Serilog.Formatting.Json.JsonFormatter());
 
             AddEmailSinkIfConfigured(configuration, context.Configuration, serviceName);
         });
@@ -56,10 +57,11 @@ public static class StartupExtensions
                 .ReadFrom.Configuration(builder.Configuration)
                 .ReadFrom.Services(services)
                 .Enrich.FromLogContext()
-                .Enrich.WithProperty("Application", serviceName)
+                .Enrich.WithMachineName()
-                .Enrich.WithProperty("Environment", builder.Environment.EnvironmentName)
+                .Enrich.WithEnvironmentName()
+                .Enrich.WithProperty("Service", serviceName)
                 .Enrich.WithProperty("AppVersion", appVersion)
-                .WriteTo.Console(new Serilog.Formatting.Compact.CompactJsonFormatter());
+                .WriteTo.Console(new Serilog.Formatting.Json.JsonFormatter());
 
             AddEmailSinkIfConfigured(configuration, builder.Configuration, serviceName);
         });

Helpers/startup-helpers/startup-helpers.csproj

@@ -17,7 +17,6 @@
     <PackageReference Include="DotNetEnv" />
     <PackageReference Include="Serilog.AspNetCore" />
     <PackageReference Include="Serilog.Enrichers.Environment" />
-    <PackageReference Include="Serilog.Formatting.Compact" />
     <PackageReference Include="Serilog.Sinks.Email" />
     <PackageReference Include="Serilog.Sinks.File" />
     <PackageReference Include="Swashbuckle.AspNetCore" />

Jobs/cv-search-job/Services/CvSearchEmailSender.cs

@@ -127,15 +127,13 @@ public sealed class CvSearchEmailSender
         var keywordsHtml = keywords.Count > 0
             ? string.Join(" ", keywords.Select(k =>
                 $"<span style=\"display:inline-block;background:#e9ecef;padding:2px 8px;margin:2px 2px 2px 0;font-size:12px;\">{k}</span>"))
-            : $"<span style=\"color:#6c757d;font-size:12px;font-style:italic;\">{_emailTemplates.Get("email.search-results.keywords-empty", language)}</span>";
+            : "<span style=\"color:#6c757d;font-size:12px;font-style:italic;\">none detected</span>";
 
         var providers = providerNames.Count > 0
             ? string.Join(", ", providerNames)
-            : _emailTemplates.Get("email.search-results.providers-empty", language);
+            : "none";
 
-        var locationDisplay = string.IsNullOrWhiteSpace(location)
+        var locationDisplay = string.IsNullOrWhiteSpace(location) ? "-" : location;
-            ? _emailTemplates.Get("email.search-results.location-empty", language)
-            : location;
 
         return _emailTemplates.Render("email.search-results.scan-summary", language,
             ("keywordsHtml", keywordsHtml),

Jobs/cv-search-job/Tasks/CvSearchJobTask.cs

@@ -198,9 +198,7 @@ public sealed class CvSearchJobTask : IJobTask
                     // Pre-fetched text passed directly so cv-matcher-api skips re-fetching the page
                     JobDescription = jobText,
                     // User already gave GDPR consent when they clicked the one-time job search link
-                    GdprConsent = true,
+                    GdprConsent = true
-                    // Propagate language so the LLM uses the correct language-specific prompt
-                    Language = session.Language
                 };
 
                 var matchResult = await _matcherApi.MatchJobAsync(matchRequest, ct);

web/wwwroot/js/i18n.js

@@ -115,10 +115,7 @@
 			"cv.noItems": "No items yet.",
 			"cv.strengths": "Strengths",
 			"cv.gaps": "Gaps",
-			"cv.evidence": "Supporting CV excerpts",
+			"cv.evidence": "Supporting CV excerpts"
-			"error.cv_file_missing": "Missing CV PDF.",
-			"error.captcha_verification_failed": "Captcha verification failed.",
-			"error.request_cancelled": "Request was cancelled."
 		},
 		ro: {
 			"brand.subtitle": "prezentare inginerie AI",
@@ -227,10 +224,7 @@
 			"cv.noItems": "Niciun element.",
 			"cv.strengths": "Puncte forte",
 			"cv.gaps": "Lipsuri",
-			"cv.evidence": "Fragmente relevante din CV",
+			"cv.evidence": "Fragmente relevante din CV"
-			"error.cv_file_missing": "Fișierul CV PDF lipsește.",
-			"error.captcha_verification_failed": "Verificarea captcha a eșuat.",
-			"error.request_cancelled": "Cererea a fost anulată."
 		}
 	};
 })();

web/wwwroot/js/utils/form-helpers.js

@@ -52,7 +52,6 @@ function isValidEmail(value) {
  *
  * Rules:
  * - 429 (rate limit) → return rateLimitKey translation
- * - 4xx with known error code → look up 'error.<code>' in i18n dictionary first
  * - 4xx with error body → return server's error message (intentional feedback)
  * - 5xx or no body → return fallbackKey translation
  *
@@ -66,17 +65,8 @@ function extractApiError(body, status, fallbackKey, rateLimitKey) {
 	if (status === 429) {
 		return window.MyAi.t(rateLimitKey || 'form.rateLimited');
 	}
-	if (status >= 400 && status < 500) {
-		// Prefer i18n translation keyed on the machine-readable error code
-		if (body && body.code) {
-			var codeKey = 'error.' + body.code;
-			var translated = window.MyAi.t(codeKey);
-			if (translated !== codeKey) return translated;
-		}
 	var msg = body && (body.error || body.Error || body.title);
-		if (msg) return msg;
+	return (status >= 400 && status < 500 && msg) ? msg : window.MyAi.t(fallbackKey);
-	}
-	return window.MyAi.t(fallbackKey);
 }
 
 // Expose helpers on window.MyAi for use by other scripts