Fix defects found auditing the ingestion, import and connector changes

An audit of this session's commits found several real problems, three of which
lose or expose data. Ordered by severity.

Live recompute was not atomic. RecomputeMeterAsync clears a meter's series with
ExecuteDelete, which commits by itself when no transaction is ambient, and only
then adds the rebuilt rows. Between the two the meter had *no* consumption:
a dashboard read reported zero, and a crash or cancelled request made the loss
permanent, for data the SDD treats as the long-term source of truth (§5.5).
Import and the events API already wrapped their recomputes; live ingestion,
which I added this session, did not. Now shares one transaction, joining an
ambient one rather than nesting.

The MQTT backfill migration counted brokers without regard to is_enabled. One
live broker plus a disabled leftover counted two, declined to backfill, and left
those sources unbound — which under endpoint-scoped routing means silently and
permanently dead. The "two or more is ambiguous" reasoning did not hold there:
the worker only ever connected to enabled endpoints. Corrected by a follow-up
migration rather than an edit, since the original may already have run; it
touches only rows still NULL, so hand-made bindings are safe.

A mapping edited after a dry run committed the *old* staged rows under the
*new* mapping. Readings went to the previous meter while the batch recorded the
current mapping — wrong data, provenance contradicting it, no exception. The
earlier fix re-validated but did not detect staleness. Commit now compares the
mapping against the one the preview was staged under and refuses.

"Test connection" sent a stored token to whatever Base URL was in the dialog.
Encrypting secrets at rest means the UI can decrypt what the operator can no
longer read, so this turned the button into an exfiltration primitive: point it
at any host, the token arrives as a Bearer header. A stored token now only goes
to the origin it was saved for; testing elsewhere requires typing it again.

A source that cannot ingest looked identical to a healthy one. Endpoint-scoped
routing made unbound and mis-bound sources silently dead, while the Sources tab
showed no connector at all and the delete dialog still promised sources would be
"unlinked". Added a Connector column that names the fault, stopped offering
disabled connectors (both workers filter on IsEnabled), and made the delete
warning say ingestion stops.

Virtual meters rendered four zero tiles: they evaluate on read and only
materialize when a cost category references them (§14.1), so summing
consumption is a confident lie about a working meter. They now report nothing
and the page explains why.

Re-importing an overlapping file failed at the database with EF's "An error
occurred while saving the entity changes", naming neither meter nor date — the
diagnosis problem a3af483 set out to fix, via the path its guard could not see.
Checked up front now, bounded by each meter's staged range.

The LXC updater left the service stopped on any failure. set -e plus an
explicit stop means Restart=always does not apply, so an OOM-killed publish or
a brief Gitea outage took MeterVault down until someone noticed. An EXIT trap
restarts the previous build and says so.

Claude-Session: https://claude.ai/code/session_01V6joyergfvVLFEizH1hJLd

deploy/install/metervault-update.sh

@@ -27,6 +27,21 @@ fi
 
 export DOTNET_CLI_TELEMETRY_OPTOUT=1 DOTNET_NOLOGO=1
 
+# Anything between the stop and the restart can fail under `set -e`: a dotnet publish OOM-killed in a
+# small container, a Gitea outage mid-fetch, a transient compile error on master. systemd's
+# Restart=always does not cover a unit stopped on purpose, so without this the service simply stays
+# down until someone notices. Bring the old build back up and say what happened — a failed update
+# should cost the new version, not the running one.
+restore_service_on_failure() {
+  local code=$?
+  if [[ ${code} -ne 0 ]]; then
+    echo "Update failed (exit ${code}). Restarting the previous build…" >&2
+    systemctl start metervault || echo "Could not restart metervault — check 'systemctl status metervault'." >&2
+  fi
+  exit "${code}"
+}
+trap restore_service_on_failure EXIT
+
 echo "Stopping metervault…"
 systemctl stop metervault || true
 

src/App/Components/Pages/Admin/Connectors.razor

@@ -168,6 +168,8 @@ else
                 // the field stays blank and only a typed value replaces what is stored.
                 TokenEnc = ha.TokenEnc,
                 UseDirectToken = !string.IsNullOrWhiteSpace(ha.TokenEnc),
+                // The host the stored token was saved against; a stored token is never sent anywhere else.
+                SavedBaseUrl = ha.BaseUrl,
             };
         }
         else
@@ -197,13 +199,29 @@ else
             // saved, so a bad token is caught before it is stored.
             if (_working.UseDirectToken)
             {
-                var token = !string.IsNullOrWhiteSpace(_working.Token)
-                    ? _working.Token
-                    : (Secrets.TryUnprotect(_working.TokenEnc, out var stored) ? stored : null);
-
-                _testResult = string.IsNullOrWhiteSpace(token)
-                    ? new HaTestResult(false, "Enter a token first.")
-                    : await HaTester.TestAsync(_working.BaseUrl, token, _working.TestEntityId);
+                if (!string.IsNullOrWhiteSpace(_working.Token))
+                {
+                    _testResult = await HaTester.TestAsync(_working.BaseUrl, _working.Token, _working.TestEntityId);
+                }
+                else if (!SameOrigin(_working.BaseUrl, _working.SavedBaseUrl))
+                {
+                    // Storing the token encrypted means the UI can decrypt something the operator
+                    // can no longer read. Sending it to a Base URL edited in this dialog would turn
+                    // "Test connection" into an exfiltration primitive — point it at any host and the
+                    // token arrives as a Bearer header. A stored secret only ever goes to the origin
+                    // it was saved for; testing elsewhere means typing the token again.
+                    _testResult = new HaTestResult(false,
+                        "Base URL differs from the saved one. Re-enter the token to test against a different host — "
+                        + "a stored token is only sent to the host it was saved for.");
+                }
+                else if (Secrets.TryUnprotect(_working.TokenEnc, out var stored) && stored is { Length: > 0 })
+                {
+                    _testResult = await HaTester.TestAsync(_working.BaseUrl, stored, _working.TestEntityId);
+                }
+                else
+                {
+                    _testResult = new HaTestResult(false, "Enter a token first.");
+                }
             }
             else if (string.IsNullOrWhiteSpace(_working.TokenEnv))
             {
@@ -295,7 +313,11 @@ else
     {
         await using var db = await DbFactory.CreateDbContextAsync();
         var sourceCount = await db.MeterSources.CountAsync(s => s.EndpointId == endpoint.Id);
-        var note = sourceCount > 0 ? $" {sourceCount} source(s) reference it and will be unlinked." : "";
+        // Routing is endpoint-scoped, so "unlinked" now means those sources stop ingesting entirely
+        // rather than falling back to any broker. Say so plainly.
+        var note = sourceCount > 0
+            ? $" {sourceCount} source(s) use it and will stop ingesting until reassigned to another connector."
+            : "";
         if (!await Confirm.DeleteAsync(DialogService, "Delete connector", $"Delete '{endpoint.Name}'?{note}"))
         {
             return;
@@ -308,6 +330,18 @@ else
 
     private static string? Trim(string? value) => string.IsNullOrWhiteSpace(value) ? null : value.Trim();
 
+    /// <summary>
+    /// Whether two URLs address the same host. Compares scheme, host and port rather than the raw
+    /// string, so a trailing slash or a path tweak does not force the token to be re-typed. Fails
+    /// closed: anything unparsable counts as a different origin.
+    /// </summary>
+    private static bool SameOrigin(string? a, string? b) =>
+        Uri.TryCreate(a, UriKind.Absolute, out var left)
+        && Uri.TryCreate(b, UriKind.Absolute, out var right)
+        && string.Equals(left.Scheme, right.Scheme, StringComparison.OrdinalIgnoreCase)
+        && string.Equals(left.Host, right.Host, StringComparison.OrdinalIgnoreCase)
+        && left.Port == right.Port;
+
     /// <summary>
     /// Encrypts a newly typed secret, or keeps the stored ciphertext when the field was left blank.
     /// The plaintext is never sent to the browser, so blank means "unchanged", not "cleared".
@@ -340,6 +374,9 @@ else
         /// <summary>Stored ciphertext, round-tripped so leaving <see cref="Token"/> blank keeps it.</summary>
         public string? TokenEnc { get; set; }
 
+        /// <summary>Base URL as saved, so an edited one can be told from the token's own host.</summary>
+        public string? SavedBaseUrl { get; set; }
+
         public bool HasStoredToken => !string.IsNullOrWhiteSpace(TokenEnc);
 
         // MQTT broker

src/App/Components/Pages/ImportWizard.razor

@@ -243,6 +243,7 @@
     private List<Meter> _meters = [];
     private List<CostCategory> _categories = [];
     private StagedImport? _staged;
+    private string? _stagedMapping;
     private List<string> _validationErrors = [];
     private bool _committing;
 
@@ -265,6 +266,7 @@
         _columns = Enumerable.Range(0, _colCount).Select(_ => new ColumnState()).ToArray();
         _dateColumn = 0;
         _staged = null;
+        _stagedMapping = null;
         _validationErrors = [];
 
         await using var db = await DbFactory.CreateDbContextAsync();
@@ -283,8 +285,23 @@
 
         using var reader = new StringReader(_csvText ?? string.Empty);
         _staged = CsvImporter.Stage(BuildProfile(), reader);
+        _stagedMapping = BuildMappingJson();
     }
 
+    /// <summary>
+    /// The mapping as persisted on the batch for provenance, and — compared against the mapping the
+    /// preview was staged under — the check that the two still agree.
+    /// </summary>
+    private string BuildMappingJson() => JsonSerializer.Serialize(new
+    {
+        dateColumn = _dateColumn,
+        dateKind = _dateKind.ToString(),
+        firstDataRow = _firstDataRow,
+        columns = _columns
+            .Select((c, i) => new { index = i, role = c.Role.ToString(), c.MeterId, c.CategoryId, c.Unit })
+            .Where(c => c.role != nameof(MappingRole.Ignore)),
+    });
+
     private async Task CommitAsync()
     {
         if (_staged is null || _staged.TotalRows == 0)
@@ -300,19 +317,22 @@
             return;
         }
 
+        // The staged rows were built from the mapping as it stood at preview time. Editing a target
+        // afterwards leaves them pointing at the old meter while the batch would record the new
+        // mapping — wrong data, with a provenance record that contradicts it and no error to notice.
+        // Nothing here can re-derive the rows, so refuse rather than write either version.
+        var mappingJson = BuildMappingJson();
+        if (!string.Equals(mappingJson, _stagedMapping, StringComparison.Ordinal))
+        {
+            _staged = null;
+            _stagedMapping = null;
+            _validationErrors = ["The mapping changed after the preview. Run the dry run again, then commit."];
+            return;
+        }
+
         _committing = true;
         try
         {
-            var mappingJson = JsonSerializer.Serialize(new
-            {
-                dateColumn = _dateColumn,
-                dateKind = _dateKind.ToString(),
-                firstDataRow = _firstDataRow,
-                columns = _columns
-                    .Select((c, i) => new { index = i, role = c.Role.ToString(), c.MeterId, c.CategoryId, c.Unit })
-                    .Where(c => c.role != nameof(MappingRole.Ignore)),
-            });
-
             var batchId = await ImportService.CommitAsync(_staged, _fileName, mappingJson);
             Snackbar.Add($"Imported batch #{batchId}: {_staged.TotalRows} rows staged. Consumption recomputed.", Severity.Success);
             Nav.NavigateTo("/import");

src/App/Components/Pages/MeterDetail.razor

@@ -100,6 +100,14 @@ else
         }
     }
 
+    @if (_periods is null && _detail.Mode == MeterMode.Virtual)
+    {
+        <MudAlert Severity="Severity.Info" Dense="true" Class="mb-2">
+            Virtual meter — its value is an expression over other meters, evaluated when read, so it has
+            no stored series of its own. See <MudLink Href="/trends">Trends</MudLink> for its figures.
+        </MudAlert>
+    }
+
     <MudExpansionPanels Elevation="0" Class="mb-2">
         <MudExpansionPanel Text="Meter register details">
             <div class="d-flex flex-wrap" style="gap:2rem">
@@ -243,13 +251,27 @@ else
             else
             {
                 <MudSimpleTable Dense="true" Hover="true">
-                    <thead><tr><th>Type</th><th>Target</th><th>Enabled</th><th>Last seen</th><th style="text-align:right">Last value</th><th>Status</th><th style="text-align:right">Actions</th></tr></thead>
+                    <thead><tr><th>Type</th><th>Target</th><th>Connector</th><th>Enabled</th><th>Last seen</th><th style="text-align:right">Last value</th><th>Status</th><th style="text-align:right">Actions</th></tr></thead>
                     <tbody>
                         @foreach (var s in _sources)
                         {
                             <tr>
                                 <td>@s.SourceType</td>
                                 <td>@SourceTarget(s)</td>
+                                <td>
+                                    @{ var problem = ConnectorProblem(s); }
+                                    @if (problem is null)
+                                    {
+                                        @(_endpoints.FirstOrDefault(e => e.Id == s.EndpointId)?.Name ?? "—")
+                                    }
+                                    else
+                                    {
+                                        <MudTooltip Text="@problem">
+                                            <MudChip T="string" Size="Size.Small" Color="Color.Error" Variant="Variant.Text"
+                                                     Icon="@Icons.Material.Filled.LinkOff">@problem</MudChip>
+                                        </MudTooltip>
+                                    }
+                                </td>
                                 <td>@(s.IsEnabled ? "yes" : "no")</td>
                                 <td>@(s.LastSeenAt?.ToString("yyyy-MM-dd HH:mm") ?? "—")</td>
                                 <td style="text-align:right">@(s.LastValue is { } v ? Format.Number(v, 2) : "—")</td>
@@ -448,6 +470,12 @@ else
                 Snackbar.Add($"'{selected.Name}' is a {selected.Type} connector; a {_sourceEdit.SourceType} source needs {needed}.", Severity.Error);
                 return;
             }
+
+            if (!selected.IsEnabled)
+            {
+                Snackbar.Add($"'{selected.Name}' is disabled, so this source would never ingest. Enable it first.", Severity.Error);
+                return;
+            }
         }
         else
         {
@@ -527,8 +555,33 @@ else
         _ => null,
     };
 
+    // Only enabled connectors can ingest: both MQTT and HA workers filter on IsEnabled, so offering
+    // a disabled one would produce a source that saves cleanly and then never runs.
     private List<IngestionEndpoint> ConnectorsFor(EndpointType type) =>
-        _endpoints.Where(e => e.Type == type).ToList();
+        _endpoints.Where(e => e.Type == type && e.IsEnabled).ToList();
+
+    /// <summary>
+    /// Why this source cannot ingest, or null if it can. Routing is endpoint-scoped, so an unbound
+    /// or mis-bound source is silently dead — and deleting a connector unlinks its sources, which
+    /// used to be harmless. Without this column such a source is indistinguishable from a healthy
+    /// one at "Enabled: yes".
+    /// </summary>
+    private string? ConnectorProblem(MeterSource source)
+    {
+        if (RequiredEndpointType(source.SourceType) is not { } needed)
+        {
+            return null;
+        }
+
+        var endpoint = _endpoints.FirstOrDefault(e => e.Id == source.EndpointId);
+        return endpoint switch
+        {
+            null => "no connector — never ingests",
+            { IsEnabled: false } => $"'{endpoint.Name}' is disabled",
+            _ when endpoint.Type != needed => $"'{endpoint.Name}' is {endpoint.Type}, needs {needed}",
+            _ => null,
+        };
+    }
 
     // Changing the source type can invalidate the chosen connector (an HA connector cannot serve an
     // MQTT source), so drop a selection that no longer fits rather than saving a mismatched pair.

src/Infrastructure/Dashboard/MeterPeriodService.cs

@@ -43,6 +43,14 @@ public sealed class MeterPeriodService(
             return null;
         }
 
+        // Virtual meters are evaluated on read and only materialize into `consumption` when a cost
+        // category references them (SDD §14.1), so summing that table would report a confident zero
+        // for a meter that is working fine. Report nothing and let the page say why.
+        if (meter.Mode == MeterMode.Virtual)
+        {
+            return null;
+        }
+
         var tz = ResolveTimeZone();
         var today = DateOnly.FromDateTime(TimeZoneInfo.ConvertTime(DateTimeOffset.UtcNow, tz).Date);
 

src/Infrastructure/Import/ImportService.cs

@@ -19,6 +19,7 @@ public sealed class ImportService(MeterVaultDbContext db, NormalizationService n
     {
         ArgumentNullException.ThrowIfNull(staged);
         GuardDuplicateReadings(staged);
+        await GuardExistingReadingsAsync(staged, cancellationToken).ConfigureAwait(false);
 
         await using var tx = await _db.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
 
@@ -115,6 +116,50 @@ public sealed class ImportService(MeterVaultDbContext db, NormalizationService n
             $"timestamp ({sample}). Check that no two mapped columns target the same meter.");
     }
 
+    /// <summary>
+    /// Rejects readings that already exist in the database, which is what re-importing an overlapping
+    /// CSV produces — the commonest real duplicate, and one the in-batch guard cannot see because the
+    /// staged set is internally unique. Left to the database it surfaces as EF's
+    /// "An error occurred while saving the entity changes", naming neither meter nor date.
+    /// </summary>
+    /// <remarks>
+    /// Checks one meter at a time, bounded by that meter's staged time range, so the query stays
+    /// proportional to the overlap rather than to the table.
+    /// </remarks>
+    private async Task GuardExistingReadingsAsync(StagedImport staged, CancellationToken cancellationToken)
+    {
+        var clashes = new List<string>();
+
+        foreach (var group in staged.Readings.GroupBy(r => r.MeterId))
+        {
+            var times = group.Select(r => r.Time).ToHashSet();
+            var from = times.Min();
+            var to = times.Max();
+
+            var existing = await _db.Readings.AsNoTracking()
+                .Where(r => r.MeterId == group.Key && r.Time >= from && r.Time <= to)
+                .Select(r => r.Time)
+                .ToListAsync(cancellationToken).ConfigureAwait(false);
+
+            foreach (var time in existing.Where(times.Contains).Take(3))
+            {
+                clashes.Add($"meter {group.Key} at {time:yyyy-MM-dd}");
+            }
+
+            if (clashes.Count >= 3)
+            {
+                break;
+            }
+        }
+
+        if (clashes.Count > 0)
+        {
+            throw new InvalidOperationException(
+                $"This import would overwrite readings that already exist ({string.Join("; ", clashes)}). "
+                + "Revert the earlier batch on the Import page first, or narrow the file's date range.");
+        }
+    }
+
     private static IEnumerable<int> AffectedMeters(StagedImport staged) =>
         staged.Readings.Select(r => r.MeterId)
             .Concat(staged.Events.Select(e => e.MeterId))

src/Infrastructure/Ingestion/IngestionService.cs

@@ -100,11 +100,8 @@ public sealed class IngestionService(
     /// Derives consumption for one meter after a batch of readings has been written. The public
     /// counterpart to skipping <c>renormalize</c> on each individual ingest.
     /// </summary>
-    public async Task RenormalizeMeterAsync(int meterId, CancellationToken cancellationToken = default)
-    {
-        await _normalization.RecomputeMeterAsync(meterId, batchId: null, cancellationToken).ConfigureAwait(false);
-        await _db.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-    }
+    public Task RenormalizeMeterAsync(int meterId, CancellationToken cancellationToken = default) =>
+        RecomputeAtomicallyAsync(meterId, cancellationToken);
 
     /// <summary>
     /// Derives consumption from the reading just written. Without this a live-ingested reading sits
@@ -130,8 +127,37 @@ public sealed class IngestionService(
 
         // The reading must already be persisted: RecomputeMeterAsync re-reads the meter's readings
         // from the database, so anything still pending in the change tracker would be missed.
+        await RecomputeAtomicallyAsync(meterId, cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Rebuilds a meter's consumption series as one atomic unit.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="Normalization.NormalizationService.RecomputeMeterAsync"/> clears the series with
+    /// <c>ExecuteDelete</c>, which commits on its own when no transaction is ambient, and only then
+    /// adds the rebuilt rows. Without a transaction around both halves the meter has *no*
+    /// consumption in between: a dashboard read in that window reports zero, and a crash or a
+    /// cancelled request makes the loss permanent — for data the SDD treats as the long-term source
+    /// of truth (§5.5). Import and the events API already wrap their recomputes this way; live
+    /// ingestion was the path that did not.
+    ///
+    /// Respects an ambient transaction rather than nesting, so callers that already opened one keep
+    /// a single unit of work.
+    /// </remarks>
+    private async Task RecomputeAtomicallyAsync(int meterId, CancellationToken cancellationToken)
+    {
+        if (_db.Database.CurrentTransaction is not null)
+        {
+            await _normalization.RecomputeMeterAsync(meterId, batchId: null, cancellationToken).ConfigureAwait(false);
+            await _db.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+            return;
+        }
+
+        await using var tx = await _db.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
         await _normalization.RecomputeMeterAsync(meterId, batchId: null, cancellationToken).ConfigureAwait(false);
         await _db.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+        await tx.CommitAsync(cancellationToken).ConfigureAwait(false);
     }
 
     private async Task<IngestionOutcome> UpsertAsync(

src/Infrastructure/Persistence/Migrations/20260718174732_BindUnboundMqttSourcesToSoleEnabledBroker.Designer.cs

@@ -0,0 +1,931 @@
+// <auto-generated />
+using System;
+using MeterVault.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace MeterVault.Infrastructure.Persistence.Migrations
+{
+    [DbContext(typeof(MeterVaultDbContext))]
+    [Migration("20260718174732_BindUnboundMqttSourcesToSoleEnabledBroker")]
+    partial class BindUnboundMqttSourcesToSoleEnabledBroker
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "timescaledb");
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("MeterVault.Core.Domain.AppSetting", b =>
+                {
+                    b.Property<string>("Key")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("key");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("value");
+
+                    b.HasKey("Key")
+                        .HasName("pk_app_setting");
+
+                    b.ToTable("app_setting", (string)null);
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.Consumption", b =>
+                {
+                    b.Property<int>("MeterId")
+                        .HasColumnType("integer")
+                        .HasColumnName("meter_id");
+
+                    b.Property<DateTimeOffset>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<short>("Kind")
+                        .HasColumnType("smallint")
+                        .HasColumnName("kind");
+
+                    b.Property<double>("Amount")
+                        .HasColumnType("double precision")
+                        .HasColumnName("amount");
+
+                    b.Property<int?>("ImportBatchId")
+                        .HasColumnType("integer")
+                        .HasColumnName("import_batch_id");
+
+                    b.Property<short>("Quality")
+                        .HasColumnType("smallint")
+                        .HasColumnName("quality");
+
+                    b.HasKey("MeterId", "Time", "Kind")
+                        .HasName("pk_consumption");
+
+                    b.HasIndex("ImportBatchId")
+                        .HasDatabaseName("ix_consumption_import_batch_id");
+
+                    b.ToTable("consumption", (string)null);
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.CostCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ColorHex")
+                        .HasColumnType("text")
+                        .HasColumnName("color_hex");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("name");
+
+                    b.Property<int>("Sort")
+                        .HasColumnType("integer")
+                        .HasColumnName("sort");
+
+                    b.HasKey("Id")
+                        .HasName("pk_cost_category");
+
+                    b.ToTable("cost_category", (string)null);
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.CostCategoryMember", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("integer")
+                        .HasColumnName("category_id");
+
+                    b.Property<short?>("EnergyTypeId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("energy_type_id");
+
+                    b.Property<int?>("MeterId")
+                        .HasColumnType("integer")
+                        .HasColumnName("meter_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_cost_category_member");
+
+                    b.HasIndex("CategoryId")
+                        .HasDatabaseName("ix_cost_category_member_category_id");
+
+                    b.HasIndex("EnergyTypeId")
+                        .HasDatabaseName("ix_cost_category_member_energy_type_id");
+
+                    b.HasIndex("MeterId")
+                        .HasDatabaseName("ix_cost_category_member_meter_id");
+
+                    b.ToTable("cost_category_member", null, t =>
+                        {
+                            t.HasCheckConstraint("ck_cost_category_member_target", "meter_id IS NOT NULL OR energy_type_id IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.EnergyType", b =>
+                {
+                    b.Property<short>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("smallint")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<short>("Id"));
+
+                    b.Property<string>("BaseUnit")
+                        .IsRequired()
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("base_unit");
+
+                    b.Property<string>("ColorHex")
+                        .HasColumnType("text")
+                        .HasColumnName("color_hex");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("DefaultMode")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)")
+                        .HasColumnName("default_mode");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("display_name");
+
+                    b.Property<string>("Icon")
+                        .HasColumnType("text")
+                        .HasColumnName("icon");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("key");
+
+                    b.HasKey("Id")
+                        .HasName("pk_energy_type");
+
+                    b.HasIndex("Key")
+                        .IsUnique()
+                        .HasDatabaseName("ix_energy_type_key");
+
+                    b.ToTable("energy_type", (string)null);
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.ImportBatch", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Mapping")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("mapping");
+
+                    b.Property<DateTimeOffset?>("RevertedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("reverted_at");
+
+                    b.Property<int>("RowCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("row_count");
+
+                    b.Property<string>("SourceName")
+                        .HasColumnType("text")
+                        .HasColumnName("source_name");
+
+                    b.HasKey("Id")
+                        .HasName("pk_import_batch");
+
+                    b.ToTable("import_batch", (string)null);
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.IngestionEndpoint", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Config")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("config")
+                        .HasDefaultValueSql("'{}'::jsonb");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_enabled");
+
+                    b.Property<DateTimeOffset?>("LastSeenAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_at");
+
+                    b.Property<string>("LastStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("last_status");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("name");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)")
+                        .HasColumnName("type");
+
+                    b.HasKey("Id")
+                        .HasName("pk_ingestion_endpoint");
+
+                    b.ToTable("ingestion_endpoint", (string)null);
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.ManualCost", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Amount")
+                        .HasColumnType("double precision")
+                        .HasColumnName("amount");
+
+                    b.Property<int?>("CategoryId")
+                        .HasColumnType("integer")
+                        .HasColumnName("category_id");
+
+                    b.Property<string>("Currency")
+                        .IsRequired()
+                        .HasMaxLength(8)
+                        .HasColumnType("character varying(8)")
+                        .HasColumnName("currency");
+
+                    b.Property<int?>("ImportBatchId")
+                        .HasColumnType("integer")
+                        .HasColumnName("import_batch_id");
+
+                    b.Property<int?>("MeterId")
+                        .HasColumnType("integer")
+                        .HasColumnName("meter_id");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text")
+                        .HasColumnName("notes");
+
+                    b.Property<DateOnly>("PeriodEnd")
+                        .HasColumnType("date")
+                        .HasColumnName("period_end");
+
+                    b.Property<DateOnly>("PeriodStart")
+                        .HasColumnType("date")
+                        .HasColumnName("period_start");
+
+                    b.HasKey("Id")
+                        .HasName("pk_manual_cost");
+
+                    b.HasIndex("CategoryId")
+                        .HasDatabaseName("ix_manual_cost_category_id");
+
+                    b.HasIndex("ImportBatchId")
+                        .HasDatabaseName("ix_manual_cost_import_batch_id");
+
+                    b.HasIndex("MeterId")
+                        .HasDatabaseName("ix_manual_cost_meter_id");
+
+                    b.ToTable("manual_cost", (string)null);
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.Meter", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<short>("EnergyTypeId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("energy_type_id");
+
+                    b.Property<double>("InitialBaseline")
+                        .HasColumnType("double precision")
+                        .HasColumnName("initial_baseline");
+
+                    b.Property<DateOnly?>("InstalledAt")
+                        .HasColumnType("date")
+                        .HasColumnName("installed_at");
+
+                    b.Property<bool>("IsActive")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(true)
+                        .HasColumnName("is_active");
+
+                    b.Property<string>("Location")
+                        .HasColumnType("text")
+                        .HasColumnName("location");
+
+                    b.Property<string>("Manufacturer")
+                        .HasColumnType("text")
+                        .HasColumnName("manufacturer");
+
+                    b.Property<string>("Meta")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("meta")
+                        .HasDefaultValueSql("'{}'::jsonb");
+
+                    b.Property<string>("Mode")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)")
+                        .HasColumnName("mode");
+
+                    b.Property<string>("Model")
+                        .HasColumnType("text")
+                        .HasColumnName("model");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.Property<DateOnly?>("RetiredAt")
+                        .HasColumnType("date")
+                        .HasColumnName("retired_at");
+
+                    b.Property<string>("SerialNumber")
+                        .HasColumnType("text")
+                        .HasColumnName("serial_number");
+
+                    b.Property<string>("Unit")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("unit");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("updated_at")
+                        .HasDefaultValueSql("now()");
+
+                    b.HasKey("Id")
+                        .HasName("pk_meter");
+
+                    b.HasIndex("EnergyTypeId", "IsActive")
+                        .HasDatabaseName("ix_meter_energy_type_id_is_active");
+
+                    b.ToTable("meter", (string)null);
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.MeterEvent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<double?>("Amount")
+                        .HasColumnType("double precision")
+                        .HasColumnName("amount");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)")
+                        .HasColumnName("event_type");
+
+                    b.Property<int?>("ImportBatchId")
+                        .HasColumnType("integer")
+                        .HasColumnName("import_batch_id");
+
+                    b.Property<string>("Meta")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("meta")
+                        .HasDefaultValueSql("'{}'::jsonb");
+
+                    b.Property<int>("MeterId")
+                        .HasColumnType("integer")
+                        .HasColumnName("meter_id");
+
+                    b.Property<double?>("NewValue")
+                        .HasColumnType("double precision")
+                        .HasColumnName("new_value");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text")
+                        .HasColumnName("notes");
+
+                    b.Property<double?>("PrevValue")
+                        .HasColumnType("double precision")
+                        .HasColumnName("prev_value");
+
+                    b.Property<DateTimeOffset>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text")
+                        .HasColumnName("unit");
+
+                    b.HasKey("Id")
+                        .HasName("pk_meter_event");
+
+                    b.HasIndex("ImportBatchId")
+                        .HasDatabaseName("ix_meter_event_import_batch_id");
+
+                    b.HasIndex("MeterId", "Time")
+                        .HasDatabaseName("ix_meter_event_meter_id_time");
+
+                    b.ToTable("meter_event", (string)null);
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.MeterLink", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("FromMeterId")
+                        .HasColumnType("integer")
+                        .HasColumnName("from_meter_id");
+
+                    b.Property<int>("ToMeterId")
+                        .HasColumnType("integer")
+                        .HasColumnName("to_meter_id");
+
+                    b.HasKey("Id")
+                        .HasName("pk_meter_link");
+
+                    b.HasIndex("ToMeterId")
+                        .HasDatabaseName("ix_meter_link_to_meter_id");
+
+                    b.HasIndex("FromMeterId", "ToMeterId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_meter_link_from_meter_id_to_meter_id");
+
+                    b.ToTable("meter_link", null, t =>
+                        {
+                            t.HasCheckConstraint("ck_meter_link_distinct", "from_meter_id <> to_meter_id");
+                        });
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.MeterSource", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Config")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("config")
+                        .HasDefaultValueSql("'{}'::jsonb");
+
+                    b.Property<int?>("EndpointId")
+                        .HasColumnType("integer")
+                        .HasColumnName("endpoint_id");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_enabled");
+
+                    b.Property<DateTimeOffset?>("LastSeenAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_at");
+
+                    b.Property<string>("LastStatus")
+                        .HasColumnType("text")
+                        .HasColumnName("last_status");
+
+                    b.Property<double?>("LastValue")
+                        .HasColumnType("double precision")
+                        .HasColumnName("last_value");
+
+                    b.Property<int>("MeterId")
+                        .HasColumnType("integer")
+                        .HasColumnName("meter_id");
+
+                    b.Property<double>("Offset")
+                        .HasColumnType("double precision")
+                        .HasColumnName("offset");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<double>("Scale")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("double precision")
+                        .HasDefaultValue(1.0)
+                        .HasColumnName("scale");
+
+                    b.Property<string>("SourceType")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)")
+                        .HasColumnName("source_type");
+
+                    b.Property<string>("ValueKind")
+                        .IsRequired()
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("value_kind");
+
+                    b.HasKey("Id")
+                        .HasName("pk_meter_source");
+
+                    b.HasIndex("EndpointId")
+                        .HasDatabaseName("ix_meter_source_endpoint_id");
+
+                    b.HasIndex("MeterId")
+                        .HasDatabaseName("ix_meter_source_meter_id");
+
+                    b.ToTable("meter_source", (string)null);
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.Reading", b =>
+                {
+                    b.Property<int>("MeterId")
+                        .HasColumnType("integer")
+                        .HasColumnName("meter_id");
+
+                    b.Property<DateTimeOffset>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.Property<int?>("ImportBatchId")
+                        .HasColumnType("integer")
+                        .HasColumnName("import_batch_id");
+
+                    b.Property<short>("Quality")
+                        .HasColumnType("smallint")
+                        .HasColumnName("quality");
+
+                    b.Property<int?>("SourceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("source_id");
+
+                    b.Property<double>("Value")
+                        .HasColumnType("double precision")
+                        .HasColumnName("value");
+
+                    b.HasKey("MeterId", "Time")
+                        .HasName("pk_reading");
+
+                    b.HasIndex("ImportBatchId")
+                        .HasDatabaseName("ix_reading_import_batch_id");
+
+                    b.ToTable("reading", (string)null);
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.Tank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTimeOffset?>("CachedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("cached_at");
+
+                    b.Property<double?>("CachedBalance")
+                        .HasColumnType("double precision")
+                        .HasColumnName("cached_balance");
+
+                    b.Property<string>("Calibration")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("calibration");
+
+                    b.Property<double>("Capacity")
+                        .HasColumnType("double precision")
+                        .HasColumnName("capacity");
+
+                    b.Property<double?>("FixedRate")
+                        .HasColumnType("double precision")
+                        .HasColumnName("fixed_rate");
+
+                    b.Property<double?>("LowThreshold")
+                        .HasColumnType("double precision")
+                        .HasColumnName("low_threshold");
+
+                    b.Property<int>("MeterId")
+                        .HasColumnType("integer")
+                        .HasColumnName("meter_id");
+
+                    b.Property<string>("RateMode")
+                        .IsRequired()
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("rate_mode");
+
+                    b.Property<double?>("ReorderThreshold")
+                        .HasColumnType("double precision")
+                        .HasColumnName("reorder_threshold");
+
+                    b.Property<string>("Unit")
+                        .IsRequired()
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("unit");
+
+                    b.HasKey("Id")
+                        .HasName("pk_tank");
+
+                    b.HasIndex("MeterId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_tank_meter_id");
+
+                    b.ToTable("tank", (string)null);
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.Tariff", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Component")
+                        .IsRequired()
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("component");
+
+                    b.Property<string>("Currency")
+                        .IsRequired()
+                        .HasMaxLength(8)
+                        .HasColumnType("character varying(8)")
+                        .HasColumnName("currency");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text")
+                        .HasColumnName("notes");
+
+                    b.Property<int?>("ScopeId")
+                        .HasColumnType("integer")
+                        .HasColumnName("scope_id");
+
+                    b.Property<string>("ScopeType")
+                        .IsRequired()
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("scope_type");
+
+                    b.Property<string>("Unit")
+                        .IsRequired()
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("unit");
+
+                    b.Property<DateOnly>("ValidFrom")
+                        .HasColumnType("date")
+                        .HasColumnName("valid_from");
+
+                    b.Property<DateOnly?>("ValidTo")
+                        .HasColumnType("date")
+                        .HasColumnName("valid_to");
+
+                    b.Property<double>("Value")
+                        .HasColumnType("double precision")
+                        .HasColumnName("value");
+
+                    b.HasKey("Id")
+                        .HasName("pk_tariff");
+
+                    b.HasIndex("ScopeType", "ScopeId", "Component", "ValidFrom")
+                        .HasDatabaseName("ix_tariff_scope_type_scope_id_component_valid_from");
+
+                    b.ToTable("tariff", (string)null);
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.Consumption", b =>
+                {
+                    b.HasOne("MeterVault.Core.Domain.Meter", null)
+                        .WithMany()
+                        .HasForeignKey("MeterId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired()
+                        .HasConstraintName("fk_consumption_meter_meter_id");
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.CostCategoryMember", b =>
+                {
+                    b.HasOne("MeterVault.Core.Domain.CostCategory", "Category")
+                        .WithMany("Members")
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_cost_category_member_cost_category_category_id");
+
+                    b.HasOne("MeterVault.Core.Domain.EnergyType", null)
+                        .WithMany()
+                        .HasForeignKey("EnergyTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("fk_cost_category_member_energy_type_energy_type_id");
+
+                    b.HasOne("MeterVault.Core.Domain.Meter", null)
+                        .WithMany()
+                        .HasForeignKey("MeterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("fk_cost_category_member_meter_meter_id");
+
+                    b.Navigation("Category");
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.ManualCost", b =>
+                {
+                    b.HasOne("MeterVault.Core.Domain.CostCategory", null)
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("fk_manual_cost_cost_category_category_id");
+
+                    b.HasOne("MeterVault.Core.Domain.Meter", null)
+                        .WithMany()
+                        .HasForeignKey("MeterId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("fk_manual_cost_meter_meter_id");
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.Meter", b =>
+                {
+                    b.HasOne("MeterVault.Core.Domain.EnergyType", "EnergyType")
+                        .WithMany("Meters")
+                        .HasForeignKey("EnergyTypeId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired()
+                        .HasConstraintName("fk_meter_energy_type_energy_type_id");
+
+                    b.Navigation("EnergyType");
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.MeterEvent", b =>
+                {
+                    b.HasOne("MeterVault.Core.Domain.Meter", null)
+                        .WithMany()
+                        .HasForeignKey("MeterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_meter_event_meter_meter_id");
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.MeterLink", b =>
+                {
+                    b.HasOne("MeterVault.Core.Domain.Meter", "FromMeter")
+                        .WithMany()
+                        .HasForeignKey("FromMeterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_meter_link_meter_from_meter_id");
+
+                    b.HasOne("MeterVault.Core.Domain.Meter", "ToMeter")
+                        .WithMany()
+                        .HasForeignKey("ToMeterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_meter_link_meter_to_meter_id");
+
+                    b.Navigation("FromMeter");
+
+                    b.Navigation("ToMeter");
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.MeterSource", b =>
+                {
+                    b.HasOne("MeterVault.Core.Domain.IngestionEndpoint", "Endpoint")
+                        .WithMany()
+                        .HasForeignKey("EndpointId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("fk_meter_source_ingestion_endpoints_endpoint_id");
+
+                    b.HasOne("MeterVault.Core.Domain.Meter", "Meter")
+                        .WithMany("Sources")
+                        .HasForeignKey("MeterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_meter_source_meter_meter_id");
+
+                    b.Navigation("Endpoint");
+
+                    b.Navigation("Meter");
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.Reading", b =>
+                {
+                    b.HasOne("MeterVault.Core.Domain.Meter", null)
+                        .WithMany()
+                        .HasForeignKey("MeterId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired()
+                        .HasConstraintName("fk_reading_meter_meter_id");
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.Tank", b =>
+                {
+                    b.HasOne("MeterVault.Core.Domain.Meter", "Meter")
+                        .WithMany()
+                        .HasForeignKey("MeterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("fk_tank_meter_meter_id");
+
+                    b.Navigation("Meter");
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.CostCategory", b =>
+                {
+                    b.Navigation("Members");
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.EnergyType", b =>
+                {
+                    b.Navigation("Meters");
+                });
+
+            modelBuilder.Entity("MeterVault.Core.Domain.Meter", b =>
+                {
+                    b.Navigation("Sources");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Infrastructure/Persistence/Migrations/20260718174732_BindUnboundMqttSourcesToSoleEnabledBroker.cs

@@ -0,0 +1,42 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace MeterVault.Infrastructure.Persistence.Migrations
+{
+    /// <inheritdoc />
+    public partial class BindUnboundMqttSourcesToSoleEnabledBroker : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // Corrects BindUnboundMqttSourcesToSoleBroker, which counted brokers without regard to
+            // is_enabled. An instance with one live broker plus a disabled leftover counted two,
+            // declined to backfill on the grounds that the old routing was "ambiguous", and left its
+            // sources unbound — which under endpoint-scoped routing means permanently, silently dead.
+            //
+            // That reasoning was wrong for exactly this shape: MqttIngestionWorker only ever
+            // connected to enabled endpoints, so with a single enabled broker the mapping was never
+            // ambiguous. Re-run the backfill counting only enabled brokers.
+            //
+            // Idempotent and safe to follow the original: it touches only rows still NULL, so
+            // anything the first migration bound, or an operator has since bound by hand, is left
+            // alone. Instances that were already correct match nothing and are unaffected.
+            migrationBuilder.Sql("""
+                UPDATE meter_source AS s
+                SET endpoint_id = sole.id
+                FROM (SELECT id FROM ingestion_endpoint WHERE type = 'MqttBroker' AND is_enabled) AS sole
+                WHERE s.endpoint_id IS NULL
+                  AND s.source_type IN ('Mqtt', 'Tasmota')
+                  AND (SELECT count(*) FROM ingestion_endpoint WHERE type = 'MqttBroker' AND is_enabled) = 1;
+                """);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            // Intentionally empty, as for the migration this corrects: the rows it bound cannot be
+            // told apart from ones bound by hand, so clearing them would discard real configuration.
+        }
+    }
+}

tests/Integration.Tests/ImportRoundTripTests.cs

@@ -85,4 +85,55 @@ public sealed class ImportRoundTripTests(TimescaleFixture fx)
         // change tracker (which holds stale entries after the revert's set-based deletes).
         await db.Meters.Where(m => m.Id == meter.Id).ExecuteDeleteAsync();
     }
+
+    [Fact]
+    public async Task Re_importing_the_same_file_is_refused_by_meter_and_date()
+    {
+        // The commonest real duplicate: import a file, then import an overlapping one. The in-batch
+        // guard cannot see it (that set is internally unique), so left to the database it surfaced as
+        // EF's "An error occurred while saving the entity changes", naming neither meter nor date.
+        await using var db = fx.CreateContext();
+        await DatabaseSeeder.SeedAsync(db);
+
+        var type = await db.EnergyTypes.FirstAsync(t => t.Key == "electricity");
+        var meter = new Meter
+        {
+            Name = $"reimport-{Guid.NewGuid():N}",
+            EnergyTypeId = type.Id,
+            Mode = MeterMode.CumulativeCounter,
+            Unit = "kWh",
+        };
+        db.Meters.Add(meter);
+        await db.SaveChangesAsync();
+
+        var service = new ImportService(db, new NormalizationService(db, NormalizationEngine.CreateDefault()));
+
+        StagedImport Stage() => Staged(meter.Id, new DateTimeOffset(2024, 5, 1, 0, 0, 0, TimeSpan.Zero), 1200);
+
+        await service.CommitAsync(Stage(), "first.csv", mappingJson: null);
+
+        var error = await Assert.ThrowsAsync<InvalidOperationException>(
+            () => service.CommitAsync(Stage(), "again.csv", mappingJson: null));
+
+        Assert.Contains("already exist", error.Message, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("2024-05-01", error.Message, StringComparison.Ordinal);
+        Assert.Contains($"meter {meter.Id}", error.Message, StringComparison.Ordinal);
+
+        await db.Consumption.Where(c => c.MeterId == meter.Id).ExecuteDeleteAsync();
+        await db.Readings.Where(r => r.MeterId == meter.Id).ExecuteDeleteAsync();
+        await db.Meters.Where(m => m.Id == meter.Id).ExecuteDeleteAsync();
+    }
+
+    private static StagedImport Staged(int meterId, DateTimeOffset time, double value)
+    {
+        var staged = new StagedImport();
+        staged.Readings.Add(new Reading
+        {
+            MeterId = meterId,
+            Time = time,
+            Value = value,
+            Quality = ReadingQuality.Imported,
+        });
+        return staged;
+    }
 }

tests/Integration.Tests/MeterPeriodServiceTests.cs

@@ -77,6 +77,19 @@ public sealed class MeterPeriodServiceTests(TimescaleFixture fx)
         await CleanupAsync(db, meterId);
     }
 
+    [Fact]
+    public async Task A_virtual_meter_reports_nothing_rather_than_a_confident_zero()
+    {
+        // Virtual meters evaluate on read and only materialize when a cost category references them
+        // (SDD §14.1). Summing `consumption` would render four zero tiles for a working meter.
+        await using var db = fx.CreateContext();
+        var meterId = await SetupAsync(db, MeterMode.Virtual);
+
+        Assert.Null(await NewService().GetAsync(meterId));
+
+        await CleanupAsync(db, meterId);
+    }
+
     [Fact]
     public async Task A_negative_previous_period_reports_no_basis_rather_than_an_inverted_percentage()
     {