chore: bump internal (D-266 network link changes are not activity)

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

rules/guardrails.json

@@ -300,6 +300,7 @@
     "script_completed",
     "script_failed",
     "script_timeout_suspected",
+    "script_recurrence_summary",
     "esp_phase_changed",
     "ime_agent_version",
     "ime_token_failure",

src/Agent/AutopilotMonitor.Agent.V2.Core.Tests/Monitoring/Gather/DiagnosticsPathGuardsTests.cs

@@ -0,0 +1,193 @@
+using System;
+using AutopilotMonitor.Agent.V2.Core.Monitoring.Telemetry.Gather;
+using Xunit;
+
+namespace AutopilotMonitor.Agent.V2.Core.Tests.Monitoring.Gather
+{
+    /// <summary>
+    /// A configured diagnostics entry is resolved to the folder and pattern that get
+    /// enumerated, and the guard judges exactly that folder. The cases below pin the
+    /// property that matters: no spelling of an allowed entry ever selects its parent.
+    /// </summary>
+    public sealed class DiagnosticsPathGuardsTests
+    {
+        private const string TestProfile = @"C:\Users\TestUser";
+
+        private static readonly Func<string, bool> IsDirectory = _ => true;
+        private static readonly Func<string, bool> IsNotDirectory = _ => false;
+
+        private static DiagnosticsPathGuards.CollectionTarget Resolve(
+            string path,
+            bool includeSubfolders = false,
+            bool unrestrictedMode = false,
+            string? userProfilePath = null,
+            Func<string, bool>? directoryExists = null)
+        {
+            Assert.True(DiagnosticsPathGuards.TryResolveCollectionTarget(
+                path, includeSubfolders, unrestrictedMode, userProfilePath!, directoryExists ?? IsDirectory, out var target));
+            return target;
+        }
+
+        private static void AssertRefused(
+            string path,
+            bool unrestrictedMode = false,
+            string? userProfilePath = null,
+            Func<string, bool>? directoryExists = null)
+        {
+            Assert.False(DiagnosticsPathGuards.TryResolveCollectionTarget(
+                path, true, unrestrictedMode, userProfilePath!, directoryExists ?? IsDirectory, out var target));
+            Assert.Null(target);
+        }
+
+        // ------------------------------------------------------------ folder entries
+
+        [Theory]
+        [InlineData(@"C:\Windows\Logs")]
+        [InlineData(@"C:\Windows\Logs\")]
+        [InlineData(@"C:\Windows\SetupDiag")]
+        [InlineData(@"C:\ProgramData\AutopilotMonitor")]
+        [InlineData(@"C:\ProgramData\Microsoft\DiagnosticLogCSP")]
+        public void Folder_entry_collects_from_itself_never_from_its_parent(string configured)
+        {
+            var target = Resolve(configured, includeSubfolders: true);
+
+            Assert.Equal(configured.TrimEnd('\\'), target.Folder, ignoreCase: true);
+            Assert.Equal("*", target.Pattern);
+            Assert.True(target.Recurse);
+        }
+
+        [Fact]
+        public void Trailing_separator_means_folder_even_when_the_folder_does_not_exist_yet()
+        {
+            var target = Resolve(@"C:\Windows\Logs\NotThereYet\", directoryExists: IsNotDirectory);
+
+            Assert.Equal(@"C:\Windows\Logs\NotThereYet", target.Folder, ignoreCase: true);
+            Assert.Equal("*", target.Pattern);
+        }
+
+        [Fact]
+        public void Folder_name_with_a_dot_is_still_a_folder()
+        {
+            var target = Resolve(@"C:\Windows\Logs\vendor.v2");
+
+            Assert.Equal(@"C:\Windows\Logs\vendor.v2", target.Folder, ignoreCase: true);
+            Assert.Equal("*", target.Pattern);
+        }
+
+        // ------------------------------------------------------------ wildcard entries
+
+        [Fact]
+        public void Wildcard_entry_collects_the_pattern_from_its_validated_parent()
+        {
+            var target = Resolve(@"C:\Windows\Panther\*.log", includeSubfolders: true);
+
+            Assert.Equal(@"C:\Windows\Panther", target.Folder, ignoreCase: true);
+            Assert.Equal("*.log", target.Pattern);
+            Assert.True(target.Recurse);
+        }
+
+        [Fact]
+        public void Wildcard_beside_an_allowlisted_file_is_refused()
+        {
+            // Only ReportingEvents.log is on the allowlist, not the folder it lives in.
+            AssertRefused(@"C:\Windows\SoftwareDistribution\*.log");
+        }
+
+        // ------------------------------------------------------------ file entries
+
+        [Fact]
+        public void File_entry_never_recurses_because_its_folder_was_not_validated()
+        {
+            var target = Resolve(
+                @"C:\Windows\SoftwareDistribution\ReportingEvents.log",
+                includeSubfolders: true,
+                directoryExists: IsNotDirectory);
+
+            Assert.Equal(@"C:\Windows\SoftwareDistribution", target.Folder, ignoreCase: true);
+            Assert.Equal("ReportingEvents.log", target.Pattern);
+            Assert.False(target.Recurse);
+        }
+
+        [Fact]
+        public void Missing_path_without_a_dot_is_one_file_name_not_a_wildcard_on_the_parent()
+        {
+            var target = Resolve(@"C:\Windows\Logs\nodot", includeSubfolders: true, directoryExists: IsNotDirectory);
+
+            Assert.Equal(@"C:\Windows\Logs", target.Folder, ignoreCase: true);
+            Assert.Equal("nodot", target.Pattern);
+            Assert.False(target.Recurse);
+        }
+
+        // ------------------------------------------------------------ refusals
+
+        [Theory]
+        [InlineData(@"C:\Windows")]
+        [InlineData(@"C:\ProgramData")]
+        [InlineData(@"C:\ProgramData\Microsoft")]
+        [InlineData(@"C:\Windows\Logs\..\System32")]
+        [InlineData(@"C:\Windows\LogsEvil")]
+        [InlineData("")]
+        public void Paths_outside_the_allowlist_are_refused(string configured)
+        {
+            AssertRefused(configured);
+        }
+
+        [Theory]
+        [InlineData(@"C:\Users")]
+        [InlineData(@"C:\Users\TestUser\Documents")]
+        [InlineData(@"C:\Windows\System32\config")]
+        [InlineData(@"C:\Windows\System32\config\*")]
+        public void Hard_blocks_hold_in_unrestricted_mode(string configured)
+        {
+            AssertRefused(configured, unrestrictedMode: true);
+        }
+
+        // ------------------------------------------------------------ user-profile token
+
+        [Fact]
+        public void Expanded_token_path_outside_AppData_is_refused_even_in_unrestricted_mode()
+        {
+            // The service expands %LOGGED_ON_USER_PROFILE% before the guard sees the path; an
+            // unexpanded token is not under C:\Users lexically and used to slip past the block.
+            AssertRefused(TestProfile + @"\Documents", unrestrictedMode: true, userProfilePath: TestProfile);
+            AssertRefused(TestProfile + @"\Documents\*.txt", unrestrictedMode: true, userProfilePath: TestProfile);
+        }
+
+        [Fact]
+        public void Expanded_token_path_on_the_profile_allowlist_is_admitted_in_restricted_mode()
+        {
+            var target = Resolve(
+                TestProfile + @"\AppData\Local\RealmJoin\Logs\*.log",
+                userProfilePath: TestProfile);
+
+            Assert.Equal(TestProfile + @"\AppData\Local\RealmJoin\Logs", target.Folder, ignoreCase: true);
+            Assert.Equal("*.log", target.Pattern);
+        }
+
+        [Fact]
+        public void Profile_path_without_the_token_stays_blocked()
+        {
+            AssertRefused(TestProfile + @"\AppData\Local\RealmJoin\Logs\*.log", userProfilePath: null);
+        }
+
+        // ------------------------------------------------------------ recursion guard
+
+        [Theory]
+        [InlineData(@"C:\Users")]
+        [InlineData(@"C:\Users\TestUser")]
+        [InlineData(@"C:\Windows\System32\config")]
+        [InlineData(@"C:\Windows\System32\config\RegBack")]
+        public void Recursion_never_enters_a_hard_blocked_subtree_in_unrestricted_mode(string directory)
+        {
+            Assert.False(DiagnosticsPathGuards.IsDirectoryEnterable(directory, unrestrictedMode: true, userProfilePath: null));
+        }
+
+        [Fact]
+        public void Recursion_enters_ordinary_subfolders()
+        {
+            Assert.True(DiagnosticsPathGuards.IsDirectoryEnterable(@"C:\Windows\System32\drivers", unrestrictedMode: true, userProfilePath: null));
+            Assert.True(DiagnosticsPathGuards.IsDirectoryEnterable(@"C:\Windows\Logs\CBS", unrestrictedMode: false, userProfilePath: null));
+            Assert.False(DiagnosticsPathGuards.IsDirectoryEnterable(@"C:\Windows\System32\drivers", unrestrictedMode: false, userProfilePath: null));
+        }
+    }
+}

src/Agent/AutopilotMonitor.Agent.V2.Core.Tests/Monitoring/Ime/ImeLogTrackerPollTimingTests.cs

@@ -0,0 +1,95 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using AutopilotMonitor.Agent.V2.Core.Logging;
+using AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime;
+using AutopilotMonitor.Agent.V2.Core.Tests.Harness;
+using AutopilotMonitor.Shared.Models;
+using Xunit;
+
+namespace AutopilotMonitor.Agent.V2.Core.Tests.Monitoring.Ime
+{
+    /// <summary>
+    /// The poll loop's timing maxima (session c3ecb568: the loop was not scheduled for 26 s at
+    /// 100 % VM CPU and nothing in the telemetry could show it): the longest pass and the
+    /// longest pause between two passes, on a monotonic clock, restart-safe like the other
+    /// health counters.
+    /// </summary>
+    public sealed class ImeLogTrackerPollTimingTests
+    {
+        /// <summary>Monotonic readings the tracker takes at the start and the end of every pass.</summary>
+        private sealed class Clock
+        {
+            private readonly Queue<long> _readings = new Queue<long>();
+            public void Enqueue(params long[] ms) { foreach (var m in ms) _readings.Enqueue(m); }
+            public long Next() => _readings.Dequeue();
+        }
+
+        private static ImeLogTracker Build(TempDirectory tmp, Clock clock)
+        {
+            var tracker = new ImeLogTracker(tmp.Path, new List<ImeLogPattern>(), new AgentLogger(tmp.Path, AgentLogLevel.Info), stateDirectory: tmp.Path);
+            tracker.MonotonicMillisProvider = clock.Next;
+            return tracker;
+        }
+
+        [Fact]
+        public async Task Longest_pass_and_longest_pause_are_kept_as_session_maxima()
+        {
+            using var tmp = new TempDirectory();
+            var clock = new Clock();
+            var tracker = Build(tmp, clock);
+
+            // Pass 1 takes 30 ms; the loop is not scheduled again for 26.1 s; pass 2 takes 10 ms,
+            // pass 3 follows after the normal 100 ms.
+            clock.Enqueue(0, 30, 26130, 26140, 26240, 26245);
+            await tracker.RunPollPassAsync(CancellationToken.None);
+            await tracker.RunPollPassAsync(CancellationToken.None);
+            await tracker.RunPollPassAsync(CancellationToken.None);
+
+            var health = tracker.GetHealthSnapshot();
+            Assert.Equal(30, health.PassMaxMs);
+            Assert.Equal(26100, health.PassGapMaxMs);
+            tracker.Dispose();
+        }
+
+        [Fact]
+        public void A_fresh_tracker_reports_zero()
+        {
+            using var tmp = new TempDirectory();
+            var tracker = Build(tmp, new Clock());
+
+            var health = tracker.GetHealthSnapshot();
+            Assert.Equal(0, health.PassMaxMs);
+            Assert.Equal(0, health.PassGapMaxMs);
+            tracker.Dispose();
+        }
+
+        [Fact]
+        public async Task Maxima_survive_a_restart_and_are_never_lowered()
+        {
+            using var tmp = new TempDirectory();
+            var clock = new Clock();
+            var tracker1 = Build(tmp, clock);
+            clock.Enqueue(0, 40, 5140, 5150);
+            await tracker1.RunPollPassAsync(CancellationToken.None);
+            await tracker1.RunPollPassAsync(CancellationToken.None);
+            tracker1.SaveStateForTest();
+            tracker1.Dispose();
+
+            var tracker2 = Build(tmp, clock);
+            tracker2.LoadStateForTest();
+            Assert.Equal(40, tracker2.GetHealthSnapshot().PassMaxMs);
+            Assert.Equal(5100, tracker2.GetHealthSnapshot().PassGapMaxMs);
+
+            // The first pass after a restart has no pause to measure; a calmer session afterwards
+            // never lowers what the session already saw.
+            clock.Enqueue(6000, 6010, 6110, 6115);
+            await tracker2.RunPollPassAsync(CancellationToken.None);
+            await tracker2.RunPollPassAsync(CancellationToken.None);
+            var health = tracker2.GetHealthSnapshot();
+            Assert.Equal(40, health.PassMaxMs);
+            Assert.Equal(5100, health.PassGapMaxMs);
+            tracker2.Dispose();
+        }
+    }
+}

src/Agent/AutopilotMonitor.Agent.V2.Core.Tests/Monitoring/Ime/RecurringScriptGateTests.cs

@@ -0,0 +1,267 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AutopilotMonitor.Agent.V2.Core.Logging;
+using AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime;
+using AutopilotMonitor.Agent.V2.Core.Tests.Harness;
+using AutopilotMonitor.Shared.Models;
+using Newtonsoft.Json;
+using Xunit;
+
+namespace AutopilotMonitor.Agent.V2.Core.Tests.Monitoring.Ime
+{
+    /// <summary>
+    /// IME re-runs health-script policies on its own schedule for as long as the device is up.
+    /// A session that waited days for its user reported every hourly run of every policy
+    /// (field: 9 policies × 94 runs in one session). The gate emits the first run and every
+    /// changed result, counts the rest, and keeps the start/result pairing intact that the
+    /// running indicators rely on.
+    /// </summary>
+    public sealed class RecurringScriptGateTests
+    {
+        private const string Policy = "11111111-2222-3333-4444-555555555555";
+        private static readonly DateTime T0 = new DateTime(2026, 9, 16, 20, 0, 0, DateTimeKind.Utc);
+
+        private static ScriptExecutionState Early(string compliance, int exit = 0, string? stderr = null) =>
+            new ScriptExecutionState
+            {
+                PolicyId = Policy, ScriptType = "remediation", ScriptPart = "detection",
+                ComplianceResult = compliance, ExitCode = exit, Stderr = stderr, DurationBasis = "script_runtime",
+            };
+
+        private static ScriptExecutionState Consolidated(string compliance, int exit = 0, int status = 1) =>
+            new ScriptExecutionState
+            {
+                PolicyId = Policy, ScriptType = "remediation", ScriptPart = "detection",
+                ComplianceResult = compliance, ExitCode = exit, RemediationStatus = status,
+                DurationBasis = "cycle_including_reporting_latency",
+            };
+
+        [Fact]
+        public void First_run_emits_start_and_result()
+        {
+            var gate = new RecurringScriptGate();
+
+            Assert.True(gate.OnStart(Policy, T0, "6", "HS-SCRIPT-START"));
+            Assert.True(gate.OnResult(Early("True"), T0.AddSeconds(5), out var released));
+            Assert.Null(released);
+        }
+
+        [Fact]
+        public void Repeated_result_is_counted_and_its_start_stays_held()
+        {
+            var gate = new RecurringScriptGate();
+            gate.OnStart(Policy, T0, "6", "HS-SCRIPT-START");
+            gate.OnResult(Early("True"), T0.AddSeconds(5), out _);
+
+            Assert.False(gate.OnStart(Policy, T0.AddHours(1), "6", "HS-SCRIPT-START"));
+            Assert.False(gate.OnResult(Early("True"), T0.AddHours(1).AddSeconds(5), out var released));
+            Assert.Null(released);
+
+            var summary = Assert.Single(gate.TakeSummaries());
+            Assert.Equal(2, summary.RunsObserved);
+            Assert.Equal(1, summary.RunsCollapsed);
+            Assert.Equal(1, summary.CollapsedResults);
+            Assert.Equal(T0.AddHours(1).AddSeconds(5), summary.LastCollapsedAtUtc);
+        }
+
+        [Fact]
+        public void Changed_result_releases_the_held_start_with_its_own_timestamp()
+        {
+            var gate = new RecurringScriptGate();
+            gate.OnStart(Policy, T0, "6", "HS-SCRIPT-START");
+            gate.OnResult(Early("True"), T0.AddSeconds(5), out _);
+
+            var secondStart = T0.AddHours(1);
+            gate.OnStart(Policy, secondStart, "6", "HS-SCRIPT-START");
+            Assert.True(gate.OnResult(Early("False", exit: 1), secondStart.AddSeconds(5), out var released));
+
+            Assert.NotNull(released);
+            Assert.Equal(Policy, released.PolicyId);
+            Assert.Equal(secondStart, released.SourceTimestampUtc);
+            Assert.Equal("HS-SCRIPT-START", released.PatternId);
+            Assert.Equal("6", released.PolicyType);
+            Assert.Empty(gate.TakeSummaries());
+        }
+
+        [Fact]
+        public void New_stderr_counts_as_a_changed_result()
+        {
+            var gate = new RecurringScriptGate();
+            gate.OnStart(Policy, T0, "6", "p");
+            gate.OnResult(Early("True"), T0, out _);
+
+            gate.OnStart(Policy, T0.AddHours(1), "6", "p");
+            Assert.True(gate.OnResult(Early("True", stderr: "Get-ChildItem : path not found"), T0.AddHours(1), out _));
+        }
+
+        [Fact]
+        public void Early_signal_and_consolidated_result_do_not_overwrite_each_other()
+        {
+            // Both describe the detection phase, but only the consolidated one knows
+            // RemediationStatus. Sharing one signature slot would make every run look changed.
+            var gate = new RecurringScriptGate();
+            gate.OnStart(Policy, T0, "6", "p");
+            Assert.True(gate.OnResult(Early("True"), T0, out _));
+            Assert.True(gate.OnResult(Consolidated("True"), T0.AddMinutes(1), out _));
+
+            gate.OnStart(Policy, T0.AddHours(1), "6", "p");
+            Assert.False(gate.OnResult(Early("True"), T0.AddHours(1), out _));
+            Assert.False(gate.OnResult(Consolidated("True"), T0.AddHours(1).AddMinutes(1), out _));
+        }
+
+        [Fact]
+        public void Held_start_without_result_is_released_only_after_the_grace()
+        {
+            var gate = new RecurringScriptGate();
+            gate.OnStart(Policy, T0, "6", "p");
+            gate.OnResult(Early("True"), T0, out _);
+            var heldAt = T0.AddHours(1);
+            gate.OnStart(Policy, heldAt, "6", "p");
+
+            Assert.Empty(gate.ReleaseStartsWithoutResult(heldAt.AddMinutes(29), TimeSpan.FromMinutes(30)));
+
+            var released = Assert.Single(gate.ReleaseStartsWithoutResult(heldAt.AddMinutes(31), TimeSpan.FromMinutes(30)));
+            Assert.Equal(heldAt, released.SourceTimestampUtc);
+            Assert.Empty(gate.ReleaseStartsWithoutResult(heldAt.AddHours(2), TimeSpan.FromMinutes(30)));
+        }
+
+        [Fact]
+        public void Held_start_whose_result_was_collapsed_is_never_released_as_unfinished()
+        {
+            var gate = new RecurringScriptGate();
+            gate.OnStart(Policy, T0, "6", "p");
+            gate.OnResult(Early("True"), T0, out _);
+            gate.OnStart(Policy, T0.AddHours(1), "6", "p");
+            gate.OnResult(Early("True"), T0.AddHours(1), out _);
+
+            Assert.Empty(gate.ReleaseStartsWithoutResult(T0.AddDays(1), TimeSpan.FromMinutes(30)));
+        }
+
+        [Fact]
+        public void Run_superseded_by_the_next_start_counts_as_without_result()
+        {
+            var gate = new RecurringScriptGate();
+            gate.OnStart(Policy, T0, "6", "p");
+            gate.OnResult(Early("True"), T0, out _);
+            gate.OnStart(Policy, T0.AddHours(1), "6", "p");   // no result
+            gate.OnStart(Policy, T0.AddHours(2), "6", "p");
+            gate.OnResult(Early("True"), T0.AddHours(2), out _);
+
+            var summary = Assert.Single(gate.TakeSummaries());
+            Assert.Equal(3, summary.RunsObserved);
+            Assert.Equal(1, summary.RunsWithoutResult);
+            Assert.Equal(1, summary.RunsCollapsed);
+        }
+
+        [Fact]
+        public void Summary_reports_growth_only()
+        {
+            var gate = new RecurringScriptGate();
+            gate.OnStart(Policy, T0, "6", "p");
+            gate.OnResult(Early("True"), T0, out _);
+            gate.OnStart(Policy, T0.AddHours(1), "6", "p");
+            gate.OnResult(Early("True"), T0.AddHours(1), out _);
+
+            Assert.Single(gate.TakeSummaries());
+            Assert.Empty(gate.TakeSummaries());
+
+            gate.OnStart(Policy, T0.AddHours(2), "6", "p");
+            gate.OnResult(Early("True"), T0.AddHours(2), out _);
+            Assert.Equal(2, Assert.Single(gate.TakeSummaries()).RunsCollapsed);
+        }
+
+        [Fact]
+        public void State_round_trips_through_json()
+        {
+            var gate = new RecurringScriptGate();
+            gate.OnStart(Policy, T0, "6", "p");
+            gate.OnResult(Early("True"), T0, out _);
+            gate.OnStart(Policy, T0.AddHours(1), "6", "p");
+
+            var json = JsonConvert.SerializeObject(gate.ToPersisted());
+            var restored = new RecurringScriptGate();
+            restored.Restore(JsonConvert.DeserializeObject<Dictionary<string, RecurringScriptPolicyState>>(json));
+
+            // The restored gate still knows the last report and still holds the second start.
+            Assert.True(restored.OnResult(Early("False", exit: 1), T0.AddHours(1).AddSeconds(5), out var released));
+            Assert.Equal(T0.AddHours(1), released.SourceTimestampUtc);
+        }
+
+        // ── Through the tracker ───────────────────────────────────────────────────
+
+        private sealed class Rig
+        {
+            public readonly List<ScriptStartedInfo> Started = new List<ScriptStartedInfo>();
+            public readonly List<ScriptExecutionState> Completed = new List<ScriptExecutionState>();
+            public readonly List<ScriptRecurrenceSummary> Summaries = new List<ScriptRecurrenceSummary>();
+            public readonly ImeLogTracker Tracker;
+
+            public Rig(TempDirectory tmp)
+            {
+                Tracker = new ImeLogTracker(
+                    logFolder: tmp.Path,
+                    patterns: new List<ImeLogPattern>(),
+                    logger: new AgentLogger(tmp.Path, AgentLogLevel.Info),
+                    stateDirectory: tmp.Path);
+                Tracker.OnScriptStarted = Started.Add;
+                Tracker.OnScriptCompleted = Completed.Add;
+                Tracker.OnScriptRecurrenceSummary = Summaries.Add;
+            }
+
+            public void Run(DateTime startedAtUtc, string compliance)
+            {
+                Tracker.HandleHealthScriptStartForTest(Policy, startedAtUtc);
+                Tracker.HandleHealthScriptDetectionResultForTest(Policy, compliance, "pre", exitCode: compliance == "True" ? 0 : 1);
+            }
+        }
+
+        [Fact]
+        public void Tracker_collapses_repeats_across_a_restart_and_reports_them_on_stop()
+        {
+            using var tmp = new TempDirectory();
+
+            var first = new Rig(tmp);
+            first.Run(T0, "True");
+            first.Run(T0.AddHours(1), "True");
+            Assert.Single(first.Started);
+            Assert.Single(first.Completed);
+            first.Tracker.SaveStateForTest();
+
+            // Restart (reboot kill, WhiteGlove Part 2): the last report and the counter are back.
+            var second = new Rig(tmp);
+            second.Tracker.LoadStateForTest();
+            second.Run(T0.AddHours(2), "True");
+            Assert.Empty(second.Started);
+            Assert.Empty(second.Completed);
+
+            second.Run(T0.AddHours(3), "False");
+            var start = Assert.Single(second.Started);
+            Assert.Equal(T0.AddHours(3), start.SourceTimestampUtc);
+            Assert.Equal("False", Assert.Single(second.Completed).ComplianceResult);
+
+            second.Tracker.FlushRecurringScripts(T0.AddHours(4), shuttingDown: true);
+            var summary = Assert.Single(second.Summaries);
+            Assert.Equal(4, summary.RunsObserved);
+            Assert.Equal(2, summary.RunsCollapsed);
+        }
+
+        [Fact]
+        public void Tracker_leaves_platform_scripts_alone()
+        {
+            using var tmp = new TempDirectory();
+            var rig = new Rig(tmp);
+            var observedAt = T0;
+
+            for (var run = 0; run < 2; run++)
+            {
+                rig.Tracker.SeedPendingPlatformScriptForTesting("platformA", exitCode: 0, exitObservedAtUtc: observedAt.AddMinutes(run * 10));
+                rig.Tracker.CompletePlatformScriptFromImeResultForTesting("platformA", "Success", observedAt.AddMinutes(run * 10 + 1));
+            }
+
+            Assert.Equal(2, rig.Completed.Count(s => s.ScriptType == "platform"));
+            rig.Tracker.FlushRecurringScripts(T0.AddDays(1), shuttingDown: true);
+            Assert.Empty(rig.Summaries);
+        }
+    }
+}

src/Agent/AutopilotMonitor.Agent.V2.Core.Tests/Monitoring/Runtime/DiagnosticsEventLogBlockTests.cs

@@ -0,0 +1,204 @@
+#nullable enable
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using AutopilotMonitor.Agent.V2.Core.Configuration;
+using AutopilotMonitor.Agent.V2.Core.Logging;
+using AutopilotMonitor.Agent.V2.Core.Monitoring.Runtime;
+using AutopilotMonitor.Agent.V2.Core.Monitoring.Telemetry.Gather;
+using AutopilotMonitor.Agent.V2.Core.Monitoring.Transport;
+using AutopilotMonitor.Agent.V2.Core.Tests.Harness;
+using AutopilotMonitor.Shared.Models;
+using Xunit;
+
+namespace AutopilotMonitor.Agent.V2.Core.Tests.Monitoring.Runtime
+{
+    /// <summary>
+    /// The hard-blocked event-log channels (Security, PowerShell, Sysmon) are unreadable through
+    /// the diagnostics package as well — by path, by wildcard, by resolved channel, and in
+    /// unrestricted mode. Before this the block held only in the event-log collector.
+    /// </summary>
+    public sealed class DiagnosticsEventLogBlockTests
+    {
+        private const string WinevtLogs = @"C:\Windows\System32\winevt\Logs";
+
+        // A channel no machine has: the export fails and the packager falls back to the raw copy.
+        private const string HarmlessChannel = "AutopilotMonitor-Tests-NoSuchChannel/Operational";
+
+        [Theory]
+        [InlineData("Security.evtx")]
+        [InlineData("security.EVTX")]
+        [InlineData("Microsoft-Windows-PowerShell%4Operational.evtx")]
+        [InlineData("Microsoft-Windows-PowerShell%4Admin.evtx")]
+        [InlineData("Windows PowerShell.evtx")]
+        [InlineData("Microsoft-Windows-Sysmon%4Operational.evtx")]
+        [InlineData("Archive-Security-2026-09-21-10-15-30-123.evtx")]
+        [InlineData("Archive-Microsoft-Windows-PowerShell%4Operational-2026-09-21-10-15-30-123.evtx")]
+        public void Hard_blocked_channel_files_are_recognised_by_name(string fileName)
+        {
+            Assert.True(DiagnosticsPathGuards.IsHardBlockedEventLogFile(Path.Combine(WinevtLogs, fileName)));
+        }
+
+        [Theory]
+        [InlineData("System.evtx")]
+        [InlineData("Application.evtx")]
+        [InlineData("SecurityAudit.evtx")]
+        [InlineData("Security.log")]
+        [InlineData("Microsoft-Windows-Security-Mitigations%4KernelMode.evtx")]
+        // Same boundary as the collector: only '/' continues a blocked channel name.
+        [InlineData("Microsoft-Windows-PowerShell-DesiredStateConfiguration-FileDownloadManager%4Operational.evtx")]
+        [InlineData("Archive-System-2026-09-21-10-15-30-123.evtx")]
+        public void Other_files_are_not_mistaken_for_a_blocked_channel(string fileName)
+        {
+            Assert.False(DiagnosticsPathGuards.IsHardBlockedEventLogFile(Path.Combine(WinevtLogs, fileName)));
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void Path_guard_refuses_a_blocked_channel_file_in_every_mode(bool unrestrictedMode)
+        {
+            Assert.False(DiagnosticsPathGuards.IsDiagnosticsPathAllowed(
+                WinevtLogs + @"\Security.evtx", unrestrictedMode));
+            Assert.False(DiagnosticsPathGuards.IsDiagnosticsPathAllowed(
+                WinevtLogs + @"\Microsoft-Windows-PowerShell%4Operational.evtx", unrestrictedMode));
+        }
+
+        [Fact]
+        public void Path_guard_still_admits_other_channels_and_wildcards()
+        {
+            Assert.True(DiagnosticsPathGuards.IsDiagnosticsPathAllowed(WinevtLogs + @"\System.evtx"));
+            // Undecidable on the string — the packager filters per file (tests below).
+            Assert.True(DiagnosticsPathGuards.IsDiagnosticsPathAllowed(WinevtLogs + @"\*.evtx"));
+        }
+
+        [Theory]
+        [InlineData("Security", true)]
+        [InlineData("Microsoft-Windows-PowerShell/Operational", true)]
+        [InlineData(" Windows PowerShell ", true)]
+        [InlineData("Microsoft-Windows-Sysmon/Operational", true)]
+        [InlineData("System", false)]
+        [InlineData("", false)]
+        [InlineData(null, false)]
+        public void Channel_block_is_one_matcher_for_collector_and_package(string? channel, bool blocked)
+        {
+            Assert.Equal(blocked, GatherRuleGuards.IsHardBlockedEventLogChannel(channel!));
+        }
+
+        // ------------------------------------------------------------ packager ----
+
+        // %TEMP% lives under C:\Users, which the path guard blocks in every mode, so the
+        // configured folder sits beside the test assembly and the run is unrestricted — which
+        // is also the strongest form of the claim: not even unrestricted mode collects these.
+        private sealed class EvtxFolder : System.IDisposable
+        {
+            public string Path { get; } = System.IO.Path.Combine(
+                System.AppContext.BaseDirectory, "diag-evtx-" + System.Guid.NewGuid().ToString("N"));
+
+            public EvtxFolder(params string[] fileNames)
+            {
+                Directory.CreateDirectory(Path);
+                foreach (var name in fileNames)
+                    File.WriteAllBytes(System.IO.Path.Combine(Path, name), new byte[] { 1, 2, 3 });
+            }
+
+            public void Dispose()
+            {
+                try { Directory.Delete(Path, recursive: true); } catch { }
+            }
+        }
+
+        private static DiagnosticsPackageService BuildService(
+            TempDirectory scratch, string configuredPath, System.Func<string, string> channelResolver)
+        {
+            var logger = new AgentLogger(Directory.CreateDirectory(Path.Combine(scratch.Path, "logs")).FullName);
+            var apiClient = new BackendApiClient(
+                httpClient: new System.Net.Http.HttpClient(),
+                baseUrl: "http://localhost",
+                manufacturer: string.Empty,
+                model: string.Empty,
+                serialNumber: string.Empty,
+                useBootstrapTokenAuth: false,
+                bootstrapToken: null,
+                agentVersion: "0.0.0",
+                logger: logger);
+
+            var cfg = new AgentConfiguration
+            {
+                SessionId = "S1",
+                TenantId = "T1",
+                ApiBaseUrl = "http://localhost",
+                UnrestrictedMode = true,
+            };
+            cfg.DiagnosticsLogPaths.Add(new DiagnosticsLogPath { Path = configuredPath });
+
+            string Sub(string name) => Directory.CreateDirectory(Path.Combine(scratch.Path, name)).FullName;
+            return new DiagnosticsPackageService(
+                cfg,
+                logger,
+                apiClient,
+                agentLogFolderOverride: Sub("agentlogs"),
+                imeLogFolderOverride: Sub("ime"),
+                agentStateFolderOverride: Sub("state"),
+                agentSpoolFolderOverride: Sub("spool"),
+                agentDataFolderOverride: Sub("data"),
+                sectionFolderOverrides: null,
+                devicePreparationProbe: () => false)
+            {
+                EventLogChannelResolver = channelResolver,
+            };
+        }
+
+        private static List<string> ZipEntryNames(byte[] bytes)
+        {
+            using var ms = new MemoryStream(bytes);
+            using var archive = new ZipArchive(ms, ZipArchiveMode.Read);
+            return archive.Entries.Select(e => e.FullName).ToList();
+        }
+
+        private static string ReadManifest(byte[] bytes)
+        {
+            using var ms = new MemoryStream(bytes);
+            using var archive = new ZipArchive(ms, ZipArchiveMode.Read);
+            using var reader = new StreamReader(archive.GetEntry("package-manifest.txt")!.Open());
+            return reader.ReadToEnd();
+        }
+
+        [Fact]
+        public void Wildcard_entry_skips_blocked_channel_files_and_keeps_the_rest()
+        {
+            using var scratch = new TempDirectory();
+            using var folder = new EvtxFolder(
+                "Security.evtx", "Microsoft-Windows-PowerShell%4Operational.evtx", "Setup.evtx");
+
+            var service = BuildService(scratch, Path.Combine(folder.Path, "*.evtx"), _ => HarmlessChannel);
+            var bytes = service.BuildArchiveBytes(enrollmentSucceeded: false);
+
+            var entries = ZipEntryNames(bytes);
+            Assert.Contains(entries, e => e.EndsWith("/Setup.evtx"));
+            Assert.DoesNotContain(entries, e => e.EndsWith("Security.evtx"));
+            Assert.DoesNotContain(entries, e => e.Contains("PowerShell"));
+
+            var manifest = ReadManifest(bytes);
+            Assert.Contains("BLOCKED (event-log channel guard", manifest);
+            Assert.Contains("Security.evtx", manifest);
+            Assert.Equal(2, service.LastPackaging!.ProblemsByKind["path-guard"]);
+        }
+
+        [Fact]
+        public void File_with_a_harmless_name_is_blocked_when_it_resolves_to_a_blocked_channel()
+        {
+            // A channel is free to write to any file name; and the resolver's naming fallback
+            // maps a stray file onto a live channel. The export must never read that channel.
+            using var scratch = new TempDirectory();
+            using var folder = new EvtxFolder("Harmless.evtx");
+
+            var service = BuildService(scratch, Path.Combine(folder.Path, "Harmless.evtx"), _ => "Security");
+            var bytes = service.BuildArchiveBytes(enrollmentSucceeded: false);
+
+            Assert.DoesNotContain(ZipEntryNames(bytes), e => e.EndsWith("Harmless.evtx"));
+            Assert.Contains("BLOCKED (event-log channel guard, channel 'Security')", ReadManifest(bytes));
+        }
+    }
+}

src/Agent/AutopilotMonitor.Agent.V2.Core.Tests/Monitoring/Runtime/DiagnosticsPackageServiceTests.cs

@@ -206,6 +206,91 @@ namespace AutopilotMonitor.Agent.V2.Core.Tests.Monitoring.Runtime
             Assert.Contains($"BLOCKED (path guard): {configuredPath}", manifest);
         }
 
+        // %TEMP% lives under C:\Users, which the guard blocks in every mode — the positive
+        // configured-path cases run beside the test assembly, in unrestricted mode.
+        private sealed class ConfiguredPathTree : System.IDisposable
+        {
+            public string Root { get; } = Path.Combine(
+                System.AppContext.BaseDirectory, "diag-paths-" + System.Guid.NewGuid().ToString("N"));
+            public string Logs => Path.Combine(Root, "Logs");
+
+            public ConfiguredPathTree()
+            {
+                Directory.CreateDirectory(Path.Combine(Logs, "sub"));
+                File.WriteAllText(Path.Combine(Root, "parent-only.txt"), "not configured");
+                File.WriteAllText(Path.Combine(Logs, "app.log"), "configured");
+                File.WriteAllText(Path.Combine(Logs, "sub", "app.log"), "below");
+            }
+
+            public void Dispose()
+            {
+                try { Directory.Delete(Root, recursive: true); } catch { /* best effort */ }
+            }
+        }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("\\")]
+        public void BuildArchiveBytes_folder_entry_collects_the_folder_not_its_parent(string trailing)
+        {
+            using var rig = new Rig();
+            using var tree = new ConfiguredPathTree();
+
+            var bytes = rig.Build(cfg =>
+                {
+                    cfg.UnrestrictedMode = true;
+                    cfg.DiagnosticsLogPaths.Add(new AutopilotMonitor.Shared.Models.DiagnosticsLogPath
+                    {
+                        Path = tree.Logs + trailing,
+                        IncludeSubfolders = true,
+                    });
+                })
+                .BuildArchiveBytes(enrollmentSucceeded: true);
+
+            var entries = ZipEntryNames(bytes);
+            Assert.Contains("AdditionalLogs/Logs/app.log", entries);
+            Assert.Contains("AdditionalLogs/Logs/sub/app.log", entries);
+            Assert.DoesNotContain(entries, e => e.EndsWith("parent-only.txt"));
+        }
+
+        [Fact]
+        public void BuildArchiveBytes_file_entry_ignores_include_subfolders()
+        {
+            using var rig = new Rig();
+            using var tree = new ConfiguredPathTree();
+
+            var bytes = rig.Build(cfg =>
+                {
+                    cfg.UnrestrictedMode = true;
+                    cfg.DiagnosticsLogPaths.Add(new AutopilotMonitor.Shared.Models.DiagnosticsLogPath
+                    {
+                        Path = Path.Combine(tree.Logs, "app.log"),
+                        IncludeSubfolders = true,
+                    });
+                })
+                .BuildArchiveBytes(enrollmentSucceeded: true);
+
+            var entries = ZipEntryNames(bytes);
+            Assert.Contains("AdditionalLogs/Logs/app.log", entries);
+            Assert.DoesNotContain("AdditionalLogs/Logs/sub/app.log", entries);
+        }
+
+        [Fact]
+        public void EnumerateFilesNoReparseDirs_asks_the_guard_before_entering_a_subfolder()
+        {
+            using var tree = new ConfiguredPathTree();
+            var refused = new List<string>();
+
+            var files = DiagnosticsPackageService.EnumerateFilesNoReparseDirs(
+                tree.Root, "*", recurse: true,
+                mayEnterDirectory: dir => !dir.EndsWith("sub"),
+                refusedDirectories: refused);
+
+            Assert.Contains(Path.Combine(tree.Logs, "app.log"), files);
+            Assert.DoesNotContain(Path.Combine(tree.Logs, "sub", "app.log"), files);
+            Assert.Equal(new[] { Path.Combine(tree.Logs, "sub") }, refused);
+        }
+
         [Fact]
         public void BuildArchiveBytes_excludes_top_level_session_id_and_bootstrap_config()
         {

src/Agent/AutopilotMonitor.Agent.V2.Core.Tests/Orchestration/SignalActivityClassifierTests.cs

@@ -37,6 +37,12 @@ namespace AutopilotMonitor.Agent.V2.Core.Tests.Orchestration
         [InlineData("modern_deployment_log")]
         // Environment observation — battery drain on an idle device must not reset idle clocks.
         [InlineData("power_state_change")]
+        // A flapping link is environment too: it must neither keep the collectors awake nor
+        // reset the stall clock of the enrollment it is stalling.
+        [InlineData("network_state_change")]
+        [InlineData("network_connectivity_check")]
+        // Bookkeeping of health-script runs that were deliberately not reported.
+        [InlineData("script_recurrence_summary")]
         // Agent health / control / transport — not device/enrollment progress (P2).
         [InlineData("collector_degraded")]
         [InlineData("telemetry_upload_poisoned")]
@@ -67,6 +73,18 @@ namespace AutopilotMonitor.Agent.V2.Core.Tests.Orchestration
             Assert.True(SignalActivityClassifier.IsRealActivity(DecisionSignalKind.InformationalEvent, payload));
         }
 
+        [Theory]
+        // Only the link-change pair is exempt. The device-info snapshots are emitted at start
+        // and at the end, not per flap, and stay activity.
+        [InlineData("network_interface_info")]
+        [InlineData("wifi_signal_info")]
+        [InlineData("network_bandwidth_estimate")]
+        public void Other_network_events_remain_activity(string eventType)
+        {
+            var payload = new Dictionary<string, string> { [SignalPayloadKeys.EventType] = eventType };
+            Assert.True(SignalActivityClassifier.IsRealActivity(DecisionSignalKind.InformationalEvent, payload));
+        }
+
         [Theory]
         // Genuine ModernDeployment warnings/errors stay real activity — only the Info/Debug
         // `modern_deployment_log` forwarding is excluded.

src/Agent/AutopilotMonitor.Agent.V2.Core.Tests/Program/ProgramGuardsTests.cs

@@ -302,6 +302,114 @@ namespace AutopilotMonitor.Agent.V2.Core.Tests.Program
             Assert.False(File.Exists(path));
         }
 
+        // ================================================================= Multi-instance guard
+
+        private static AutopilotMonitor.Agent.V2.Program.AgentProcessFact Proc(int pid, int sessionId)
+            => new AutopilotMonitor.Agent.V2.Program.AgentProcessFact(pid, sessionId);
+
+        [Fact]
+        public void FindSiblingAgentPid_ignores_a_same_named_process_in_a_user_session()
+        {
+            // The agent (pid 100, session 0) starts while a standard user keeps a process with
+            // the agent's image name resident in their own session. It must not block the start.
+            var matches = new[] { Proc(100, 0), Proc(200, 1) };
+
+            Assert.Equal(0, AutopilotMonitor.Agent.V2.Program.FindSiblingAgentPid(matches, ownPid: 100));
+        }
+
+        [Theory]
+        [InlineData(1)]
+        [InlineData(2)]
+        [InlineData(7)]
+        [InlineData(-1)]
+        public void FindSiblingAgentPid_ignores_every_session_but_zero(int sessionId)
+        {
+            var matches = new[] { Proc(100, 0), Proc(200, sessionId) };
+
+            Assert.Equal(0, AutopilotMonitor.Agent.V2.Program.FindSiblingAgentPid(matches, ownPid: 100));
+        }
+
+        [Fact]
+        public void FindSiblingAgentPid_reports_a_second_runtime_in_session_zero()
+        {
+            // Self-update restart while the old runtime is still alive — the single-agent
+            // invariant the guard exists for.
+            var matches = new[] { Proc(100, 0), Proc(300, 0) };
+
+            Assert.Equal(300, AutopilotMonitor.Agent.V2.Program.FindSiblingAgentPid(matches, ownPid: 100));
+        }
+
+        [Fact]
+        public void FindSiblingAgentPid_never_reports_the_caller_itself()
+        {
+            var matches = new[] { Proc(100, 0) };
+
+            Assert.Equal(0, AutopilotMonitor.Agent.V2.Program.FindSiblingAgentPid(matches, ownPid: 100));
+        }
+
+        [Fact]
+        public void FindSiblingAgentPid_skips_user_session_processes_listed_before_the_runtime()
+        {
+            // Install-mode launch verification: a user-session process enumerated first must not
+            // be reported as the launched runtime.
+            var matches = new[] { Proc(200, 1), Proc(201, 2), Proc(100, 0), Proc(300, 0) };
+
+            Assert.Equal(300, AutopilotMonitor.Agent.V2.Program.FindSiblingAgentPid(matches, ownPid: 100));
+        }
+
+        [Fact]
+        public void FindSiblingAgentPid_blocks_an_interactive_start_next_to_the_session_zero_runtime()
+        {
+            // --console run from an admin prompt (session 1) while the Scheduled Task runtime is up.
+            var matches = new[] { Proc(100, 1), Proc(300, 0) };
+
+            Assert.Equal(300, AutopilotMonitor.Agent.V2.Program.FindSiblingAgentPid(matches, ownPid: 100));
+        }
+
+        [Fact]
+        public void FindSiblingAgentPid_returns_zero_for_no_matches()
+        {
+            Assert.Equal(0, AutopilotMonitor.Agent.V2.Program.FindSiblingAgentPid(
+                new AutopilotMonitor.Agent.V2.Program.AgentProcessFact[0], ownPid: 100));
+            Assert.Equal(0, AutopilotMonitor.Agent.V2.Program.FindSiblingAgentPid(null, ownPid: 100));
+        }
+
+        [Fact]
+        public void SnapshotProcessesByName_reads_pid_and_session_of_the_running_test_host()
+        {
+            using var self = System.Diagnostics.Process.GetCurrentProcess();
+
+            var facts = AutopilotMonitor.Agent.V2.Program.SnapshotProcessesByName(self.ProcessName);
+
+            var own = Assert.Single(facts, f => f.Pid == self.Id);
+            Assert.Equal(self.SessionId, own.SessionId);
+        }
+
+        [Fact]
+        public void SnapshotProcessesByName_reads_the_session_of_system_owned_processes_without_access_rights()
+        {
+            // Positive control for the fail-open direction: the session id comes from the process
+            // snapshot, not from an opened handle, so even an unprivileged caller reads it for
+            // SYSTEM-owned service hosts. A skipped process would let a real sibling go unseen.
+            var expected = System.Diagnostics.Process.GetProcessesByName("svchost");
+            foreach (var p in expected) p.Dispose();
+
+            var facts = AutopilotMonitor.Agent.V2.Program.SnapshotProcessesByName("svchost");
+
+            Assert.NotEmpty(facts);
+            Assert.All(facts, f => Assert.True(f.Pid > 0));
+            Assert.Contains(facts, f => f.SessionId == 0);
+            // Service hosts come and go; a wholesale access failure would drop (nearly) all of them.
+            Assert.True(facts.Count >= expected.Length / 2,
+                $"Snapshot returned {facts.Count} of ~{expected.Length} svchost processes.");
+        }
+
+        [Fact]
+        public void SnapshotProcessesByName_returns_empty_for_an_unknown_name()
+        {
+            Assert.Empty(AutopilotMonitor.Agent.V2.Program.SnapshotProcessesByName("no-such-process-" + Guid.NewGuid().ToString("N")));
+        }
+
         // ================================================================= Crash log writer
 
         [Fact]

src/Agent/AutopilotMonitor.Agent.V2.Core/Monitoring/Enrollment/Ime/ImeLogTracker.Handlers.cs

@@ -252,10 +252,22 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
                 // duration when the consolidated [HS] new result line arrives (the slot above is
                 // cleared by the early-signal HS-COMPLIANCE handler, so timing lives in its own
                 // map). Prefer the source CMTrace timestamp; latest start wins on a policy re-run.
-                _healthScriptStartTimes[id] = LastMatchedLogTimestamp ?? DateTime.UtcNow;
+                var startedAtUtc = LastMatchedLogTimestamp ?? DateTime.UtcNow;
+                _healthScriptStartTimes[id] = startedAtUtc;
                 _logger.Info($"ImeLogTracker: health script started: {id}");
-                try { OnScriptStarted?.Invoke(new ScriptStartedInfo { PolicyId = id, ScriptType = "remediation", PolicyType = policyType }); }
-                catch (Exception ex) { _logger.Warning($"ImeLogTracker: OnScriptStarted handler threw: {ex.Message}"); }
+
+                // A replayed line of a previous enrollment bypasses the recurrence gate: the
+                // adapter drops its event, and a dropped run must not count as the policy's
+                // first report.
+                if (!_currentLineIsHistoricReplay
+                    && !_recurringScripts.OnStart(id, startedAtUtc, policyType, LastMatchedPatternId))
+                {
+                    _stateDirty = true;
+                    _logger.Debug($"ImeLogTracker: health script {id} is a recurring policy — start held until its result is known");
+                    return;
+                }
+                _stateDirty = true;
+                RaiseScriptStarted(new ScriptStartedInfo { PolicyId = id, ScriptType = "remediation", PolicyType = policyType });
             }
             else
             {
@@ -794,6 +806,17 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
             _pendingHealthScript = null;
         }
 
+        /// <summary>
+        /// Test seam: a health-script start line for <paramref name="id"/> stamped
+        /// <paramref name="startedAtUtc"/>, without driving the regex pipeline.
+        /// </summary>
+        internal void HandleHealthScriptStartForTest(string id, DateTime startedAtUtc)
+        {
+            LastMatchedLogTimestamp = startedAtUtc;
+            var match = System.Text.RegularExpressions.Regex.Match(id ?? string.Empty, @"(?<id>.+)");
+            HandleScriptStarted(match, new Dictionary<string, string> { ["scriptType"] = "remediation" });
+        }
+
         /// <summary>
         /// Test seam: simulates the full HS-SCRIPT-START → HS-RUN-CONTEXT / HS-EXITCODE /
         /// HS-STDOUT / HS-STDERR → HS-COMPLIANCE sequence by directly populating the
@@ -1052,9 +1075,58 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
         private void EmitScriptEvent(ScriptExecutionState script)
         {
             if (script == null || string.IsNullOrEmpty(script.PolicyId)) return;
+
+            // Health scripts recur for as long as the device is up; platform scripts run once.
+            if (string.Equals(script.ScriptType, "remediation", StringComparison.OrdinalIgnoreCase)
+                && !_currentLineIsHistoricReplay)
+            {
+                var emit = _recurringScripts.OnResult(script, LastMatchedLogTimestamp ?? UtcNowProvider(), out var releasedStart);
+                _stateDirty = true;
+                if (!emit)
+                {
+                    _logger.Debug($"ImeLogTracker: health script {script.PolicyId} {script.ScriptPart} repeats its last reported result — counted, not emitted");
+                    return;
+                }
+                if (releasedStart != null) RaiseScriptStarted(releasedStart);
+            }
+
             OnScriptCompleted?.Invoke(script);
         }
 
+        private void RaiseScriptStarted(ScriptStartedInfo info)
+        {
+            try { OnScriptStarted?.Invoke(info); }
+            catch (Exception ex) { _logger.Warning($"ImeLogTracker: OnScriptStarted handler threw: {ex.Message}"); }
+        }
+
+        /// <summary>
+        /// A held start whose run produced no result for <see cref="HeldScriptStartGrace"/> is
+        /// emitted after all: the script did not finish. On shutdown the shorter
+        /// <see cref="HeldScriptStartShutdownGrace"/> applies — a start read moments before the
+        /// stop stays held for the next run of this session instead of reading as unfinished.
+        /// </summary>
+        internal void FlushRecurringScripts(DateTime nowUtc, bool shuttingDown)
+        {
+            var released = _recurringScripts.ReleaseStartsWithoutResult(
+                nowUtc, shuttingDown ? HeldScriptStartShutdownGrace : HeldScriptStartGrace);
+            foreach (var start in released) RaiseScriptStarted(start);
+
+            if (shuttingDown)
+            {
+                foreach (var summary in _recurringScripts.TakeSummaries())
+                {
+                    try { OnScriptRecurrenceSummary?.Invoke(summary); }
+                    catch (Exception ex) { _logger.Warning($"ImeLogTracker: OnScriptRecurrenceSummary handler threw: {ex.Message}"); }
+                }
+            }
+
+            if (_recurringScripts.ConsumeDirty()) _stateDirty = true;
+        }
+
+        // IME aborts a health script after roughly 30 minutes.
+        internal static readonly TimeSpan HeldScriptStartGrace = TimeSpan.FromMinutes(30);
+        internal static readonly TimeSpan HeldScriptStartShutdownGrace = TimeSpan.FromMinutes(5);
+
         private static string TruncateOutput(string output)
         {
             if (string.IsNullOrEmpty(output) || output.Length <= MaxScriptOutputLength)

src/Agent/AutopilotMonitor.Agent.V2.Core/Monitoring/Enrollment/Ime/ImeLogTracker.LogProcessing.cs

@@ -551,6 +551,7 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
             // replays historic logs on purpose and bypasses the guard.
             var isStaleReplayLine = !SimulationMode && entry != null
                 && (UtcNowProvider() - NormalizeUtc(ResolveEntryUtc(entry))) > HistoricReplayThreshold;
+            _currentLineIsHistoricReplay = isStaleReplayLine;
             if (isStaleReplayLine && AppMutatingActions.Contains(pattern.Action?.ToLower() ?? string.Empty))
             {
                 _logger.Debug($"ImeLogTracker: skipped app action '{pattern.Action}' for historic line ({ResolveEntryUtc(entry):o})");

src/Agent/AutopilotMonitor.Agent.V2.Core/Monitoring/Enrollment/Ime/ImeLogTracker.cs

@@ -192,6 +192,13 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
         // UI dedupe (dataCompleteness scoring).
         private ScriptExecutionState _pendingHealthScript;
 
+        // Collapses recurring health-script runs; persisted with the file positions.
+        private readonly RecurringScriptGate _recurringScripts = new RecurringScriptGate();
+
+        // Set for the duration of one pattern dispatch: the matched line is older than
+        // HistoricReplayThreshold, so the adapter drops whatever it produces.
+        private bool _currentLineIsHistoricReplay;
+
         // Cycle start timestamps for health (remediation) scripts, keyed by policyId. Captured
         // from the HS-SCRIPT-START line ([HS] ProcessScript) so the consolidated HS-NEW-RESULT
         // emit can surface the cycle's total run duration (start → result) on its phase events —
@@ -336,7 +343,15 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
         private int _unanchoredPatterns;
         private int _filesTailed;
         private long _backlogBytes;
+        // Poll-loop timing (restart-safe maxima on a monotonic clock): the longest pass and the
+        // longest pause between passes — see ImeTrackerHealth.PassMaxMs / PassGapMaxMs.
+        private long _passMaxMs;
+        private long _passGapMaxMs;
+        private long _lastPassEndMs = -1;
         private string _imeAgentVersionSeen;
+
+        /// <summary>Monotonic milliseconds for the poll-loop timing; tests substitute a counter.</summary>
+        internal Func<long> MonotonicMillisProvider { get; set; } = () => Stopwatch.GetTimestamp() * 1000 / Stopwatch.Frequency;
         private bool _trackerDegradedFired;
         private readonly Dictionary<string, int> _patternHits = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
 
@@ -370,6 +385,8 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
                     OverwriteBytesReprocessed = _overwriteBytesReprocessed,
                     VerifyPasses = _verifyPasses,
                     VerifiedBytes = _verifiedBytes,
+                    PassMaxMs = _passMaxMs,
+                    PassGapMaxMs = _passGapMaxMs,
                     PatternHits = new Dictionary<string, int>(_patternHits, StringComparer.OrdinalIgnoreCase),
                 };
             }
@@ -488,6 +505,12 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
         /// </summary>
         public Action<ScriptStartedInfo> OnScriptStarted { get; set; }
 
+        /// <summary>
+        /// Fires when the tracker stops, once per health-script policy whose repeated runs were
+        /// counted instead of emitted since the last summary (see <see cref="RecurringScriptGate"/>).
+        /// </summary>
+        public Action<ScriptRecurrenceSummary> OnScriptRecurrenceSummary { get; set; }
+
         /// <summary>
         /// Fires on every pattern match with the matched <c>PatternId</c>. Plan §4.x M4.4.4.
         /// Invoked by <c>HandlePatternMatch</c> after <see cref="LastMatchedPatternId"/> is
@@ -954,18 +977,7 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
                 {
                     try
                     {
-                        await CheckLogFilesAsync(token);
-
-                        // Platform-script completions that wait for the other file: an IME result
-                        // held for its executor end block, and the exit-code fallback for a
-                        // result IME never logged within the grace period. Runs on this same loop
-                        // thread (no locking) so it observes the buffer right after parsing.
-                        FlushPendingPlatformScriptResults(UtcNowProvider());
-
-                        // Token-failure grace window: fires only when the failure stayed
-                        // unresolved (no IME-TOKEN-SUCCESS) for the whole window. Runs after
-                        // the drain so a success later in the same batch clears first.
-                        CheckPendingTokenFailure(DateTime.UtcNow);
+                        await RunPollPassAsync(token);
                     }
                     catch (OperationCanceledException) { break; }
                     catch (Exception ex)
@@ -995,6 +1007,9 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
                 try { FlushPendingPlatformScriptResults(UtcNowProvider(), force: true); }
                 catch (Exception ex) { _logger.Warning($"ImeLogTracker: shutdown script flush failed: {ex.Message}"); }
 
+                try { FlushRecurringScripts(UtcNowProvider(), shuttingDown: true); }
+                catch (Exception ex) { _logger.Warning($"ImeLogTracker: shutdown recurring-script flush failed: {ex.Message}"); }
+
                 // Final state save on shutdown
                 if (_stateDirty)
                 {
@@ -1006,6 +1021,37 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
             }, token);
         }
 
+        /// <summary>
+        /// One poll pass, timed: the file reads, then the platform-script completions that wait
+        /// for the other file (an IME result held for its executor end block, the exit-code
+        /// fallback for a result IME never logged), then the token-failure grace window — all on
+        /// this one loop thread, no locking, so the flushes observe the buffers right after
+        /// parsing. The longest pass and the longest pause since the previous pass ended are the
+        /// session's <see cref="ImeTrackerHealth.PassMaxMs"/> / <see cref="ImeTrackerHealth.PassGapMaxMs"/>.
+        /// </summary>
+        internal async Task RunPollPassAsync(CancellationToken token)
+        {
+            var startMs = MonotonicMillisProvider();
+            if (_lastPassEndMs >= 0 && startMs - _lastPassEndMs > _passGapMaxMs)
+            {
+                _passGapMaxMs = startMs - _lastPassEndMs;
+                _stateDirty = true;
+            }
+
+            await CheckLogFilesAsync(token);
+            FlushPendingPlatformScriptResults(UtcNowProvider());
+            FlushRecurringScripts(UtcNowProvider(), shuttingDown: false);
+            CheckPendingTokenFailure(UtcNowProvider());
+
+            var endMs = MonotonicMillisProvider();
+            if (endMs - startMs > _passMaxMs)
+            {
+                _passMaxMs = endMs - startMs;
+                _stateDirty = true;
+            }
+            _lastPassEndMs = endMs;
+        }
+
         /// <summary>
         /// Stops the background polling task
         /// </summary>
@@ -1134,6 +1180,8 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
                     _scriptTimeoutSuspectedPosted.Add(id);
             }
 
+            _recurringScripts.Restore(state.RecurringScripts);
+
             // Health counters + histogram: a restart (or WhiteGlove Part 2) must report the
             // whole session, not only the lines seen since the last start. Null on state files
             // written before these fields existed → counters start at zero.
@@ -1155,6 +1203,8 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
                     _overwriteBytesReprocessed = state.Health.OverwriteBytesReprocessed;
                     _verifyPasses = state.Health.VerifyPasses;
                     _verifiedBytes = state.Health.VerifiedBytes;
+                    _passMaxMs = state.Health.PassMaxMs;
+                    _passGapMaxMs = state.Health.PassGapMaxMs;
                 }
                 if (state.PatternHits != null)
                 {
@@ -1208,6 +1258,7 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
                 PlatformScriptResultEmittedAt = new Dictionary<string, DateTime>(_platformScriptResultEmitted, StringComparer.OrdinalIgnoreCase),
                 PendingPlatformScripts = _pendingPlatformScripts.Values.ToList(),
                 ScriptTimeoutSuspectedPosted = _scriptTimeoutSuspectedPosted.ToList(),
+                RecurringScripts = _recurringScripts.ToPersisted(),
             };
 
             lock (_healthLock)
@@ -1228,6 +1279,8 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
                     OverwriteBytesReprocessed = _overwriteBytesReprocessed,
                     VerifyPasses = _verifyPasses,
                     VerifiedBytes = _verifiedBytes,
+                    PassMaxMs = _passMaxMs,
+                    PassGapMaxMs = _passGapMaxMs,
                 };
                 state.PatternHits = new Dictionary<string, int>(_patternHits, StringComparer.OrdinalIgnoreCase);
             }

src/Agent/AutopilotMonitor.Agent.V2.Core/Monitoring/Enrollment/Ime/ImeTrackerHealth.cs

@@ -63,6 +63,24 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
         /// <summary>Bytes re-read for verification, guard-zone checks included — the cost of the overwrite detection.</summary>
         public long VerifiedBytes { get; set; }
 
+        /// <summary>
+        /// Longest single poll pass this session (one <c>CheckLogFilesAsync</c> plus the
+        /// flushes), milliseconds on a monotonic clock. A pass spends its time in the file
+        /// reads, the ledger verifications and the regex matching; the fleet baseline is well
+        /// under 100 ms.
+        /// </summary>
+        public long PassMaxMs { get; set; }
+
+        /// <summary>
+        /// Longest pause between the end of one poll pass and the start of the next this
+        /// session, milliseconds. The loop sleeps 100 ms between passes and saves its state now
+        /// and then; anything far above that is the loop not being scheduled — session c3ecb568
+        /// lost 26 s this way at 100 % VM CPU while the rest of the agent kept running. Late
+        /// reading, not lost data: every event keeps its log line's own timestamp, and a
+        /// result read before its executor end block waits for it.
+        /// </summary>
+        public long PassGapMaxMs { get; set; }
+
         /// <summary>Match count per enabled pattern ID — every enabled pattern is present, zeros included.</summary>
         public IReadOnlyDictionary<string, int> PatternHits { get; set; }
 

src/Agent/AutopilotMonitor.Agent.V2.Core/Monitoring/Enrollment/Ime/ImeTrackerStatePersistence.cs

@@ -153,6 +153,11 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
         public List<ScriptExecutionState> PendingPlatformScripts { get; set; }
         public List<string> ScriptTimeoutSuspectedPosted { get; set; }
 
+        // Recurring health-script runs collapsed per policy. Saved in the same write as
+        // FilePositions on purpose: after a hard kill both fall back together, so re-read lines
+        // are counted again instead of twice. Null on older state files → empty.
+        public Dictionary<string, RecurringScriptPolicyState> RecurringScripts { get; set; }
+
         // Cumulative tracker health + per-pattern histogram (ime_pattern_hits / ime_tracker_degraded,
         // 2026-08-30). Restart-safe on purpose: WhiteGlove Part 2 reports the whole session and the
         // one-shot degraded event must not fire twice. Null on older state files → zero.
@@ -177,6 +182,9 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
         public long OverwriteBytesReprocessed { get; set; }
         public long VerifyPasses { get; set; }
         public long VerifiedBytes { get; set; }
+        // Poll-loop timing maxima (null-defaulting on older state files).
+        public long PassMaxMs { get; set; }
+        public long PassGapMaxMs { get; set; }
     }
 
     public class PackageStateData

src/Agent/AutopilotMonitor.Agent.V2.Core/Monitoring/Enrollment/Ime/RecurringScriptGate.cs

@@ -0,0 +1,257 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Enrollment.Ime
+{
+    /// <summary>
+    /// Collapses recurring health-script (proactive remediation) runs. IME re-runs every assigned
+    /// policy on its own schedule for as long as the device is up; an enrollment that waits for
+    /// its user for days would otherwise report every hourly run of every policy. A policy's
+    /// first run and every run whose result differs from the last reported one are emitted in
+    /// full; runs that repeat the last reported result are only counted and surface once per
+    /// policy as a recurrence summary.
+    /// <para>
+    /// The start signal of an already known policy is held until its result is known, because
+    /// the running indicators (web panel, session coverage) pair a start with a later result of
+    /// the same policy — a start whose result was collapsed would read as "still running".
+    /// </para>
+    /// <para>
+    /// The state is part of the tracker state file and is saved in the same write as the file
+    /// positions: after a hard kill both fall back together, the lines after the last save are
+    /// read again and counted again — nothing is lost and nothing counts twice.
+    /// </para>
+    /// Not thread-safe: called from the tracker's single poll thread only.
+    /// </summary>
+    public sealed class RecurringScriptGate
+    {
+        private readonly Dictionary<string, RecurringScriptPolicyState> _policies =
+            new Dictionary<string, RecurringScriptPolicyState>(StringComparer.OrdinalIgnoreCase);
+
+        /// <summary>True when any call changed persisted state since the last <see cref="ConsumeDirty"/>.</summary>
+        private bool _dirty;
+
+        public bool ConsumeDirty()
+        {
+            var wasDirty = _dirty;
+            _dirty = false;
+            return wasDirty;
+        }
+
+        /// <summary>
+        /// A start line was read. Returns <c>true</c> when the start signal is emitted right away
+        /// (first run of the policy); <c>false</c> when it is held until the run's result is known.
+        /// </summary>
+        public bool OnStart(string policyId, DateTime startedAtUtc, string policyType, string patternId)
+        {
+            if (string.IsNullOrEmpty(policyId)) return true;
+
+            var isKnown = _policies.TryGetValue(policyId, out var state);
+            if (!isKnown)
+            {
+                state = new RecurringScriptPolicyState();
+                _policies[policyId] = state;
+            }
+
+            CloseHeldRun(state);
+            state.RunsObserved++;
+            _dirty = true;
+
+            if (!isKnown) return true;
+
+            state.HeldStartAtUtc = startedAtUtc;
+            state.HeldStartPolicyType = policyType;
+            state.HeldStartPatternId = patternId;
+            state.HeldRunSawResult = false;
+            return false;
+        }
+
+        /// <summary>
+        /// A result (one phase event) is about to be emitted. Returns <c>true</c> to emit it; when
+        /// the run's start was held, <paramref name="releasedStart"/> carries the start signal to
+        /// emit first. Returns <c>false</c> when the result repeats the last reported one.
+        /// </summary>
+        public bool OnResult(ScriptExecutionState script, DateTime observedAtUtc, out ScriptStartedInfo releasedStart)
+        {
+            releasedStart = null;
+            if (script == null || string.IsNullOrEmpty(script.PolicyId)) return true;
+
+            if (!_policies.TryGetValue(script.PolicyId, out var state))
+            {
+                state = new RecurringScriptPolicyState();
+                _policies[script.PolicyId] = state;
+            }
+
+            var key = SignatureKey(script);
+            var signature = Signature(script);
+            _dirty = true;
+
+            if (state.Signatures.TryGetValue(key, out var last) && string.Equals(last, signature, StringComparison.Ordinal))
+            {
+                state.CollapsedResults++;
+                if (!state.FirstCollapsedAtUtc.HasValue) state.FirstCollapsedAtUtc = observedAtUtc;
+                state.LastCollapsedAtUtc = observedAtUtc;
+                if (state.HeldStartAtUtc.HasValue) state.HeldRunSawResult = true;
+                return false;
+            }
+
+            state.Signatures[key] = signature;
+            releasedStart = ReleaseHeldStart(script.PolicyId, state);
+            return true;
+        }
+
+        /// <summary>
+        /// Start signals that were held for at least <paramref name="minAge"/> without any result:
+        /// the script did not finish, which is exactly what the running indicators are for.
+        /// </summary>
+        public List<ScriptStartedInfo> ReleaseStartsWithoutResult(DateTime nowUtc, TimeSpan minAge)
+        {
+            var released = new List<ScriptStartedInfo>();
+            foreach (var kv in _policies)
+            {
+                var state = kv.Value;
+                if (!state.HeldStartAtUtc.HasValue || state.HeldRunSawResult) continue;
+                if (nowUtc - state.HeldStartAtUtc.Value < minAge) continue;
+                released.Add(ReleaseHeldStart(kv.Key, state));
+                _dirty = true;
+            }
+            return released;
+        }
+
+        /// <summary>
+        /// One summary per policy whose collapsed-run count grew since the last summary. Marks
+        /// the reported count, so a later stop of the same session only reports new growth.
+        /// </summary>
+        public List<ScriptRecurrenceSummary> TakeSummaries()
+        {
+            var summaries = new List<ScriptRecurrenceSummary>();
+            foreach (var kv in _policies)
+            {
+                var state = kv.Value;
+                var collapsedRuns = state.RunsCollapsed + (state.HeldStartAtUtc.HasValue && state.HeldRunSawResult ? 1 : 0);
+                if (collapsedRuns <= state.RunsCollapsedAtLastSummary) continue;
+
+                summaries.Add(new ScriptRecurrenceSummary
+                {
+                    PolicyId = kv.Key,
+                    RunsObserved = state.RunsObserved,
+                    RunsCollapsed = collapsedRuns,
+                    RunsWithoutResult = state.RunsWithoutResult,
+                    CollapsedResults = state.CollapsedResults,
+                    FirstCollapsedAtUtc = state.FirstCollapsedAtUtc,
+                    LastCollapsedAtUtc = state.LastCollapsedAtUtc,
+                });
+                state.RunsCollapsedAtLastSummary = collapsedRuns;
+                _dirty = true;
+            }
+            return summaries;
+        }
+
+        public Dictionary<string, RecurringScriptPolicyState> ToPersisted() =>
+            new Dictionary<string, RecurringScriptPolicyState>(_policies, StringComparer.OrdinalIgnoreCase);
+
+        public void Restore(Dictionary<string, RecurringScriptPolicyState> persisted)
+        {
+            _policies.Clear();
+            if (persisted == null) return;
+            foreach (var kv in persisted)
+            {
+                if (string.IsNullOrEmpty(kv.Key) || kv.Value == null) continue;
+                if (kv.Value.Signatures == null)
+                    kv.Value.Signatures = new Dictionary<string, string>(StringComparer.Ordinal);
+                _policies[kv.Key] = kv.Value;
+            }
+        }
+
+        // A held run ends when the next start of the policy arrives: all its results repeated the
+        // last report (collapsed), or it never produced one.
+        private static void CloseHeldRun(RecurringScriptPolicyState state)
+        {
+            if (!state.HeldStartAtUtc.HasValue) return;
+            if (state.HeldRunSawResult) state.RunsCollapsed++;
+            else state.RunsWithoutResult++;
+            ClearHeldStart(state);
+        }
+
+        private static ScriptStartedInfo ReleaseHeldStart(string policyId, RecurringScriptPolicyState state)
+        {
+            if (!state.HeldStartAtUtc.HasValue) return null;
+            var info = new ScriptStartedInfo
+            {
+                PolicyId = policyId,
+                ScriptType = "remediation",
+                PolicyType = state.HeldStartPolicyType,
+                SourceTimestampUtc = state.HeldStartAtUtc,
+                PatternId = state.HeldStartPatternId,
+            };
+            ClearHeldStart(state);
+            return info;
+        }
+
+        private static void ClearHeldStart(RecurringScriptPolicyState state)
+        {
+            state.HeldStartAtUtc = null;
+            state.HeldStartPolicyType = null;
+            state.HeldStartPatternId = null;
+            state.HeldRunSawResult = false;
+        }
+
+        // The early compliance signal and the consolidated result of one phase differ in
+        // completeness (only the latter knows RemediationStatus); keyed apart, or the two would
+        // overwrite each other's signature on every run and nothing would ever collapse.
+        private static string SignatureKey(ScriptExecutionState script) =>
+            (script.ScriptPart ?? string.Empty) + "|" + (script.DurationBasis ?? string.Empty);
+
+        private static string Signature(ScriptExecutionState script)
+        {
+            var culture = CultureInfo.InvariantCulture;
+            return string.Join("|",
+                script.ComplianceResult ?? string.Empty,
+                script.ExitCode.HasValue ? script.ExitCode.Value.ToString(culture) : string.Empty,
+                string.IsNullOrWhiteSpace(script.Stderr) ? "0" : "1",
+                script.RemediationStatus.HasValue ? script.RemediationStatus.Value.ToString(culture) : string.Empty,
+                script.ErrorCode.HasValue ? script.ErrorCode.Value.ToString(culture) : string.Empty);
+        }
+    }
+
+    /// <summary>Persisted per-policy state of <see cref="RecurringScriptGate"/>.</summary>
+    public class RecurringScriptPolicyState
+    {
+        /// <summary>Last reported result per phase and signal kind.</summary>
+        public Dictionary<string, string> Signatures { get; set; } = new Dictionary<string, string>(StringComparer.Ordinal);
+
+        /// <summary>Start lines read for the policy.</summary>
+        public int RunsObserved { get; set; }
+
+        /// <summary>Runs whose every result repeated the last reported one.</summary>
+        public int RunsCollapsed { get; set; }
+
+        /// <summary>Runs that were followed by the next start without any result in between.</summary>
+        public int RunsWithoutResult { get; set; }
+
+        /// <summary>Phase events that were not emitted.</summary>
+        public int CollapsedResults { get; set; }
+
+        public DateTime? FirstCollapsedAtUtc { get; set; }
+        public DateTime? LastCollapsedAtUtc { get; set; }
+
+        public DateTime? HeldStartAtUtc { get; set; }
+        public string HeldStartPolicyType { get; set; }
+        public string HeldStartPatternId { get; set; }
+        public bool HeldRunSawResult { get; set; }
+
+        public int RunsCollapsedAtLastSummary { get; set; }
+    }
+
+    /// <summary>What <see cref="RecurringScriptGate"/> collapsed for one policy.</summary>
+    public class ScriptRecurrenceSummary
+    {
+        public string PolicyId { get; set; }
+        public int RunsObserved { get; set; }
+        public int RunsCollapsed { get; set; }
+        public int RunsWithoutResult { get; set; }
+        public int CollapsedResults { get; set; }
+        public DateTime? FirstCollapsedAtUtc { get; set; }
+        public DateTime? LastCollapsedAtUtc { get; set; }
+    }
+}

src/Agent/AutopilotMonitor.Agent.V2.Core/Monitoring/Enrollment/Ime/ScriptExecutionState.cs

@@ -142,4 +142,14 @@ public class ScriptStartedInfo
 
     /// <summary>Numeric IME PolicyType from the start line (captured as string), e.g. "6" for health scripts.</summary>
     public string PolicyType { get; set; }
+
+    /// <summary>
+    /// Source timestamp of the start line when the signal is emitted later than it was read
+    /// (a held start of a recurring health script, see <see cref="RecurringScriptGate"/>). Null
+    /// for a start emitted while its own line is the tracker's last matched one.
+    /// </summary>
+    public System.DateTime? SourceTimestampUtc { get; set; }
+
+    /// <summary>Pattern id of the start line; set together with <see cref="SourceTimestampUtc"/>.</summary>
+    public string PatternId { get; set; }
 }

src/Agent/AutopilotMonitor.Agent.V2.Core/Monitoring/Runtime/DiagnosticsPackageService.cs

@@ -99,7 +99,7 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Runtime
 
         /// <summary>
         /// Packaging problems that are not cap skips, per kind: <c>path-guard</c> (configured path
-        /// refused), <c>no-user-session</c> (user-profile token without a signed-in user),
+        /// or hard-blocked event log refused),<c>no-user-session</c> (user-profile token without a signed-in user),
         /// <c>folder-rejected</c>, <c>enumerate</c>, <c>open</c>, <c>copy</c>.
         /// </summary>
         public IReadOnlyDictionary<string, int> ProblemsByKind { get; set; } = Empty;
@@ -145,6 +145,10 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Runtime
         // exact point production is exposed. Null in production.
         internal Action<string> BeforeSourceFileOpen { get; set; }
 
+        // Test seam: which channel writes to an .evtx file. Production asks the registered
+        // channels; a test cannot register one.
+        internal Func<string, string> EventLogChannelResolver { get; set; } = ResolveChannelForEvtxFile;
+
         // Tracks per-build inclusion totals + skip reasons. Threaded through every
         // AddLogFiles call so caps are global across all sections, not per section.
         private sealed class BudgetTracker
@@ -462,17 +466,12 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Runtime
                     // 3. Configured additional log paths (global + tenant, validated by guards)
                     foreach (var entry in _configuration.DiagnosticsLogPaths ?? new System.Collections.Generic.List<Shared.Models.DiagnosticsLogPath>())
                     {
-                        // Resolve %LOGGED_ON_USER_PROFILE% token and get profile path for guard exception
+                        // The profile path only lifts the C:\Users block for entries that use the token.
                         var userProfilePath = UserProfileResolver.ContainsUserProfileToken(entry.Path)
                             ? UserProfileResolver.GetLoggedOnUserProfilePath() : null;
 
-                        if (!DiagnosticsPathGuards.IsDiagnosticsPathAllowed(entry.Path, _configuration.UnrestrictedMode, userProfilePath))
-                        {
-                            _logger.Warning($"Diagnostics path blocked by guard: {entry.Path}");
-                            ManifestLine($"BLOCKED (path guard): {entry.Path}");
-                            tracker.RecordProblem("path-guard");
-                            continue;
-                        }
+                        // Expand BEFORE the guard: the guard must judge the path that is read,
+                        // and an unresolved token is not a path it can judge.
                         var expandedPath = UserProfileResolver.ExpandCustomTokens(entry.Path);
                         if (expandedPath == null)
                         {
@@ -481,13 +480,23 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Runtime
                             tracker.RecordProblem("no-user-session");
                             continue;
                         }
-                        var folder = Path.GetDirectoryName(expandedPath);
-                        var pattern = Path.GetFileName(expandedPath);
-                        if (string.IsNullOrEmpty(folder)) continue;
-                        if (string.IsNullOrEmpty(pattern) || !pattern.Contains(".")) pattern = "*";
-                        var zipFolder = $"AdditionalLogs/{Path.GetFileName(folder)}";
-                        ManifestLine($"CONFIGURED PATH: '{entry.Path}' -> folder='{folder}' pattern='{pattern}'");
-                        AddLogFiles(archive, folder, zipFolder, pattern, tracker, entry.IncludeSubfolders);
+
+                        // The guard validates the folder that gets enumerated — never a path
+                        // derived from the validated one afterwards.
+                        if (!DiagnosticsPathGuards.TryResolveCollectionTarget(
+                                expandedPath, entry.IncludeSubfolders, _configuration.UnrestrictedMode, userProfilePath, out var target))
+                        {
+                            _logger.Warning($"Diagnostics path blocked by guard: {entry.Path}");
+                            ManifestLine($"BLOCKED (path guard): {entry.Path}");
+                            tracker.RecordProblem("path-guard");
+                            continue;
+                        }
+
+                        var unrestrictedMode = _configuration.UnrestrictedMode;
+                        var zipFolder = $"AdditionalLogs/{Path.GetFileName(target.Folder)}";
+                        ManifestLine($"CONFIGURED PATH: '{entry.Path}' -> folder='{target.Folder}' pattern='{target.Pattern}' recursive={target.Recurse}");
+                        AddLogFiles(archive, target.Folder, zipFolder, target.Pattern, tracker, target.Recurse,
+                            dir => DiagnosticsPathGuards.IsDirectoryEnterable(dir, unrestrictedMode, userProfilePath));
                     }
 
                     // Packaging manifest — always written, even when empty of problems, so its
@@ -617,14 +626,18 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Runtime
         // Recursive enumeration that skips reparse-point directories. Materializes the
         // result into a list so the caller can iterate without holding a directory handle.
         // Errors during enumeration are swallowed (logged via _logger by the caller).
-        private static List<string> EnumerateFilesNoReparseDirs(string folder, string pattern, bool recurse)
+        // mayEnterDirectory (configured paths only) is asked for every subdirectory before the
+        // walk descends: a hard-blocked subtree can sit below a folder that passed the guard.
+        internal static List<string> EnumerateFilesNoReparseDirs(string folder, string pattern, bool recurse,
+            Func<string, bool> mayEnterDirectory, List<string> refusedDirectories)
         {
             var result = new List<string>();
-            CollectFilesNoReparseDirs(folder, pattern, recurse, result);
+            CollectFilesNoReparseDirs(folder, pattern, recurse, mayEnterDirectory, refusedDirectories, result);
             return result;
         }
 
-        private static void CollectFilesNoReparseDirs(string folder, string pattern, bool recurse, List<string> result)
+        private static void CollectFilesNoReparseDirs(string folder, string pattern, bool recurse,
+            Func<string, bool> mayEnterDirectory, List<string> refusedDirectories, List<string> result)
         {
             string[] files;
             try { files = Directory.GetFiles(folder, pattern, SearchOption.TopDirectoryOnly); }
@@ -643,12 +656,17 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Runtime
                 try { attrs = File.GetAttributes(sub); }
                 catch { continue; }
                 if (IsReparsePoint(attrs)) continue;
-                CollectFilesNoReparseDirs(sub, pattern, recurse: true, result);
+                if (mayEnterDirectory != null && !mayEnterDirectory(sub))
+                {
+                    refusedDirectories.Add(sub);
+                    continue;
+                }
+                CollectFilesNoReparseDirs(sub, pattern, recurse: true, mayEnterDirectory, refusedDirectories, result);
             }
         }
 
         private void AddLogFiles(ZipArchive archive, string sourceFolder, string zipFolder, string searchPattern,
-            BudgetTracker tracker, bool includeSubfolders = false)
+            BudgetTracker tracker, bool includeSubfolders = false, Func<string, bool> mayEnterDirectory = null)
         {
             // The folder stays pinned (open handle) for this whole section. The path guards and
             // the enumeration below only ever judge path strings; every byte that reaches the
@@ -673,9 +691,11 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Runtime
                 }
 
                 List<string> files;
+                var refusedDirectories = new List<string>();
                 try
                 {
-                    files = EnumerateFilesNoReparseDirs(pinned.LexicalPath, searchPattern, includeSubfolders);
+                    files = EnumerateFilesNoReparseDirs(pinned.LexicalPath, searchPattern, includeSubfolders,
+                        mayEnterDirectory, refusedDirectories);
                 }
                 catch (Exception ex)
                 {
@@ -685,6 +705,13 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Runtime
                     return;
                 }
 
+                // Expected outcome, not a packaging problem: the subtree is off limits by design.
+                foreach (var refused in refusedDirectories)
+                {
+                    _logger.Info($"Diagnostics subfolder skipped by guard: {refused}");
+                    ManifestLine($"SKIPPED DIR (path guard): {refused}");
+                }
+
                 if (files.Count == 0)
                     ManifestLine($"NO MATCH: {sourceFolder} pattern '{searchPattern}'");
 
@@ -704,7 +731,22 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Runtime
                 // the tenant-configured BootstrapperAgent channel never made it into the ZIP.
                 if (file.EndsWith(".evtx", StringComparison.OrdinalIgnoreCase))
                 {
-                    tempExport = TryExportEventLogChannel(file);
+                    // Hard-blocked channels are refused for every source and in every mode,
+                    // by file name AND by the channel the export would read: the path guard
+                    // cannot judge what a wildcard or folder entry resolves to, and the %4
+                    // fallback of the resolver turns a "Security.evtx" in any allowed folder
+                    // into the live Security channel.
+                    var channel = EventLogChannelResolver(file);
+                    if (DiagnosticsPathGuards.IsHardBlockedEventLogFile(file) ||
+                        GatherRuleGuards.IsHardBlockedEventLogChannel(channel))
+                    {
+                        _logger.Warning($"Event log blocked by channel guard (channel '{channel}'): {file}");
+                        ManifestLine($"BLOCKED (event-log channel guard, channel '{channel}'): {file}");
+                        tracker.RecordProblem("path-guard");
+                        return;
+                    }
+
+                    tempExport = TryExportEventLogChannel(file, channel);
                     if (tempExport == null)
                     {
                         // Export failed (channel not resolvable / wevtutil error) — fall through
@@ -850,16 +892,16 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Runtime
         /// <summary>
         /// Exports the event-log channel behind a winevt .evtx file to a temp copy via
         /// <c>wevtutil epl</c> (active channels hold their file exclusively locked, so a raw
-        /// copy fails). Channel resolution happens against the registered channels — see
-        /// <see cref="ResolveChannelForEvtxFile"/>. Returns the temp file path (caller deletes)
-        /// or null when the export failed.
+        /// copy fails). The caller resolved <paramref name="channel"/> against the registered
+        /// channels — see <see cref="ResolveChannelForEvtxFile"/> — and checked it against the
+        /// hard-blocked channels. Returns the temp file path (caller deletes) or null when the
+        /// export failed.
         /// </summary>
-        private string TryExportEventLogChannel(string evtxPath)
+        private string TryExportEventLogChannel(string evtxPath, string channel)
         {
             string tempPath = null;
             try
             {
-                var channel = ResolveChannelForEvtxFile(evtxPath);
                 tempPath = Path.Combine(Path.GetTempPath(), $"am-evtx-{Guid.NewGuid():N}.evtx");
                 var psi = new System.Diagnostics.ProcessStartInfo
                 {

src/Agent/AutopilotMonitor.Agent.V2.Core/Monitoring/Telemetry/Gather/DiagnosticsPathGuards.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Telemetry.Gather
 {
@@ -124,51 +125,7 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Telemetry.Gather
                 if (IsSymlinkOrReparsePoint(normalizedDir))
                     return false;
 
-                // C:\Users block always applies (even in unrestricted mode)
-                // Exception: paths under <userProfilePath>\AppData\Local or AppData\Roaming
-                // are allowed when the %LOGGED_ON_USER_PROFILE% token was used.
-                if (normalizedDir.StartsWith(BlockedUsersPrefix, StringComparison.OrdinalIgnoreCase) &&
-                    (normalizedDir.Length == BlockedUsersPrefix.Length ||
-                     normalizedDir[BlockedUsersPrefix.Length] == Path.DirectorySeparatorChar))
-                {
-                    if (!GatherRuleGuards.IsUserProfileSubpathAllowed(normalizedDir, userProfilePath))
-                        return false;
-                }
-
-                // Additional hard-blocked paths (even in unrestricted mode)
-                foreach (var blocked in AdditionalHardBlockedPrefixes)
-                {
-                    var normalizedBlocked = Path.GetFullPath(blocked);
-                    if (normalizedDir.StartsWith(normalizedBlocked, StringComparison.OrdinalIgnoreCase) &&
-                        (normalizedDir.Length == normalizedBlocked.Length ||
-                         normalizedDir[normalizedBlocked.Length] == Path.DirectorySeparatorChar))
-                    {
-                        return false;
-                    }
-                }
-
-                // In unrestricted mode, everything except hard-blocked paths is allowed
-                if (unrestrictedMode)
-                    return true;
-
-                foreach (var prefix in AllowedDiagnosticsPathPrefixes)
-                {
-                    var normalizedPrefix = Path.GetFullPath(prefix);
-                    if (normalizedDir.StartsWith(normalizedPrefix, StringComparison.OrdinalIgnoreCase))
-                    {
-                        // Segment-bounded: next char must be '\' or end-of-string
-                        if (normalizedDir.Length == normalizedPrefix.Length ||
-                            normalizedDir[normalizedPrefix.Length] == Path.DirectorySeparatorChar)
-                        {
-                            return true;
-                        }
-                    }
-                }
-
-                // Vendor folders under the signed-in user's profile — same allowlist the file
-                // collectors use, since it answers the same question: which folders below a
-                // profile carry enrollment-relevant logs rather than the user's own data.
-                return GatherRuleGuards.IsUserProfilePathOnAllowlist(normalizedDir, userProfilePath);
+                return IsNormalizedPathAllowed(normalizedDir, unrestrictedMode, userProfilePath);
             }
             catch
             {
@@ -177,6 +134,213 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Telemetry.Gather
             }
         }
 
+        /// <summary>
+        /// What the package actually reads for one configured entry: every file matching
+        /// <see cref="Pattern"/> in <see cref="Folder"/>, optionally below it.
+        /// </summary>
+        public sealed class CollectionTarget
+        {
+            public CollectionTarget(string folder, string pattern, bool recurse)
+            {
+                Folder = folder;
+                Pattern = pattern;
+                Recurse = recurse;
+            }
+
+            /// <summary>Full path without a trailing separator (drive roots keep theirs).</summary>
+            public string Folder { get; }
+            public string Pattern { get; }
+            public bool Recurse { get; }
+        }
+
+        /// <summary>
+        /// Resolves a configured entry to the folder and pattern that get enumerated, and
+        /// validates exactly that. Returns false when the guard refuses the entry.
+        ///
+        /// <paramref name="expandedPath"/> must already have the %LOGGED_ON_USER_PROFILE% token
+        /// resolved: validating the raw token would judge a different path than the one read.
+        ///
+        /// A wildcard in the last segment selects files in its parent folder. A trailing
+        /// separator or an existing directory selects every file in that folder. Anything else
+        /// names one file — validated as that file and never recursed, because its parent
+        /// folder has not passed the guard. The filesystem decides folder-vs-file, never the
+        /// spelling of the last segment.
+        /// </summary>
+        public static bool TryResolveCollectionTarget(
+            string expandedPath,
+            bool includeSubfolders,
+            bool unrestrictedMode,
+            string userProfilePath,
+            out CollectionTarget target)
+            => TryResolveCollectionTarget(
+                expandedPath, includeSubfolders, unrestrictedMode, userProfilePath, Directory.Exists, out target);
+
+        internal static bool TryResolveCollectionTarget(
+            string expandedPath,
+            bool includeSubfolders,
+            bool unrestrictedMode,
+            string userProfilePath,
+            Func<string, bool> directoryExists,
+            out CollectionTarget target)
+        {
+            target = null;
+            if (string.IsNullOrWhiteSpace(expandedPath))
+                return false;
+
+            try
+            {
+                var expanded = Environment.ExpandEnvironmentVariables(expandedPath.Trim());
+                var lastSegment = Path.GetFileName(expanded);
+
+                if (lastSegment.Contains('*') || lastSegment.Contains('?'))
+                {
+                    var parent = Path.GetDirectoryName(expanded);
+                    if (string.IsNullOrEmpty(parent))
+                        return false;
+                    var folder = TrimTrailingSeparators(Path.GetFullPath(parent));
+                    if (!IsDiagnosticsPathAllowed(folder, unrestrictedMode, userProfilePath))
+                        return false;
+                    target = new CollectionTarget(folder, lastSegment, includeSubfolders);
+                    return true;
+                }
+
+                var full = TrimTrailingSeparators(Path.GetFullPath(expanded));
+                if (!IsDiagnosticsPathAllowed(full, unrestrictedMode, userProfilePath))
+                    return false;
+
+                if (lastSegment.Length == 0 || directoryExists(full))
+                {
+                    target = new CollectionTarget(full, "*", includeSubfolders);
+                    return true;
+                }
+
+                var fileFolder = Path.GetDirectoryName(full);
+                if (string.IsNullOrEmpty(fileFolder))
+                    return false;
+                target = new CollectionTarget(fileFolder, Path.GetFileName(full), recurse: false);
+                return true;
+            }
+            catch
+            {
+                target = null;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Guard for every subdirectory a recursive collection is about to enter. The start
+        /// folder passed <see cref="IsDiagnosticsPathAllowed(string, bool, string)"/>, but a
+        /// hard-blocked subtree can sit below an allowed folder (unrestricted mode, drive
+        /// root). Lexical only: reparse points are skipped by the enumeration and refused
+        /// again on the handle that is read.
+        /// </summary>
+        public static bool IsDirectoryEnterable(string directory, bool unrestrictedMode, string userProfilePath)
+        {
+            if (string.IsNullOrWhiteSpace(directory))
+                return false;
+
+            try
+            {
+                return IsNormalizedPathAllowed(Path.GetFullPath(directory), unrestrictedMode, userProfilePath);
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        private static string TrimTrailingSeparators(string fullPath)
+        {
+            var root = Path.GetPathRoot(fullPath);
+            var trimmed = fullPath.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+            return root != null && trimmed.Length < root.Length ? root : trimmed;
+        }
+
+        // Hard blocks, then (restricted mode) the allowlists — on an already normalized path.
+        private static bool IsNormalizedPathAllowed(string normalizedDir, bool unrestrictedMode, string userProfilePath)
+        {
+            // C:\Users block always applies (even in unrestricted mode)
+            // Exception: paths under <userProfilePath>\AppData\Local or AppData\Roaming
+            // are allowed when the %LOGGED_ON_USER_PROFILE% token was used.
+            if (normalizedDir.StartsWith(BlockedUsersPrefix, StringComparison.OrdinalIgnoreCase) &&
+                (normalizedDir.Length == BlockedUsersPrefix.Length ||
+                 normalizedDir[BlockedUsersPrefix.Length] == Path.DirectorySeparatorChar))
+            {
+                if (!GatherRuleGuards.IsUserProfileSubpathAllowed(normalizedDir, userProfilePath))
+                    return false;
+            }
+
+            // Additional hard-blocked paths (even in unrestricted mode)
+            foreach (var blocked in AdditionalHardBlockedPrefixes)
+            {
+                var normalizedBlocked = Path.GetFullPath(blocked);
+                if (normalizedDir.StartsWith(normalizedBlocked, StringComparison.OrdinalIgnoreCase) &&
+                    (normalizedDir.Length == normalizedBlocked.Length ||
+                     normalizedDir[normalizedBlocked.Length] == Path.DirectorySeparatorChar))
+                {
+                    return false;
+                }
+            }
+
+            // Hard-blocked event logs (even in unrestricted mode). Only a path that names the
+            // file is caught here; a wildcard or folder entry is judged per file by
+            // DiagnosticsPackageService, which is the enforcement point.
+            if (IsHardBlockedEventLogFile(normalizedDir))
+                return false;
+
+            // In unrestricted mode, everything except hard-blocked paths is allowed
+            if (unrestrictedMode)
+                return true;
+
+            foreach (var prefix in AllowedDiagnosticsPathPrefixes)
+            {
+                var normalizedPrefix = Path.GetFullPath(prefix);
+                if (normalizedDir.StartsWith(normalizedPrefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    // Segment-bounded: next char must be '\' or end-of-string
+                    if (normalizedDir.Length == normalizedPrefix.Length ||
+                        normalizedDir[normalizedPrefix.Length] == Path.DirectorySeparatorChar)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            // Vendor folders under the signed-in user's profile — same allowlist the file
+            // collectors use, since it answers the same question: which folders below a
+            // profile carry enrollment-relevant logs rather than the user's own data.
+            return GatherRuleGuards.IsUserProfilePathOnAllowlist(normalizedDir, userProfilePath);
+        }
+
+        // Windows archives a full channel as "Archive-<file name>-yyyy-MM-dd-HH-mm-ss-fff.evtx".
+        private static readonly Regex ArchivedEventLogRegex = new Regex(
+            @"^Archive-(.+)-\d{4}-\d{2}-\d{2}-\d{2}-\d{2}-\d{2}-\d{3}$",
+            RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Compiled);
+
+        /// <summary>
+        /// True when the .evtx file name belongs to one of
+        /// <see cref="GatherRuleGuards.HardBlockedEventLogChannels"/> — live file
+        /// ("Microsoft-Windows-PowerShell%4Operational.evtx", where %4 encodes '/') or
+        /// archived copy. Judges the NAME only; a channel may write to a file that does not
+        /// follow the convention, so the packager also checks the channel it resolved.
+        /// </summary>
+        internal static bool IsHardBlockedEventLogFile(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+                return false;
+
+            var name = Path.GetFileName(path);
+            if (!name.EndsWith(".evtx", StringComparison.OrdinalIgnoreCase))
+                return false;
+
+            var stem = name.Substring(0, name.Length - ".evtx".Length);
+            var archived = ArchivedEventLogRegex.Match(stem);
+            if (archived.Success)
+                stem = archived.Groups[1].Value;
+
+            return GatherRuleGuards.IsHardBlockedEventLogChannel(stem.Replace("%4", "/"));
+        }
+
         /// <summary>
         /// Checks whether any component of the path (directories or file) is a symlink,
         /// junction, or other reparse point. Returns true if a reparse point is detected.

src/Agent/AutopilotMonitor.Agent.V2.Core/Monitoring/Telemetry/Gather/GatherRuleGuards.cs

@@ -451,11 +451,8 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Telemetry.Gather
             var trimmed = channel.Trim();
 
             // Hard blocks apply even in unrestricted mode
-            foreach (var blocked in HardBlockedEventLogChannels)
-            {
-                if (MatchesChannel(trimmed, blocked))
-                    return false;
-            }
+            if (IsHardBlockedEventLogChannel(trimmed))
+                return false;
 
             if (unrestrictedMode)
                 return true;
@@ -463,6 +460,20 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Telemetry.Gather
             return AllowedEventLogChannels.Any(allowed => MatchesChannel(trimmed, allowed));
         }
 
+        /// <summary>
+        /// True when the channel is one of <see cref="HardBlockedEventLogChannels"/>. Every
+        /// path that can read an event log asks here — the event-log collector and the
+        /// diagnostics package alike — so the block cannot hold in one and leak through another.
+        /// </summary>
+        internal static bool IsHardBlockedEventLogChannel(string channel)
+        {
+            if (string.IsNullOrWhiteSpace(channel))
+                return false;
+
+            var trimmed = channel.Trim();
+            return HardBlockedEventLogChannels.Any(blocked => MatchesChannel(trimmed, blocked));
+        }
+
         private static bool MatchesChannel(string channel, string prefix)
             => channel.StartsWith(prefix, StringComparison.OrdinalIgnoreCase) &&
                (channel.Length == prefix.Length || channel[prefix.Length] == '/');

src/Agent/AutopilotMonitor.Agent.V2.Core/Monitoring/Telemetry/Periodic/AgentSelfMetricsCollector.cs

@@ -213,6 +213,8 @@ namespace AutopilotMonitor.Agent.V2.Core.Monitoring.Telemetry.Periodic
                         data["ime_overwrite_bytes_reprocessed"] = health.OverwriteBytesReprocessed;
                         data["ime_verify_passes"] = health.VerifyPasses;
                         data["ime_verified_bytes"] = health.VerifiedBytes;
+                        data["ime_pass_max_ms"] = health.PassMaxMs;
+                        data["ime_pass_gap_max_ms"] = health.PassGapMaxMs;
                     }
                 }
                 catch (Exception ex)

src/Agent/AutopilotMonitor.Agent.V2.Core/Orchestration/SignalActivityClassifier.cs

@@ -61,6 +61,15 @@ namespace AutopilotMonitor.Agent.V2.Core.Orchestration
             // detection — the exact scenario the power watcher exists to observe.
             SharedConstants.EventTypes.PowerStateChange,
 
+            // Same for the network link: a dock or access point that flaps for hours (field:
+            // 288 lost/connected pairs in 11 h, each with its connectivity check) is not
+            // enrollment progress. Counted as activity it kept the periodic collectors running
+            // for the whole episode and hid the stall it was causing, because every flap reset
+            // the stall clock. Progress that follows a reconnect arrives as its own download,
+            // app or phase event.
+            SharedConstants.EventTypes.NetworkStateChange,
+            SharedConstants.EventTypes.NetworkConnectivityCheck,
+
             // Same reasoning for the system timeline watcher: a clock step, a wake from standby,
             // or a backfilled episode at agent start is environment observation and must not
             // reset the idle/stall clocks.
@@ -81,6 +90,8 @@ namespace AutopilotMonitor.Agent.V2.Core.Orchestration
             // says something about the agent, not about the device's enrollment progress.
             SharedConstants.EventTypes.ImeTrackerDegraded,
             SharedConstants.EventTypes.ImePatternHits,
+            // Bookkeeping of runs that were deliberately not reported as activity.
+            SharedConstants.EventTypes.ScriptRecurrenceSummary,
         };
 
         /// <summary>

src/Agent/AutopilotMonitor.Agent.V2.Core/SignalAdapters/ImeLogTrackerAdapter.cs

@@ -94,6 +94,8 @@ namespace AutopilotMonitor.Agent.V2.Core.SignalAdapters
         private readonly Action<AppPackageState, DateTime?> _ourOnDoTelemetryReceived;
         private readonly Action<ScriptExecutionState> _ourOnScriptCompleted;
         private readonly Action<ScriptStartedInfo> _ourOnScriptStarted;
+        private readonly Action<ScriptRecurrenceSummary>? _prevOnScriptRecurrenceSummary;
+        private readonly Action<ScriptRecurrenceSummary> _ourOnScriptRecurrenceSummary;
         private readonly Action<string, string> _ourOnImeTokenFailure;
 
         // Dedup state for DecisionSignals.
@@ -195,6 +197,7 @@ namespace AutopilotMonitor.Agent.V2.Core.SignalAdapters
             _prevOnDoTelemetryReceived = _tracker.OnDoTelemetryReceived;
             _prevOnScriptCompleted = _tracker.OnScriptCompleted;
             _prevOnScriptStarted = _tracker.OnScriptStarted;
+            _prevOnScriptRecurrenceSummary = _tracker.OnScriptRecurrenceSummary;
             _prevOnImeTokenFailure = _tracker.OnImeTokenFailure;
             _prevOnTrackerDegraded = _tracker.OnTrackerDegraded;
 
@@ -209,6 +212,7 @@ namespace AutopilotMonitor.Agent.V2.Core.SignalAdapters
             _ourOnDoTelemetryReceived = OnDoTelemetryReceived;
             _ourOnScriptCompleted = OnScriptCompleted;
             _ourOnScriptStarted = OnScriptStarted;
+            _ourOnScriptRecurrenceSummary = OnScriptRecurrenceSummary;
             _ourOnImeTokenFailure = OnImeTokenFailure;
 
             _tracker.OnEspPhaseChanged = _ourOnEspPhaseChanged;
@@ -219,6 +223,7 @@ namespace AutopilotMonitor.Agent.V2.Core.SignalAdapters
             _tracker.OnDoTelemetryReceived = _ourOnDoTelemetryReceived;
             _tracker.OnScriptCompleted = _ourOnScriptCompleted;
             _tracker.OnScriptStarted = _ourOnScriptStarted;
+            _tracker.OnScriptRecurrenceSummary = _ourOnScriptRecurrenceSummary;
             _tracker.OnImeTokenFailure = _ourOnImeTokenFailure;
             _tracker.OnTrackerDegraded = _ourOnTrackerDegraded;
         }
@@ -245,6 +250,8 @@ namespace AutopilotMonitor.Agent.V2.Core.SignalAdapters
                 _tracker.OnScriptCompleted = _prevOnScriptCompleted;
             if (ReferenceEquals(_tracker.OnScriptStarted, _ourOnScriptStarted))
                 _tracker.OnScriptStarted = _prevOnScriptStarted;
+            if (ReferenceEquals(_tracker.OnScriptRecurrenceSummary, _ourOnScriptRecurrenceSummary))
+                _tracker.OnScriptRecurrenceSummary = _prevOnScriptRecurrenceSummary;
             if (ReferenceEquals(_tracker.OnImeTokenFailure, _ourOnImeTokenFailure))
                 _tracker.OnImeTokenFailure = _prevOnImeTokenFailure;
         }
@@ -297,6 +304,12 @@ namespace AutopilotMonitor.Agent.V2.Core.SignalAdapters
             EmitScriptStarted(info);
         }
 
+        private void OnScriptRecurrenceSummary(ScriptRecurrenceSummary summary)
+        {
+            _prevOnScriptRecurrenceSummary?.Invoke(summary);
+            EmitScriptRecurrenceSummary(summary);
+        }
+
         private void OnImeTokenFailure(string errorCode, string message)
         {
             _prevOnImeTokenFailure?.Invoke(errorCode, message);
@@ -1464,10 +1477,13 @@ namespace AutopilotMonitor.Agent.V2.Core.SignalAdapters
             };
             if (!string.IsNullOrEmpty(info.ScriptType)) data["scriptType"] = info.ScriptType!;
             if (!string.IsNullOrEmpty(info.PolicyType)) data["policyType"] = info.PolicyType!;
-            var patternId = _tracker.LastMatchedPatternId;
+            // A held start of a recurring health script arrives with its own line's stamp and
+            // pattern — by now the tracker's "last matched" line is the result line.
+            var wasHeld = info.SourceTimestampUtc.HasValue;
+            var patternId = wasHeld ? info.PatternId : _tracker.LastMatchedPatternId;
             if (!string.IsNullOrEmpty(patternId)) data["patternId"] = patternId!;
 
-            var now = ResolveOccurredAt(out var derivedFromClock, out var rawSourceTs);
+            var now = ResolveOccurredAt(info.SourceTimestampUtc, out var derivedFromClock, out var rawSourceTs);
 
             // Historic replay — suppressing here also kills the immediateUpload flood the
             // replayed batch caused (session eaf3d8c4: 3× ingress_backpressure).
@@ -1485,13 +1501,42 @@ namespace AutopilotMonitor.Agent.V2.Core.SignalAdapters
                 message: $"{label} {shortId}: started",
                 // Live UI indicator — flush immediately so the running card appears within seconds,
                 // not at the next batch boundary (which would defeat the purpose of a live signal).
-                immediateUpload: true,
+                // A held start is no longer live and rides the normal batch.
+                immediateUpload: !wasHeld,
                 data: data,
                 occurredAtUtc: now);
 
             _logger?.Debug($"ImeAdapter: script started policyId={shortId} type={info.ScriptType ?? "?"} policyType={info.PolicyType ?? "?"}");
         }
 
+        private void EmitScriptRecurrenceSummary(ScriptRecurrenceSummary summary)
+        {
+            if (summary == null || string.IsNullOrEmpty(summary.PolicyId)) return;
+
+            var culture = System.Globalization.CultureInfo.InvariantCulture;
+            var data = new Dictionary<string, string>(StringComparer.Ordinal)
+            {
+                ["policyId"] = summary.PolicyId,
+                ["scriptType"] = "remediation",
+                ["runsObserved"] = summary.RunsObserved.ToString(culture),
+                ["runsCollapsed"] = summary.RunsCollapsed.ToString(culture),
+                ["runsWithoutResult"] = summary.RunsWithoutResult.ToString(culture),
+                ["collapsedResults"] = summary.CollapsedResults.ToString(culture),
+            };
+            if (summary.FirstCollapsedAtUtc.HasValue)
+                data["firstCollapsedAt"] = NormalizeUtc(summary.FirstCollapsedAtUtc.Value).ToString("o", culture);
+            if (summary.LastCollapsedAtUtc.HasValue)
+                data["lastCollapsedAt"] = NormalizeUtc(summary.LastCollapsedAtUtc.Value).ToString("o", culture);
+
+            var shortId = summary.PolicyId.Length >= 8 ? summary.PolicyId.Substring(0, 8) : summary.PolicyId;
+            _post.Emit(
+                eventType: SharedEventTypes.ScriptRecurrenceSummary,
+                source: SourceLabel,
+                message: $"Health script {shortId}: {summary.RunsCollapsed} further run(s) repeated the last reported result",
+                severity: EventSeverity.Info,
+                data: data);
+        }
+
         private static bool IsRemediation(string? scriptType) =>
             string.Equals(scriptType, "remediation", StringComparison.OrdinalIgnoreCase);
 

src/Agent/AutopilotMonitor.Agent.V2.Core/Termination/EnrollmentTerminationHandler.cs

@@ -588,6 +588,8 @@ namespace AutopilotMonitor.Agent.V2.Core.Termination
                     ["overwriteBytesReprocessed"] = health.OverwriteBytesReprocessed,
                     ["verifyPasses"] = health.VerifyPasses,
                     ["verifiedBytes"] = health.VerifiedBytes,
+                    ["passMaxMs"] = health.PassMaxMs,
+                    ["passGapMaxMs"] = health.PassGapMaxMs,
                     ["agentVersion"] = _agentVersion ?? string.Empty,
                 };
                 if (!string.IsNullOrEmpty(health.ImeAgentVersion))

src/Agent/AutopilotMonitor.Agent.V2/Program.Guards.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.Eventing.Reader;
 using System.IO;
@@ -41,17 +42,31 @@ namespace AutopilotMonitor.Agent.V2
 
         // ----------------------------------------------------------------- Multi-instance guard
 
+        /// <summary>Pid and terminal-services session of one name-matched process.</summary>
+        internal readonly struct AgentProcessFact
+        {
+            public AgentProcessFact(int pid, int sessionId)
+            {
+                Pid = pid;
+                SessionId = sessionId;
+            }
+
+            public int Pid { get; }
+            public int SessionId { get; }
+        }
+
         /// <summary>
-        /// <c>true</c> when another process with the same filename (module name) is alive.
-        /// Race-safe by design: we count processes sharing our name; if 1, only we exist.
+        /// <c>true</c> when another agent runtime is alive. A process name is not a protected
+        /// namespace — any user session can run a binary named like the agent — so a name match
+        /// only counts in session 0. Every runtime start (Scheduled Task, WMI launch, self-update
+        /// restart) lands there, and a standard user cannot start a process in it.
         /// </summary>
         internal static bool IsAnotherAgentInstanceRunning()
         {
             try
             {
-                var self = Process.GetCurrentProcess();
-                var siblings = Process.GetProcessesByName(self.ProcessName);
-                return siblings.Length > 1;
+                using (var self = Process.GetCurrentProcess())
+                    return FindSiblingAgentPid(SnapshotProcessesByName(self.ProcessName), self.Id) != 0;
             }
             catch
             {
@@ -61,6 +76,40 @@ namespace AutopilotMonitor.Agent.V2
             }
         }
 
+        /// <summary>
+        /// Pid of the first name-matched process that is a real agent runtime — session 0 and not
+        /// the caller itself — or <c>0</c> when there is none. Shared by the multi-instance guard
+        /// and install mode's launch verification so both trust the same identity.
+        /// </summary>
+        internal static int FindSiblingAgentPid(IEnumerable<AgentProcessFact> nameMatches, int ownPid)
+        {
+            if (nameMatches == null) return 0;
+            foreach (var candidate in nameMatches)
+            {
+                if (candidate.Pid == ownPid) continue;
+                if (candidate.SessionId != 0) continue;
+                return candidate.Pid;
+            }
+            return 0;
+        }
+
+        /// <summary>
+        /// Reads pid and session of every process with the given name. A process that vanished
+        /// between enumeration and read is skipped: it is not a live sibling, and failing open
+        /// means the worst case is two agents, never none.
+        /// </summary>
+        internal static List<AgentProcessFact> SnapshotProcessesByName(string processName)
+        {
+            var facts = new List<AgentProcessFact>();
+            foreach (var process in Process.GetProcessesByName(processName))
+            {
+                try { facts.Add(new AgentProcessFact(process.Id, process.SessionId)); }
+                catch { /* exited mid-read */ }
+                finally { process.Dispose(); }
+            }
+            return facts;
+        }
+
         // ----------------------------------------------------------------- clean-exit marker
 
         /// <summary>

src/Agent/AutopilotMonitor.Agent.V2/Program.InstallMode.cs

@@ -731,7 +731,8 @@ namespace AutopilotMonitor.Agent.V2
         /// 10s / 500ms contract as the bootstrap script's Get-Process probe. The install-mode
         /// process shares the runtime's exe name, so the own pid is excluded; a pre-existing
         /// foreign runtime cannot be running here because install mode bails earlier on the
-        /// Deployed marker.
+        /// Deployed marker. Same identity rule as the multi-instance guard: a same-named process
+        /// in a user session is not the runtime and must not satisfy the verification.
         /// </summary>
         private static int WaitForDetachedRuntimePid(string exePath, AgentLogger logger)
         {
@@ -742,16 +743,8 @@ namespace AutopilotMonitor.Agent.V2
             {
                 try
                 {
-                    var candidates = Process.GetProcessesByName(processName);
-                    try
-                    {
-                        var runtime = candidates.FirstOrDefault(p => p.Id != ownPid);
-                        if (runtime != null) return runtime.Id;
-                    }
-                    finally
-                    {
-                        foreach (var p in candidates) p.Dispose();
-                    }
+                    var runtimePid = FindSiblingAgentPid(SnapshotProcessesByName(processName), ownPid);
+                    if (runtimePid != 0) return runtimePid;
                 }
                 catch (Exception ex)
                 {

src/Backend/AutopilotMonitor.Functions.Tests/AdminWireParityTests.cs

@@ -447,41 +447,27 @@ public class AdminWireParityTests
     // ---- TriggerMaintenance --------------------------------------------------------------
 
     [Fact]
-    public void TriggerMaintenanceResponse_matches_the_manual_trigger_shape()
+    public void TriggerMaintenanceResponse_matches_the_queued_trigger_shape()
     {
-        var result = new MaintenanceResult
-        {
-            Success = true,
-            TriggeredBy = "admin@contoso.com",
-            TriggeredAt = new DateTime(2026, 8, 30, 13, 10, 0, DateTimeKind.Utc),
-            DurationMs = 1234,
-            StalledSessionsChecked = true,
-            MetricsAggregated = true,
-            AggregatedDate = "2026-08-29",
-            DataCleanupExecuted = false,
-            PlatformStatsRecomputed = true,
-            DevicesBlockedForExcessiveData = 0,
-            ContactEmailsBackfilled = 2,
-        };
         var userEmail = "admin@contoso.com";
         var triggeredAt = new DateTime(2026, 8, 30, 13, 10, 5, DateTimeKind.Utc);
 
         AssertParity(
             new
             {
-                success = true,
-                message = "Maintenance tasks completed",
-                result = result,
+                message = "Maintenance run queued",
                 triggeredBy = userEmail,
-                triggeredAt
+                triggeredAt,
+                targetDate = "2026-08-29",
+                aggregateOnly = true
             },
             new TriggerMaintenanceResponse
             {
-                Success = true,
-                Message = "Maintenance tasks completed",
-                Result = result,
+                Message = "Maintenance run queued",
                 TriggeredBy = userEmail,
-                TriggeredAt = triggeredAt
+                TriggeredAt = triggeredAt,
+                TargetDate = "2026-08-29",
+                AggregateOnly = true
             });
     }
 

src/Backend/AutopilotMonitor.Functions.Tests/AppVersionRegressionRadarTests.cs

@@ -27,6 +27,13 @@ public class AppVersionRegressionRadarTests
     private const string App = "Contoso VPN";
     private static readonly DateTime Now = new(2026, 8, 13, 12, 0, 0, DateTimeKind.Utc);
 
+    /// <summary>
+    /// For the analytics tests only: AppsAnalyticsHelper windows off the REAL clock (DateTime.UtcNow − days),
+    /// so their rows must be dated relative to it — a row dated off the fixed <see cref="Now"/> falls out of
+    /// the 30-day window once the calendar moves on (it did on 2026-09-11).
+    /// </summary>
+    private static readonly DateTime Recent = DateTime.UtcNow.AddDays(-1);
+
     private static int _sessionCounter;
 
     private static AppInstallSummary Install(
@@ -357,10 +364,10 @@ public class AppVersionRegressionRadarTests
 
         var rows = new List<AppInstallSummary>
         {
-            Install("1.0", 100), Install("1.0", 200), Install("1.0", 300), Install("1.0", 400),
-            Install("1.0", 0),                                  // unmeasured — excluded from stats
-            Install("1.0", 50, terminalState: "Skipped"),       // skip — excluded
-            Install("1.0", 50, status: "Failed"),               // failed — excluded from durations
+            Install("1.0", 100, Recent), Install("1.0", 200, Recent), Install("1.0", 300, Recent), Install("1.0", 400, Recent),
+            Install("1.0", 0, Recent),                                  // unmeasured — excluded from stats
+            Install("1.0", 50, Recent, terminalState: "Skipped"),       // skip — excluded
+            Install("1.0", 50, Recent, status: "Failed"),               // failed — excluded from durations
         };
 
         var root = TestWire.SerializeToElement(await AppsAnalyticsHelper.BuildAnalyticsResponseAsync(
@@ -393,7 +400,7 @@ public class AppVersionRegressionRadarTests
         Assert.Equal(1, emptyRoot.GetProperty("versionRegressions").GetArrayLength());
 
         var root = TestWire.SerializeToElement(await AppsAnalyticsHelper.BuildAnalyticsResponseAsync(
-            new List<AppInstallSummary> { Install("1.0", 100) }, sessionRepo.Object, App, days: 30,
+            new List<AppInstallSummary> { Install("1.0", 100, Recent) }, sessionRepo.Object, App, days: 30,
             new List<AppVersionRegressionAlert> { alert }));
 
         var regression = root.GetProperty("versionRegressions")[0];

src/Backend/AutopilotMonitor.Functions.Tests/AuthFunctionSideEffectTests.cs

@@ -219,6 +219,8 @@ public class AuthFunctionSideEffectTests
         // OnboardedBy is the immutable copy of the first-login UPN that auto-promote on
         // preview approval reads — UpdatedBy may later be clobbered by background syncs.
         Assert.Equal(Upn, config.OnboardedBy);
+        // The DPA version rides along in the same onboarding write (D-252).
+        Assert.Equal(CurrentDpa, config.DpaVersion);
         _tenantConfigMock.Verify(x => x.SaveConfigurationAsync(config, It.IsAny<string?>(), It.IsAny<string?>()), Times.Once);
         _telegramMock.Verify(x => x.SendNewTenantSignupAsync(TenantId, Upn), Times.Once);
         _globalNotificationMock.Verify(x => x.CreateNotificationAsync(
@@ -304,6 +306,23 @@ public class AuthFunctionSideEffectTests
         _tenantConfigMock.Verify(x => x.SaveConfigurationAsync(It.IsAny<TenantConfiguration>(), It.IsAny<string?>(), It.IsAny<string?>()), Times.Never);
     }
 
+    private const string CurrentDpa = AutopilotMonitor.Shared.Constants.CurrentDpaVersion;
+
+    [Fact]
+    public async Task HandleNewTenantDomain_WhenDomainAlreadySet_NeverStampsDpaVersion()
+    {
+        // The DPA version is written once, with the onboarding (D-252): an existing tenant's
+        // login writes nothing — no stamp, no save.
+        var config = DefaultConfig();
+        config.DomainName = "contoso.com";
+        config.DpaVersion = null;
+
+        await _sut.HandleNewTenantDomainAsync(config, TenantId, Upn);
+
+        Assert.Null(config.DpaVersion);
+        _tenantConfigMock.Verify(x => x.SaveConfigurationAsync(It.IsAny<TenantConfiguration>(), It.IsAny<string?>(), It.IsAny<string?>()), Times.Never);
+    }
+
     [Fact]
     public async Task HandleNewTenantDomain_PreservesExistingOnboardedBy()
     {

src/Backend/AutopilotMonitor.Functions.Tests/BackupWireParityTests.cs

@@ -0,0 +1,156 @@
+using System.Text.Json;
+using AutopilotMonitor.Functions.Helpers;
+using AutopilotMonitor.Shared.Models;
+using AutopilotMonitor.Shared.Models.Backup;
+using Xunit;
+
+namespace AutopilotMonitor.Functions.Tests;
+
+/// <summary>
+/// Wire-identity proof for moving the backup job, row-restore and queued-run bodies off their
+/// private <c>WriteJsonAsync(req, status, object)</c> wrappers onto <c>ResponseHelper</c>.
+/// Two things changed at once and both are pinned here: the anonymous 202 bodies became DTOs,
+/// and the typed bodies left <see cref="BackupManifestJson.SerializerOptions"/> for the worker
+/// pipeline (<see cref="ApiJsonOptions"/>). The two option sets differ only in how they READ
+/// enums (<c>allowIntegerValues</c>); the facts below keep the WRITE side honest if either set
+/// ever gains a naming policy, a key policy or a converter.
+/// </summary>
+public class BackupWireParityTests
+{
+    private static readonly JsonSerializerOptions WireOptions = ApiJsonOptions.Create();
+
+    private static JsonElement Json(string raw)
+    {
+        using var doc = JsonDocument.Parse(raw);
+        return doc.RootElement.Clone();
+    }
+
+    private static void AssertSameUnderBothOptionSets(object body)
+    {
+        var backupSurface = JsonSerializer.Serialize(body, body.GetType(), BackupManifestJson.SerializerOptions);
+        var pipeline = JsonSerializer.Serialize(body, body.GetType(), WireOptions);
+        Assert.Equal(backupSurface, pipeline);
+    }
+
+    [Fact]
+    public void BackupJobStatus_serializes_identically_under_both_option_sets()
+    {
+        var t = new DateTime(2026, 9, 21, 4, 0, 0, DateTimeKind.Utc);
+
+        AssertSameUnderBothOptionSets(new BackupJobStatus
+        {
+            JobId = "0f8fad5bd9cb469fa16570867728950e",
+            Kind = BackupJobKind.RestoreTable,
+            State = BackupJobState.BlockedTerminal,
+            RequestedBy = "admin@contoso.example",
+            QueuedAtUtc = t,
+            StartedAtUtc = t.AddSeconds(3),
+            CompletedAtUtc = t.AddMinutes(2),
+            LastHeartbeatUtc = t.AddMinutes(2),
+            BackupId = "20260921T040000Z_a1b2c3d4",
+            SourceBackupId = "20260920T040000Z_e5f6a7b8",
+            TableName = "TenantConfiguration",
+            Strategy = "upsert-only",
+            Progress = "{\"phase\":\"copy\",\"rows\":12}",
+            Error = "IntegrityCheckFailed",
+            BackupOutcome = BackupOutcome.Partial,
+        });
+
+        // Freshly queued: every nullable slot absent on both sides.
+        AssertSameUnderBothOptionSets(new BackupJobStatus
+        {
+            JobId = "0f8fad5bd9cb469fa16570867728950e",
+            Kind = BackupJobKind.Backup,
+            State = BackupJobState.Queued,
+            RequestedBy = "admin@contoso.example",
+            QueuedAtUtc = t,
+            LastHeartbeatUtc = t,
+        });
+    }
+
+    [Fact]
+    public void RestoreRowPreviewResponse_serializes_identically_under_both_option_sets()
+    {
+        var text = new RestoreRowPropertySnapshot { EdmType = "Edm.String", Value = Json("\"Pro\"") };
+        var flag = new RestoreRowPropertySnapshot { EdmType = "Edm.Boolean", Value = Json("true") };
+        var number = new RestoreRowPropertySnapshot { EdmType = "Edm.Int64", Value = Json("\"9007199254740993\"") };
+
+        AssertSameUnderBothOptionSets(new RestoreRowPreviewResponse
+        {
+            BackupId = "20260921T040000Z_a1b2c3d4",
+            TableName = "TenantConfiguration",
+            PartitionKey = "tenant/with+odd%chars",
+            RowKey = "config",
+            // Case-faithful column names: a key policy on either side would rewrite them.
+            BackupProperties = { ["PlanTier"] = text, ["IsEnabled"] = flag, ["lowerCaseColumn"] = number },
+            CurrentProperties = new Dictionary<string, RestoreRowPropertySnapshot> { ["PlanTier"] = text },
+            Diff =
+            {
+                new RestoreRowPropertyDiff { Name = "IsEnabled", Kind = RestoreRowDiffKind.Added, Backup = flag },
+                new RestoreRowPropertyDiff { Name = "PlanTier", Kind = RestoreRowDiffKind.Unchanged, Backup = text, Current = text },
+            },
+            RowSha256 = "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08",
+            CurrentETag = "W/\"datetime'2026-09-21T04%3A00%3A00Z'\"",
+            IsAuthTable = true,
+        });
+
+        // Live row absent: currentProperties and currentETag vanish on both sides.
+        AssertSameUnderBothOptionSets(new RestoreRowPreviewResponse
+        {
+            BackupId = "20260921T040000Z_a1b2c3d4",
+            TableName = "TenantConfiguration",
+            PartitionKey = "pk",
+            RowKey = "rk",
+            BackupProperties = { ["PlanTier"] = text },
+            Diff = { new RestoreRowPropertyDiff { Name = "PlanTier", Kind = RestoreRowDiffKind.Added, Backup = text } },
+            RowSha256 = "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08",
+        });
+    }
+
+    [Fact]
+    public void RestoreRowCommitResponse_serializes_identically_under_both_option_sets()
+    {
+        AssertSameUnderBothOptionSets(new RestoreRowCommitResponse
+        {
+            BackupId = "20260921T040000Z_a1b2c3d4",
+            TableName = "TenantConfiguration",
+            PartitionKey = "pk",
+            RowKey = "rk",
+            Outcome = RestoreRowCommitOutcome.Replaced,
+        });
+    }
+
+    [Fact]
+    public void BackupTriggerResponse_matches_the_anonymous_202_body()
+    {
+        const string jobId = "0f8fad5bd9cb469fa16570867728950e";
+        var old = new { jobId, statusUrl = $"/api/global/backups/jobs/{jobId}" };
+
+        Assert.Equal(
+            JsonSerializer.Serialize(old, old.GetType(), BackupManifestJson.SerializerOptions),
+            JsonSerializer.Serialize(
+                new BackupTriggerResponse { JobId = jobId, StatusUrl = $"/api/global/backups/jobs/{jobId}" },
+                WireOptions));
+    }
+
+    [Fact]
+    public void SessionDeletionMaintenanceTriggerResponse_matches_the_anonymous_202_body()
+    {
+        var old = new { message = "Maintenance run queued.", triggeredBy = "admin@contoso.example" };
+
+        // The old wrapper serialized with DEFAULT options; its keys were camelCase by hand.
+        Assert.Equal(
+            JsonSerializer.Serialize(old, old.GetType()),
+            JsonSerializer.Serialize(
+                new SessionDeletionMaintenanceTriggerResponse { Message = "Maintenance run queued.", TriggeredBy = "admin@contoso.example" },
+                WireOptions));
+    }
+
+    [Fact]
+    public void Delegation_acknowledgements_match_the_anonymous_message_body()
+    {
+        ApiResponseWireParityTests.AssertWireIdentical(
+            new { message = "Delegation ended" },
+            new MessageResponse { Message = "Delegation ended" });
+    }
+}

src/Backend/AutopilotMonitor.Functions.Tests/BootstrapRouteFailClosedTests.cs

@@ -156,6 +156,8 @@ public sealed class BootstrapRouteFailClosedTests
 
         reqMock.SetupGet(r => r.Headers).Returns(headers);
         reqMock.SetupGet(r => r.Url).Returns(new Uri(url));
+        // Query is virtual: without CallBase a loose mock answers null instead of parsing Url.
+        reqMock.SetupGet(r => r.Query).CallBase();
         return reqMock.Object;
     }
 }

src/Backend/AutopilotMonitor.Functions.Tests/ConfigWireParityTests.cs

@@ -1,3 +1,4 @@
+using AutopilotMonitor.Functions.Functions.Config;
 using AutopilotMonitor.Functions.Services;
 using AutopilotMonitor.Shared.Models;
 using AutopilotMonitor.Shared.Models.Config;
@@ -619,12 +620,26 @@ public class ConfigWireParityTests
                 // keys omitted on the wire).
                 TenantDailyRequestLimit = 3000,
                 TenantMonthlyRequestLimit = 60000,
+                // Per purchased delegation slot (the community tier leaves these unset too).
+                SlotDailyRequestLimit = 300,
+                SlotMonthlyRequestLimit = 6000,
+                SlotTenantDailyRequestLimit = 900,
+                SlotTenantMonthlyRequestLimit = 18000,
             },
         };
 
         AssertParity(
-            new { tiers },
-            new PlanTierDefinitionsResponse { Tiers = tiers });
+            new
+            {
+                tiers,
+                // The built-in fallbacks per edition — what a blank definition field means.
+                catalog = new[]
+                {
+                    new { edition = "community", dailyRequestLimit = 100, monthlyRequestLimit = 3000, tenantDailyRequestLimit = 300, tenantMonthlyRequestLimit = 9000, includedDelegatedSlots = 0, slotDailyRequestLimit = 0, slotMonthlyRequestLimit = 0, slotTenantDailyRequestLimit = 0, slotTenantMonthlyRequestLimit = 0 },
+                    new { edition = "pro", dailyRequestLimit = 1000, monthlyRequestLimit = 20000, tenantDailyRequestLimit = 3000, tenantMonthlyRequestLimit = 60000, includedDelegatedSlots = 2, slotDailyRequestLimit = 300, slotMonthlyRequestLimit = 6000, slotTenantDailyRequestLimit = 900, slotTenantMonthlyRequestLimit = 18000 },
+                },
+            },
+            new PlanTierDefinitionsResponse { Tiers = tiers, Catalog = PlanManagementFunction.BuildUsagePlanCatalog() });
     }
 
     // ---- TestWebhookNotification (dual-purpose: success carries the delivery verdict) ----

src/Backend/AutopilotMonitor.Functions.Tests/DelegatedAdminServiceTests.cs

@@ -66,16 +66,12 @@ public class DelegatedAdminServiceTests
     private static void ReturnsGroups(Mock<IAdminRepository> repo, params TenantGroupAssignment[] assignments) =>
         repo.Setup(r => r.GetGroupAssignmentsForUpnAsync(It.IsAny<string>())).ReturnsAsync(assignments.ToList());
 
+    /// <summary>Stubs the hot-path membership read (tenants from one partition read).</summary>
     private static void GroupTenants(Mock<IAdminRepository> repo, string groupId, params string[] tenantIds) =>
-        GroupMembership(repo, groupId, chargeHomeTenantQuota: false, tenantIds);
-
-    /// <summary>Stubs the hot-path membership read (tenants + meta flags from one partition read).</summary>
-    private static void GroupMembership(Mock<IAdminRepository> repo, string groupId, bool chargeHomeTenantQuota, params string[] tenantIds) =>
         repo.Setup(r => r.GetGroupMembershipAsync(groupId)).ReturnsAsync(new TenantGroupMembership
         {
             GroupId = groupId,
             TenantIds = tenantIds.ToList(),
-            ChargeHomeTenantQuota = chargeHomeTenantQuota,
         });
 
     private static DelegatedAdminEntry Row(
@@ -390,96 +386,6 @@ public class DelegatedAdminServiceTests
         repo.Verify(r => r.GetGroupMembershipAsync(GroupId1), Times.Once);
     }
 
-    // --- ChargeHomeTenantQuota: MCP billing attribution rides in the scope (never authorization) ---
-
-    [Fact]
-    public async Task GetScope_FlaggedGroup_MarksItsTenantsHomeCharged()
-    {
-        var (svc, repo) = Build();
-        ReturnsGroups(repo, Assignment(GroupId1));
-        GroupMembership(repo, GroupId1, chargeHomeTenantQuota: true, TenantA, TenantB);
-
-        var scope = await svc.GetScopeAsync(Id(Upn));
-
-        Assert.True(scope.Covers(TenantA));
-        Assert.True(scope.ChargesHome(TenantA));
-        Assert.True(scope.ChargesHome(TenantB));
-        Assert.Equal(2, scope.HomeChargedTenantIds.Count);
-    }
-
-    [Fact]
-    public async Task GetScope_UnflaggedGroup_NothingIsHomeCharged()
-    {
-        var (svc, repo) = Build();
-        ReturnsGroups(repo, Assignment(GroupId1));
-        GroupTenants(repo, GroupId1, TenantA);
-
-        var scope = await svc.GetScopeAsync(Id(Upn));
-
-        Assert.True(scope.Covers(TenantA));
-        Assert.False(scope.ChargesHome(TenantA));
-        Assert.Empty(scope.HomeChargedTenantIds);
-    }
-
-    [Fact]
-    public async Task GetScope_DirectGrantAndFlaggedGroup_TheFlagWins()
-    {
-        // The operator's explicit group flag is the more privileged choice — a parallel direct grant on the
-        // same tenant does not re-attribute the reads to the managed tenant.
-        var (svc, repo) = Build();
-        Returns(repo, Row(TenantA, Constants.DelegatedRoles.DelegatedAdmin));
-        ReturnsGroups(repo, Assignment(GroupId1));
-        GroupMembership(repo, GroupId1, chargeHomeTenantQuota: true, TenantA);
-
-        var scope = await svc.GetScopeAsync(Id(Upn));
-
-        Assert.Equal(Constants.DelegatedRoles.DelegatedAdmin, scope.RoleFor(TenantA)); // stronger role kept
-        Assert.True(scope.ChargesHome(TenantA));
-    }
-
-    [Fact]
-    public async Task GetScope_DisabledAssignmentToFlaggedGroup_ConfersNothing()
-    {
-        var (svc, repo) = Build();
-        ReturnsGroups(repo, Assignment(GroupId1, enabled: false));
-        GroupMembership(repo, GroupId1, chargeHomeTenantQuota: true, TenantA);
-
-        var scope = await svc.GetScopeAsync(Id(Upn));
-
-        Assert.False(scope.Covers(TenantA));
-        Assert.False(scope.ChargesHome(TenantA));
-    }
-
-    [Fact]
-    public async Task SetChargeHomeTenantQuota_InvalidatesEveryAssignee()
-    {
-        var (svc, repo) = Build();
-        ReturnsGroups(repo, Assignment(GroupId1));
-        GroupMembership(repo, GroupId1, chargeHomeTenantQuota: false, TenantA);
-        repo.Setup(r => r.SetTenantGroupChargeHomeTenantQuotaAsync(GroupId1, true)).ReturnsAsync(true);
-        repo.Setup(r => r.GetGroupAssigneesAsync(GroupId1)).ReturnsAsync(new List<TenantGroupAssignment> { Assignment(GroupId1) });
-
-        await svc.GetScopeAsync(Id(Upn));
-        var ok = await svc.SetChargeHomeTenantQuotaAsync(GroupId1, true);
-        await svc.GetScopeAsync(Id(Upn));
-
-        Assert.True(ok);
-        // The flag rides in the cached scope, so the flip forces a re-resolution for the assignee.
-        repo.Verify(r => r.GetGroupMembershipAsync(GroupId1), Times.Exactly(2));
-    }
-
-    [Fact]
-    public async Task SetChargeHomeTenantQuota_UnknownGroup_IsFalse_AndInvalidatesNobody()
-    {
-        var (svc, repo) = Build();
-        repo.Setup(r => r.SetTenantGroupChargeHomeTenantQuotaAsync(It.IsAny<string>(), It.IsAny<bool>())).ReturnsAsync(false);
-
-        var ok = await svc.SetChargeHomeTenantQuotaAsync("no-such-group", true);
-
-        Assert.False(ok);
-        repo.Verify(r => r.GetGroupAssigneesAsync(It.IsAny<string>()), Times.Never);
-    }
-
     // --- Group mutations go through the service and invalidate cached scope (no stale auth) ---
 
     [Fact]

src/Backend/AutopilotMonitor.Functions.Tests/DelegationSelfServiceTests.cs

@@ -45,7 +45,10 @@ public class DelegationSelfServiceTests
         public required Mock<ProConferralService> ProConferral { get; init; }
     }
 
-    private static Harness Build(TenantEdition homeEdition = TenantEdition.Pro, int? slotOverride = null)
+    /// <summary>Pro by conferral only (managed by a Pro MSP): the shape that must never delegate onward.</summary>
+    private static readonly EditionResolution ConferredPro = new(TenantEdition.Pro, EditionSource.Msp, OwnPro: false);
+
+    private static Harness Build(TenantEdition homeEdition = TenantEdition.Pro, int? slotOverride = null, EditionResolution? homeResolution = null)
     {
         var rows = new List<DelegationInvitation>();
         var groupTenants = new List<string>();
@@ -104,7 +107,9 @@ public class DelegationSelfServiceTests
 
         var cache = new MemoryCache(new MemoryCacheOptions());
         var time = new TestTimeProvider(Now);
-        var entitlements = new StubTenantEntitlementService(t => t == Home ? homeEdition : TenantEdition.Community);
+        var entitlements = homeResolution is EditionResolution resolution
+            ? new StubTenantEntitlementService(t => t == Home ? resolution : new EditionResolution(TenantEdition.Community, EditionSource.Community, OwnPro: false), null)
+            : new StubTenantEntitlementService(t => t == Home ? homeEdition : TenantEdition.Community);
         var delegatedAdmins = new DelegatedAdminService(repo.Object, new StubAdminIdentityBindingService(bound: true), entitlements, cache, NullLogger<DelegatedAdminService>.Instance);
         var slots = new DelegatedSlotService(repo.Object, configRepo.Object, invitations.Object, cache, NullLogger<DelegatedSlotService>.Instance, time);
         var audit = new Mock<IMaintenanceRepository>();
@@ -199,6 +204,18 @@ public class DelegationSelfServiceTests
         Assert.Empty(h.Rows);
     }
 
+    [Fact]
+    public async Task CreateInvitation_ConferredProHome_403_NoTransitiveDelegation()
+    {
+        // The would-be manager is Pro only because a Pro MSP manages IT — conferred Pro carries no delegation right.
+        var h = Build(homeResolution: ConferredPro);
+        var r = await h.Svc.CreateInvitationAsync(Home, MspAdmin);
+        Assert.False(r.Ok);
+        Assert.Equal(403, r.Failure!.Status);
+        Assert.Equal(Constants.DelegationCodes.DelegatedAdminNotAllowed, r.Failure.Code);
+        Assert.Empty(h.Rows);
+    }
+
     [Fact]
     public async Task CreateInvitation_NoFreeSlot_409_WithViolation()
     {
@@ -322,6 +339,17 @@ public class DelegationSelfServiceTests
         Assert.Equal(Constants.DelegationCodes.ManagerNotEntitled, r.Failure!.Code);
     }
 
+    [Fact]
+    public async Task Accept_ManagerConferredProOnly_409()
+    {
+        // The inviting tenant lost its own Pro and is now Pro by conferral: its pending link is not redeemable.
+        var h = Build(homeResolution: ConferredPro);
+        h.Rows.Add(Pending());
+        var r = await h.Svc.AcceptAsync(Token(), Customer, CustomerAdmin);
+        Assert.Equal(Constants.DelegationCodes.ManagerNotEntitled, r.Failure!.Code);
+        Assert.Equal(Constants.DelegationInvitationStatus.Pending, h.Rows[0].Status); // untouched
+    }
+
     [Fact]
     public async Task Accept_LimitLoweredSinceInvitation_409_SlotViolation()
     {
@@ -453,6 +481,16 @@ public class DelegationSelfServiceTests
         h.Repo.Verify(x => x.EnsureOwnedTenantGroupAsync(GroupId, It.IsAny<string>(), Home), Times.Once);
     }
 
+    [Fact]
+    public async Task Assign_ConferredProHome_403()
+    {
+        var h = Build(homeResolution: ConferredPro);
+        var r = await h.Svc.AssignAsync(Home, "Analyst@Partner.Example", MspAdmin);
+        Assert.Equal(403, r.Failure!.Status);
+        Assert.Equal(Constants.DelegationCodes.DelegatedAdminNotAllowed, r.Failure.Code);
+        h.Repo.Verify(x => x.AssignGroupAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>()), Times.Never);
+    }
+
     [Fact]
     public async Task Unassign_NotAssigned_404()
     {

src/Backend/AutopilotMonitor.Functions.Tests/DelegationWireParityTests.cs

@@ -106,12 +106,11 @@ public class DelegationWireParityTests
     // ---- Self-service delegation ------------------------------------------------------------
 
     [Fact]
-    public void ManagedTenantListResponse_matches_the_managed_shape_and_omits_null_usage()
+    public void ManagedTenantListResponse_matches_the_managed_shape_and_omits_null_domain_and_since()
     {
         var since = new DateTime(2026, 9, 1, 8, 0, 0, DateTimeKind.Utc);
         var slots = new DelegatedSlotUsageResponse { HomeTenantId = Home, Limit = 2, CatalogLimit = 2, Used = 1, ManagedTenantIds = new[] { TenantA }, PendingInvitations = 0, Holds = Array.Empty<DelegatedSlotHold>() };
         string? domainB = null;
-        ManagedTenantQuotaUsage? usageB = null;
         DateTime? sinceB = null;
 
         AssertParity(
@@ -121,9 +120,8 @@ public class DelegationWireParityTests
                 slots,
                 tenants = new[]
                 {
-                    new { tenantId = TenantA, domain = (string?)"customer.example", source = "self-service", sinceUtc = (DateTime?)since, removable = true,
-                          usage = (ManagedTenantQuotaUsage?)new ManagedTenantQuotaUsage { TenantPlan = "community", TenantDailyLimit = 300, TenantMonthlyLimit = 9000, TenantDailyUsed = 12, TenantMonthlyUsed = 340 } },
-                    new { tenantId = TenantB, domain = domainB, source = "operator", sinceUtc = sinceB, removable = false, usage = usageB },
+                    new { tenantId = TenantA, domain = (string?)"customer.example", source = "self-service", sinceUtc = (DateTime?)since, removable = true },
+                    new { tenantId = TenantB, domain = domainB, source = "operator", sinceUtc = sinceB, removable = false },
                 },
             },
             new ManagedTenantListResponse
@@ -132,8 +130,7 @@ public class DelegationWireParityTests
                 Slots = slots,
                 Tenants = new List<ManagedTenantItem>
                 {
-                    new() { TenantId = TenantA, Domain = "customer.example", Source = "self-service", SinceUtc = since, Removable = true,
-                            Usage = new ManagedTenantQuotaUsage { TenantPlan = "community", TenantDailyLimit = 300, TenantMonthlyLimit = 9000, TenantDailyUsed = 12, TenantMonthlyUsed = 340 } },
+                    new() { TenantId = TenantA, Domain = "customer.example", Source = "self-service", SinceUtc = since, Removable = true },
                     new() { TenantId = TenantB, Source = "operator", Removable = false },
                 },
             });

src/Backend/AutopilotMonitor.Functions.Tests/FeatureEntitlementCatalogTests.cs

@@ -158,6 +158,11 @@ public class FeatureEntitlementCatalogTests
         Assert.Equal(pro.McpMonthlyRequestLimit, conferred.McpMonthlyRequestLimit);
         Assert.Equal(pro.McpTenantDailyRequestLimit, conferred.McpTenantDailyRequestLimit);
         Assert.Equal(pro.McpTenantMonthlyRequestLimit, conferred.McpTenantMonthlyRequestLimit);
+        // …except the slot growth, which follows the delegation right.
+        Assert.Equal(0, conferred.McpSlotDailyRequestLimit);
+        Assert.Equal(0, conferred.McpSlotMonthlyRequestLimit);
+        Assert.Equal(0, conferred.McpSlotTenantDailyRequestLimit);
+        Assert.Equal(0, conferred.McpSlotTenantMonthlyRequestLimit);
     }
 
     [Fact]
@@ -207,6 +212,10 @@ public class FeatureEntitlementCatalogTests
         Assert.Equal(3000, e.McpMonthlyRequestLimit);
         Assert.Equal(300, e.McpTenantDailyRequestLimit);
         Assert.Equal(9000, e.McpTenantMonthlyRequestLimit);
+        Assert.Equal(0, e.McpSlotDailyRequestLimit);
+        Assert.Equal(0, e.McpSlotMonthlyRequestLimit);
+        Assert.Equal(0, e.McpSlotTenantDailyRequestLimit);
+        Assert.Equal(0, e.McpSlotTenantMonthlyRequestLimit);
     }
 
     [Fact]
@@ -224,6 +233,11 @@ public class FeatureEntitlementCatalogTests
         Assert.Equal(20000, e.McpMonthlyRequestLimit);
         Assert.Equal(3000, e.McpTenantDailyRequestLimit);
         Assert.Equal(60000, e.McpTenantMonthlyRequestLimit);
+        // Per purchased delegation slot: 30 % of the Pro windows (an additional slot costs 30 % of Pro).
+        Assert.Equal(300, e.McpSlotDailyRequestLimit);
+        Assert.Equal(6000, e.McpSlotMonthlyRequestLimit);
+        Assert.Equal(900, e.McpSlotTenantDailyRequestLimit);
+        Assert.Equal(18000, e.McpSlotTenantMonthlyRequestLimit);
     }
 
     [Fact]

src/Backend/AutopilotMonitor.Functions.Tests/ImeLogPatternServiceSeedTests.cs

@@ -0,0 +1,142 @@
+using AutopilotMonitor.Functions.Services;
+using AutopilotMonitor.Shared.DataAccess;
+using AutopilotMonitor.Shared.Models;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace AutopilotMonitor.Functions.Tests;
+
+/// <summary>
+/// The IME pattern self-seed behind the newest-source-wins gate (<see cref="RuleCatalogSeedGate"/>):
+/// a GitHub reseed newer than the build owns the table (nothing written, nothing deleted), an
+/// older one hands it back to the binary (missing ids written, retired ids sunset), an empty
+/// table is always seeded, and the code reseed stamps <c>embedded</c>. The retired id stands in
+/// for PS-SCRIPT-EXITCODE, which the deployed binary re-inserted on 2026-09-11 after the reseed
+/// had deleted it.
+/// </summary>
+public class ImeLogPatternServiceSeedTests
+{
+    private const string RetiredId = "IME-RETIRED-TEST";
+    private static readonly DateTime Build = new(2026, 9, 10, 19, 19, 57, DateTimeKind.Utc);
+    private static readonly BackendBuildInfo BuildInfo = new("1.5.1205", "e3b2113", Build);
+
+    private static RuleCatalogStamp GitHubStamp(DateTime at) => new()
+    {
+        Kind = RuleCatalogStamp.KindIme, Source = RuleCatalogStamp.SourceGitHub, StampedAt = at, Count = 82,
+    };
+
+    /// <summary>Global partition = the embedded catalog minus its first id plus one retired built-in row.</summary>
+    private static (List<ImeLogPattern> table, string missingId) DriftedTable()
+    {
+        var embedded = BuiltInImeLogPatterns.GetAll();
+        var missing = embedded[0].PatternId;
+        var table = embedded.Skip(1).Select(p => p.Clone()).ToList();
+        table.Add(new ImeLogPattern
+        {
+            PatternId = RetiredId, Category = "always", Pattern = "^retired", Action = "scriptExitCode",
+            Parameters = new Dictionary<string, string>(), Enabled = true, Description = "retired", IsBuiltIn = true,
+        });
+        return (table, missing);
+    }
+
+    private sealed class Rig
+    {
+        public readonly Mock<IRuleRepository> Repo = new();
+        public readonly List<string> Stored = new();
+        public readonly List<string> Deleted = new();
+
+        public Rig(List<ImeLogPattern> global, RuleCatalogStamp? stamp)
+        {
+            Repo.Setup(r => r.GetImeLogPatternsAsync("global")).ReturnsAsync(() => global.Select(p => p.Clone()).ToList());
+            Repo.Setup(r => r.GetImeLogPatternsAsync(It.Is<string>(k => k != "global"))).ReturnsAsync(new List<ImeLogPattern>());
+            Repo.Setup(r => r.GetRuleCatalogStampAsync(RuleCatalogStamp.KindIme)).ReturnsAsync(stamp);
+            Repo.Setup(r => r.StoreImeLogPatternAsync(It.IsAny<ImeLogPattern>(), "global"))
+                .Callback<ImeLogPattern, string>((p, _) => Stored.Add(p.PatternId)).ReturnsAsync(true);
+            Repo.Setup(r => r.DeleteImeLogPatternAsync("global", It.IsAny<string>()))
+                .Callback<string, string>((_, id) => Deleted.Add(id)).ReturnsAsync(true);
+            Repo.Setup(r => r.SetRuleCatalogStampAsync(It.IsAny<RuleCatalogStamp>())).ReturnsAsync(true);
+        }
+    }
+
+    [Fact]
+    public async Task GitHub_reseed_newer_than_the_build_owns_the_table()
+    {
+        var (table, missing) = DriftedTable();
+        var rig = new Rig(table, GitHubStamp(Build.AddHours(6)));
+        var service = new ImeLogPatternService(rig.Repo.Object, NullLogger<ImeLogPatternService>.Instance, BuildInfo);
+
+        var catalog = await service.GetGlobalCatalogAsync();
+
+        Assert.Empty(rig.Stored);
+        Assert.Empty(rig.Deleted);
+        Assert.Contains(catalog, p => p.PatternId == RetiredId);       // the reseed's table, untouched
+        Assert.DoesNotContain(catalog, p => p.PatternId == missing);
+    }
+
+    [Fact]
+    public async Task GitHub_reseed_older_than_the_build_hands_the_table_to_the_binary()
+    {
+        var (table, missing) = DriftedTable();
+        var rig = new Rig(table, GitHubStamp(Build.AddHours(-1)));
+        var service = new ImeLogPatternService(rig.Repo.Object, NullLogger<ImeLogPatternService>.Instance, BuildInfo);
+
+        await service.GetGlobalCatalogAsync();
+
+        Assert.Contains(missing, rig.Stored);      // added from the embedded catalog
+        Assert.Equal(new[] { RetiredId }, rig.Deleted); // sunset: no longer shipped
+    }
+
+    [Fact]
+    public async Task Without_build_info_the_gate_is_open_and_the_stamp_is_never_read()
+    {
+        var (table, missing) = DriftedTable();
+        var rig = new Rig(table, GitHubStamp(Build.AddHours(6)));
+        var service = new ImeLogPatternService(rig.Repo.Object, NullLogger<ImeLogPatternService>.Instance);
+
+        await service.GetGlobalCatalogAsync();
+
+        Assert.Contains(missing, rig.Stored);
+        rig.Repo.Verify(r => r.GetRuleCatalogStampAsync(It.IsAny<string>()), Times.Never);
+    }
+
+    [Fact]
+    public async Task Empty_table_is_seeded_even_behind_a_newer_reseed()
+    {
+        var rig = new Rig(new List<ImeLogPattern>(), GitHubStamp(Build.AddHours(6)));
+        var service = new ImeLogPatternService(rig.Repo.Object, NullLogger<ImeLogPatternService>.Instance, BuildInfo);
+
+        await service.GetGlobalCatalogAsync();
+
+        Assert.Equal(BuiltInImeLogPatterns.GetAll().Count, rig.Stored.Count);
+        Assert.Empty(rig.Deleted);
+    }
+
+    [Fact]
+    public async Task Seed_runs_once_per_instance_also_when_the_gate_is_closed()
+    {
+        var (table, _) = DriftedTable();
+        var rig = new Rig(table, GitHubStamp(Build.AddHours(6)));
+        var service = new ImeLogPatternService(rig.Repo.Object, NullLogger<ImeLogPatternService>.Instance, BuildInfo);
+
+        await service.GetGlobalCatalogAsync();
+        await service.GetGlobalCatalogAsync();
+
+        rig.Repo.Verify(r => r.GetRuleCatalogStampAsync(RuleCatalogStamp.KindIme), Times.Once);
+    }
+
+    [Fact]
+    public async Task Code_reseed_stamps_the_embedded_source()
+    {
+        var (table, _) = DriftedTable();
+        var rig = new Rig(table, GitHubStamp(Build.AddHours(6)));
+        var service = new ImeLogPatternService(rig.Repo.Object, NullLogger<ImeLogPatternService>.Instance, BuildInfo);
+
+        var (deleted, written) = await service.ReseedBuiltInPatternsAsync();
+
+        Assert.Equal(table.Count, deleted);
+        Assert.Equal(BuiltInImeLogPatterns.GetAll().Count, written);
+        rig.Repo.Verify(r => r.SetRuleCatalogStampAsync(It.Is<RuleCatalogStamp>(s =>
+            s.Kind == RuleCatalogStamp.KindIme && s.Source == RuleCatalogStamp.SourceEmbedded && s.Count == written)), Times.Once);
+    }
+}

src/Backend/AutopilotMonitor.Functions.Tests/ImeMsiArchiverTests.cs

@@ -441,6 +441,96 @@ public class ImeMsiArchiverTests
         Assert.Equal(0, archiver.ProvenanceCalls);
     }
 
+    // =========================================================================
+    // Archive already holds the version before the walk (operator backfill of a
+    // build no host serves any more). The 409 path can never be reached for it —
+    // without the pre-walk check the row stays Failed:VersionMismatch forever.
+    // =========================================================================
+
+    [Fact]
+    public async Task ArchiveAsync_VersionAlreadyInArchive_NoHostServesIt_ArchivedWithoutDownload()
+    {
+        var archivedPayload = new byte[1024];
+        new Random(11).NextBytes(archivedPayload);
+        var expectedSha = Convert.ToHexString(SHA256.HashData(archivedPayload)).ToLowerInvariant();
+        var archiver = new RecordingArchiver
+        {
+            ArchivedMsiExists = true,
+            ArchivedPayload = archivedPayload,
+            DefaultProductVersion = "9.9.9.0", // every host has moved on
+        };
+        archiver.ProductVersionByUrl[RecordingArchiver.ArchivedOrigin] = Version;
+
+        var result = await archiver.ArchiveAsync(Envelope());
+
+        Assert.True(result.Success);
+        Assert.Equal(ImeMsiArchiver.Statuses.Archived, result.Status);
+        Assert.False(result.Retryable);
+        Assert.Equal($"{Version}/IntuneWindowsAgent.msi", result.BlobPath);
+        // The row must describe the archived bytes; the source URL of a backfill is unknown.
+        Assert.Equal(expectedSha, result.Sha256);
+        Assert.Equal(archivedPayload.Length, result.SizeBytes);
+        Assert.Null(result.SourceUrl);
+        Assert.Equal(0, archiver.DownloadCalls);
+        Assert.Equal(0, archiver.UploadCalls);
+        Assert.Equal(0, archiver.ProvenanceCalls); // sidecar came with the backfill
+    }
+
+    [Fact]
+    public async Task ArchiveAsync_VersionAlreadyInArchive_MissingSidecar_IsWrittenWithoutSourceUrl()
+    {
+        var archiver = new RecordingArchiver { ArchivedMsiExists = true, ProvenanceExists = false };
+
+        var result = await archiver.ArchiveAsync(Envelope());
+
+        Assert.True(result.Success);
+        Assert.Equal(0, archiver.DownloadCalls);
+        Assert.Equal(1, archiver.ProvenanceCalls);
+        Assert.Equal($"{Version}/provenance.json", archiver.ProvenanceLastPath);
+        using var doc = System.Text.Json.JsonDocument.Parse(archiver.ProvenanceLastJson);
+        Assert.Equal(System.Text.Json.JsonValueKind.Null, doc.RootElement.GetProperty("url").ValueKind);
+        // A null source must not compare equal to a null event URL.
+        Assert.False(doc.RootElement.GetProperty("urlFromEvent").GetBoolean());
+        Assert.Equal(0, doc.RootElement.GetProperty("candidates").GetArrayLength());
+    }
+
+    [Theory]
+    [InlineData("1.103.101.0")] // another ring's build filed under this version
+    [InlineData(null)]          // not a readable package
+    public async Task ArchiveAsync_ArchiveEntryIsNotTheObservedVersion_NotAccepted_WalkRuns(string? archivedProductVersion)
+    {
+        var archiver = new RecordingArchiver
+        {
+            ArchivedMsiExists = true,
+            DefaultProductVersion = "9.9.9.0",
+        };
+        archiver.ProductVersionByUrl[RecordingArchiver.ArchivedOrigin] = archivedProductVersion;
+
+        var result = await archiver.ArchiveAsync(Envelope());
+
+        Assert.False(result.Success);
+        Assert.Equal(ImeMsiArchiver.Statuses.FailedVersionMismatch, result.Status);
+        Assert.Equal(ImeMsiArchiver.BuildCandidateUrls(EventUrl).Count, archiver.DownloadCalls);
+        Assert.Equal(0, archiver.ProvenanceCalls);
+    }
+
+    [Fact]
+    public async Task ArchiveAsync_ArchiveCheckFails_RetryableError_NoDownload()
+    {
+        var archiver = new RecordingArchiver
+        {
+            ArchivedMsiExists = true,
+            ArchivedOpenException = new RequestFailedException(500, "read failed"),
+        };
+
+        var result = await archiver.ArchiveAsync(Envelope());
+
+        Assert.False(result.Success);
+        Assert.Equal(ImeMsiArchiver.Statuses.FailedError, result.Status);
+        Assert.True(result.Retryable);
+        Assert.Equal(0, archiver.DownloadCalls);
+    }
+
     // =========================================================================
     // Provenance-write gap (daily review 2026-08-18): MSI upload is write-once,
     // so a first attempt that dies between the MSI and the provenance upload
@@ -660,6 +750,10 @@ public class ImeMsiArchiverTests
         public Exception? UploadException { get; set; }
         public Exception? ProvenanceException { get; set; }
         public bool ProvenanceExists { get; set; } = true;
+        /// <summary>Whether the archive already holds an installer for the version BEFORE the walk (operator backfill).</summary>
+        public bool ArchivedMsiExists { get; set; }
+        /// <summary>Key into <see cref="ProductVersionByUrl"/> for the archived bytes — they have no URL of their own.</summary>
+        public const string ArchivedOrigin = "archive://existing";
         public byte[]? ArchivedPayload { get; set; }
         public Exception? ArchivedOpenException { get; set; }
 
@@ -722,12 +816,15 @@ public class ImeMsiArchiverTests
             return Task.CompletedTask;
         }
 
-        protected override Task<bool> ProvenanceExistsAsync(string blobPath, CancellationToken cancellationToken)
-            => Task.FromResult(ProvenanceExists);
+        protected override Task<bool> ArchiveBlobExistsAsync(string blobPath, CancellationToken cancellationToken)
+            => Task.FromResult(blobPath.EndsWith("provenance.json", StringComparison.Ordinal)
+                ? ProvenanceExists
+                : ArchivedMsiExists);
 
         protected override Task<Stream> OpenArchivedMsiAsync(string blobPath, CancellationToken cancellationToken)
         {
             if (ArchivedOpenException is not null) throw ArchivedOpenException;
+            _currentUrl = ArchivedOrigin;
             return Task.FromResult<Stream>(new MemoryStream(ArchivedPayload ?? Payload));
         }
     }

src/Backend/AutopilotMonitor.Functions.Tests/ImePatternHealthTests.cs

@@ -93,8 +93,9 @@ public class ImePatternHealthTests
             ["PS-AGENT-OUTPUT"] = "not-a-number",
         };
         var data = new Dictionary<string, object> { ["hits"] = hits, ["imeVersion"] = "1.105.103.0" };
+        var shipped = new HashSet<string>(new[] { "IME-ESP-PHASE", "IME-STARTED", "IME-DO-TEL", "PS-AGENT-OUTPUT" }, StringComparer.OrdinalIgnoreCase);
 
-        var result = ImePatternHealthService.ExtractBuiltInHits(data);
+        var result = ImePatternHealthService.ExtractBuiltInHits(data, shipped);
 
         Assert.Equal(12, result["IME-ESP-PHASE"]);
         Assert.Equal(1, result["IME-STARTED"]);
@@ -106,8 +107,9 @@ public class ImePatternHealthTests
     [Fact]
     public void ExtractBuiltInHits_without_a_histogram_is_empty()
     {
-        Assert.Empty(ImePatternHealthService.ExtractBuiltInHits(null));
-        Assert.Empty(ImePatternHealthService.ExtractBuiltInHits(new Dictionary<string, object> { ["linesRead"] = 5 }));
+        var shipped = new HashSet<string>(new[] { "IME-ESP-PHASE" }, StringComparer.OrdinalIgnoreCase);
+        Assert.Empty(ImePatternHealthService.ExtractBuiltInHits(null, shipped));
+        Assert.Empty(ImePatternHealthService.ExtractBuiltInHits(new Dictionary<string, object> { ["linesRead"] = 5 }, shipped));
     }
 
     [Fact]
@@ -128,9 +130,13 @@ public class ImePatternHealthTests
             new() { PatternId = "IME-NEW-THING", Category = "currentPhase", Enabled = true }, // no data yet
         };
 
-        var r = ImePatternHealthService.BuildResponse(stats, history, catalog, flaggedAt);
+        var stamp = new RuleCatalogStamp { Kind = RuleCatalogStamp.KindIme, Source = RuleCatalogStamp.SourceGitHub, StampedAt = flaggedAt.AddDays(-1), Count = 3 };
+        var r = ImePatternHealthService.BuildResponse(stats, history, catalog, stamp, flaggedAt);
 
         Assert.Equal("1.104.102.0", r.BaselineVersion);
+        Assert.Equal("github", r.Catalog.Source);
+        Assert.Equal(flaggedAt.AddDays(-1), r.Catalog.StampedAt);
+        Assert.Equal(3, r.Catalog.PatternCount);
         Assert.Equal("1.105.103.0", r.Versions[0].Version); // newest first
         Assert.Equal(30, r.Versions[0].Sessions);
         Assert.Equal(31, r.Versions[0].FleetSessions);
@@ -150,11 +156,13 @@ public class ImePatternHealthTests
     }
 
     [Fact]
-    public void BuiltInPatternIds_matches_the_embedded_catalog()
+    public void BuildResponse_without_a_stamp_reports_the_embedded_source()
     {
-        var ids = BuiltInImeLogPatterns.BuiltInPatternIds.Value;
-        Assert.Contains("IME-ESP-PHASE", ids);
-        Assert.Contains("PS-SCRIPT-RESULT", ids);
-        Assert.Equal(BuiltInImeLogPatterns.GetAll().Count, ids.Count);
+        var r = ImePatternHealthService.BuildResponse(new List<ImePatternStatsEntry>(), new List<ImeVersionHistoryEntry>(),
+            new List<ImeLogPattern> { new() { PatternId = "IME-ESP-PHASE", Category = "always", Enabled = true } }, null, DateTime.UtcNow);
+
+        Assert.Equal("embedded", r.Catalog.Source);
+        Assert.Null(r.Catalog.StampedAt);
+        Assert.Equal(1, r.Catalog.PatternCount);
     }
 }

src/Backend/AutopilotMonitor.Functions.Tests/InfrastructureWireParityTests.cs

@@ -656,7 +656,8 @@ public class InfrastructureWireParityTests
     // DELIBERATE wire change (error-envelope pass): the body now leads with the envelope prefix
     // error/code/correlationId (error carries the former `message`); quotaExceeded stays as the
     // MCP's discriminator. These literals pin the NEW shape (correlationId is stamped by the writer,
-    // so the builder leaves it empty).
+    // so the builder leaves it empty). Both windows belong to the caller's own tenant since 2026-09-11
+    // (the budget follows the delegating tenant) — there is no managed-tenant shape any more.
 
     [Fact]
     public void McpQuotaExceededResponse_matches_the_daily_blocked_shape()
@@ -745,62 +746,6 @@ public class InfrastructureWireParityTests
             });
     }
 
-    [Fact]
-    public void McpQuotaExceededResponse_matches_the_managed_tenant_blocked_shape()
-    {
-        // A delegated (MSP) read charged to a MANAGED Community tenant whose organization window is spent:
-        // level=tenant, the managed tenant is named (label + targetTenantId) and the upgrade path is spelled out.
-        var decision = McpQuotaService.BuildDecision(
-            new McpPlanLimits("pro", 1000, 20000, "community", 300, 9000),
-            dailyUsed: 12, monthlyUsed: 340, tenantDailyUsed: 300, tenantMonthlyUsed: 2100,
-            new DateTime(2026, 8, 30, 15, 0, 0, DateTimeKind.Utc),
-            targetTenantId: "7aa20c11-0002-4b7c-a1d2-52f3aaaa0002");
-
-        AssertParity(
-            new
-            {
-                error = "MCP daily request quota of the managed tenant 'customer.example' exceeded (tenant plan 'community', shared by all its members and delegated admins). That tenant is on the Community plan, which is sized for occasional use; its own plan governs this window, not yours. Upgrading that tenant to Pro lifts its organization windows. Resets at 2026-08-31T00:00:00Z.",
-                code = "QuotaExceeded",
-                correlationId = "",
-                quotaExceeded = true,
-                plan = "pro",
-                scope = "daily",
-                level = "tenant",
-                limit = 300,
-                used = 300L,
-                resetUtc = "2026-08-31T00:00:00Z",
-                targetTenantId = "7aa20c11-0002-4b7c-a1d2-52f3aaaa0002"
-            },
-            McpQuotaEnforcementMiddleware.BuildExceededResponse(decision, "customer.example"));
-    }
-
-    [Fact]
-    public void McpQuotaExceededResponse_matches_the_all_managed_tenants_exhausted_shape()
-    {
-        // The fleet aggregate where EVERY managed tenant is spent: no single target, the count is named.
-        var decision = McpQuotaService.BuildDecision(
-            new McpPlanLimits("pro", 1000, 20000, "community", 300, 9000),
-            dailyUsed: 12, monthlyUsed: 340, tenantDailyUsed: 300, tenantMonthlyUsed: 2100,
-            new DateTime(2026, 8, 30, 15, 0, 0, DateTimeKind.Utc),
-            targetTenantId: "7aa20c11-0002-4b7c-a1d2-52f3aaaa0002");
-
-        AssertParity(
-            new
-            {
-                error = "MCP request quota exceeded for all 2 managed tenants in scope (each managed tenant's own plan governs its organization windows; upgrading a managed tenant to Pro lifts them). Earliest reset at 2026-08-31T00:00:00Z.",
-                code = "QuotaExceeded",
-                correlationId = "",
-                quotaExceeded = true,
-                plan = "pro",
-                scope = "daily",
-                level = "tenant",
-                limit = 300,
-                used = 300L,
-                resetUtc = "2026-08-31T00:00:00Z"
-            },
-            McpQuotaEnforcementMiddleware.BuildExceededResponse(decision, exhaustedTenantCount: 2));
-    }
-
     private static void AssertParity(object anonymousLiteral, IApiResponse typed)
         => ApiResponseWireParityTests.AssertWireIdentical(anonymousLiteral, typed);
 }

src/Backend/AutopilotMonitor.Functions.Tests/MaintenanceRunGateTests.cs

@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using AutopilotMonitor.Functions.Services;
+using AutopilotMonitor.Functions.Services.Backup;
+using AutopilotMonitor.Functions.Services.Maintenance;
+using AutopilotMonitor.Shared.DataAccess;
+using AutopilotMonitor.Shared.Models;
+using Azure.Storage.Blobs.Specialized;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace AutopilotMonitor.Functions.Tests;
+
+/// <summary>
+/// Single-flight of the platform maintenance run: the 2h timer and the manual trigger enter
+/// through one gate, so a second run is skipped instead of aggregating, cleaning up and
+/// backfilling the same tables in parallel — and a skip never looks like an active run.
+/// </summary>
+public class MaintenanceRunGateTests
+{
+    private sealed class Harness
+    {
+        public Mock<MaintenanceRunLockStore> LockStore { get; }
+        public Mock<BlobLeaseClient> Lease { get; } = new();
+        public List<string> OpsEvents { get; } = new();
+        public MaintenanceRunGate Sut { get; }
+
+        public Harness()
+        {
+            LockStore = new Mock<MaintenanceRunLockStore>(new SessionDeletionMaintenanceFunctionTests.MaintenanceBlobStub());
+            LockStore.Setup(l => l.AcquireLeaseAsync(It.IsAny<TimeSpan?>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Lease.Object);
+
+            var opsRepo = new Mock<IOpsEventRepository>();
+            opsRepo.Setup(r => r.SaveOpsEventAsync(It.IsAny<OpsEventEntry>()))
+                .Returns<OpsEventEntry>(e => { lock (OpsEvents) OpsEvents.Add(e.EventType); return Task.CompletedTask; });
+            var adminConfig = new Mock<AdminConfigurationService>(
+                Mock.Of<IConfigRepository>(), NullLogger<AdminConfigurationService>.Instance, new MemoryCache(new MemoryCacheOptions()));
+            var opsService = new OpsEventService(opsRepo.Object, NullLogger<OpsEventService>.Instance,
+                TestNotifications.InertOpsAlertDispatch(adminConfig.Object));
+
+            Sut = new MaintenanceRunGate(LockStore.Object, opsService, NullLogger<MaintenanceRunGate>.Instance);
+        }
+
+        public void HoldLease() =>
+            LockStore.Setup(l => l.AcquireLeaseAsync(It.IsAny<TimeSpan?>(), It.IsAny<CancellationToken>()))
+                .ThrowsAsync(new LeaseHeldException("held", new Exception("409")));
+    }
+
+    [Fact]
+    public async Task A_held_lease_skips_the_run_and_never_reports_it_as_started()
+    {
+        var h = new Harness();
+        h.HoldLease();
+        var ran = false;
+
+        var result = await h.Sut.RunExclusiveAsync("Timer", () => { ran = true; return Task.CompletedTask; });
+
+        Assert.False(result);
+        Assert.False(ran);
+        Assert.Equal(new[] { OpsEventTypes.MaintenanceSkippedLocked }, h.OpsEvents);
+    }
+
+    [Fact]
+    public async Task Started_is_written_under_the_lease_before_the_body_and_the_lease_is_released_last()
+    {
+        var h = new Harness();
+        var order = new List<string>();
+        h.Lease.Setup(l => l.ReleaseAsync(It.IsAny<Azure.RequestConditions>(), It.IsAny<CancellationToken>()))
+            .Callback(() => order.Add("release"))
+            .ReturnsAsync(Mock.Of<Azure.Response<Azure.Storage.Blobs.Models.ReleasedObjectInfo>>());
+
+        var result = await h.Sut.RunExclusiveAsync("admin@example.com", () =>
+        {
+            order.Add($"body after [{string.Join(",", h.OpsEvents)}]");
+            return Task.CompletedTask;
+        });
+
+        Assert.True(result);
+        Assert.Equal(new[] { $"body after [{OpsEventTypes.MaintenanceStarted}]", "release" }, order);
+    }
+
+    [Fact]
+    public async Task The_lease_is_released_when_the_body_throws()
+    {
+        var h = new Harness();
+        var released = false;
+        h.Lease.Setup(l => l.ReleaseAsync(It.IsAny<Azure.RequestConditions>(), It.IsAny<CancellationToken>()))
+            .Callback(() => released = true)
+            .ReturnsAsync(Mock.Of<Azure.Response<Azure.Storage.Blobs.Models.ReleasedObjectInfo>>());
+
+        await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            h.Sut.RunExclusiveAsync("Timer", () => throw new InvalidOperationException("boom")));
+
+        Assert.True(released);
+    }
+
+    [Fact]
+    public async Task Probe_reports_an_active_run_while_the_lease_is_held()
+    {
+        var h = new Harness();
+        h.HoldLease();
+
+        Assert.True(await h.Sut.IsRunActiveAsync());
+        Assert.Empty(h.OpsEvents);
+    }
+
+    [Fact]
+    public async Task Probe_releases_its_lease_and_reports_no_active_run()
+    {
+        var h = new Harness();
+        var released = false;
+        h.Lease.Setup(l => l.ReleaseAsync(It.IsAny<Azure.RequestConditions>(), It.IsAny<CancellationToken>()))
+            .Callback(() => released = true)
+            .ReturnsAsync(Mock.Of<Azure.Response<Azure.Storage.Blobs.Models.ReleasedObjectInfo>>());
+
+        Assert.False(await h.Sut.IsRunActiveAsync());
+        Assert.True(released);
+    }
+
+    [Fact]
+    public async Task Probe_lets_a_failed_release_surface_so_nothing_is_queued_behind_a_stuck_lease()
+    {
+        // A queued run picked up seconds later would find the probe's own lease still held,
+        // skip as "locked" and delete the message — the operator's run would silently vanish.
+        var h = new Harness();
+        h.Lease.Setup(l => l.ReleaseAsync(It.IsAny<Azure.RequestConditions>(), It.IsAny<CancellationToken>()))
+            .ThrowsAsync(new Azure.RequestFailedException(500, "storage down"));
+
+        await Assert.ThrowsAsync<Azure.RequestFailedException>(() => h.Sut.IsRunActiveAsync());
+    }
+}

src/Backend/AutopilotMonitor.Functions.Tests/MaintenanceServiceExcessiveEventAutoActionTests.cs

@@ -116,6 +116,53 @@ public class MaintenanceServiceExcessiveEventAutoActionTests
         Assert.False(MaintenanceService.IsAutoActionEligible(status));
     }
 
+    // ── Recount gate ──────────────────────────────────────────────────────────
+    // The stored counter doubles on replayed batches, so every warn and every block is
+    // decided on a recount. The gate keeps that Events-partition scan to candidates that
+    // still have something to fire.
+
+    [Fact]
+    public void HasPendingAction_WarnNotYetFired_IsPending()
+    {
+        Assert.True(MaintenanceService.HasPendingExcessiveEventAction(
+            storedEventCount: 2001, SessionStatus.Succeeded, alreadyAlerted: false, alreadyAutoActioned: false,
+            warnThreshold: 2000, autoMode: "Off", autoThreshold: 2500));
+    }
+
+    [Fact]
+    public void HasPendingAction_BlockNotYetFiredOnRunningSession_IsPending()
+    {
+        Assert.True(MaintenanceService.HasPendingExcessiveEventAction(
+            storedEventCount: 2501, SessionStatus.InProgress, alreadyAlerted: true, alreadyAutoActioned: false,
+            warnThreshold: 2000, autoMode: "Block", autoThreshold: 2500));
+    }
+
+    [Fact]
+    public void HasPendingAction_FinishedSessionAboveBlockThreshold_IsNotRescannedForever()
+    {
+        // Warned long ago, can never be blocked any more: without the eligibility term this
+        // row would cost a full partition scan on every sweep until retention removes it.
+        Assert.False(MaintenanceService.HasPendingExcessiveEventAction(
+            storedEventCount: 9000, SessionStatus.Incomplete, alreadyAlerted: true, alreadyAutoActioned: false,
+            warnThreshold: 2000, autoMode: "Block", autoThreshold: 2500));
+    }
+
+    [Fact]
+    public void HasPendingAction_BothAlreadyFired_IsNotPending()
+    {
+        Assert.False(MaintenanceService.HasPendingExcessiveEventAction(
+            storedEventCount: 9000, SessionStatus.InProgress, alreadyAlerted: true, alreadyAutoActioned: true,
+            warnThreshold: 2000, autoMode: "Block", autoThreshold: 2500));
+    }
+
+    [Fact]
+    public void HasPendingAction_WarnDisabledAndModeOff_IsNotPending()
+    {
+        Assert.False(MaintenanceService.HasPendingExcessiveEventAction(
+            storedEventCount: 9000, SessionStatus.InProgress, alreadyAlerted: false, alreadyAutoActioned: false,
+            warnThreshold: 0, autoMode: "Off", autoThreshold: 2500));
+    }
+
     // ── Status parsing feeding that gate ──────────────────────────────────────
     // The runaway query projects a subset of columns. SessionStatus.InProgress is ordinal 0,
     // so an unparsed Status would leave every row looking in-progress and the gate above

src/Backend/AutopilotMonitor.Functions.Tests/McpOrganizationUsageAggregationTests.cs

@@ -7,47 +7,43 @@ namespace AutopilotMonitor.Functions.Tests;
 
 /// <summary>
 /// Tests for the pure folds behind GET metrics/mcp-usage/organization (and its global twin): one item per
-/// account, the delegated (MSP) marker from the row's home tenant, the three windows (today / month / range),
-/// and the tenant's organization windows over every account.
+/// account, the three windows (today / month / range), and the tenant's organization windows over every
+/// account including the purchased-slot breakdown.
 /// </summary>
 public class McpOrganizationUsageAggregationTests
 {
     private const string Tenant = "11111111-1111-1111-1111-111111111111";
-    private const string MspHome = "99999999-9999-9999-9999-999999999999";
     private const string Member = "aaaaaaaa-0000-0000-0000-000000000001";
-    private const string MspAdmin = "bbbbbbbb-0000-0000-0000-000000000002";
+    private const string OtherMember = "bbbbbbbb-0000-0000-0000-000000000002";
 
-    private static TenantUsageRecord Row(string user, string date, long count, string upn = "", string home = "", DateTime? last = null)
-        => new() { TenantId = Tenant, UserId = user, Date = date, RequestCount = count, UserPrincipalName = upn, HomeTenantId = home, LastRequestAt = last };
+    private static TenantUsageRecord Row(string user, string date, long count, string upn = "", DateTime? last = null)
+        => new() { TenantId = Tenant, UserId = user, Date = date, RequestCount = count, UserPrincipalName = upn, LastRequestAt = last };
 
     [Fact]
-    public void Aggregate_MarksDelegatedAccounts_ByForeignHomeTenant()
+    public void Aggregate_OneItemPerAccount_KeepsTheLatestUpn()
     {
         var rows = new[]
         {
-            Row(Member, "20260902", 10, "alice@contoso.com"),
-            Row(MspAdmin, "20260902", 40, "msp@partner.example", MspHome),
+            Row(Member, "20260901", 10),                       // written before the UPN column existed
+            Row(Member, "20260902", 5, "alice@contoso.com"),
+            Row(OtherMember, "20260902", 40, "bob@contoso.com"),
         };
 
-        var items = McpUsageMetricsFunction.AggregateOrganizationUsage(rows, Tenant, "20260901", "20260902", "20260902", "20260901");
+        var items = McpUsageMetricsFunction.AggregateOrganizationUsage(rows, "20260901", "20260902", "20260902", "20260901");
 
-        var msp = Assert.Single(items, i => i.UserId == MspAdmin);
-        Assert.True(msp.Delegated);
-        Assert.Equal(MspHome, msp.HomeTenantId);
-        Assert.Equal("msp@partner.example", msp.UserPrincipalName);
-        var member = Assert.Single(items, i => i.UserId == Member);
-        Assert.False(member.Delegated);
-        Assert.Null(member.HomeTenantId);
+        Assert.Equal(2, items.Count);
+        var alice = Assert.Single(items, i => i.UserId == Member);
+        Assert.Equal("alice@contoso.com", alice.UserPrincipalName);
+        Assert.Equal(15, alice.RequestsThisMonth);
+        var bob = Assert.Single(items, i => i.UserId == OtherMember);
+        Assert.Equal("bob@contoso.com", bob.UserPrincipalName);
     }
 
     [Fact]
-    public void Aggregate_OwnTenantAsHome_IsNotDelegated()
+    public void Aggregate_RowsWithoutUpn_LeaveItNull()
     {
-        // Legacy/own rows may carry the tenant itself (or nothing) as home — both mean "own member".
-        var rows = new[] { Row(Member, "20260902", 1, home: Tenant), Row(Member, "20260901", 1) };
-        var items = McpUsageMetricsFunction.AggregateOrganizationUsage(rows, Tenant, "20260901", "20260902", "20260902", "20260901");
-        var item = Assert.Single(items);
-        Assert.False(item.Delegated);
+        var rows = new[] { Row(Member, "20260902", 1), Row(Member, "20260901", 1) };
+        var item = Assert.Single(McpUsageMetricsFunction.AggregateOrganizationUsage(rows, "20260901", "20260902", "20260902", "20260901"));
         Assert.Null(item.UserPrincipalName);
     }
 
@@ -62,7 +58,7 @@ public class McpOrganizationUsageAggregationTests
             Row(Member, "20260903", 7),   // read window past the range end (never counted in range)
         };
 
-        var items = McpUsageMetricsFunction.AggregateOrganizationUsage(rows, Tenant, "20260815", "20260902", "20260902", "20260901");
+        var items = McpUsageMetricsFunction.AggregateOrganizationUsage(rows, "20260815", "20260902", "20260902", "20260901");
 
         var item = Assert.Single(items);
         Assert.Equal(5, item.RequestsToday);
@@ -79,12 +75,12 @@ public class McpOrganizationUsageAggregationTests
         {
             Row(Member, "20260901", 3, last: newer),
             Row(Member, "20260902", 1, last: older),
-            Row(MspAdmin, "20260902", 50, home: MspHome, last: older),
+            Row(OtherMember, "20260902", 50, last: older),
         };
 
-        var items = McpUsageMetricsFunction.AggregateOrganizationUsage(rows, Tenant, "20260901", "20260902", "20260902", "20260901");
+        var items = McpUsageMetricsFunction.AggregateOrganizationUsage(rows, "20260901", "20260902", "20260902", "20260901");
 
-        Assert.Equal(new[] { MspAdmin, Member }, items.Select(i => i.UserId));
+        Assert.Equal(new[] { OtherMember, Member }, items.Select(i => i.UserId));
         Assert.Equal(newer, items[1].LastRequestAt);
     }
 
@@ -93,11 +89,11 @@ public class McpOrganizationUsageAggregationTests
     {
         var rows = new[]
         {
-            Row(Member, "20260815", 100),                 // last month: neither window
-            Row(Member, "20260901", 20),                  // month
-            Row(Member, "20260902", 2),                   // today + month
-            Row(MspAdmin, "20260902", 5, home: MspHome),  // delegated reads count against the same windows
-            Row(Member, "20260903", 7),                   // read window past today (range only)
+            Row(Member, "20260815", 100),       // last month: neither window
+            Row(Member, "20260901", 20),        // month
+            Row(Member, "20260902", 2),         // today + month
+            Row(OtherMember, "20260902", 5),    // another account counts against the same windows
+            Row(Member, "20260903", 7),         // read window past today (range only)
         };
 
         var quota = McpUsageMetricsFunction.BuildOrganizationQuota(
@@ -108,6 +104,25 @@ public class McpOrganizationUsageAggregationTests
         Assert.Equal(15000, quota.MonthlyLimit);
         Assert.Equal(7, quota.DailyUsed);
         Assert.Equal(27, quota.MonthlyUsed);
+        // No purchased slot: the breakdown stays off the wire.
+        Assert.Null(quota.PurchasedDelegatedSlots);
+        Assert.Null(quota.SlotDailyLimit);
+        Assert.Null(quota.SlotMonthlyLimit);
+    }
+
+    [Fact]
+    public void OrganizationQuota_PurchasedSlots_CarryTheBreakdown()
+    {
+        // 3 000 + 3 × 900 = 5 700 — the limits arrive grown; the slot fields let the page show the sum.
+        var quota = McpUsageMetricsFunction.BuildOrganizationQuota(
+            new[] { Row(Member, "20260902", 3) },
+            new McpQuotaService.TenantPlanLimits("pro", 5700, 114000, PurchasedDelegatedSlots: 3, SlotTenantDailyLimit: 900, SlotTenantMonthlyLimit: 18000),
+            "20260902", "20260901");
+
+        Assert.Equal(5700, quota.DailyLimit);
+        Assert.Equal(3, quota.PurchasedDelegatedSlots);
+        Assert.Equal(900, quota.SlotDailyLimit);
+        Assert.Equal(18000, quota.SlotMonthlyLimit);
     }
 
     [Fact]
@@ -115,11 +130,11 @@ public class McpOrganizationUsageAggregationTests
     {
         var rows = new[]
         {
-            Row(Member, "20260815", 100),                 // before the range
+            Row(Member, "20260815", 100),       // before the range
             Row(Member, "20260902", 2),
-            Row(MspAdmin, "20260902", 5, home: MspHome),  // same day, delegated — one bar
+            Row(OtherMember, "20260902", 5),    // same day, another account — one bar
             Row(Member, "20260901", 20),
-            Row(Member, "20260903", 7),                   // after the range (read window)
+            Row(Member, "20260903", 7),         // after the range (read window)
         };
 
         var daily = McpUsageMetricsFunction.BuildOrganizationDaily(rows, "20260901", "20260902");

src/Backend/AutopilotMonitor.Functions.Tests/McpQuotaEnforcementMiddlewareTests.cs

@@ -6,252 +6,77 @@ using Xunit;
 namespace AutopilotMonitor.Functions.Tests;
 
 /// <summary>
-/// Tests for the pure seams of <see cref="McpQuotaEnforcementMiddleware"/>: which tenant a request is
-/// charged to ("the budget follows the data"), the bound-narrowing isolation invariant, and the 429 texts
-/// that name whose budget is exhausted.
+/// Tests for the pure seams of <see cref="McpQuotaEnforcementMiddleware"/>: who bypasses the check (the Global
+/// Admin only — counted, never blocked) and the 429 texts that name whose window is exhausted. Every request is
+/// charged to the caller's HOME tenant ("the budget follows the delegating tenant"), so no seam names a target
+/// tenant any more.
 /// </summary>
 public class McpQuotaEnforcementMiddlewareTests
 {
     private const string Home = "aaaaaaaa-0000-0000-0000-000000000001";
     private const string TenantB = "bbbbbbbb-0000-0000-0000-000000000002";
-    private const string TenantC = "cccccccc-0000-0000-0000-000000000003";
-    private const string TenantD = "dddddddd-0000-0000-0000-000000000004";
     private static readonly DateTime Now = new(2026, 9, 2, 15, 0, 0, DateTimeKind.Utc);
 
-    // ── ResolveChargeScope ─────────────────────────────────────────────────────────
+    // ── IsExempt — the Global Admin runs, the Global Reader is quota'd ─────────────
 
     [Fact]
-    public void Member_ReadingOwnTenant_ChargesHome()
+    public void GlobalAdmin_IsExempt_EvenOnAForeignTarget()
     {
-        var ctx = new RequestContext { TenantId = Home, TargetTenantId = Home };
-        var scope = McpQuotaEnforcementMiddleware.ResolveChargeScope(ctx, Home);
-        Assert.Equal(McpChargeKind.Home, scope.Kind);
-        Assert.Null(scope.TargetTenantId);
-    }
-
-    [Fact]
-    public void Delegated_SingleManagedTarget_ChargesThatTarget()
-    {
-        var ctx = new RequestContext
-        {
-            TenantId = Home, TargetTenantId = TenantB, IsDelegatedReader = true,
-            AllowedTenantIds = new[] { TenantB, TenantC },
-        };
-        var scope = McpQuotaEnforcementMiddleware.ResolveChargeScope(ctx, Home);
-        Assert.Equal(McpChargeKind.SingleTarget, scope.Kind);
-        Assert.Equal(TenantB, scope.TargetTenantId);
-    }
-
-    [Fact]
-    public void Delegated_ReadingHomeTenant_ChargesHome()
-    {
-        // The subset tier admits a delegated caller for ?tenantId=<home> too (crossTenant=false) — that read
-        // is the caller's OWN tenant and draws on its own budget.
-        var ctx = new RequestContext
-        {
-            TenantId = Home, TargetTenantId = Home, IsDelegatedReader = true,
-            AllowedTenantIds = new[] { TenantB },
-        };
-        var scope = McpQuotaEnforcementMiddleware.ResolveChargeScope(ctx, Home);
-        Assert.Equal(McpChargeKind.Home, scope.Kind);
-    }
-
-    [Fact]
-    public void Delegated_TargetReachedThroughHomeChargedGroup_ChargesHome()
-    {
-        var ctx = new RequestContext
-        {
-            TenantId = Home, TargetTenantId = TenantC, IsDelegatedReader = true,
-            AllowedTenantIds = new[] { TenantB, TenantC },
-            HomeChargedTenantIds = new[] { TenantC },
-        };
-        var scope = McpQuotaEnforcementMiddleware.ResolveChargeScope(ctx, Home);
-        Assert.Equal(McpChargeKind.Home, scope.Kind);
-        Assert.Null(scope.TargetTenantId);
-    }
-
-    [Fact]
-    public void Delegated_FleetAggregate_ChargesEveryManagedTenant()
-    {
-        var ctx = new RequestContext
-        {
-            TenantId = Home, TargetTenantId = Home, IsDelegatedReader = true, IsDelegatedAggregate = true,
-            AllowedTenantIds = new[] { TenantB, TenantC },
-        };
-        var scope = McpQuotaEnforcementMiddleware.ResolveChargeScope(ctx, Home);
-        Assert.Equal(McpChargeKind.BoundedAggregate, scope.Kind);
-        Assert.Equal(new[] { TenantB, TenantC }, scope.ChargeMap!.Keys.OrderBy(k => k));
-        Assert.Equal(new[] { TenantB }, scope.TargetsOf(new[] { TenantB }));
-    }
-
-    [Fact]
-    public void Delegated_FleetAggregate_FoldsHomeChargedTenantsOntoHome()
-    {
-        var ctx = new RequestContext
-        {
-            TenantId = Home, TargetTenantId = Home, IsDelegatedReader = true, IsDelegatedAggregate = true,
-            AllowedTenantIds = new[] { TenantB, TenantC, TenantD },
-            HomeChargedTenantIds = new[] { TenantC, TenantD },
-        };
-        var scope = McpQuotaEnforcementMiddleware.ResolveChargeScope(ctx, Home);
-        Assert.Equal(McpChargeKind.BoundedAggregate, scope.Kind);
-        Assert.Equal(new[] { Home, TenantB }, scope.ChargeMap!.Keys.OrderBy(k => k));
-        // Home is charged ONCE for both operator-managed tenants; they are served or dropped together.
-        Assert.Equal(new[] { TenantC, TenantD }, scope.TargetsOf(new[] { Home }).OrderBy(t => t));
-        Assert.Equal(new[] { TenantB }, scope.TargetsOf(new[] { TenantB }));
-    }
-
-    [Fact]
-    public void Delegated_SubsetTierDirectoryListing_IsNotAnAggregate_ChargesHome()
-    {
-        // config/all: subset tier but TenantScoping.None → the policy middleware never marks it an aggregate.
-        var ctx = new RequestContext
-        {
-            TenantId = Home, TargetTenantId = Home, IsDelegatedReader = true, IsDelegatedAggregate = false,
-            AllowedTenantIds = new[] { TenantB, TenantC },
-        };
-        var scope = McpQuotaEnforcementMiddleware.ResolveChargeScope(ctx, Home);
-        Assert.Equal(McpChargeKind.Home, scope.Kind);
-    }
-
-    [Fact]
-    public void GlobalAdmin_IsNeverDelegated_ResolvesHome()
-    {
-        // The policy middleware short-circuits delegated resolution for platform scope, so a GA reading
-        // ?tenantId=<customer> carries no delegated flags — the charge scope is Home (and Invoke tracks
-        // GA on home only, exempt from the check).
+        // Platform operations must never be blocked by a budget; Invoke still counts the GA on home.
         var ctx = new RequestContext { TenantId = Home, TargetTenantId = TenantB, IsGlobalAdmin = true };
-        var scope = McpQuotaEnforcementMiddleware.ResolveChargeScope(ctx, Home);
-        Assert.Equal(McpChargeKind.Home, scope.Kind);
-    }
-
-    // ── Narrow — ISOLATION INVARIANT ───────────────────────────────────────────────
-
-    [Fact]
-    public void Narrow_WithoutBound_LeavesContextUntouched()
-    {
-        // null = unbounded (GA/Reader). Narrowing must neither introduce a bound nor touch the context.
-        var ctx = new RequestContext { TenantId = Home, AllowedTenantIds = null };
-        var narrowed = McpQuotaEnforcementMiddleware.Narrow(ctx, new[] { TenantB }, new[] { TenantC });
-        Assert.Same(ctx, narrowed);
-        Assert.Null(narrowed.AllowedTenantIds);
-        Assert.Null(narrowed.QuotaExcludedTenantIds);
-    }
-
-    [Theory]
-    [InlineData(new[] { TenantB, TenantC }, new[] { TenantB }, new[] { TenantC })]
-    [InlineData(new[] { TenantB, TenantC }, new string[0], new[] { TenantB, TenantC })]
-    [InlineData(new[] { TenantB, TenantC }, new[] { TenantB, TenantC }, new string[0])]
-    [InlineData(new[] { TenantB }, new[] { TenantB, TenantD }, new[] { TenantD })]
-    [InlineData(new[] { TenantB, TenantC, TenantD }, new[] { TenantD, TenantB }, new[] { TenantC })]
-    public void Narrow_NeverWidens_NeverNull(string[] bound, string[] admitted, string[] excluded)
-    {
-        var ctx = new RequestContext { TenantId = Home, AllowedTenantIds = bound, IsDelegatedReader = true };
-
-        var narrowed = McpQuotaEnforcementMiddleware.Narrow(ctx, admitted, excluded);
-
-        Assert.NotNull(narrowed.AllowedTenantIds);
-        var boundSet = new HashSet<string>(bound, StringComparer.OrdinalIgnoreCase);
-        Assert.All(narrowed.AllowedTenantIds!, t => Assert.Contains(t, boundSet));
-        Assert.True(narrowed.AllowedTenantIds!.Count <= bound.Length);
-        // A foreign tenant sneaking into "admitted" never widens the bound (TenantD ∉ bound in row 4).
-        Assert.DoesNotContain(narrowed.AllowedTenantIds!, t => !boundSet.Contains(t));
-        if (narrowed.QuotaExcludedTenantIds != null)
-            Assert.All(narrowed.QuotaExcludedTenantIds, t => Assert.Contains(t, boundSet));
-        // The rest of the context survives the copy.
-        Assert.True(narrowed.IsDelegatedReader);
-        Assert.Equal(Home, narrowed.TenantId);
+        Assert.True(McpQuotaEnforcementMiddleware.IsExempt(ctx));
     }
 
     [Fact]
-    public void Narrow_EmptyAdmittedSet_PublishesEmptyBound_NotNull()
+    public void GlobalReader_IsNotExempt()
     {
-        // Empty ⇒ the repository serves an empty page. NEVER null (= all tenants).
-        var ctx = new RequestContext { TenantId = Home, AllowedTenantIds = new[] { TenantB, TenantC } };
-        var narrowed = McpQuotaEnforcementMiddleware.Narrow(ctx, Array.Empty<string>(), new[] { TenantB, TenantC });
-        Assert.NotNull(narrowed.AllowedTenantIds);
-        Assert.Empty(narrowed.AllowedTenantIds!);
-        Assert.Equal(new[] { TenantB, TenantC }, narrowed.QuotaExcludedTenantIds!.OrderBy(t => t));
+        // A customer-facing read role: it stays within its home tenant's windows like every member.
+        var ctx = new RequestContext { TenantId = Home, TargetTenantId = TenantB, IsGlobalReader = true };
+        Assert.False(McpQuotaEnforcementMiddleware.IsExempt(ctx));
     }
 
     [Fact]
-    public void Narrow_NothingExcluded_OmitsTheExcludedSet()
+    public void Member_And_DelegatedReader_AreNotExempt()
     {
-        var ctx = new RequestContext { TenantId = Home, AllowedTenantIds = new[] { TenantB, TenantC } };
-        var narrowed = McpQuotaEnforcementMiddleware.Narrow(ctx, new[] { TenantB, TenantC }, Array.Empty<string>());
-        Assert.Equal(2, narrowed.AllowedTenantIds!.Count);
-        Assert.Null(narrowed.QuotaExcludedTenantIds);
+        Assert.False(McpQuotaEnforcementMiddleware.IsExempt(new RequestContext { TenantId = Home, TargetTenantId = Home }));
+        Assert.False(McpQuotaEnforcementMiddleware.IsExempt(new RequestContext
+        {
+            TenantId = Home, TargetTenantId = TenantB, IsDelegatedReader = true, AllowedTenantIds = new[] { TenantB },
+        }));
     }
 
     // ── BuildExceededResponse — whose budget ───────────────────────────────────────
 
-    private static McpQuotaDecision Blocked(string tenantPlan, string? target, long tenantDailyUsed = 300, int tenantDaily = 300)
+    private static McpQuotaDecision Blocked(string tenantPlan, long tenantDailyUsed = 300, int tenantDaily = 300)
         => McpQuotaService.BuildDecision(
             new McpPlanLimits("pro", 1000, 20000, tenantPlan, tenantDaily, 60000),
             dailyUsed: 5, monthlyUsed: 50, tenantDailyUsed: tenantDailyUsed, tenantMonthlyUsed: 400,
-            Now, target);
+            Now);
 
     [Fact]
-    public void ManagedCommunityTarget_NamesTheTenant_AndTheUpgradePath()
+    public void OrganizationBlock_KeepsTheOrganizationWording()
     {
-        var body = McpQuotaEnforcementMiddleware.BuildExceededResponse(Blocked("community", TenantB), "customer.example");
-
+        var body = McpQuotaEnforcementMiddleware.BuildExceededResponse(Blocked("community"));
         Assert.Equal("tenant", body.Level);
-        Assert.Equal(TenantB, body.TargetTenantId);
-        Assert.Contains("managed tenant 'customer.example'", body.Error);
-        Assert.Contains("tenant plan 'community'", body.Error);
-        Assert.Contains("Upgrading that tenant to Pro", body.Error);
-        Assert.DoesNotContain("your organization", body.Error);
-    }
-
-    [Fact]
-    public void ManagedTarget_WithoutLabel_FallsBackToTheId()
-    {
-        var body = McpQuotaEnforcementMiddleware.BuildExceededResponse(Blocked("community", TenantB));
-        Assert.Contains($"managed tenant '{TenantB}'", body.Error);
-    }
-
-    [Fact]
-    public void ManagedProTarget_OmitsTheUpgradeHint()
-    {
-        var body = McpQuotaEnforcementMiddleware.BuildExceededResponse(Blocked("pro", TenantB, 3000, 3000), "customer.example");
-        Assert.Equal(TenantB, body.TargetTenantId);
-        Assert.DoesNotContain("Upgrading", body.Error);
-        Assert.Contains("shared by all its members and delegated admins", body.Error);
-    }
-
-    [Fact]
-    public void OwnTenant_KeepsTheOrganizationWording_AndNoTarget()
-    {
-        var body = McpQuotaEnforcementMiddleware.BuildExceededResponse(Blocked("community", target: null));
-        Assert.Null(body.TargetTenantId);
         Assert.Contains("of your organization", body.Error);
+        Assert.Contains("tenant plan 'community'", body.Error);
         Assert.DoesNotContain("managed tenant", body.Error);
     }
 
     [Fact]
-    public void OwnCommunityTenant_NamesTheUpgradePath()
+    public void OrganizationBlock_OnCommunity_NamesTheUpgradePath()
     {
         // The quota is the upgrade lever: a member blocked by their own Community organization window is told
         // that Community is sized for occasional use and that Pro lifts it — Pro members never see the hint.
-        var community = McpQuotaEnforcementMiddleware.BuildExceededResponse(Blocked("community", target: null));
+        var community = McpQuotaEnforcementMiddleware.BuildExceededResponse(Blocked("community"));
         Assert.Contains("sized for occasional use", community.Error);
         Assert.Contains("upgrading your organization to Pro", community.Error);
         Assert.EndsWith("Resets at 2026-09-03T00:00:00Z.", community.Error);
 
-        var pro = McpQuotaEnforcementMiddleware.BuildExceededResponse(Blocked("pro", target: null, 3000, 3000));
+        var pro = McpQuotaEnforcementMiddleware.BuildExceededResponse(Blocked("pro", 3000, 3000));
         Assert.DoesNotContain("upgrading", pro.Error);
         Assert.DoesNotContain("occasional use", pro.Error);
-    }
-
-    [Fact]
-    public void ManagedCommunityTarget_SaysWhosePlanGoverns()
-    {
-        // The delegated admin must learn that the CUSTOMER's plan (not their own Pro/MSP plan) governs the window.
-        var body = McpQuotaEnforcementMiddleware.BuildExceededResponse(Blocked("community", TenantB), "customer.example");
-        Assert.Contains("on the Community plan", body.Error);
-        Assert.Contains("its own plan governs this window, not yours", body.Error);
-        Assert.Contains("Upgrading that tenant to Pro", body.Error);
+        Assert.Contains("shared by all its members", pro.Error);
     }
 
     [Theory]
@@ -272,25 +97,14 @@ public class McpQuotaEnforcementMiddlewareTests
     }
 
     [Fact]
-    public void AllManagedTenantsExhausted_NamesTheCount_AndNoSingleTarget()
+    public void UserLevelBlock_ReportsTheUserWindow()
     {
-        var body = McpQuotaEnforcementMiddleware.BuildExceededResponse(Blocked("community", TenantB), exhaustedTenantCount: 3);
-        Assert.Null(body.TargetTenantId);
-        Assert.Equal("tenant", body.Level);
-        Assert.Contains("all 3 managed tenants", body.Error);
-        Assert.Contains("Earliest reset at 2026-09-03T00:00:00Z", body.Error);
-    }
-
-    [Fact]
-    public void UserLevelBlock_IgnoresTargetAndCount()
-    {
-        // The caller's OWN budget is exhausted — the target tenant is irrelevant and must not be named.
         var decision = McpQuotaService.BuildDecision(
             new McpPlanLimits("community", 100, 3000, "pro", 3000, 60000),
-            dailyUsed: 100, monthlyUsed: 500, tenantDailyUsed: 1, tenantMonthlyUsed: 1, Now, TenantB);
-        var body = McpQuotaEnforcementMiddleware.BuildExceededResponse(decision, "customer.example", exhaustedTenantCount: 2);
-        Assert.Equal("user", body.Level);
-        Assert.Null(body.TargetTenantId);
+            dailyUsed: 100, monthlyUsed: 500, tenantDailyUsed: 1, tenantMonthlyUsed: 1, Now);
+        var body = McpQuotaEnforcementMiddleware.BuildExceededResponse(decision);
+        Assert.Equal(100, body.Limit);
+        Assert.Equal(100, body.Used);
         Assert.Equal(
             "MCP daily request quota exceeded for plan 'community'. The Community plan is sized for occasional use; Pro raises your daily and monthly windows. Resets at 2026-09-03T00:00:00Z.",
             body.Error);

src/Backend/AutopilotMonitor.Functions.Tests/McpQuotaServiceTests.cs

@@ -11,7 +11,8 @@ namespace AutopilotMonitor.Functions.Tests;
 /// <summary>
 /// Tests for <see cref="McpQuotaService"/>: window math (daily/monthly, reset times), plan
 /// precedence (per-user override → tenant edition; SectionUsagePlans definition → catalog
-/// fallback), and the fail-open contract on counter errors.
+/// fallback), the growth of both windows by purchased delegation slots, and the fail-open
+/// contract on counter errors.
 /// </summary>
 public class McpQuotaServiceTests
 {
@@ -127,7 +128,9 @@ public class McpQuotaServiceTests
         IMemoryCache? cache = null,
         bool bound = true,
         Func<string?, TenantEdition>? editionResolver = null,
-        Func<string?, string?>? tenantPlanOverrideResolver = null)
+        Func<string?, string?>? tenantPlanOverrideResolver = null,
+        Func<string?, int>? purchasedSlotsResolver = null,
+        Func<string?, EditionResolution>? resolutionResolver = null)
     {
         var adminRepo = new Mock<IAdminRepository>();
         adminRepo.Setup(r => r.GetMcpUserAsync(It.IsAny<string>()))
@@ -150,11 +153,15 @@ public class McpQuotaServiceTests
         var adminConfigService = new AdminConfigurationService(
             configRepo.Object, NullLogger<AdminConfigurationService>.Instance, cache);
 
+        var entitlements = resolutionResolver != null
+            ? new StubTenantEntitlementService(resolutionResolver, tenantPlanOverrideResolver, purchasedSlotsResolver)
+            : new StubTenantEntitlementService(editionResolver ?? (_ => edition), tenantPlanOverrideResolver, purchasedSlotsResolver);
+
         return new McpQuotaService(
             usageRepo.Object,
             mcpUserService,
             adminConfigService,
-            new StubTenantEntitlementService(editionResolver ?? (_ => edition), tenantPlanOverrideResolver),
+            entitlements,
             cache,
             NullLogger<McpQuotaService>.Instance,
             new TestTimeProvider(Now));
@@ -338,25 +345,18 @@ public class McpQuotaServiceTests
     }
 
     [Fact]
-    public async Task Check_DelegatedTarget_MspHomeOverride_LiftsTheCallerNotTheCustomer()
+    public async Task Check_TenantOverride_ComposesWithPurchasedSlots()
     {
-        // The MSP's home tenant carries the "msp" override; the managed Community customer does not.
-        // The caller's own windows are lifted, the customer's organization window still bites.
-        var repo = UsageRepo(("20260707", 1200));
-        TenantRows(repo, Target, ("20260707", 300));
-        var svc = Build(repo, planDefinitionsJson: MspPlanJson,
-            editionResolver: HomeProTargetsCommunity,
-            tenantPlanOverrideResolver: t => t == TenantId ? "msp" : null);
+        // The "msp" definition carries no slot fields → the Pro catalog slot values grow its windows.
+        var svc = Build(UsageRepo(("20260707", 1)), planDefinitionsJson: MspPlanJson,
+            edition: TenantEdition.Pro, tenantPlanOverrideResolver: _ => "msp", purchasedSlotsResolver: _ => 2);
 
-        var d = await svc.CheckAsync(Oid, Upn, homeTenantId: TenantId, chargeTenantId: Target);
+        var d = await svc.CheckAsync(Oid, Upn, TenantId);
 
-        Assert.False(d.Allowed);
-        Assert.Equal("tenant", d.Level);
         Assert.Equal("msp", d.Plan);
-        Assert.Equal(1500, d.DailyLimit);
-        Assert.Equal("community", d.TenantPlan);
-        Assert.Equal(300, d.TenantDailyLimit);
-        Assert.Equal(Target, d.TargetTenantId);
+        Assert.Equal(2100, d.DailyLimit);          // 1500 + 2 × 300
+        Assert.Equal("msp", d.TenantPlan);
+        Assert.Equal(6800, d.TenantDailyLimit);    // 5000 + 2 × 900
     }
 
     [Fact]
@@ -560,155 +560,176 @@ public class McpQuotaServiceTests
         repo.Verify(r => r.GetTenantUsageAsync(It.IsAny<string>(), It.IsAny<string?>(), It.IsAny<string?>()), Times.Exactly(2));
     }
 
-    // ── Delegated (MSP) reads: the budget follows the data ───────────────────────
-    // The CHARGED tenant (the managed customer) supplies the organization windows and counters; the
-    // caller's own windows still follow their HOME tenant's plan (and their per-user override).
+    // ── Purchased delegation slots grow both windows ─────────────────────────────
+    // The home tenant's windows (user AND organization) grow by purchased slots × per-slot value; the slot
+    // values come from the governing plan definition, else the home edition's catalog. Community and
+    // conferred Pro carry catalog slot values of 0, so a stray slot count grows nothing there.
 
-    private const string Target = "22222222-2222-2222-2222-222222222222";
-    private const string Target2 = "33333333-3333-3333-3333-333333333333";
     private const string OtherOid = "00000000-0000-0000-0000-000000000002";
 
-    private static void TenantRows(Mock<IUserUsageRepository> repo, string tenantId, params (string Date, long Count)[] rows)
-        => repo.Setup(r => r.GetTenantUsageAsync(tenantId, It.IsAny<string?>(), It.IsAny<string?>()))
-            .ReturnsAsync(rows.Select(r => new TenantUsageRecord
-            {
-                TenantId = tenantId,
-                UserId = "some-member-or-msp",
-                Date = r.Date,
-                RequestCount = r.Count
-            }).ToList());
+    [Fact]
+    public async Task Check_PurchasedSlots_GrowBothWindows()
+    {
+        // Pro home with 3 purchased slots: 1000 + 3 × 300 per account, 3000 + 3 × 900 for the organization.
+        var svc = Build(UsageRepo(("20260707", 1)), edition: TenantEdition.Pro, purchasedSlotsResolver: _ => 3);
 
-    private static TenantEdition HomeProTargetsCommunity(string? tenantId)
-        => tenantId == TenantId ? TenantEdition.Pro : TenantEdition.Community;
+        var d = await svc.CheckAsync(Oid, Upn, TenantId);
+
+        Assert.Equal(1900, d.DailyLimit);
+        Assert.Equal(38000, d.MonthlyLimit);
+        Assert.Equal(5700, d.TenantDailyLimit);
+        Assert.Equal(114000, d.TenantMonthlyLimit);
+        Assert.Equal(3, d.PurchasedDelegatedSlots);
+        Assert.Equal(300, d.SlotDailyLimit);
+        Assert.Equal(6000, d.SlotMonthlyLimit);
+        Assert.Equal(900, d.SlotTenantDailyLimit);
+        Assert.Equal(18000, d.SlotTenantMonthlyLimit);
+    }
 
     [Fact]
-    public async Task Check_DelegatedTarget_ChargesTheManagedTenantsPlanAndCounters()
+    public async Task Check_IncludedSlotsOnly_NoGrowth()
     {
-        // Pro MSP reads a Community customer whose organization window (300/day) other readers burned.
-        var repo = UsageRepo(("20260707", 5));
-        TenantRows(repo, Target, ("20260707", 300));
-        var svc = Build(repo, editionResolver: HomeProTargetsCommunity);
+        // A Pro tenant on its two included slots (purchased = 0) keeps the plain Pro windows.
+        var svc = Build(UsageRepo(("20260707", 1)), edition: TenantEdition.Pro, purchasedSlotsResolver: _ => 0);
 
-        var d = await svc.CheckAsync(Oid, Upn, homeTenantId: TenantId, chargeTenantId: Target);
+        var d = await svc.CheckAsync(Oid, Upn, TenantId);
+
+        Assert.Equal(1000, d.DailyLimit);
+        Assert.Equal(3000, d.TenantDailyLimit);
+        Assert.Equal(0, d.PurchasedDelegatedSlots);
+    }
+
+    [Fact]
+    public async Task Check_ConferredProHome_GrowsNothing_EvenWithASlotCount()
+    {
+        // Conferred Pro (managed by a Pro MSP, not Pro itself): the catalog slot values are 0, so even a slot
+        // count leaking through (the entitlement service gates it to 0 anyway) grows neither window.
+        var conferred = new EditionResolution(TenantEdition.Pro, EditionSource.Msp, OwnPro: false);
+        var svc = Build(UsageRepo(("20260707", 1)), resolutionResolver: _ => conferred, purchasedSlotsResolver: _ => 3);
+
+        var d = await svc.CheckAsync(Oid, Upn, TenantId);
 
-        Assert.False(d.Allowed);
-        Assert.Equal("tenant", d.Level);
-        Assert.Equal("daily", d.Scope);
-        Assert.Equal("community", d.TenantPlan);
-        Assert.Equal(300, d.TenantDailyLimit);
-        Assert.Equal(Target, d.TargetTenantId);
-        // The caller's OWN windows still come from the Pro home tenant.
         Assert.Equal("pro", d.Plan);
         Assert.Equal(1000, d.DailyLimit);
-        repo.Verify(r => r.GetTenantUsageAsync(TenantId, It.IsAny<string?>(), It.IsAny<string?>()), Times.Never);
+        Assert.Equal(3000, d.TenantDailyLimit);
+        Assert.Equal(0, d.SlotDailyLimit);
+        Assert.Equal(0, d.SlotTenantDailyLimit);
     }
 
     [Fact]
-    public async Task Check_DelegatedTarget_UserBudgetStillFollowsHome()
+    public async Task Check_UserOverridePlan_StillGrowsWithTheHomeSlots()
     {
-        // Community home (100/day) reading a Pro customer: the caller's own daily window bites first.
-        var repo = UsageRepo(("20260707", 100));
-        TenantRows(repo, Target, ("20260707", 1));
-        var svc = Build(repo, editionResolver: t => t == Target ? TenantEdition.Pro : TenantEdition.Community);
+        // The per-user "power" plan carries no slot fields → the HOME edition's catalog slot values apply,
+        // so the override account grows with the tenant's purchased slots like everyone else.
+        var json = """[{"name":"power","dailyRequestLimit":10000,"monthlyRequestLimit":100000,"description":""}]""";
+        var svc = Build(UsageRepo(("20260707", 1)), planDefinitionsJson: json, edition: TenantEdition.Pro,
+            mcpUserPlanOverride: "power", purchasedSlotsResolver: _ => 2);
 
-        var d = await svc.CheckAsync(Oid, Upn, homeTenantId: TenantId, chargeTenantId: Target);
+        var d = await svc.CheckAsync(Oid, Upn, TenantId);
 
+        Assert.Equal("power", d.Plan);
+        Assert.Equal(10600, d.DailyLimit);
+        Assert.Equal(112000, d.MonthlyLimit);
+        Assert.Equal(4800, d.TenantDailyLimit); // 3000 + 2 × 900 — the organization follows the tenant plan
+    }
+
+    [Fact]
+    public async Task Check_SlotValues_DefinitionZero_DisablesTheGrowth()
+    {
+        var json = """[{"name":"pro","dailyRequestLimit":1000,"monthlyRequestLimit":20000,"slotDailyRequestLimit":0,"slotMonthlyRequestLimit":0,"slotTenantDailyRequestLimit":0,"slotTenantMonthlyRequestLimit":0,"description":""}]""";
+        var svc = Build(UsageRepo(("20260707", 1)), planDefinitionsJson: json, edition: TenantEdition.Pro, purchasedSlotsResolver: _ => 5);
+
+        var d = await svc.CheckAsync(Oid, Upn, TenantId);
+
+        Assert.Equal(1000, d.DailyLimit);
+        Assert.Equal(3000, d.TenantDailyLimit);
+        Assert.Equal(5, d.PurchasedDelegatedSlots);
+        Assert.Equal(0, d.SlotDailyLimit);
+    }
+
+    [Fact]
+    public async Task Check_SlotValues_DefinitionSet_OverridesTheCatalog()
+    {
+        var json = """[{"name":"pro","dailyRequestLimit":1000,"monthlyRequestLimit":20000,"slotDailyRequestLimit":50,"slotMonthlyRequestLimit":500,"slotTenantDailyRequestLimit":100,"slotTenantMonthlyRequestLimit":1000,"description":""}]""";
+        var svc = Build(UsageRepo(("20260707", 1)), planDefinitionsJson: json, edition: TenantEdition.Pro, purchasedSlotsResolver: _ => 2);
+
+        var d = await svc.CheckAsync(Oid, Upn, TenantId);
+
+        Assert.Equal(1100, d.DailyLimit);
+        Assert.Equal(21000, d.MonthlyLimit);
+        Assert.Equal(3200, d.TenantDailyLimit);
+        Assert.Equal(62000, d.TenantMonthlyLimit);
+    }
+
+    [Fact]
+    public async Task Check_SlotValues_DefinitionNull_UsesTheCatalog()
+    {
+        // A pre-existing definition without slot fields → the edition's catalog slot values.
+        var json = """[{"name":"pro","dailyRequestLimit":1000,"monthlyRequestLimit":20000,"description":""}]""";
+        var svc = Build(UsageRepo(("20260707", 1)), planDefinitionsJson: json, edition: TenantEdition.Pro, purchasedSlotsResolver: _ => 1);
+
+        var d = await svc.CheckAsync(Oid, Upn, TenantId);
+
+        Assert.Equal(1300, d.DailyLimit);
+        Assert.Equal(3900, d.TenantDailyLimit);
+    }
+
+    [Fact]
+    public async Task Check_LiftedWindow_StaysUnlimited_DespiteSlots()
+    {
+        // 0 = unlimited must never turn into "0 + slots × value" — a limit again. 30 000 requests today would
+        // exceed any grown daily window (and the plain 20 000 monthly one) but stay under 20 000 + 4 × 6 000.
+        var json = """[{"name":"pro","dailyRequestLimit":0,"monthlyRequestLimit":20000,"tenantDailyRequestLimit":0,"tenantMonthlyRequestLimit":60000,"description":""}]""";
+        var svc = Build(UsageRepo(("20260707", 30000)), planDefinitionsJson: json, edition: TenantEdition.Pro, purchasedSlotsResolver: _ => 4);
+
+        var d = await svc.CheckAsync(Oid, Upn, TenantId);
+
+        Assert.True(d.Allowed);
+        Assert.Equal(0, d.DailyLimit);
+        Assert.Equal(0, d.TenantDailyLimit);
+        Assert.Equal(44000, d.MonthlyLimit);
+        Assert.Equal(30000, d.MonthlyUsed);
+    }
+
+    [Theory]
+    [InlineData(1000, 3, 300, 1900)]
+    [InlineData(1000, 0, 300, 1000)]
+    [InlineData(1000, 3, 0, 1000)]
+    [InlineData(0, 3, 300, 0)]
+    [InlineData(-1, 3, 300, -1)]
+    public void Grow_AddsSlotsTimesValue_AndKeepsALiftedWindowLifted(int baseLimit, int slots, int perSlot, int expected)
+        => Assert.Equal(expected, McpQuotaService.Grow(baseLimit, slots, perSlot));
+
+    [Fact]
+    public async Task Check_GrownWindow_IsTheEnforcedOne()
+    {
+        // Pro 1000 + 1 × 300 = 1300: the 1300th request of the day is the first blocked one.
+        var below = Build(UsageRepo(("20260707", 1299)), edition: TenantEdition.Pro, purchasedSlotsResolver: _ => 1);
+        Assert.True((await below.CheckAsync(Oid, Upn, TenantId)).Allowed);
+
+        var at = Build(UsageRepo(("20260707", 1300)), edition: TenantEdition.Pro, purchasedSlotsResolver: _ => 1);
+        var d = await at.CheckAsync(Oid, Upn, TenantId);
         Assert.False(d.Allowed);
+        Assert.Equal("daily", d.Scope);
         Assert.Equal("user", d.Level);
-        Assert.Equal("community", d.Plan);
-        Assert.Equal("pro", d.TenantPlan);
-        Assert.Equal(Target, d.TargetTenantId);
+        Assert.Equal(1300, d.ExceededLimit);
     }
 
-    [Fact]
-    public async Task Check_OwnTenant_NamesNoTarget()
-    {
-        var svc = Build(UsageRepo(("20260707", 1)));
-        var legacy = await svc.CheckAsync(Oid, Upn, TenantId);
-        var explicitHome = await svc.CheckAsync(Oid, Upn, TenantId, TenantId);
-        Assert.Null(legacy.TargetTenantId);
-        Assert.Null(explicitHome.TargetTenantId);
-    }
+    // ── One tenant, many callers ─────────────────────────────────────────────────
 
     [Fact]
-    public async Task Check_TenantSnapshot_IsSharedAcrossCallersOfTheSameTenant()
+    public async Task Check_TenantSnapshot_IsSharedAcrossMembersOfTheSameTenant()
     {
-        // Two different callers charged to the same customer read its organization counters ONCE per TTL.
-        var repo = UsageRepo(("20260707", 1));
+        // Two members of one tenant read its organization counters ONCE per TTL.
+        var repo = UsageRepo(new[] { ("20260707", 1L) }, tenantRows: new[] { ("20260707", 10L) });
         repo.Setup(r => r.GetUsageByUserAsync(OtherOid, It.IsAny<string?>(), It.IsAny<string?>()))
             .ReturnsAsync(new List<UserUsageRecord>());
-        TenantRows(repo, Target, ("20260707", 10));
-        var svc = Build(repo, editionResolver: HomeProTargetsCommunity);
-
-        await svc.CheckAsync(Oid, Upn, TenantId, Target);
-        await svc.CheckAsync(OtherOid, "bob@contoso.com", TenantId, Target);
-
-        repo.Verify(r => r.GetTenantUsageAsync(Target, It.IsAny<string?>(), It.IsAny<string?>()), Times.Once);
-        repo.Verify(r => r.GetUsageByUserAsync(It.IsAny<string>(), It.IsAny<string?>(), It.IsAny<string?>()), Times.Exactly(2));
-    }
-
-    [Fact]
-    public async Task CheckMany_ExcludesExhaustedTenants_AdmitsTheRest()
-    {
-        var repo = UsageRepo(("20260707", 1));
-        TenantRows(repo, Target, ("20260707", 300));
-        TenantRows(repo, Target2, ("20260707", 10));
-        var svc = Build(repo, editionResolver: HomeProTargetsCommunity);
-
-        var r = await svc.CheckManyAsync(Oid, Upn, TenantId, new[] { Target, Target2 });
-
-        Assert.True(r.Allowed);
-        Assert.Null(r.BlockingDecision);
-        Assert.True(r.UserDecision.Allowed);
-        Assert.Equal(new[] { Target2 }, r.AdmittedTenantIds);
-        Assert.Equal(new[] { Target }, r.ExcludedTenantIds);
-    }
-
-    [Fact]
-    public async Task CheckMany_AllExhausted_BlocksWithTheEarliestReset()
-    {
-        var repo = UsageRepo(("20260707", 1));
-        TenantRows(repo, Target, ("20260707", 300));                       // daily window → resets tomorrow
-        TenantRows(repo, Target2, ("20260701", 9000), ("20260707", 1));   // monthly window → resets on the 1st
-        var svc = Build(repo, editionResolver: HomeProTargetsCommunity);
-
-        var r = await svc.CheckManyAsync(Oid, Upn, TenantId, new[] { Target, Target2 });
-
-        Assert.False(r.Allowed);
-        Assert.Empty(r.AdmittedTenantIds);
-        Assert.Equal(2, r.ExcludedTenantIds.Count);
-        Assert.Equal("tenant", r.BlockingDecision!.Level);
-        Assert.Equal("daily", r.BlockingDecision.Scope);
-        Assert.Equal(new DateTime(2026, 7, 8, 0, 0, 0, DateTimeKind.Utc), r.BlockingDecision.ResetUtc);
-    }
-
-    [Fact]
-    public async Task CheckMany_UserExhausted_SkipsEveryTenantRead()
-    {
-        var repo = UsageRepo(("20260707", 100)); // Community home: 100/day
         var svc = Build(repo);
 
-        var r = await svc.CheckManyAsync(Oid, Upn, TenantId, new[] { Target, Target2 });
+        await svc.CheckAsync(Oid, Upn, TenantId);
+        await svc.CheckAsync(OtherOid, "bob@contoso.com", TenantId);
 
-        Assert.False(r.Allowed);
-        Assert.Equal("user", r.BlockingDecision!.Level);
-        Assert.Equal(2, r.ExcludedTenantIds.Count);
-        repo.Verify(r2 => r2.GetTenantUsageAsync(It.IsAny<string>(), It.IsAny<string?>(), It.IsAny<string?>()), Times.Never);
-    }
-
-    [Fact]
-    public async Task CheckMany_TenantReadFails_AdmitsThatTenant_FailOpen()
-    {
-        var repo = UsageRepo(("20260707", 1));
-        repo.Setup(r => r.GetTenantUsageAsync(Target, It.IsAny<string?>(), It.IsAny<string?>()))
-            .ThrowsAsync(new InvalidOperationException("storage down"));
-        TenantRows(repo, Target2, ("20260707", 10));
-        var svc = Build(repo, editionResolver: HomeProTargetsCommunity);
-
-        var r = await svc.CheckManyAsync(Oid, Upn, TenantId, new[] { Target, Target2 });
-
-        Assert.True(r.Allowed);
-        Assert.Equal(new[] { Target, Target2 }, r.AdmittedTenantIds.OrderBy(t => t));
-        Assert.Empty(r.ExcludedTenantIds);
+        repo.Verify(r => r.GetTenantUsageAsync(TenantId, It.IsAny<string?>(), It.IsAny<string?>()), Times.Once);
+        repo.Verify(r => r.GetUsageByUserAsync(It.IsAny<string>(), It.IsAny<string?>(), It.IsAny<string?>()), Times.Exactly(2));
     }
 }

src/Backend/AutopilotMonitor.Functions.Tests/MetricsWireParityTests.cs

@@ -407,6 +407,12 @@ public class MetricsWireParityTests
         var tenantMonthlyLimit = 9000;
         long tenantDailyUsed = 120;
         long tenantMonthlyUsed = 4100;
+        // Three purchased delegation slots: the limits above already grew by them; the breakdown rides along.
+        int? purchasedDelegatedSlots = 3;
+        int? slotDailyLimit = 300;
+        int? slotMonthlyLimit = 6000;
+        int? slotTenantDailyLimit = 900;
+        int? slotTenantMonthlyLimit = 18000;
         var records = SampleUsageRecords(userId);
 
         AssertParity(
@@ -427,7 +433,12 @@ public class MetricsWireParityTests
                     tenantDailyLimit,
                     tenantMonthlyLimit,
                     tenantDailyUsed,
-                    tenantMonthlyUsed
+                    tenantMonthlyUsed,
+                    purchasedDelegatedSlots,
+                    slotDailyLimit,
+                    slotMonthlyLimit,
+                    slotTenantDailyLimit,
+                    slotTenantMonthlyLimit
                 },
                 records
             },
@@ -448,7 +459,12 @@ public class MetricsWireParityTests
                     TenantDailyLimit = tenantDailyLimit,
                     TenantMonthlyLimit = tenantMonthlyLimit,
                     TenantDailyUsed = tenantDailyUsed,
-                    TenantMonthlyUsed = tenantMonthlyUsed
+                    TenantMonthlyUsed = tenantMonthlyUsed,
+                    PurchasedDelegatedSlots = purchasedDelegatedSlots,
+                    SlotDailyLimit = slotDailyLimit,
+                    SlotMonthlyLimit = slotMonthlyLimit,
+                    SlotTenantDailyLimit = slotTenantDailyLimit,
+                    SlotTenantMonthlyLimit = slotTenantMonthlyLimit
                 },
                 Records = records
             });
@@ -457,10 +473,16 @@ public class MetricsWireParityTests
     [Fact]
     public void GetMyMcpUsageResponse_omits_null_upn_and_usagePlan()
     {
+        // …and the slot breakdown, which is absent when no delegation slot was purchased.
         var userId = "7aa20c11-0002-4b7c-a1d2-52f3aaaa0008";
         string? upn = null;
         string? usagePlan = null;
         var effectivePlan = "free";
+        int? purchasedDelegatedSlots = null;
+        int? slotDailyLimit = null;
+        int? slotMonthlyLimit = null;
+        int? slotTenantDailyLimit = null;
+        int? slotTenantMonthlyLimit = null;
         var records = new List<UserUsageRecord>();
 
         AssertParity(
@@ -481,7 +503,12 @@ public class MetricsWireParityTests
                     tenantDailyLimit = 0,
                     tenantMonthlyLimit = 0,
                     tenantDailyUsed = 0L,
-                    tenantMonthlyUsed = 0L
+                    tenantMonthlyUsed = 0L,
+                    purchasedDelegatedSlots,
+                    slotDailyLimit,
+                    slotMonthlyLimit,
+                    slotTenantDailyLimit,
+                    slotTenantMonthlyLimit
                 },
                 records
             },
@@ -672,7 +699,6 @@ public class MetricsWireParityTests
     {
         var tenantId = "7aa20c11-0002-4b7c-a1d2-52f3aaaa0001";
         var userId = "7aa20c11-0002-4b7c-a1d2-52f3aaaa0009";
-        var homeTenantId = "7aa20c11-0002-4b7c-a1d2-52f3aaaa0002";
         var lastRequestAt = new DateTime(2026, 9, 2, 14, 5, 0, DateTimeKind.Utc);
 
         AssertParity(
@@ -686,9 +712,7 @@ public class MetricsWireParityTests
                     new
                     {
                         userId,
-                        userPrincipalName = "msp@partner.example",
-                        delegated = true,
-                        homeTenantId,
+                        userPrincipalName = "admin@contoso.com",
                         requestsToday = 4L,
                         requestsThisMonth = 120L,
                         requestsInRange = 120L,
@@ -706,9 +730,7 @@ public class MetricsWireParityTests
                     new()
                     {
                         UserId = userId,
-                        UserPrincipalName = "msp@partner.example",
-                        Delegated = true,
-                        HomeTenantId = homeTenantId,
+                        UserPrincipalName = "admin@contoso.com",
                         RequestsToday = 4,
                         RequestsThisMonth = 120,
                         RequestsInRange = 120,
@@ -719,13 +741,12 @@ public class MetricsWireParityTests
     }
 
     [Fact]
-    public void GetMcpOrganizationUsageResponse_omits_null_upn_home_and_lastRequest()
+    public void GetMcpOrganizationUsageResponse_omits_null_upn_and_lastRequest()
     {
-        // A row written before the attribution columns existed: own member, no UPN, no timestamp.
+        // A row written before the attribution columns existed: no UPN, no timestamp.
         var tenantId = "7aa20c11-0002-4b7c-a1d2-52f3aaaa0001";
         var userId = "7aa20c11-0002-4b7c-a1d2-52f3aaaa0009";
         string? userPrincipalName = null;
-        string? homeTenantId = null;
         DateTime? lastRequestAt = null;
 
         AssertParity(
@@ -740,8 +761,6 @@ public class MetricsWireParityTests
                     {
                         userId,
                         userPrincipalName,
-                        delegated = false,
-                        homeTenantId,
                         requestsToday = 0L,
                         requestsThisMonth = 3L,
                         requestsInRange = 3L,
@@ -756,11 +775,63 @@ public class MetricsWireParityTests
                 DateTo = "20260902",
                 Users = new List<McpOrganizationUsageItem>
                 {
-                    new() { UserId = userId, Delegated = false, RequestsToday = 0, RequestsThisMonth = 3, RequestsInRange = 3 },
+                    new() { UserId = userId, RequestsToday = 0, RequestsThisMonth = 3, RequestsInRange = 3 },
                 },
             });
     }
 
+    [Fact]
+    public void GetMcpOrganizationUsageResponse_quota_carries_the_slot_breakdown()
+    {
+        // Three purchased slots: 3 000 + 3 × 900 arrive as the grown limit; the breakdown lets the page show the sum.
+        var tenantId = "7aa20c11-0002-4b7c-a1d2-52f3aaaa0001";
+        var daily = new List<McpOrganizationDailyItem>
+        {
+            new() { Date = "20260901", Requests = 12 },
+            new() { Date = "20260902", Requests = 7 },
+        };
+
+        AssertParity(
+            new
+            {
+                tenantId,
+                dateFrom = "20260901",
+                dateTo = "20260902",
+                users = Array.Empty<object>(),
+                quota = new
+                {
+                    tenantPlan = "pro",
+                    dailyLimit = 5700,
+                    monthlyLimit = 114000,
+                    dailyUsed = 7L,
+                    monthlyUsed = 19L,
+                    purchasedDelegatedSlots = 3,
+                    slotDailyLimit = 900,
+                    slotMonthlyLimit = 18000,
+                },
+                daily,
+            },
+            new GetMcpOrganizationUsageResponse
+            {
+                TenantId = tenantId,
+                DateFrom = "20260901",
+                DateTo = "20260902",
+                Users = new List<McpOrganizationUsageItem>(),
+                Quota = new McpOrganizationQuotaNode
+                {
+                    TenantPlan = "pro",
+                    DailyLimit = 5700,
+                    MonthlyLimit = 114000,
+                    DailyUsed = 7,
+                    MonthlyUsed = 19,
+                    PurchasedDelegatedSlots = 3,
+                    SlotDailyLimit = 900,
+                    SlotMonthlyLimit = 18000,
+                },
+                Daily = daily,
+            });
+    }
+
     private static void AssertParity(object anonymousLiteral, IApiResponse typed)
         => ApiResponseWireParityTests.AssertWireIdentical(anonymousLiteral, typed);
 }

src/Backend/AutopilotMonitor.Functions.Tests/Offboarding/OffboardingMarkerCleanupFunctionTests.cs

@@ -414,7 +414,7 @@ public class OffboardingMarkerCleanupFunctionTests
         {
         }
 
-        public override Task<int> WipeByExactPartitionAsync(string tableName, string normalizedTenantId, CancellationToken ct = default)
+        protected override Task<int> WipeByExactPartitionCoreAsync(string tableName, string normalizedTenantId, string filter, CancellationToken ct)
         {
             WipeCalls.Add((tableName, normalizedTenantId));
             if (ThrowOnNextWipe is { } ex)

src/Backend/AutopilotMonitor.Functions.Tests/Offboarding/TenantOffboardingHandlerDrainContractTests.cs

@@ -593,9 +593,9 @@ public class TenantOffboardingHandlerDrainContractTests
 
     /// <summary>
     /// <see cref="SafeWipeService"/> that records call counts without performing any storage IO.
-    /// Tests use this to assert that fail-closed paths NEVER touch the wipe methods. Now that
-    /// <see cref="SafeWipeService"/> exposes the wipe methods as <c>virtual</c>, the production
-    /// dispatch lands here.
+    /// Tests use this to assert that fail-closed paths NEVER touch the wipe methods. Only the
+    /// protected cores are overridden, so the tenant-GUID guard of the public entry points still
+    /// runs against whatever the handler passes in.
     /// </summary>
     private sealed class CountingSafeWipeService : SafeWipeService
     {
@@ -610,37 +610,37 @@ public class TenantOffboardingHandlerDrainContractTests
         {
         }
 
-        public override Task<int> WipeByExactPartitionAsync(string tableName, string normalizedTenantId, CancellationToken ct = default)
+        protected override Task<int> WipeByExactPartitionCoreAsync(string tableName, string normalizedTenantId, string filter, CancellationToken ct)
         {
             WipeCallCount++;
             return Task.FromResult(0);
         }
 
-        public override Task<int> WipeByCompositePartitionRangeAsync(string tableName, string normalizedTenantId, CancellationToken ct = default)
+        protected override Task<int> WipeByCompositePartitionRangeCoreAsync(string tableName, string normalizedTenantId, CancellationToken ct)
         {
             WipeCallCount++;
             return Task.FromResult(0);
         }
 
-        public override Task<int> WipeByDiscriminatorAndTenantPropertyAsync(string tableName, string discriminator, string normalizedTenantId, CancellationToken ct = default)
+        protected override Task<int> WipeByDiscriminatorAndTenantPropertyCoreAsync(string tableName, string discriminator, string normalizedTenantId, CancellationToken ct)
         {
             WipeCallCount++;
             return Task.FromResult(0);
         }
 
-        public override Task<int> WipeByTenantIdPropertyAsync(string tableName, string normalizedTenantId, CancellationToken ct = default)
+        protected override Task<int> WipeByTenantIdPropertyCoreAsync(string tableName, string normalizedTenantId, CancellationToken ct)
         {
             WipeCallCount++;
             return Task.FromResult(0);
         }
 
-        public override Task<int> WipeByRowKeyAsync(string tableName, string normalizedTenantId, CancellationToken ct = default)
+        protected override Task<int> WipeByRowKeyCoreAsync(string tableName, string normalizedTenantId, string filter, CancellationToken ct)
         {
             WipeCallCount++;
             return Task.FromResult(0);
         }
 
-        public override Task<int> WipeBlobsByTenantPrefixAsync(string containerName, string normalizedTenantId, CancellationToken ct = default)
+        protected override Task<int> WipeBlobsByTenantPrefixCoreAsync(string containerName, string normalizedTenantId, CancellationToken ct)
         {
             WipeCallCount++;
             return Task.FromResult(0);

src/Backend/AutopilotMonitor.Functions.Tests/Offboarding/TenantOffboardingHandlerOrderingTests.cs

@@ -320,6 +320,22 @@ public class TenantOffboardingHandlerOrderingTests
         Assert.Contains(Constants.TableNames.ScriptNameCache, harness.SafeWipeProbe.ExactPartitionWipes);
     }
 
+    [Fact]
+    public async Task PostDrain_OwnedGroupWipe_AnchorsOnSelfServiceGroupId()
+    {
+        // The tenant's own self-service group lives under "msp-{tenantId}" — not a GUID. The wipe
+        // must go through the owned-group entry points (tenant GUID in, group id derived inside);
+        // handing the group id to a tenant-GUID entry point throws and poisons every offboarding.
+        var harness = Harness.New();
+        var ownedGroupId = Constants.TenantGroupIds.ForHomeTenant(TenantId);
+
+        await harness.Sut.HandleAsync(harness.Envelope());
+
+        Assert.Contains((Constants.TableNames.TenantGroups, ownedGroupId), harness.SafeWipeProbe.ExactPartitionAnchors);
+        Assert.Contains((Constants.TableNames.TenantGroupAssignments, ownedGroupId), harness.SafeWipeProbe.RowKeyAnchors);
+        Assert.Equal("Completed", harness.Repo.History[HistoryRowKey].Status);
+    }
+
     // ── Harness (copied minimal — only what these tests need) ───────────────────
 
     private sealed class Harness
@@ -470,12 +486,16 @@ public class TenantOffboardingHandlerOrderingTests
             new BlobStorageService(new BlobServiceClient("UseDevelopmentStorage=true"),
                 NullLogger<BlobStorageService>.Instance, usesManagedIdentity: false),
             NullLogger<SafeWipeService>.Instance) { }
-        public override Task<int> WipeByExactPartitionAsync(string t, string i, CancellationToken c = default) { WipeCallCount++; ExactPartitionWipes.Add(t); return Task.FromResult(0); }
-        public override Task<int> WipeByCompositePartitionRangeAsync(string t, string i, CancellationToken c = default) { WipeCallCount++; return Task.FromResult(0); }
-        public override Task<int> WipeByDiscriminatorAndTenantPropertyAsync(string t, string d, string i, CancellationToken c = default) { WipeCallCount++; return Task.FromResult(0); }
-        public override Task<int> WipeByTenantIdPropertyAsync(string t, string i, CancellationToken c = default) { WipeCallCount++; PropertyOnlyWipes.Add(t); return Task.FromResult(0); }
-        public override Task<int> WipeByRowKeyAsync(string t, string i, CancellationToken c = default) { WipeCallCount++; RowKeyWipes.Add(t); return Task.FromResult(0); }
-        public override Task<int> WipeBlobsByTenantPrefixAsync(string c, string i, CancellationToken ct = default) { WipeCallCount++; return Task.FromResult(0); }
+        /// <summary>(table, partition key) pairs of the exact-partition wipe — the anchor the delete would run against.</summary>
+        public List<(string Table, string Anchor)> ExactPartitionAnchors { get; } = new();
+        /// <summary>(table, row key) pairs of the RowKey-anchored wipe.</summary>
+        public List<(string Table, string Anchor)> RowKeyAnchors { get; } = new();
+        protected override Task<int> WipeByExactPartitionCoreAsync(string t, string pk, string filter, CancellationToken c) { WipeCallCount++; ExactPartitionWipes.Add(t); ExactPartitionAnchors.Add((t, pk)); return Task.FromResult(0); }
+        protected override Task<int> WipeByCompositePartitionRangeCoreAsync(string t, string i, CancellationToken c) { WipeCallCount++; return Task.FromResult(0); }
+        protected override Task<int> WipeByDiscriminatorAndTenantPropertyCoreAsync(string t, string d, string i, CancellationToken c) { WipeCallCount++; return Task.FromResult(0); }
+        protected override Task<int> WipeByTenantIdPropertyCoreAsync(string t, string i, CancellationToken c) { WipeCallCount++; PropertyOnlyWipes.Add(t); return Task.FromResult(0); }
+        protected override Task<int> WipeByRowKeyCoreAsync(string t, string rk, string filter, CancellationToken c) { WipeCallCount++; RowKeyWipes.Add(t); RowKeyAnchors.Add((t, rk)); return Task.FromResult(0); }
+        protected override Task<int> WipeBlobsByTenantPrefixCoreAsync(string c, string i, CancellationToken ct) { WipeCallCount++; return Task.FromResult(0); }
     }
 
     private sealed class NoopCustomsArchivingOrderingHandler : TenantOffboardingHandler

src/Backend/AutopilotMonitor.Functions.Tests/Offboarding/TenantOffboardingWorkerPoisonTests.cs

@@ -111,6 +111,71 @@ public class TenantOffboardingWorkerPoisonTests
         Assert.Equal("InProgress", harness.Repo.History[HistoryRowKey].Status);
     }
 
+    // ── Superseded dead letters ─────────────────────────────────────────────────
+    //
+    // A retry after a poisoned run is a new envelope, so nothing else ever removes the dead
+    // letter of the failed run. The completed run sweeps it.
+
+    private const string OtherTenantId = "22222222-2222-2222-2222-222222222222";
+
+    [Fact]
+    public async Task Completed_RemovesOnlyTheTenantsDeadLetters()
+    {
+        var harness = new Harness();
+        harness.Repo.History[HistoryRowKey].Status = "Completed";
+        var own = harness.AddDeadLetter(TenantId.ToUpperInvariant());   // tenant ids compare case-insensitively
+        var foreign = harness.AddDeadLetter(OtherTenantId);
+        var malformed = harness.AddDeadLetter(tenantId: null, bodyOverride: "{ not json at all");
+
+        await harness.InvokeHandleAsync();
+
+        Assert.Equal(new[] { own }, harness.PoisonDeletedIds);
+        Assert.DoesNotContain(foreign, harness.PoisonDeletedIds);
+        Assert.DoesNotContain(malformed, harness.PoisonDeletedIds);
+    }
+
+    [Fact]
+    public async Task Completed_SweepsPastTheFirstBatch()
+    {
+        var harness = new Harness();
+        harness.Repo.History[HistoryRowKey].Status = "Completed";
+        for (var i = 0; i < TenantOffboardingWorker.PoisonSweepBatchSize; i++)
+            harness.AddDeadLetter(OtherTenantId);
+        var own = harness.AddDeadLetter(TenantId);
+
+        await harness.InvokeHandleAsync();
+
+        Assert.Equal(new[] { own }, harness.PoisonDeletedIds);
+    }
+
+    [Fact]
+    public async Task NotCompleted_LeavesThePoisonQueueAlone()
+    {
+        // A pickup that finds the run Failed must not touch the dead letter — it is the only
+        // queue-side trace of a failure nobody has resolved yet.
+        var harness = new Harness();
+        harness.Repo.History[HistoryRowKey].Status = "Failed";
+        harness.AddDeadLetter(TenantId);
+
+        await harness.InvokeHandleAsync();
+
+        Assert.Equal(0, harness.PoisonReceiveCount);
+        Assert.Empty(harness.PoisonDeletedIds);
+    }
+
+    [Fact]
+    public async Task Completed_SweepFailure_DoesNotFailTheRun()
+    {
+        // A throw here would keep the completed envelope on the main queue and finally move a
+        // Completed run to poison.
+        var harness = new Harness(poisonReceiveThrows: true);
+        harness.Repo.History[HistoryRowKey].Status = "Completed";
+
+        await harness.InvokeHandleAsync();
+
+        Assert.Equal(1, harness.PoisonReceiveCount);
+    }
+
     // ── Harness ─────────────────────────────────────────────────────────────────
 
     private sealed class Harness
@@ -121,11 +186,38 @@ public class TenantOffboardingWorkerPoisonTests
         public Mock<QueueClient> PoisonQueue { get; } = new();
         public int PoisonSendCount { get; private set; }
         public int MainDeleteCount { get; private set; }
+        public int PoisonReceiveCount { get; private set; }
+        public List<string> PoisonDeletedIds { get; } = new();
 
-        public Harness(bool poisonSendThrows = false)
+        // Poison-queue content for the sweep tests. A received message turns invisible, like the
+        // real queue, so a second receive returns the next batch instead of the same one.
+        private readonly List<QueueMessage> _deadLetters = new();
+        private readonly HashSet<string> _hiddenDeadLetters = new();
+
+        public Harness(bool poisonSendThrows = false, bool poisonReceiveThrows = false)
         {
             SeedAudit();
 
+            PoisonQueue.Setup(q => q.ReceiveMessagesAsync(It.IsAny<int?>(), It.IsAny<TimeSpan?>(), It.IsAny<CancellationToken>()))
+                .Returns<int?, TimeSpan?, CancellationToken>((max, _, _) =>
+                {
+                    PoisonReceiveCount++;
+                    if (poisonReceiveThrows) throw new InvalidOperationException("simulated poison-queue 503");
+                    var batch = _deadLetters
+                        .Where(m => !_hiddenDeadLetters.Contains(m.MessageId))
+                        .Take(max ?? 1)
+                        .ToArray();
+                    foreach (var m in batch) _hiddenDeadLetters.Add(m.MessageId);
+                    return Task.FromResult(Response.FromValue(batch, new Mock<Response>().Object));
+                });
+
+            PoisonQueue.Setup(q => q.DeleteMessageAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
+                .Returns<string, string, CancellationToken>((id, _, _) =>
+                {
+                    PoisonDeletedIds.Add(id);
+                    return Task.FromResult(new Mock<Response>().Object);
+                });
+
             // Cascade-handler dependencies. The handler is real — it talks to FakeRepo +
             // OpsEvent + (unused) other deps. Only MarkEnvelopeFailedFromPoisonAsync is
             // exercised, so most deps are noise.
@@ -160,24 +252,43 @@ public class TenantOffboardingWorkerPoisonTests
         }
 
         public QueueMessage BuildMessage(int dequeueCount, string? bodyOverride = null)
-        {
-            var envelope = new TenantOffboardingEnvelope
-            {
-                TenantId = TenantId,
-                HistoryPartitionKey = Constants.OffboardingPartitionKeys.History,
-                HistoryRowKey = HistoryRowKey,
-                InitiatedBy = "alice@contoso.invalid",
-                InitiatedAt = DateTime.UtcNow.AddMinutes(-1),
-                EnqueuedAt = DateTime.UtcNow,
-                DrainPollCount = 0,
-            };
-            return QueuesModelFactory.QueueMessage(
+            => QueuesModelFactory.QueueMessage(
                 messageId: Guid.NewGuid().ToString(),
                 popReceipt: "fake-receipt",
-                body: new BinaryData(bodyOverride ?? JsonConvert.SerializeObject(envelope)),
+                body: new BinaryData(bodyOverride ?? JsonConvert.SerializeObject(BuildEnvelope(TenantId))),
                 dequeueCount: dequeueCount);
+
+        /// <summary>Puts a dead letter into the poison queue and returns its message id.</summary>
+        public string AddDeadLetter(string? tenantId, string? bodyOverride = null)
+        {
+            var msg = QueuesModelFactory.QueueMessage(
+                messageId: Guid.NewGuid().ToString(),
+                popReceipt: "fake-receipt",
+                body: new BinaryData(bodyOverride ?? JsonConvert.SerializeObject(BuildEnvelope(tenantId!))),
+                dequeueCount: 1);
+            _deadLetters.Add(msg);
+            return msg.MessageId;
         }
 
+        public Task InvokeHandleAsync()
+        {
+            var method = typeof(TenantOffboardingWorker)
+                .GetMethod("HandleAsync", BindingFlags.NonPublic | BindingFlags.Instance);
+            Assert.NotNull(method);
+            return (Task)method!.Invoke(Worker, new object[] { BuildEnvelope(TenantId), default(CancellationToken) })!;
+        }
+
+        private static TenantOffboardingEnvelope BuildEnvelope(string tenantId) => new()
+        {
+            TenantId = tenantId,
+            HistoryPartitionKey = Constants.OffboardingPartitionKeys.History,
+            HistoryRowKey = HistoryRowKey,
+            InitiatedBy = "alice@contoso.invalid",
+            InitiatedAt = DateTime.UtcNow.AddMinutes(-1),
+            EnqueuedAt = DateTime.UtcNow,
+            DrainPollCount = 0,
+        };
+
         public Task InvokeMoveToPoisonAsync(QueueMessage msg)
         {
             // MoveToPoisonAsync is private — invoke via reflection. Avoids spinning up the
@@ -288,10 +399,10 @@ public class TenantOffboardingWorkerPoisonTests
             new BlobStorageService(new BlobServiceClient("UseDevelopmentStorage=true"),
                 NullLogger<BlobStorageService>.Instance, usesManagedIdentity: false),
             NullLogger<SafeWipeService>.Instance) { }
-        public override Task<int> WipeByExactPartitionAsync(string t, string i, CancellationToken c = default) => Task.FromResult(0);
-        public override Task<int> WipeByCompositePartitionRangeAsync(string t, string i, CancellationToken c = default) => Task.FromResult(0);
-        public override Task<int> WipeByDiscriminatorAndTenantPropertyAsync(string t, string d, string i, CancellationToken c = default) => Task.FromResult(0);
-        public override Task<int> WipeByTenantIdPropertyAsync(string t, string i, CancellationToken c = default) => Task.FromResult(0);
-        public override Task<int> WipeBlobsByTenantPrefixAsync(string c, string i, CancellationToken ct = default) => Task.FromResult(0);
+        protected override Task<int> WipeByExactPartitionCoreAsync(string t, string i, string filter, CancellationToken c) => Task.FromResult(0);
+        protected override Task<int> WipeByCompositePartitionRangeCoreAsync(string t, string i, CancellationToken c) => Task.FromResult(0);
+        protected override Task<int> WipeByDiscriminatorAndTenantPropertyCoreAsync(string t, string d, string i, CancellationToken c) => Task.FromResult(0);
+        protected override Task<int> WipeByTenantIdPropertyCoreAsync(string t, string i, CancellationToken c) => Task.FromResult(0);
+        protected override Task<int> WipeBlobsByTenantPrefixCoreAsync(string c, string i, CancellationToken ct) => Task.FromResult(0);
     }
 }

src/Backend/AutopilotMonitor.Functions.Tests/OffboardingFiltersTests.cs

@@ -116,6 +116,23 @@ public class OffboardingFiltersTests
         Assert.DoesNotContain("PartitionKey", filter);
     }
 
+    [Fact]
+    public void OwnedGroupFilters_AnchorOnTheDerivedSelfServiceGroupId()
+    {
+        Assert.Equal($"PartitionKey eq 'msp-{ValidTenant}'", OffboardingFilters.OwnedGroupPartition(ValidTenant));
+        Assert.Equal($"RowKey eq 'msp-{ValidTenant}'", OffboardingFilters.OwnedGroupRowKey(ValidTenant));
+    }
+
+    [Theory]
+    [InlineData("not-a-guid")]
+    [InlineData("msp-11111111-1111-1111-1111-111111111111")] // the group id itself is not an input
+    [InlineData("")]
+    public void OwnedGroupFilters_ThrowForNonGuid(string input)
+    {
+        Assert.Throws<ArgumentException>(() => OffboardingFilters.OwnedGroupPartition(input));
+        Assert.Throws<ArgumentException>(() => OffboardingFilters.OwnedGroupRowKey(input));
+    }
+
     // ── Injection neutralization (defense in depth even after EnsureValidGuid) ──
 
     [Fact]

src/Backend/AutopilotMonitor.Functions.Tests/PlatformStatsMonotonicTests.cs

@@ -1,129 +0,0 @@
-using AutopilotMonitor.Functions.Services;
-using AutopilotMonitor.Shared.Models;
-
-namespace AutopilotMonitor.Functions.Tests;
-
-/// <summary>
-/// Pins the "since release" semantics of the platform-stats recompute: every cumulative
-/// counter is a monotonic high-water-mark. The tables the recompute scans are pruned by
-/// retention, so a raw recompute only sees the retention window — persisting that verbatim
-/// regressed the public landing-page figures after every cleanup.
-/// </summary>
-public class PlatformStatsMonotonicTests
-{
-    private static readonly DateTime Now = new(2026, 07, 11, 12, 0, 0, DateTimeKind.Utc);
-
-    [Fact]
-    public void Cumulative_counters_never_regress_below_persisted_values()
-    {
-        // Retention pruned old sessions: the recompute sees far less than the persisted
-        // counters accumulated. Every cumulative figure must keep its high-water-mark.
-        var existing = new PlatformStats
-        {
-            TotalEnrollments = 50_000,
-            SuccessfulEnrollments = 40_000,
-            TotalEventsProcessed = 9_000_000,
-            TotalUsers = 800,
-            TotalTenants = 120,
-            UniqueDeviceModels = 450,
-            IssuesDetected = 6_500,
-            TotalSignedUpTenants = 150
-        };
-
-        var stats = MaintenanceService.BuildMonotonicPlatformStats(
-            recomputedEnrollments: 7_000,
-            recomputedSuccessful: 6_000,
-            recomputedEvents: 1_200_000,
-            recomputedUsers: 90,
-            recomputedActiveTenants: 80,
-            recomputedUniqueModels: 200,
-            signedUpTenants: 155,
-            existing: existing,
-            nowUtc: Now);
-
-        Assert.Equal(50_000, stats.TotalEnrollments);
-        Assert.Equal(40_000, stats.SuccessfulEnrollments);
-        Assert.Equal(9_000_000, stats.TotalEventsProcessed);
-        Assert.Equal(800, stats.TotalUsers);
-        Assert.Equal(120, stats.TotalTenants);
-        Assert.Equal(450, stats.UniqueDeviceModels);
-        Assert.Equal(6_500, stats.IssuesDetected);
-    }
-
-    [Fact]
-    public void Recompute_raises_counters_when_live_data_exceeds_persisted_values()
-    {
-        // Self-heal: lost increments (fire-and-forget failures, pre-feature history) are
-        // recovered as long as the sessions are still within retention.
-        var existing = new PlatformStats
-        {
-            TotalEnrollments = 1_000,
-            SuccessfulEnrollments = 700,
-            TotalEventsProcessed = 100_000,
-            TotalUsers = 50,
-            TotalTenants = 10,
-            UniqueDeviceModels = 30
-        };
-
-        var stats = MaintenanceService.BuildMonotonicPlatformStats(
-            recomputedEnrollments: 1_500,
-            recomputedSuccessful: 1_100,
-            recomputedEvents: 250_000,
-            recomputedUsers: 80,
-            recomputedActiveTenants: 14,
-            recomputedUniqueModels: 42,
-            signedUpTenants: 20,
-            existing: existing,
-            nowUtc: Now);
-
-        Assert.Equal(1_500, stats.TotalEnrollments);
-        Assert.Equal(1_100, stats.SuccessfulEnrollments);
-        Assert.Equal(250_000, stats.TotalEventsProcessed);
-        Assert.Equal(80, stats.TotalUsers);
-        Assert.Equal(14, stats.TotalTenants);
-        Assert.Equal(42, stats.UniqueDeviceModels);
-    }
-
-    [Fact]
-    public void SignedUpTenants_is_current_state_and_may_drop()
-    {
-        // Deliberate exception: TenantConfiguration is not retention-pruned, so its count is
-        // authoritative — a drop reflects real offboarding, not data loss.
-        var existing = new PlatformStats { TotalSignedUpTenants = 150 };
-
-        var stats = MaintenanceService.BuildMonotonicPlatformStats(
-            recomputedEnrollments: 0, recomputedSuccessful: 0, recomputedEvents: 0,
-            recomputedUsers: 0, recomputedActiveTenants: 0, recomputedUniqueModels: 0,
-            signedUpTenants: 140,
-            existing: existing,
-            nowUtc: Now);
-
-        Assert.Equal(140, stats.TotalSignedUpTenants);
-    }
-
-    [Fact]
-    public void First_run_without_persisted_row_uses_recomputed_values()
-    {
-        var stats = MaintenanceService.BuildMonotonicPlatformStats(
-            recomputedEnrollments: 10,
-            recomputedSuccessful: 8,
-            recomputedEvents: 500,
-            recomputedUsers: 3,
-            recomputedActiveTenants: 2,
-            recomputedUniqueModels: 4,
-            signedUpTenants: 5,
-            existing: null,
-            nowUtc: Now);
-
-        Assert.Equal(10, stats.TotalEnrollments);
-        Assert.Equal(8, stats.SuccessfulEnrollments);
-        Assert.Equal(500, stats.TotalEventsProcessed);
-        Assert.Equal(3, stats.TotalUsers);
-        Assert.Equal(2, stats.TotalTenants);
-        Assert.Equal(4, stats.UniqueDeviceModels);
-        Assert.Equal(0, stats.IssuesDetected);
-        Assert.Equal(5, stats.TotalSignedUpTenants);
-        Assert.Equal(Now, stats.LastFullCompute);
-        Assert.Equal(Now, stats.LastUpdated);
-    }
-}

src/Backend/AutopilotMonitor.Functions.Tests/PlatformStatsRollupTests.cs

@@ -0,0 +1,138 @@
+using AutopilotMonitor.Functions.Services;
+using AutopilotMonitor.Shared.Models;
+
+namespace AutopilotMonitor.Functions.Tests;
+
+/// <summary>
+/// Pins the "since release" semantics of the platform-stats rollup: a cumulative counter is
+/// the persisted total plus the growth of its source since the previous run. A total derived
+/// from an absolute figure stops moving for good once that figure shrinks below it — retention
+/// prunes sessions, offboarding deletes a tenant's counters — which froze the public
+/// landing-page figures while enrollments kept arriving.
+/// </summary>
+public class PlatformStatsRollupTests
+{
+    private static readonly DateTime Now = new(2026, 07, 11, 12, 0, 0, DateTimeKind.Utc);
+
+    private static PlatformRollupSources Sources(long enrollments, long successful = 0, long events = 0, long tenants = 0, long models = 0)
+        => new()
+        {
+            TotalEnrollments = enrollments,
+            SuccessfulEnrollments = successful,
+            TotalEventsProcessed = events,
+            ActiveTenants = tenants,
+            SeenDeviceModels = models
+        };
+
+    [Fact]
+    public void Counters_grow_by_the_source_delta_although_the_source_is_far_below_the_total()
+    {
+        // The freeze scenario: the persisted total (19 312) is above anything the source can
+        // show, yet 40 enrollments arrived since the last run. Max(source, total) never moves.
+        var existing = new PlatformStats
+        {
+            TotalEnrollments = 19_312,
+            SuccessfulEnrollments = 10_289,
+            TotalEventsProcessed = 5_779_212,
+            TotalTenants = 84,
+            UniqueDeviceModels = 486
+        };
+
+        var stats = MaintenanceService.BuildPlatformStatsRollup(
+            existing,
+            baseline: Sources(14_540, successful: 10_240, events: 4_000_000, tenants: 80, models: 430),
+            sources: Sources(14_580, successful: 10_275, events: 4_012_000, tenants: 81, models: 433),
+            recomputedUsers: 0, signedUpTenants: 0, nowUtc: Now);
+
+        Assert.Equal(19_352, stats.TotalEnrollments);
+        Assert.Equal(10_324, stats.SuccessfulEnrollments);
+        Assert.Equal(5_791_212, stats.TotalEventsProcessed);
+        Assert.Equal(85, stats.TotalTenants);
+        Assert.Equal(489, stats.UniqueDeviceModels);
+    }
+
+    [Fact]
+    public void A_shrunken_source_never_lowers_the_total_and_the_next_run_counts_again()
+    {
+        // Offboarding deleted a tenant's counters (−3 000) while 20 enrollments arrived: the
+        // delta of this interval is clamped, the baseline follows, the next interval is exact.
+        var existing = new PlatformStats { TotalEnrollments = 50_000 };
+        var afterOffboarding = Sources(37_020);
+
+        var clamped = MaintenanceService.BuildPlatformStatsRollup(
+            existing, baseline: Sources(40_000), sources: afterOffboarding,
+            recomputedUsers: 0, signedUpTenants: 0, nowUtc: Now);
+        Assert.Equal(50_000, clamped.TotalEnrollments);
+
+        var next = MaintenanceService.BuildPlatformStatsRollup(
+            clamped, baseline: afterOffboarding, sources: Sources(37_055),
+            recomputedUsers: 0, signedUpTenants: 0, nowUtc: Now);
+        Assert.Equal(50_035, next.TotalEnrollments);
+    }
+
+    [Fact]
+    public void First_run_without_a_baseline_treats_the_source_as_a_lower_bound_only()
+    {
+        // No baseline yet: whatever the sources show is already contained in the persisted
+        // totals (or exceeds them and heals them) — it must never be added on top.
+        var existing = new PlatformStats { TotalEnrollments = 19_312, SuccessfulEnrollments = 10_289 };
+
+        var stats = MaintenanceService.BuildPlatformStatsRollup(
+            existing, baseline: null, sources: Sources(21_687, successful: 10_275),
+            recomputedUsers: 0, signedUpTenants: 0, nowUtc: Now);
+
+        Assert.Equal(21_687, stats.TotalEnrollments);
+        Assert.Equal(10_289, stats.SuccessfulEnrollments);
+    }
+
+    [Fact]
+    public void First_run_without_a_persisted_row_starts_from_the_sources()
+    {
+        var stats = MaintenanceService.BuildPlatformStatsRollup(
+            existing: null, baseline: null,
+            sources: Sources(10, successful: 8, events: 500, tenants: 2, models: 4),
+            recomputedUsers: 3, signedUpTenants: 5, nowUtc: Now);
+
+        Assert.Equal(10, stats.TotalEnrollments);
+        Assert.Equal(8, stats.SuccessfulEnrollments);
+        Assert.Equal(500, stats.TotalEventsProcessed);
+        Assert.Equal(3, stats.TotalUsers);
+        Assert.Equal(2, stats.TotalTenants);
+        Assert.Equal(4, stats.UniqueDeviceModels);
+        Assert.Equal(0, stats.IssuesDetected);
+        Assert.Equal(5, stats.TotalSignedUpTenants);
+        Assert.Equal(Now, stats.LastFullCompute);
+        Assert.Equal(Now, stats.LastUpdated);
+    }
+
+    [Fact]
+    public void Users_stay_a_high_water_mark_and_issues_are_carried_over()
+    {
+        var existing = new PlatformStats { TotalUsers = 800, IssuesDetected = 6_500 };
+
+        var pruned = MaintenanceService.BuildPlatformStatsRollup(
+            existing, baseline: Sources(0), sources: Sources(0),
+            recomputedUsers: 90, signedUpTenants: 0, nowUtc: Now);
+        Assert.Equal(800, pruned.TotalUsers);
+        Assert.Equal(6_500, pruned.IssuesDetected);
+
+        var grown = MaintenanceService.BuildPlatformStatsRollup(
+            existing, baseline: Sources(0), sources: Sources(0),
+            recomputedUsers: 950, signedUpTenants: 0, nowUtc: Now);
+        Assert.Equal(950, grown.TotalUsers);
+    }
+
+    [Fact]
+    public void SignedUpTenants_is_current_state_and_may_drop()
+    {
+        // Deliberate exception: TenantConfiguration is not retention-pruned, so its count is
+        // authoritative — a drop reflects real offboarding, not data loss.
+        var existing = new PlatformStats { TotalSignedUpTenants = 150 };
+
+        var stats = MaintenanceService.BuildPlatformStatsRollup(
+            existing, baseline: Sources(0), sources: Sources(0),
+            recomputedUsers: 0, signedUpTenants: 140, nowUtc: Now);
+
+        Assert.Equal(140, stats.TotalSignedUpTenants);
+    }
+}

src/Backend/AutopilotMonitor.Functions.Tests/PlatformStatsStorageTests.cs

@@ -0,0 +1,271 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure;
+using Azure.Data.Tables;
+using AutopilotMonitor.Functions.Services;
+using AutopilotMonitor.Shared;
+using AutopilotMonitor.Shared.Models;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace AutopilotMonitor.Functions.Tests;
+
+/// <summary>
+/// Storage side of the platform rollup: the platform row is merged with the ETag it was read
+/// with and never carries IssuesDetected, the tenant floors land in one write, and the reads
+/// that feed the rollup baseline are scoped to exactly the rows they mean.
+/// </summary>
+public class PlatformStatsStorageTests
+{
+    private const string Tenant = "11111111-1111-1111-1111-111111111111";
+
+    private sealed class Harness
+    {
+        public Mock<TableClient> Table { get; } = new();
+        public List<string> Filters { get; } = new();
+        public List<List<TableTransactionAction>> Submitted { get; } = new();
+        public Func<string, TableEntity[]> RowsFor { get; set; } = _ => Array.Empty<TableEntity>();
+        public Queue<Exception> SubmitFailures { get; } = new();
+        public TableStorageService Sut { get; }
+
+        public Harness()
+        {
+            Table.Setup(c => c.QueryAsync<TableEntity>(It.IsAny<string>(), It.IsAny<int?>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()))
+                .Returns((string filter, int? _, IEnumerable<string> _, CancellationToken _) =>
+                {
+                    Filters.Add(filter);
+                    var page = Page<TableEntity>.FromValues(RowsFor(filter), null, Mock.Of<Response>());
+                    return AsyncPageable<TableEntity>.FromPages(new[] { page });
+                });
+            Table.Setup(c => c.SubmitTransactionAsync(It.IsAny<IEnumerable<TableTransactionAction>>(), It.IsAny<CancellationToken>()))
+                .Returns<IEnumerable<TableTransactionAction>, CancellationToken>((actions, _) =>
+                {
+                    var snapshot = actions.ToList();
+                    Submitted.Add(snapshot);
+                    if (SubmitFailures.Count > 0) throw SubmitFailures.Dequeue();
+                    var inner = (IReadOnlyList<Response>)snapshot.Select(_ => Mock.Of<Response>()).ToList();
+                    return Task.FromResult(Response.FromValue(inner, Mock.Of<Response>()));
+                });
+
+            var service = new Mock<TableServiceClient>();
+            service.Setup(s => s.GetTableClient(Constants.TableNames.PlatformStats)).Returns(Table.Object);
+            Sut = new TableStorageService(service.Object, NullLogger<TableStorageService>.Instance);
+        }
+    }
+
+    private static TableEntity PlatformRow(long enrollments, long issues, string etag)
+    {
+        var row = new TableEntity("global", "current") { ["TotalEnrollments"] = enrollments, ["IssuesDetected"] = issues };
+        row.ETag = new ETag(etag);
+        return row;
+    }
+
+    private static TableEntity BaselineRow(long enrollments)
+        => new("global", "rollup-baseline") { ["TotalEnrollments"] = enrollments };
+
+    // ---------- rollup write ----------
+
+    [Fact]
+    public async Task Rollup_merges_the_platform_row_with_its_read_etag_and_leaves_IssuesDetected_alone()
+    {
+        var h = new Harness { RowsFor = _ => new[] { PlatformRow(19_312, issues: 35_000, etag: "e1"), BaselineRow(21_000) } };
+        PlatformRollupSources? seenBaseline = null;
+
+        var result = await h.Sut.RollupPlatformStatsAsync(
+            (existing, baseline) =>
+            {
+                seenBaseline = baseline;
+                return new PlatformStats { TotalEnrollments = existing!.TotalEnrollments + 40, IssuesDetected = existing.IssuesDetected };
+            },
+            new PlatformRollupSources { TotalEnrollments = 21_040 });
+
+        Assert.Equal(21_000, seenBaseline!.TotalEnrollments);
+        Assert.Equal(19_352, result!.TotalEnrollments);
+        Assert.Equal("PartitionKey eq 'global'", Assert.Single(h.Filters));
+
+        var batch = Assert.Single(h.Submitted);
+        var platform = batch.Single(a => a.Entity.RowKey == "current");
+        Assert.Equal(TableTransactionActionType.UpdateMerge, platform.ActionType);
+        Assert.Equal(new ETag("e1"), platform.ETag);
+        Assert.Equal(19_352L, ((TableEntity)platform.Entity).GetInt64("TotalEnrollments"));
+        Assert.False(((TableEntity)platform.Entity).ContainsKey("IssuesDetected"),
+            "a write-back of IssuesDetected undoes every increment that landed since the read");
+
+        var baselineWrite = batch.Single(a => a.Entity.RowKey == "rollup-baseline");
+        Assert.Equal(TableTransactionActionType.UpsertReplace, baselineWrite.ActionType);
+        Assert.Equal(21_040L, ((TableEntity)baselineWrite.Entity).GetInt64("TotalEnrollments"));
+    }
+
+    [Fact]
+    public async Task Rollup_re_reads_and_re_merges_when_the_platform_row_changed_in_between()
+    {
+        var reads = 0;
+        var h = new Harness
+        {
+            RowsFor = _ => ++reads == 1
+                ? new[] { PlatformRow(19_312, issues: 1, etag: "e1"), BaselineRow(100) }
+                : new[] { PlatformRow(21_800, issues: 2, etag: "e2"), BaselineRow(100) } // corrected in between
+        };
+        h.SubmitFailures.Enqueue(new RequestFailedException(412, "precondition failed"));
+
+        var result = await h.Sut.RollupPlatformStatsAsync(
+            (existing, _) => new PlatformStats { TotalEnrollments = existing!.TotalEnrollments + 5 },
+            new PlatformRollupSources { TotalEnrollments = 105 });
+
+        Assert.Equal(21_805, result!.TotalEnrollments);
+        Assert.Equal(2, h.Submitted.Count);
+        Assert.Equal(new ETag("e2"), h.Submitted[1].Single(a => a.Entity.RowKey == "current").ETag);
+    }
+
+    [Fact]
+    public async Task Rollup_adds_a_missing_platform_row_instead_of_upserting_it()
+    {
+        var h = new Harness();
+
+        await h.Sut.RollupPlatformStatsAsync(
+            (existing, baseline) =>
+            {
+                Assert.Null(existing);
+                Assert.Null(baseline);
+                return new PlatformStats { TotalEnrollments = 10 };
+            },
+            new PlatformRollupSources { TotalEnrollments = 10 });
+
+        var platform = Assert.Single(h.Submitted).Single(a => a.Entity.RowKey == "current");
+        Assert.Equal(TableTransactionActionType.Add, platform.ActionType);
+        Assert.True(((TableEntity)platform.Entity).ContainsKey("IssuesDetected"));
+    }
+
+    // ---------- tenant counters ----------
+
+    private static (Mock<TableClient> Table, TableStorageService Sut, List<(TableEntity Entity, ETag ETag, TableUpdateMode Mode)> Updates) TenantRowHarness(TableEntity row)
+    {
+        var table = new Mock<TableClient>();
+        table.Setup(t => t.GetEntityAsync<TableEntity>(Tenant, "current", It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(Response.FromValue(row, Mock.Of<Response>()));
+        var updates = new List<(TableEntity, ETag, TableUpdateMode)>();
+        table.Setup(t => t.UpdateEntityAsync(It.IsAny<TableEntity>(), It.IsAny<ETag>(), It.IsAny<TableUpdateMode>(), It.IsAny<CancellationToken>()))
+            .Returns<TableEntity, ETag, TableUpdateMode, CancellationToken>((e, tag, mode, _) => { updates.Add((e, tag, mode)); return Task.FromResult(Mock.Of<Response>()); });
+        var service = new Mock<TableServiceClient>();
+        service.Setup(s => s.GetTableClient(Constants.TableNames.PlatformStats)).Returns(table.Object);
+        return (table, new TableStorageService(service.Object, NullLogger<TableStorageService>.Instance), updates);
+    }
+
+    [Fact]
+    public async Task Floors_raise_only_the_counters_below_their_floor_in_one_merge()
+    {
+        var row = new TableEntity(Tenant, "current") { ["TotalEnrollments"] = 500L, ["SuccessfulEnrollments"] = 10L };
+        row.ETag = new ETag("t1");
+        var (_, sut, updates) = TenantRowHarness(row);
+
+        var inPlace = await sut.EnsureTenantStatFloorsAsync(Tenant, new Dictionary<string, long>
+        {
+            ["TotalEnrollments"] = 120,       // below the counter: retention pruned, must not lower
+            ["SuccessfulEnrollments"] = 90,   // above: heal
+            ["TotalEventsProcessed"] = 30_000 // field missing on the row: seed
+        });
+
+        Assert.True(inPlace);
+        var update = Assert.Single(updates);
+        Assert.Equal(new ETag("t1"), update.ETag);
+        Assert.Equal(TableUpdateMode.Merge, update.Mode);
+        Assert.False(update.Entity.ContainsKey("TotalEnrollments"));
+        Assert.Equal(90L, update.Entity.GetInt64("SuccessfulEnrollments"));
+        Assert.Equal(30_000L, update.Entity.GetInt64("TotalEventsProcessed"));
+    }
+
+    [Fact]
+    public async Task Floors_already_met_write_nothing_and_still_count_as_in_place()
+    {
+        var row = new TableEntity(Tenant, "current") { ["TotalEnrollments"] = 500L };
+        row.ETag = new ETag("t1");
+        var (_, sut, updates) = TenantRowHarness(row);
+
+        var inPlace = await sut.EnsureTenantStatFloorsAsync(Tenant, new Dictionary<string, long> { ["TotalEnrollments"] = 120 });
+
+        Assert.True(inPlace);
+        Assert.Empty(updates);
+    }
+
+    [Fact]
+    public async Task Floors_that_cannot_be_written_report_false()
+    {
+        var row = new TableEntity(Tenant, "current") { ["TotalEnrollments"] = 1L };
+        row.ETag = new ETag("t1");
+        var (table, sut, _) = TenantRowHarness(row);
+        table.Setup(t => t.UpdateEntityAsync(It.IsAny<TableEntity>(), It.IsAny<ETag>(), It.IsAny<TableUpdateMode>(), It.IsAny<CancellationToken>()))
+            .ThrowsAsync(new RequestFailedException(500, "storage down"));
+
+        Assert.False(await sut.EnsureTenantStatFloorsAsync(Tenant, new Dictionary<string, long> { ["TotalEnrollments"] = 120 }));
+    }
+
+    [Fact]
+    public async Task Increment_adds_to_the_one_field()
+    {
+        var row = new TableEntity(Tenant, "current") { ["TotalEnrollments"] = 500L, ["TotalEventsProcessed"] = 1_000L };
+        row.ETag = new ETag("t1");
+        var (_, sut, updates) = TenantRowHarness(row);
+
+        await sut.IncrementTenantStatAsync(Tenant, "TotalEventsProcessed", 37);
+
+        var update = Assert.Single(updates);
+        Assert.Equal(1_037L, update.Entity.GetInt64("TotalEventsProcessed"));
+        Assert.False(update.Entity.ContainsKey("TotalEnrollments"), "the patch must not carry fields it did not change");
+    }
+
+    [Fact]
+    public async Task All_tenant_stats_read_the_tenant_rows_only()
+    {
+        var h = new Harness
+        {
+            RowsFor = _ => new[]
+            {
+                new TableEntity(Tenant, "current") { ["TotalEnrollments"] = 7L, ["SuccessfulEnrollments"] = 5L, ["TotalEventsProcessed"] = 900L },
+            }
+        };
+
+        var stats = Assert.Single(await h.Sut.GetAllTenantStatsAsync());
+
+        Assert.Equal("RowKey eq 'current' and PartitionKey ne 'global'", Assert.Single(h.Filters));
+        Assert.Equal(7, stats.TotalEnrollments);
+        Assert.Equal(5, stats.SuccessfulEnrollments);
+        Assert.Equal(900, stats.TotalEventsProcessed);
+    }
+
+    [Fact]
+    public async Task A_failing_tenant_stats_read_throws_instead_of_reporting_zero()
+    {
+        // Zero would become the rollup baseline and the next run would count every tenant
+        // counter as growth a second time.
+        var h = new Harness { RowsFor = _ => throw new RequestFailedException(503, "busy") };
+
+        await Assert.ThrowsAsync<RequestFailedException>(() => h.Sut.GetAllTenantStatsAsync());
+    }
+
+    // ---------- seen device models ----------
+
+    [Fact]
+    public async Task Seen_models_adds_only_unknown_models_and_returns_the_size_of_the_set()
+    {
+        var known = TableStorageService.SeenDeviceModelRowKey("LENOVO ThinkPad T14 Gen 6");
+        var h = new Harness { RowsFor = _ => new[] { new TableEntity("models", known), new TableEntity("models", "PRUNEDMODELHASH") } };
+
+        var size = await h.Sut.RecordSeenDeviceModelsAsync(new[]
+        {
+            "lenovo thinkpad t14 gen 6",          // known, different casing
+            "HP EliteBook 840 14 inch G10/#1",    // new, with characters a table key cannot hold
+            " ",
+        });
+
+        Assert.Equal(3, size);
+        Assert.Equal("PartitionKey eq 'models'", Assert.Single(h.Filters));
+        var added = Assert.Single(Assert.Single(h.Submitted));
+        Assert.Equal("models", added.Entity.PartitionKey);
+        Assert.Equal("HP EliteBook 840 14 inch G10/#1", ((TableEntity)added.Entity).GetString("Model"));
+        Assert.Matches("^[0-9A-F]{64}$", added.Entity.RowKey);
+    }
+}

src/Backend/AutopilotMonitor.Functions.Tests/PolicyEnforcementMiddlewareTests.cs

@@ -937,13 +937,10 @@ public class PolicyEnforcementMiddlewareTests
         Assert.False(rc.IsGlobalReader);
         Assert.NotNull(rc.AllowedTenantIds);
         Assert.Contains(TenantB.ToLowerInvariant(), rc.AllowedTenantIds!);
-        // …and it is the DATA aggregate the MCP quota layer may narrow (charged per managed tenant).
-        Assert.True(rc.IsDelegatedAggregate);
-        Assert.Null(rc.HomeChargedTenantIds);
     }
 
     [Fact]
-    public async Task Delegated_GlobalSessions_WithTenantId_IsADrill_NotAnAggregate()
+    public async Task Delegated_GlobalSessions_WithTenantId_IsADrill()
     {
         const string upn = "msp@partner.example";
         var h = BuildHarness();
@@ -955,15 +952,12 @@ public class PolicyEnforcementMiddlewareTests
         var rc = result.Context!;
         Assert.True(rc.IsDelegatedReader);
         Assert.Equal(TenantB, rc.TargetTenantId);
-        Assert.False(rc.IsDelegatedAggregate);
-        Assert.Null(rc.HomeChargedTenantIds);
     }
 
     [Fact]
-    public async Task Delegated_ConfigAll_IsADirectoryListing_NotAnAggregate()
+    public async Task Delegated_ConfigAll_IsADirectoryListing_AdmittedAndBounded()
     {
-        // Subset tier with TenantScoping.None: admitted + bounded, but no data fan-out — the quota layer
-        // charges it to the caller's home tenant, never to the managed tenants.
+        // Subset tier with TenantScoping.None: admitted + bounded, but no data fan-out.
         const string upn = "msp@partner.example";
         var h = BuildHarness();
         h.AsDelegated(TenantB);
@@ -974,54 +968,6 @@ public class PolicyEnforcementMiddlewareTests
         var rc = result.Context!;
         Assert.True(rc.IsDelegatedReader);
         Assert.NotNull(rc.AllowedTenantIds);
-        Assert.False(rc.IsDelegatedAggregate);
-    }
-
-    private static void AsHomeChargedGroupMember(Harness h, string groupId, string upn, params string[] tenantIds)
-    {
-        h.Repo.Setup(r => r.GetGroupAssignmentsForUpnAsync(It.IsAny<string>()))
-            .ReturnsAsync(new List<TenantGroupAssignment>
-            {
-                new() { Upn = upn, GroupId = groupId, Role = Constants.DelegatedRoles.DelegatedReader, IsEnabled = true, AssignedBy = "ga@vendor.example" },
-            });
-        h.Repo.Setup(r => r.GetGroupMembershipAsync(groupId))
-            .ReturnsAsync(new TenantGroupMembership
-            {
-                GroupId = groupId,
-                TenantIds = tenantIds.Select(t => t.ToLowerInvariant()).ToList(),
-                ChargeHomeTenantQuota = true,
-            });
-    }
-
-    [Fact]
-    public async Task Delegated_HomeChargedGroup_MarksTheDrillTarget()
-    {
-        const string upn = "ops@vendor.example";
-        var h = BuildHarness();
-        AsHomeChargedGroupMember(h, "grp-managed-service", upn, TenantB);
-
-        var result = await h.Middleware.DecideAsync("GET", "/api/global/sessions", TenantB, AuthedPrincipal(TenantA, upn));
-
-        Assert.True(result.Allowed);
-        var rc = result.Context!;
-        Assert.True(rc.IsDelegatedReader);
-        Assert.Equal(new[] { TenantB.ToLowerInvariant() }, rc.HomeChargedTenantIds);
-    }
-
-    [Fact]
-    public async Task Delegated_HomeChargedGroup_MarksTheAggregateMembers()
-    {
-        const string upn = "ops@vendor.example";
-        var h = BuildHarness();
-        AsHomeChargedGroupMember(h, "grp-managed-service", upn, TenantB);
-
-        var result = await h.Middleware.DecideAsync("GET", "/api/global/sessions", null, AuthedPrincipal(TenantA, upn));
-
-        Assert.True(result.Allowed);
-        var rc = result.Context!;
-        Assert.True(rc.IsDelegatedAggregate);
-        Assert.Contains(TenantB.ToLowerInvariant(), rc.AllowedTenantIds!);
-        Assert.Equal(new[] { TenantB.ToLowerInvariant() }, rc.HomeChargedTenantIds);
     }
 
     [Fact]
@@ -1769,7 +1715,6 @@ public class PolicyEnforcementMiddlewareTests
         Assert.True(mcp.Allowed);
         Assert.NotNull(mcp.Context!.AllowedTenantIds);
         Assert.Empty(mcp.Context!.AllowedTenantIds!);
-        Assert.True(mcp.Context!.IsDelegatedAggregate);
         Assert.Contains(TenantB.ToLowerInvariant(), portal.Context!.AllowedTenantIds!);
     }
 

src/Backend/AutopilotMonitor.Functions.Tests/QueryParamGuardTests.cs

@@ -71,4 +71,67 @@ public class QueryParamGuardTests
             "Baseline entries without a TryParse any more — remove them (the ratchet only shrinks):\n  " +
             string.Join("\n  ", stale));
     }
+
+    // ── One source of the query collection ──────────────────────────────────────────────
+    // `req.Query` IS `HttpUtility.ParseQueryString(req.Url.Query)`, cached per request (the
+    // fact below pins that against a worker update). A second spelling of the same call is
+    // only a pattern for the next function to copy, so the request query is read through
+    // `req.Query` and ParseQueryString stays for strings that are not the request's query.
+
+    private static readonly Regex ParseQueryStringCall = new(@"\bParseQueryString\(", RegexOptions.Compiled);
+
+    /// <summary>ParseQueryString over something other than the request query: file → why.</summary>
+    private static readonly IReadOnlyDictionary<string, string> ParseQueryStringBaseline = new Dictionary<string, string>(StringComparer.Ordinal)
+    {
+        ["Functions/Config/GetTenantConfigurationFunction.cs"] = "ShouldRedact takes the raw query string so the redaction decision is unit-testable without a request",
+        ["Functions/Diagnostics/GetDiagnosticsUploadUrlFunction.cs"] = "query of the tenant's stored SAS URL",
+        ["Services/Diagnostics/SasPermissionParser.cs"] = "query of a SAS URL",
+    };
+
+    [Fact]
+    public void The_request_query_is_read_through_req_Query_only()
+    {
+        var root = FunctionsRoot();
+        var offenders = new List<string>();
+        var seen = new HashSet<string>(StringComparer.Ordinal);
+
+        var files = Directory.EnumerateFiles(root, "*.cs", SearchOption.AllDirectories)
+            .Select(p => Path.GetRelativePath(root, p).Replace('\\', '/'))
+            .Where(rel => !rel.StartsWith("bin/", StringComparison.Ordinal) && !rel.StartsWith("obj/", StringComparison.Ordinal))
+            .OrderBy(p => p, StringComparer.Ordinal);
+
+        foreach (var rel in files)
+        {
+            if (!ParseQueryStringCall.IsMatch(File.ReadAllText(Path.Combine(root, rel)))) continue;
+            seen.Add(rel);
+            if (!ParseQueryStringBaseline.ContainsKey(rel)) offenders.Add(rel);
+        }
+
+        Assert.True(offenders.Count == 0,
+            "HttpUtility.ParseQueryString in the Functions project — read the request query through " +
+            "req.Query, or add the file to the baseline with what it parses instead:\n  " + string.Join("\n  ", offenders));
+
+        var stale = ParseQueryStringBaseline.Keys.Where(k => !seen.Contains(k)).ToList();
+        Assert.True(stale.Count == 0,
+            "Baseline entries without a ParseQueryString any more — remove them:\n  " + string.Join("\n  ", stale));
+    }
+
+    [Fact]
+    public void Req_Query_is_ParseQueryString_over_the_request_url()
+    {
+        var url = new Uri("https://localhost/api/x?a=1&a=2&b=%20x%2B&c&=orphan&D=Case");
+        var req = new Moq.Mock<Microsoft.Azure.Functions.Worker.Http.HttpRequestData>(
+            Moq.Mock.Of<Microsoft.Azure.Functions.Worker.FunctionContext>()) { CallBase = true };
+        req.SetupGet(r => r.Url).Returns(url);
+
+        var viaRequest = req.Object.Query;
+        var viaHelper = System.Web.HttpUtility.ParseQueryString(url.Query);
+
+        Assert.Equal(viaHelper.AllKeys, viaRequest.AllKeys);
+        foreach (var key in viaHelper.AllKeys)
+            Assert.Equal(viaHelper.GetValues(key), viaRequest.GetValues(key));
+        Assert.Equal("1,2", viaRequest["a"]);   // repeated key: comma-joined on both paths
+        Assert.Equal(" x+", viaRequest["b"]);
+        Assert.Same(viaRequest, req.Object.Query); // parsed once per request
+    }
 }

src/Backend/AutopilotMonitor.Functions.Tests/RevokeEnforcementTests.cs

@@ -101,51 +101,6 @@ public class RevokeEnforcementTests
             ManagedTenantProIndex.None,
             NullLogger<ProConferralService>.Instance) { CallBase = false };
 
-    // --- ChargeHomeTenantQuota flip: audited under every tenant, no-op on an unchanged value ---
-
-    [Fact]
-    public async Task SetChargeMode_UnknownGroup_False_NoAudit()
-    {
-        var (fn, _, audit, _) = BuildGroupFn();
-        var ok = await fn.SetChargeModeCoreAsync("no-such-group", true, "ga@vendor.example");
-        Assert.False(ok);
-        VerifyNoAudit(audit);
-    }
-
-    [Fact]
-    public async Task SetChargeMode_UnchangedValue_IsNoOp_NoAudit()
-    {
-        var (fn, repo, audit, _) = BuildGroupFn();
-        repo.Setup(r => r.GetTenantGroupAsync(GroupId)).ReturnsAsync(
-            new TenantGroup { GroupId = GroupId, Name = "Managed Service", TenantIds = { TenantA }, ChargeHomeTenantQuota = true });
-
-        var ok = await fn.SetChargeModeCoreAsync(GroupId, true, "ga@vendor.example");
-
-        Assert.True(ok);
-        repo.Verify(r => r.SetTenantGroupChargeHomeTenantQuotaAsync(It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
-        VerifyNoAudit(audit);
-    }
-
-    [Fact]
-    public async Task SetChargeMode_RealChange_AuditsUnderEveryTenantInTheGroup()
-    {
-        var (fn, repo, audit, _) = BuildGroupFn();
-        repo.Setup(r => r.GetTenantGroupAsync(GroupId)).ReturnsAsync(
-            new TenantGroup { GroupId = GroupId, Name = "Managed Service", TenantIds = { TenantA, TenantB } });
-        repo.Setup(r => r.SetTenantGroupChargeHomeTenantQuotaAsync(GroupId, true)).ReturnsAsync(true);
-
-        var ok = await fn.SetChargeModeCoreAsync(GroupId, true, "ga@vendor.example");
-
-        Assert.True(ok);
-        foreach (var tenant in new[] { TenantA, TenantB })
-        {
-            audit.Verify(a => a.LogAuditEntryAsync(tenant, "UPDATE", "DelegatedGroupAccess", "*", "ga@vendor.example",
-                It.Is<Dictionary<string, string>?>(d => d != null
-                    && d["Reason"] == "quota-charge-mode-changed"
-                    && d["ChargeHomeTenantQuota"] == "true")), Times.Once);
-        }
-    }
-
     // --- Delegated grant validation (fail-closed) ---
 
     [Fact]

src/Backend/AutopilotMonitor.Functions.Tests/RuleCatalogStampTests.cs

@@ -0,0 +1,46 @@
+using AutopilotMonitor.Shared.Models;
+using Xunit;
+
+namespace AutopilotMonitor.Functions.Tests;
+
+/// <summary>
+/// The gate in front of the embedded self-seed: only a GitHub reseed that is NEWER than the
+/// deployed binary closes it. The dates are the 2026-09-11 incident — a backend built on
+/// 2026-09-10 19:19 UTC re-inserted a pattern that the reseed of 2026-09-11 01:20 had deleted.
+/// </summary>
+public class RuleCatalogStampTests
+{
+    private static readonly DateTime Build = new(2026, 9, 10, 19, 19, 57, DateTimeKind.Utc);
+
+    private static RuleCatalogStamp Stamp(string source, DateTime at) => new()
+    {
+        Kind = RuleCatalogStamp.KindIme, Source = source, StampedAt = at, Count = 82,
+    };
+
+    [Fact]
+    public void No_stamp_lets_the_embedded_seed_run()
+    {
+        Assert.True(RuleCatalogStamp.EmbeddedSeedAllowed(null, Build));
+    }
+
+    [Fact]
+    public void GitHub_reseed_after_the_build_closes_the_gate()
+    {
+        var reseed = new DateTime(2026, 9, 11, 1, 20, 42, DateTimeKind.Utc);
+        Assert.False(RuleCatalogStamp.EmbeddedSeedAllowed(Stamp(RuleCatalogStamp.SourceGitHub, reseed), Build));
+    }
+
+    [Fact]
+    public void GitHub_reseed_before_or_at_the_build_keeps_it_open()
+    {
+        Assert.True(RuleCatalogStamp.EmbeddedSeedAllowed(Stamp(RuleCatalogStamp.SourceGitHub, Build.AddHours(-1)), Build));
+        Assert.True(RuleCatalogStamp.EmbeddedSeedAllowed(Stamp(RuleCatalogStamp.SourceGitHub, Build), Build));
+    }
+
+    [Fact]
+    public void Embedded_reseed_never_closes_the_gate()
+    {
+        Assert.True(RuleCatalogStamp.EmbeddedSeedAllowed(Stamp(RuleCatalogStamp.SourceEmbedded, Build.AddDays(3)), Build));
+        Assert.False(RuleCatalogStamp.EmbeddedSeedAllowed(Stamp("GitHub", Build.AddDays(3)), Build)); // source is compared case-insensitively
+    }
+}

src/Backend/AutopilotMonitor.Functions.Tests/SafeWipeServiceTests.cs

@@ -8,6 +8,7 @@ using Azure.Data.Tables;
 using Azure.Storage.Blobs;
 using AutopilotMonitor.Functions.Services;
 using AutopilotMonitor.Functions.Services.Offboarding;
+using AutopilotMonitor.Shared;
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using Xunit;
@@ -205,6 +206,75 @@ public class SafeWipeServiceTests
         Assert.Empty(harness.SubmittedBatches);
     }
 
+    [Fact]
+    public async Task OwnedGroupPartition_DeletesRowsUnderSelfServiceGroupId()
+    {
+        // TenantGroups: PK = "msp-{tenantId}". The entry point takes the tenant GUID and derives
+        // the group id — the rows under that partition are the ones deleted.
+        var groupId = Constants.TenantGroupIds.ForHomeTenant(TenantId);
+        var harness = new Harness(
+            queriedRows: new[]
+            {
+                new TableEntity(groupId, "meta"),
+                new TableEntity(groupId, OtherTenant),
+            });
+
+        var deleted = await harness.Sut.WipeByOwnedGroupPartitionAsync("FakeTable", TenantId);
+
+        Assert.Equal(2, deleted);
+        Assert.Equal($"PartitionKey eq '{groupId}'", Assert.Single(harness.Filters));
+    }
+
+    [Fact]
+    public async Task OwnedGroupPartition_AbortsWhenForeignGroupReturned()
+    {
+        var harness = new Harness(
+            queriedRows: new[]
+            {
+                new TableEntity(Constants.TenantGroupIds.ForHomeTenant(TenantId), "meta"),
+                new TableEntity(Constants.TenantGroupIds.ForHomeTenant(OtherTenant), "meta"), // <-- another manager's group
+            });
+
+        await Assert.ThrowsAsync<SafeWipeVerificationException>(() =>
+            harness.Sut.WipeByOwnedGroupPartitionAsync("FakeTable", TenantId));
+
+        Assert.Empty(harness.SubmittedBatches);
+        Assert.Empty(harness.PerRowDeletes);
+    }
+
+    [Fact]
+    public async Task OwnedGroupRowKey_AbortsWhenForeignGroupAssignmentReturned()
+    {
+        // TenantGroupAssignments: PK = managed tenant, RK = groupId. An assignment pointing at
+        // another manager's group must never be deleted.
+        var harness = new Harness(
+            queriedRows: new[]
+            {
+                new TableEntity(OtherTenant, Constants.TenantGroupIds.ForHomeTenant(TenantId)),
+                new TableEntity(OtherTenant, Constants.TenantGroupIds.ForHomeTenant(OtherTenant)),
+            });
+
+        await Assert.ThrowsAsync<SafeWipeVerificationException>(() =>
+            harness.Sut.WipeByOwnedGroupRowKeyAsync("FakeTable", TenantId));
+
+        Assert.Empty(harness.SubmittedBatches);
+        Assert.Empty(harness.PerRowDeletes);
+    }
+
+    [Fact]
+    public async Task TenantGuidEntryPoints_RejectTheDerivedGroupId()
+    {
+        // The production bug: the handler passed "msp-{tenantId}" into the tenant-GUID entry
+        // points and every offboarding poisoned. Those entry points stay GUID-only.
+        var harness = new Harness(queriedRows: Array.Empty<TableEntity>());
+        var groupId = Constants.TenantGroupIds.ForHomeTenant(TenantId);
+
+        await Assert.ThrowsAsync<ArgumentException>(() => harness.Sut.WipeByExactPartitionAsync("t", groupId));
+        await Assert.ThrowsAsync<ArgumentException>(() => harness.Sut.WipeByRowKeyAsync("t", groupId));
+        await Assert.ThrowsAsync<ArgumentException>(() => harness.Sut.WipeByOwnedGroupPartitionAsync("t", groupId));
+        await Assert.ThrowsAsync<ArgumentException>(() => harness.Sut.WipeByOwnedGroupRowKeyAsync("t", groupId));
+    }
+
     [Fact]
     public async Task Variants_RejectNonGuidTenantId()
     {
@@ -228,6 +298,8 @@ public class SafeWipeServiceTests
     {
         public List<List<TableTransactionAction>> SubmittedBatches { get; } = new();
         public List<(string Pk, string Rk, ETag Etag)> PerRowDeletes { get; } = new();
+        /// <summary>OData filters the service sent to the table — the server-side anchor.</summary>
+        public List<string> Filters { get; } = new();
         public SafeWipeService Sut { get; }
 
         public Harness(
@@ -244,6 +316,7 @@ public class SafeWipeServiceTests
                     It.IsAny<int?>(),
                     It.IsAny<IEnumerable<string>>(),
                     It.IsAny<CancellationToken>()))
+                .Callback<string, int?, IEnumerable<string>, CancellationToken>((filter, _, _, _) => Filters.Add(filter))
                 .Returns(AsAsyncPageable(queriedRows));
 
             mockTableClient

src/Backend/AutopilotMonitor.Functions.Tests/SessionAnnotationFunctionsTests.cs

@@ -208,6 +208,8 @@ public class SessionAnnotationFunctionsTests
         var req = BuildRequest(Principal(("tid", TenantId)), requestCtx, new { });
         Mock.Get(req).SetupGet(r => r.Url)
             .Returns(new Uri("https://localhost/api/global/session-annotations"));
+        // Query is virtual: without CallBase a loose mock answers null instead of parsing Url.
+        Mock.Get(req).SetupGet(r => r.Query).CallBase();
 
         var res = await function.Run(req);
 

src/Backend/AutopilotMonitor.Functions.Tests/SessionsWireParityTests.cs

@@ -850,45 +850,6 @@ public class SessionsWireParityTests
             });
     }
 
-    // ---- Delegated (MSP) MCP fleet aggregate: quota-excluded tenants ---------------------
-
-    [Fact]
-    public void SessionListResponse_carries_quotaExcludedTenants_on_a_narrowed_fleet_aggregate()
-    {
-        IReadOnlyList<SessionSummary> items = new List<SessionSummary> { SampleSummary("0b6f7a37-1111-4d61-9c93-0aa111111111") };
-        string? nextLink = null;
-        var quotaExcludedTenants = new[] { "7aa20c11-0002-4b7c-a1d2-52f3aaaa0002" };
-
-        AssertParity(
-            new
-            {
-                success = true,
-                count = items.Count,
-                sessions = items,
-                nextLink,
-                quotaExcludedTenants,
-            },
-            new SessionListResponse
-            {
-                Success = true,
-                Count = items.Count,
-                Sessions = items,
-                NextLink = null,
-                QuotaExcludedTenants = quotaExcludedTenants,
-            });
-    }
-
-    [Fact]
-    public void SessionStatsResponse_carries_quotaExcludedTenants_on_a_narrowed_fleet_aggregate()
-    {
-        var stats = new SessionStats { Days = 7, ComputedAt = new DateTime(2026, 8, 30, 12, 0, 0, DateTimeKind.Utc) };
-        var quotaExcludedTenants = new[] { "7aa20c11-0002-4b7c-a1d2-52f3aaaa0002", "7aa20c11-0002-4b7c-a1d2-52f3aaaa0003" };
-
-        AssertParity(
-            new { success = true, stats, quotaExcludedTenants },
-            new SessionStatsResponse { Success = true, Stats = stats, QuotaExcludedTenants = quotaExcludedTenants });
-    }
-
     private static void AssertParity(object anonymousLiteral, IApiResponse typed)
         => ApiResponseWireParityTests.AssertWireIdentical(anonymousLiteral, typed);
 }

src/Backend/AutopilotMonitor.Functions.Tests/SharedManifestParityTests.cs

@@ -107,6 +107,7 @@ public sealed class SharedManifestParityTests
             ["apiErrorCodes"] = ConstStrings(typeof(Constants.ApiErrorCodes))
                 .Concat(ConstStrings(typeof(Constants.DelegationCodes)))
                 .Concat(ConstStrings(typeof(Constants.DelegatedSlots)))
+                .Concat(ConstStrings(typeof(Constants.BackupErrorCodes)))
                 .ToArray(),
             ["tenantRoles"] = ConstStrings(typeof(Constants.TenantRoles)),
             ["globalRoles"] = ConstStrings(typeof(Constants.GlobalRoles)),

src/Backend/AutopilotMonitor.Functions.Tests/SlaMetricsServiceTests.cs

@@ -17,6 +17,10 @@ public class SlaMetricsServiceTests
     // Use unique tenant IDs per test to avoid static cache collisions
     private static string NewTenantId() => $"sla-test-{Guid.NewGuid():N}";
 
+    // Fixed clock: Wednesday 2026-09-23, ISO week 39. Mid-week and mid-month, so neither a week
+    // nor a month boundary can move a fixture out of its period.
+    private static readonly DateTime Now = new(2026, 9, 23, 12, 0, 0, DateTimeKind.Utc);
+
     private static (SlaMetricsService Service, string TenantId) CreateService(
         List<SessionSummary> sessions,
         TenantConfiguration? config = null,
@@ -44,7 +48,7 @@ public class SlaMetricsServiceTests
 
         var logger = NullLogger<SlaMetricsService>.Instance;
 
-        return (new SlaMetricsService(maintenanceRepo.Object, metricsRepo.Object, configService.Object, logger), tenantId);
+        return (new SlaMetricsService(maintenanceRepo.Object, metricsRepo.Object, configService.Object, logger, () => Now), tenantId);
     }
 
     private static TenantConfiguration CreateDefaultConfig(
@@ -65,15 +69,7 @@ public class SlaMetricsServiceTests
         int? durationSeconds = null,
         DateTime? startedAt = null)
     {
-        // The CurrentWeek asserts require the session to fall into the CURRENT ISO week
-        // (SlaMetricsService groups by GetIsoWeekKey, weeks start Monday 00:00 UTC).
-        // A plain "now - 1h" crosses into LAST week during the first hour of every
-        // Monday (UTC) and empties CurrentWeek — exactly the CI failure on
-        // Mon 2026-08-31 00:20Z. Clamp the anchor to the week's Monday instead.
-        var now = DateTime.UtcNow;
-        var isoWeekMonday = now.Date.AddDays(-(((int)now.DayOfWeek + 6) % 7));
-        var anHourAgo = now.AddHours(-1);
-        var started = startedAt ?? (anHourAgo >= isoWeekMonday ? anHourAgo : isoWeekMonday);
+        var started = startedAt ?? Now.AddHours(-1);
         return new SessionSummary
         {
             SessionId = Guid.NewGuid().ToString(),
@@ -134,6 +130,96 @@ public class SlaMetricsServiceTests
         Assert.Equal(0, result.CurrentWeek.SuccessRate);
         Assert.Equal(0, result.CurrentWeek.TotalCompleted);
         Assert.Empty(result.Violators);
+
+        // An empty period is "no data": it must not read as a breached target.
+        foreach (var snapshot in new[] { result.CurrentWeek, result.EvaluationPeriod })
+        {
+            Assert.False(snapshot.HasData);
+            Assert.True(snapshot.SuccessRateMet);
+            Assert.True(snapshot.DurationTargetMet);
+        }
+    }
+
+    [Fact]
+    public async Task ComputeSlaMetrics_EmptyWeekFilledWindow_HeadlineCarriesTheEvaluationWindow()
+    {
+        // The evaluation window holds finished enrollments, the current ISO week none — the
+        // headline snapshot (what the breach notification evaluates) reports them, the week stays empty.
+        var twoWeeksAgo = new DateTime(2026, 9, 8, 10, 0, 0, DateTimeKind.Utc); // W37
+        var sessions = new List<SessionSummary>();
+        for (var i = 0; i < 32; i++) sessions.Add(CreateSession(SessionStatus.Succeeded, 1800, twoWeeksAgo));
+        for (var i = 0; i < 9; i++) sessions.Add(CreateSession(SessionStatus.Failed, 1800, twoWeeksAgo));
+
+        var (service, tenantId) = CreateService(sessions);
+        var result = await service.ComputeSlaMetricsAsync(tenantId, 1);
+
+        Assert.Equal(30, result.EvaluationWindowDays);
+        Assert.Equal("last-30-days", result.EvaluationPeriod.Period);
+        Assert.Equal("", result.EvaluationPeriod.Week);
+        Assert.True(result.EvaluationPeriod.HasData);
+        Assert.Equal(41, result.EvaluationPeriod.TotalCompleted);
+        Assert.Equal(78, result.EvaluationPeriod.SuccessRate);
+        Assert.False(result.EvaluationPeriod.SuccessRateMet);
+
+        Assert.Equal("2026-W39", result.CurrentWeek.Period);
+        Assert.Equal("2026-W39", result.CurrentWeek.Week);
+        Assert.False(result.CurrentWeek.HasData);
+        Assert.True(result.CurrentWeek.SuccessRateMet);
+    }
+
+    [Fact]
+    public async Task ComputeSlaMetrics_EvaluationWindow_IsRolling_NotTheCalendarMonth()
+    {
+        // Now = 2026-09-23 12:00 ⇒ the window starts 2026-08-24 12:00.
+        var sessions = new List<SessionSummary>
+        {
+            CreateSession(SessionStatus.Succeeded, 1800),
+            // previous calendar month, inside the rolling window
+            CreateSession(SessionStatus.Failed, 1800, new DateTime(2026, 8, 25, 9, 0, 0, DateTimeKind.Utc)),
+            // just outside the window
+            CreateSession(SessionStatus.Failed, 1800, new DateTime(2026, 8, 24, 11, 59, 59, DateTimeKind.Utc)),
+            CreateSession(SessionStatus.Failed, 1800, new DateTime(2026, 7, 15, 9, 0, 0, DateTimeKind.Utc)),
+        };
+
+        var (service, tenantId) = CreateService(sessions);
+        var result = await service.ComputeSlaMetricsAsync(tenantId, 3);
+
+        Assert.Equal(2, result.EvaluationPeriod.TotalCompleted);
+        Assert.Equal(50, result.EvaluationPeriod.SuccessRate);
+        Assert.Equal(4, result.WeeklyTrend.Sum(w => w.TotalCompleted));
+    }
+
+    [Fact]
+    public async Task ComputeSlaMetrics_OneMonthSelection_HeadlineStillReachesBack_TrendDoesNot()
+    {
+        // "1 Month" starts on the first; the evaluation window reaches into August. The headline
+        // must count the August session, the trend and the violators must not grow by it.
+        var sessions = new List<SessionSummary>
+        {
+            CreateSession(SessionStatus.Succeeded, 1800),
+            CreateSession(SessionStatus.Failed, 1800, new DateTime(2026, 8, 28, 9, 0, 0, DateTimeKind.Utc)),
+        };
+
+        var (service, tenantId) = CreateService(sessions);
+        var result = await service.ComputeSlaMetricsAsync(tenantId, 1);
+
+        Assert.Equal(2, result.EvaluationPeriod.TotalCompleted);
+        Assert.Equal(1, result.WeeklyTrend.Sum(w => w.TotalCompleted));
+        Assert.Empty(result.Violators);
+    }
+
+    [Fact]
+    public async Task ComputeSlaMetrics_SessionsWithoutDuration_DurationTargetIsNotJudged()
+    {
+        var config = CreateDefaultConfig(targetMaxDuration: 30);
+        var sessions = new List<SessionSummary> { CreateSession(SessionStatus.Failed) };
+
+        var (service, tenantId) = CreateService(sessions, config);
+        var result = await service.ComputeSlaMetricsAsync(tenantId, 1);
+
+        Assert.True(result.EvaluationPeriod.HasData);
+        Assert.False(result.EvaluationPeriod.SuccessRateMet);
+        Assert.True(result.EvaluationPeriod.DurationTargetMet);
     }
 
     [Fact]

src/Backend/AutopilotMonitor.Functions.Tests/SlaTenantStatusLifecycleTests.cs

@@ -213,6 +213,14 @@ public class SlaTenantStatusLifecycleTests
                 .ReturnsAsync(sessions);
         }
 
+        /// <summary>Like the real repository: only sessions started inside the queried range come back.</summary>
+        public void SetSessionsHonoringDateRange(string tenantId, List<SessionSummary> sessions)
+        {
+            _maintenanceRepo.Setup(r => r.GetSessionsByDateRangeAsync(It.IsAny<DateTime>(), It.IsAny<DateTime>(), tenantId, It.IsAny<CancellationToken>()))
+                .ReturnsAsync((DateTime start, DateTime end, string? _, CancellationToken _) =>
+                    sessions.Where(s => s.StartedAt >= start && s.StartedAt < end).ToList());
+        }
+
         public void SetRecentSessions(string tenantId, List<SessionSummary> sessions)
         {
             _sessionRepo.Setup(r => r.GetSessionsPageAsync(tenantId, It.IsAny<int?>(), It.IsAny<int>(), It.IsAny<string?>()))
@@ -291,7 +299,7 @@ public class SlaTenantStatusLifecycleTests
     }
 
     [Fact]
-    public async Task ReBreach_AfterCooldown_SendsAnotherNotification()
+    public async Task ReBreach_AfterCooldown_WithNewlyFinishedSession_SendsAnotherNotification()
     {
         var h = new Harness();
         var config = CreateConfig(successRate: true);
@@ -307,6 +315,15 @@ public class SlaTenantStatusLifecycleTests
         row!.SuccessRate_LastNotifiedAt = DateTime.UtcNow.AddHours(-25);
         await h.StatusRepo.UpsertAsync(row);
 
+        // A session that finished after the last notification: the population changed.
+        var sessions = Sessions(succeeded: 8, failed: 4);
+        sessions.Add(new SessionSummary
+        {
+            TenantId = TenantId, SessionId = Guid.NewGuid().ToString(), Status = SessionStatus.Failed,
+            StartedAt = DateTime.UtcNow.AddHours(-26), CompletedAt = DateTime.UtcNow.AddHours(-1), DurationSeconds = 1800,
+        });
+        h.SetTerminalSessions(TenantId, sessions);
+
         await h.Service.EvaluateAllTenantsAsync();
 
         Assert.Equal(2, h.NotificationsSent.Count(n => n.Type == "sla_breach"));
@@ -314,6 +331,67 @@ public class SlaTenantStatusLifecycleTests
         Assert.True((DateTime.UtcNow - afterRow!.SuccessRate_LastNotifiedAt!.Value).TotalMinutes < 1);
     }
 
+    /// <summary>
+    /// A lasting breach without any newly finished enrollment is not repeated, however long the
+    /// cooldown has expired — a tenant that enrolls nothing must not get the same number every day.
+    /// Includes a session that finished BEFORE the last notification (an imported or merely old
+    /// row): it is not new evidence.
+    /// </summary>
+    [Fact]
+    public async Task ReBreach_AfterCooldown_WithoutNewSession_StaysSilent()
+    {
+        var h = new Harness();
+        var config = CreateConfig(successRate: true, duration: true, targetMaxDurationMinutes: 10);
+        h.SetTenants(config);
+        var sessions = Sessions(succeeded: 8, failed: 4); // 66.7 % and P95 30 min: both breach
+        sessions.Add(new SessionSummary
+        {
+            TenantId = TenantId, SessionId = Guid.NewGuid().ToString(), Status = SessionStatus.Failed,
+            StartedAt = DateTime.UtcNow.AddDays(-9), CompletedAt = DateTime.UtcNow.AddDays(-9).AddMinutes(30), DurationSeconds = 1800,
+        });
+        h.SetTerminalSessions(TenantId, sessions);
+
+        await h.Service.EvaluateAllTenantsAsync();
+        Assert.Equal(2, h.NotificationsSent.Count(n => n.Type == "sla_breach"));
+
+        var row = await h.StatusRepo.GetAsync(TenantId);
+        row!.SuccessRate_LastNotifiedAt = DateTime.UtcNow.AddDays(-5);
+        row.Duration_LastNotifiedAt = DateTime.UtcNow.AddDays(-5);
+        await h.StatusRepo.UpsertAsync(row);
+
+        await h.Service.EvaluateAllTenantsAsync();
+
+        Assert.Equal(2, h.NotificationsSent.Count(n => n.Type == "sla_breach"));
+        var afterRow = await h.StatusRepo.GetAsync(TenantId);
+        Assert.True(afterRow!.SuccessRate_IsActive); // still breaching, still tracked
+        Assert.True(afterRow.Duration_IsActive);
+        Assert.NotNull(afterRow.SuccessRate_LastBreachAt);
+    }
+
+    /// <summary>
+    /// A new breach episode after a resolve notifies without new evidence: the rolling window can
+    /// re-breach by good sessions aging out, and the admin was last told "resolved".
+    /// </summary>
+    [Fact]
+    public async Task NewBreachEpisode_AfterResolve_NotifiesWithoutNewSession()
+    {
+        var h = new Harness();
+        var config = CreateConfig(successRate: true);
+        h.SetTenants(config);
+        await h.StatusRepo.UpsertAsync(new SlaTenantStatus
+        {
+            TenantId = TenantId,
+            SuccessRate_IsActive = false,
+            SuccessRate_LastNotifiedAt = DateTime.UtcNow.AddDays(-3),
+            SuccessRate_ResolvedAt = DateTime.UtcNow.AddDays(-2),
+        });
+        h.SetTerminalSessions(TenantId, Sessions(succeeded: 8, failed: 4)); // no CompletedAt after the watermark
+
+        await h.Service.EvaluateAllTenantsAsync();
+
+        Assert.Single(h.NotificationsSent, n => n.Type == "sla_breach");
+    }
+
     [Fact]
     public async Task BreachResolved_SetsIsActiveFalseAndSendsResolvedNotification()
     {
@@ -773,6 +851,68 @@ public class SlaTenantStatusLifecycleTests
         Assert.DoesNotContain(h.NotificationsSent, n => n.Type == "sla_breach");
     }
 
+    /// <summary>
+    /// The breach notification links to the SLA dashboard, so both must report the same number
+    /// for the same target. Same sessions through the evaluator and through SlaMetricsService:
+    /// the persisted breach values equal the dashboard's evaluation-period snapshot. The fixture
+    /// holds sessions of the previous calendar month inside AND outside the rolling window and an
+    /// empty current ISO week on purpose — a headline computed on a calendar month, on the ISO
+    /// week or on the selected months diverges here. Both month selections run: with "1 Month"
+    /// the dashboard's own range starts after the window does.
+    /// </summary>
+    [Theory]
+    [InlineData(1)]
+    [InlineData(3)]
+    public async Task Evaluator_And_DashboardEvaluationPeriod_ReportTheSameValues(int months)
+    {
+        var clock = new DateTime(2026, 9, 21, 12, 0, 0, DateTimeKind.Utc); // Monday, ISO week 39; window starts 08-22 12:00
+        SessionSummary At(DateTime startedAt, SessionStatus status, int durationSec) => new()
+        {
+            TenantId = TenantId, SessionId = Guid.NewGuid().ToString(), Status = status,
+            StartedAt = startedAt, DurationSeconds = durationSec,
+        };
+
+        var sessions = new List<SessionSummary>();
+        for (int i = 0; i < 4; i++) // previous month, outside the rolling window
+            sessions.Add(At(new DateTime(2026, 8, 20, 9, 0, 0, DateTimeKind.Utc), SessionStatus.Failed, 9000));
+        for (int i = 0; i < 2; i++) // previous month, inside the rolling window
+            sessions.Add(At(new DateTime(2026, 8, 28, 9, 0, 0, DateTimeKind.Utc), SessionStatus.Failed, 5400));
+        for (int i = 0; i < 7; i++) // this month, earlier ISO weeks
+            sessions.Add(At(new DateTime(2026, 9, 3 + i, 9, 0, 0, DateTimeKind.Utc), SessionStatus.Succeeded, 900 + i * 600));
+        sessions.Add(At(new DateTime(2026, 9, 9, 9, 0, 0, DateTimeKind.Utc), SessionStatus.Failed, 7200));
+        sessions.Add(At(new DateTime(2026, 9, 10, 9, 0, 0, DateTimeKind.Utc), SessionStatus.Failed, 300));
+
+        var h = new Harness(clock: clock);
+        var config = CreateConfig(successRate: true, duration: true, targetMaxDurationMinutes: 30);
+        h.SetTenants(config);
+        h.SetSessionsHonoringDateRange(TenantId, sessions);
+
+        await h.Service.EvaluateAllTenantsAsync();
+        var row = await h.StatusRepo.GetAsync(TenantId);
+
+        var maintenanceRepo = new Mock<IMaintenanceRepository>();
+        maintenanceRepo.Setup(r => r.GetSessionsByDateRangeAsync(It.IsAny<DateTime>(), It.IsAny<DateTime>(), TenantId, It.IsAny<CancellationToken>()))
+            .ReturnsAsync((DateTime start, DateTime end, string? _, CancellationToken _) =>
+                sessions.Where(s => s.StartedAt >= start && s.StartedAt < end).ToList());
+        var configService = new Mock<TenantConfigurationService>(
+            Mock.Of<IConfigRepository>(), NullLogger<TenantConfigurationService>.Instance, new MemoryCache(new MemoryCacheOptions()));
+        configService.Setup(c => c.GetConfigurationAsync(TenantId)).ReturnsAsync(config);
+        var dashboard = new SlaMetricsService(
+            maintenanceRepo.Object, Mock.Of<IMetricsRepository>(), configService.Object,
+            NullLogger<SlaMetricsService>.Instance, () => clock);
+
+        var metrics = await dashboard.ComputeSlaMetricsAsync(TenantId, months, fresh: true);
+
+        Assert.Equal(11, metrics.EvaluationPeriod.TotalCompleted);
+        Assert.Equal(63.6, metrics.EvaluationPeriod.SuccessRate);
+        Assert.Equal(row!.SuccessRate_CurrentValue, metrics.EvaluationPeriod.SuccessRate);
+        Assert.Equal(row.SuccessRate_TotalSessions, metrics.EvaluationPeriod.TotalCompleted);
+        Assert.Equal(row.Duration_CurrentP95Minutes, metrics.EvaluationPeriod.P95DurationMinutes);
+        Assert.Equal(row.SuccessRate_IsActive, !metrics.EvaluationPeriod.SuccessRateMet);
+        Assert.Equal(row.Duration_IsActive, !metrics.EvaluationPeriod.DurationTargetMet);
+        Assert.False(metrics.CurrentWeek.HasData);
+    }
+
     /// <summary>
     /// Review-finding regression: AppInstall notification + ops event must carry the actual
     /// installer totals (not 0/0). Without this, Application Insights / Ops dashboards see
@@ -877,8 +1017,8 @@ public class SlaTenantStatusLifecycleTests
     /// ops dashboards even though they were evaluated on the current ISO week.
     /// </summary>
     [Theory]
-    [InlineData("SuccessRate", "CurrentMonth")]
-    [InlineData("Duration", "CurrentMonth")]
+    [InlineData("SuccessRate", "Last30Days")]
+    [InlineData("Duration", "Last30Days")]
     [InlineData("AppInstall", "CurrentWeek")]
     public void PeriodForBreachType_MatchesEvaluationWindow(string breachType, string expectedPeriod)
     {

src/Backend/AutopilotMonitor.Functions.Tests/StubTenantEntitlementService.cs

@@ -13,6 +13,7 @@ internal sealed class StubTenantEntitlementService : TenantEntitlementService
 {
     private readonly Func<string?, EditionResolution> _resolver;
     private readonly Func<string?, string?> _planOverrideResolver;
+    private readonly Func<string?, int> _purchasedSlotsResolver;
 
     public StubTenantEntitlementService(TenantEdition edition) : this(_ => edition)
     {
@@ -23,18 +24,27 @@ internal sealed class StubTenantEntitlementService : TenantEntitlementService
     /// The tenant-wide MCP usage-plan override (TenantConfiguration.McpUsagePlanOverride) per tenant id;
     /// null = no override (the edition's plan name applies). Defaults to "no override anywhere".
     /// </param>
-    public StubTenantEntitlementService(Func<string?, TenantEdition> resolver, Func<string?, string?>? planOverrideResolver = null)
-        : this(tenantId => AsOwnResolution(resolver(tenantId)), planOverrideResolver)
+    /// <param name="purchasedSlotsResolver">Purchased delegation slots per tenant id; defaults to 0 everywhere.</param>
+    public StubTenantEntitlementService(
+        Func<string?, TenantEdition> resolver,
+        Func<string?, string?>? planOverrideResolver = null,
+        Func<string?, int>? purchasedSlotsResolver = null)
+        : this(tenantId => AsOwnResolution(resolver(tenantId)), planOverrideResolver, purchasedSlotsResolver)
     {
     }
 
     /// <param name="resolver">Full resolution per tenant id (edition, source, own standing) — for conferred-Pro cases.</param>
     /// <param name="planOverrideResolver">See the edition-based constructor.</param>
-    public StubTenantEntitlementService(Func<string?, EditionResolution> resolver, Func<string?, string?>? planOverrideResolver)
+    /// <param name="purchasedSlotsResolver">See the edition-based constructor.</param>
+    public StubTenantEntitlementService(
+        Func<string?, EditionResolution> resolver,
+        Func<string?, string?>? planOverrideResolver,
+        Func<string?, int>? purchasedSlotsResolver = null)
         : base(configService: null!, logger: NullLogger<TenantEntitlementService>.Instance)
     {
         _resolver = resolver;
         _planOverrideResolver = planOverrideResolver ?? (_ => null);
+        _purchasedSlotsResolver = purchasedSlotsResolver ?? (_ => 0);
     }
 
     private static EditionResolution AsOwnResolution(TenantEdition edition) => edition == TenantEdition.Pro
@@ -49,4 +59,7 @@ internal sealed class StubTenantEntitlementService : TenantEntitlementService
         => Task.FromResult(
             NormalizePlanName(_planOverrideResolver(tenantId))
             ?? FeatureEntitlementCatalog.Get(_resolver(tenantId)).McpUsagePlanName);
+
+    public override Task<int> GetPurchasedDelegatedSlotsAsync(string? tenantId)
+        => Task.FromResult(_purchasedSlotsResolver(tenantId));
 }

src/Backend/AutopilotMonitor.Functions.Tests/TableUserUsageRepositoryCasTests.cs

@@ -122,17 +122,18 @@ public class TableUserUsageRepositoryCasTests
     public async Task Tenant_increment_merges_only_the_counter_and_attribution_columns()
     {
         var h = new Harness();
-        h.Tenants.Read = () => TableHarness.Row("tid-customer", "20260906_oid-1", 41, "t1");
+        h.Tenants.Read = () => TableHarness.Row("tid-home", "20260906_oid-1", 41, "t1");
 
-        await h.Repo.IncrementTenantUsageAsync("tid-customer", "oid-1", "msp@example.test", "tid-home");
+        await h.Repo.IncrementTenantUsageAsync("tid-home", "oid-1", "admin@example.test");
 
         var (entity, etag, mode) = Assert.Single(h.Tenants.Updates);
         Assert.Equal(TableUpdateMode.Merge, mode);
         Assert.Equal(new ETag("t1"), etag);
         Assert.Equal(42L, entity.GetInt64("RequestCount"));
-        Assert.Equal("msp@example.test", entity.GetString("UserPrincipalName"));
-        Assert.Equal("tid-home", entity.GetString("HomeTenantId"));
+        Assert.Equal("admin@example.test", entity.GetString("UserPrincipalName"));
         Assert.NotNull(entity["LastRequestAt"]);
+        // The counter is the caller's HOME tenant's; there is no foreign-home attribution any more.
+        Assert.False(entity.ContainsKey("HomeTenantId"));
         // A merge patch never re-sends the identity columns of the row.
         Assert.False(entity.ContainsKey("Date"));
         Assert.False(entity.ContainsKey("UserId"));
@@ -143,8 +144,8 @@ public class TableUserUsageRepositoryCasTests
     {
         var h = new Harness();
 
-        await h.Repo.IncrementTenantUsageAsync("", "oid-1", null, null);
-        await h.Repo.IncrementTenantUsageAsync("tid-customer", " ", null, null);
+        await h.Repo.IncrementTenantUsageAsync("", "oid-1", null);
+        await h.Repo.IncrementTenantUsageAsync("tid-home", " ", null);
 
         Assert.Empty(h.Tenants.Updates);
         Assert.Empty(h.Tenants.Added);

src/Backend/AutopilotMonitor.Functions.Tests/TenantConfigProjectionTests.cs

@@ -30,7 +30,7 @@ public class TenantConfigProjectionTests
         "tenantId", "domainName", "planTier", "trialExpiresUtc", "trialConsumed", "maxDelegatedTenantsOverride",
         "mcpUsagePlanOverride", "payingCustomer", "managedByProTenantId",
         "disabled", "disabledReason", "mcpDisabled", "mcpDisabledReason",
-        "onboardedAt", "onboardedBy", "lastUpdated", "dataRetentionDays",
+        "onboardedAt", "onboardedBy", "dpaVersion", "lastUpdated", "dataRetentionDays",
         "homedAppClientId", "lastAuthClientId", "lastAuthClientIdSince",
     };
 

src/Backend/AutopilotMonitor.Functions.Tests/TenantEntitlementServiceTests.cs

@@ -332,6 +332,54 @@ public class TenantEntitlementServiceTests
         Assert.Equal(7, await svc.GetMaxDelegatedTenantsAsync(TenantId));
     }
 
+    // ── Purchased delegation slots (beyond the edition's included ones) ──────────
+
+    [Theory]
+    [InlineData("pro", null, 0)]       // the two included slots earn nothing
+    [InlineData("pro", 2, 0)]
+    [InlineData("pro", 5, 3)]
+    [InlineData("pro", 0, 0)]          // a lowered limit never goes negative
+    [InlineData("community", null, 0)]
+    [InlineData("community", 4, 0)]    // pre-provisioned override without the delegation right: no growth
+    public void GetPurchasedDelegatedSlots_CountsOnlySlotsBeyondTheIncludedOnes(string tier, int? overrideLimit, int expected)
+    {
+        var config = new TenantConfiguration { TenantId = TenantId, PlanTier = tier, MaxDelegatedTenantsOverride = overrideLimit };
+        Assert.Equal(expected, TenantEntitlementService.GetPurchasedDelegatedSlots(config, Now));
+    }
+
+    [Fact]
+    public void GetPurchasedDelegatedSlots_ConferredPro_IsZero_DespiteAnOverride()
+    {
+        // Pro by conferral only: no delegation right, so no slot can have been bought — nothing grows.
+        var config = new TenantConfiguration
+        {
+            TenantId = TenantId, PlanTier = "community", ManagedByProTenantId = "99999999-9999-9999-9999-999999999999", MaxDelegatedTenantsOverride = 3,
+        };
+        Assert.Equal(0, TenantEntitlementService.GetPurchasedDelegatedSlots(config, Now));
+    }
+
+    [Fact]
+    public void GetPurchasedDelegatedSlots_ActiveTrial_CountsLikePro()
+    {
+        var config = new TenantConfiguration { TenantId = TenantId, PlanTier = "free", TrialExpiresUtc = Now.AddDays(3), MaxDelegatedTenantsOverride = 3 };
+        Assert.Equal(1, TenantEntitlementService.GetPurchasedDelegatedSlots(config, Now));
+    }
+
+    [Fact]
+    public async Task GetPurchasedDelegatedSlotsAsync_NoRow_FailsClosedToZero()
+    {
+        var (svc, _) = Build(config: null);
+        Assert.Equal(0, await svc.GetPurchasedDelegatedSlotsAsync(TenantId));
+        Assert.Equal(0, await svc.GetPurchasedDelegatedSlotsAsync(null));
+    }
+
+    [Fact]
+    public async Task GetPurchasedDelegatedSlotsAsync_ReadsTheOverride()
+    {
+        var (svc, _) = Build(new TenantConfiguration { TenantId = TenantId, PlanTier = "pro", MaxDelegatedTenantsOverride = 7 });
+        Assert.Equal(5, await svc.GetPurchasedDelegatedSlotsAsync(TenantId));
+    }
+
     // ── MCP usage plan (tenant-wide override) ────────────────────────────────────
 
     [Theory]

src/Backend/AutopilotMonitor.Functions.Tests/TenantOffboardFunctionTests.cs

@@ -1046,4 +1046,210 @@ public sealed class TenantOffboardFunctionTests
         // No Save call (the tombstone was already correct).
         configRepoMock.Verify(r => r.SaveTenantConfigurationAsync(It.IsAny<TenantConfiguration>(), It.IsAny<string?>(), It.IsAny<string?>()), Times.Never);
     }
+
+    // ── RetryFailedOffboardingAsync (operator retry of a Failed offboarding) ──────────
+
+    private const string HistoryRowKey = "20260101000000000_" + TenantId;
+
+    private static FakeOffboardingAuditRepository SeedFailedOffboarding(
+        string failedPhase = "max_dequeue", DateTime? drainCompletedAt = null, int retryCount = 3)
+    {
+        var repo = new FakeOffboardingAuditRepository();
+        repo.Markers[TenantId] = new OffboardingMarkerEntry
+        {
+            PartitionKey = Constants.OffboardingPartitionKeys.Marker,
+            RowKey = TenantId, TenantId = TenantId,
+            OffboardingHistoryRowKey = HistoryRowKey,
+            InitiatedAt = DateTime.UtcNow.AddHours(-3),
+            InitiatedBy = "alice@contoso.com",
+            Status = "Failed",
+            FailedAt = DateTime.UtcNow.AddHours(-2),
+            FailedPhase = failedPhase,
+        };
+        repo.History[HistoryRowKey] = new OffboardingHistoryEntry
+        {
+            PartitionKey = Constants.OffboardingPartitionKeys.History,
+            RowKey = HistoryRowKey, TenantId = TenantId,
+            Status = "Failed",
+            ErrorMessage = "Poison queue: max dequeue count reached",
+            RetryCount = retryCount,
+            DrainCompletedAt = drainCompletedAt,
+            EarliestProcessingAt = DateTime.UtcNow.AddHours(-3),
+        };
+        return repo;
+    }
+
+    [Fact]
+    public async Task Retry_Failed_ResetsHistoryAndMarker_KeepsDrainAnchor_ReEnqueues()
+    {
+        var drained = DateTime.UtcNow.AddHours(-2).AddMinutes(-30);
+        var repo = SeedFailedOffboarding(drainCompletedAt: drained, retryCount: 5);
+        var enqueuer = new RecordingEnqueuer();
+        var sut = Build(repo, enqueuer);
+
+        var outcome = await sut.RetryFailedOffboardingAsync(TenantId, "ops@contoso.com");
+
+        Assert.Equal(RetryOutcomeKind.Retried, outcome.Kind);
+        Assert.Equal(HistoryRowKey, outcome.HistoryRowKey);
+        Assert.Contains("max_dequeue", outcome.Message);
+
+        var history = repo.History[HistoryRowKey];
+        Assert.Equal("Initiated", history.Status);
+        Assert.Equal(6, history.RetryCount);
+        Assert.Null(history.ErrorMessage);
+        Assert.Equal(drained, history.DrainCompletedAt);   // the worker's resume anchor survives
+        Assert.Equal(HistoryRowKey, history.RowKey);      // same run, no new history row
+        Assert.Single(repo.History);
+
+        var marker = repo.Markers[TenantId];
+        Assert.Equal("Initiated", marker.Status);
+        Assert.Null(marker.FailedAt);
+        Assert.Null(marker.FailedPhase);
+
+        // History is written before the marker (worker authority first, HTTP anchor second).
+        Assert.Equal(new[] { "Initiated" }, repo.HistoryWrites);
+        Assert.Equal(new[] { "Initiated" }, repo.MarkerWrites);
+
+        var envelope = Assert.Single(enqueuer.Sent);
+        Assert.Equal(TenantId, envelope.TenantId);
+        Assert.Equal(HistoryRowKey, envelope.HistoryRowKey);
+        Assert.Equal("ops@contoso.com", envelope.InitiatedBy);
+    }
+
+    [Fact]
+    public async Task Retry_Completed_Conflict_NoWrites()
+    {
+        var repo = SeedFailedOffboarding();
+        repo.Markers[TenantId].Status = "Completed";
+        repo.Markers[TenantId].FailedPhase = null;
+        var enqueuer = new RecordingEnqueuer();
+        var sut = Build(repo, enqueuer);
+
+        var outcome = await sut.RetryFailedOffboardingAsync(TenantId, "ops@contoso.com");
+
+        Assert.Equal(RetryOutcomeKind.NotFailed, outcome.Kind);
+        Assert.Contains("already completed", outcome.Message);
+        Assert.Empty(repo.HistoryWrites);
+        Assert.Empty(repo.MarkerWrites);
+        Assert.Empty(enqueuer.Sent);
+    }
+
+    [Theory]
+    [InlineData("Initiated")]
+    [InlineData("InProgress")]
+    public async Task Retry_InFlight_Conflict_PointsAtTheOffboardResume(string status)
+    {
+        var repo = SeedFailedOffboarding();
+        repo.Markers[TenantId].Status = status;
+        var enqueuer = new RecordingEnqueuer();
+        var sut = Build(repo, enqueuer);
+
+        var outcome = await sut.RetryFailedOffboardingAsync(TenantId, "ops@contoso.com");
+
+        Assert.Equal(RetryOutcomeKind.NotFailed, outcome.Kind);
+        Assert.Contains(status, outcome.Message);
+        Assert.Equal("Failed", repo.History[HistoryRowKey].Status);
+        Assert.Empty(repo.MarkerWrites);
+        Assert.Empty(enqueuer.Sent);
+    }
+
+    [Fact]
+    public async Task Retry_NoMarker_NotFound()
+    {
+        var enqueuer = new RecordingEnqueuer();
+        var sut = Build(new FakeOffboardingAuditRepository(), enqueuer);
+
+        var outcome = await sut.RetryFailedOffboardingAsync(TenantId, "ops@contoso.com");
+
+        Assert.Equal(RetryOutcomeKind.NotFound, outcome.Kind);
+        Assert.Empty(enqueuer.Sent);
+    }
+
+    [Fact]
+    public async Task Retry_HistoryRowMissing_FailsBeforeTouchingTheMarker()
+    {
+        var repo = SeedFailedOffboarding();
+        repo.History.Clear();
+        var enqueuer = new RecordingEnqueuer();
+        var sut = Build(repo, enqueuer);
+
+        var outcome = await sut.RetryFailedOffboardingAsync(TenantId, "ops@contoso.com");
+
+        Assert.Equal(RetryOutcomeKind.HistoryMissing, outcome.Kind);
+        Assert.Equal("Failed", repo.Markers[TenantId].Status);
+        Assert.Empty(repo.MarkerWrites);
+        Assert.Empty(enqueuer.Sent);
+    }
+
+    [Fact]
+    public async Task Retry_EnqueueThrows_LeavesMarkerInitiated_ForTheOffboardResume()
+    {
+        var repo = SeedFailedOffboarding();
+        var enqueuer = new RecordingEnqueuer { ThrowOnEnqueue = new InvalidOperationException("queue down") };
+        var sut = Build(repo, enqueuer);
+
+        var outcome = await sut.RetryFailedOffboardingAsync(TenantId, "ops@contoso.com");
+
+        Assert.Equal(RetryOutcomeKind.ReEnqueueFailed, outcome.Kind);
+        // Rows are reset: the ordinary DELETE offboard re-click now hits the Initiated resume path.
+        Assert.Equal("Initiated", repo.Markers[TenantId].Status);
+        Assert.Equal("Initiated", repo.History[HistoryRowKey].Status);
+    }
+
+    [Fact]
+    public async Task Retry_ResumesThroughTheDisabledGate_WithRemainingBarrierDelay()
+    {
+        // Tombstone written 2 minutes ago → the resume path must wait out the remaining
+        // 4 minutes of the 6-minute drain barrier, not restart it and not skip it.
+        var repo = SeedFailedOffboarding();
+        repo.History[HistoryRowKey].EarliestProcessingAt = DateTime.UtcNow.AddHours(-3);
+        var configRepoMock = new Mock<IConfigRepository>();
+        var tombstone = TenantConfiguration.CreateDefault(TenantId);
+        tombstone.Disabled = true;
+        tombstone.DisabledReason = "Offboarding in progress";
+        tombstone.LastUpdated = DateTime.UtcNow.AddMinutes(-2);
+        configRepoMock.Setup(r => r.GetTenantConfigurationAsync(It.IsAny<string>())).ReturnsAsync(tombstone);
+        var cache = new MemoryCache(new MemoryCacheOptions());
+        var service = new TenantConfigurationService(configRepoMock.Object, NullLogger<TenantConfigurationService>.Instance, cache);
+        var enqueuer = new RecordingEnqueuer();
+        var sut = new TenantOffboardFunction(
+            logger: NullLogger<TenantOffboardFunction>.Instance,
+            configRepo: configRepoMock.Object,
+            tenantConfigService: service,
+            maintenanceRepo: Mock.Of<IMaintenanceRepository>(),
+            offboardingRepo: repo,
+            offboardingEnqueuer: enqueuer,
+            previewWhitelistService: BuildPreviewWhitelistService(configRepoMock));
+
+        var outcome = await sut.RetryFailedOffboardingAsync(TenantId, "ops@contoso.com");
+
+        Assert.Equal(RetryOutcomeKind.Retried, outcome.Kind);
+        var delay = Assert.Single(enqueuer.VisibilityDelays);
+        Assert.NotNull(delay);
+        Assert.InRange(delay!.Value, TimeSpan.FromMinutes(3.5), TimeSpan.FromMinutes(4.1));
+        configRepoMock.Verify(r => r.SaveTenantConfigurationAsync(It.IsAny<TenantConfiguration>(), It.IsAny<string>(), It.IsAny<string>()), Times.Never);
+    }
+
+    [Fact]
+    public void BuildStatusResponse_ProjectsMarkerStatus_AndHistoryDetails()
+    {
+        var repo = SeedFailedOffboarding(retryCount: 5);
+        var marker = repo.Markers[TenantId];
+        var history = repo.History[HistoryRowKey];
+
+        var dto = TenantOffboardFunction.BuildStatusResponse(TenantId, marker, history);
+
+        Assert.Equal("Failed", dto.Status);
+        Assert.Equal("max_dequeue", dto.FailedPhase);
+        Assert.Equal(marker.FailedAt, dto.FailedAt);
+        Assert.Equal(5, dto.RetryCount);
+        Assert.Equal(history.ErrorMessage, dto.ErrorMessage);
+        Assert.Equal(HistoryRowKey, dto.HistoryRowKey);
+
+        // History row gone (should not happen, but the record must still render).
+        var bare = TenantOffboardFunction.BuildStatusResponse(TenantId, marker, null);
+        Assert.Equal("Failed", bare.Status);
+        Assert.Equal(0, bare.RetryCount);
+        Assert.Null(bare.ErrorMessage);
+    }
 }

src/Backend/AutopilotMonitor.Functions.Tests/TypedContractCompletionWireParityTests.cs

@@ -888,4 +888,75 @@ public class TypedContractCompletionWireParityTests
                 },
             });
     }
+
+    // ── global/tenants/{tenantId}/offboarding ────────────────────────────────────────────
+
+    [Fact]
+    public void TenantOffboardingStatusResponse_pins_the_failed_record_shape()
+    {
+        var initiated = new DateTime(2026, 9, 18, 6, 0, 0, DateTimeKind.Utc);
+        var failed = initiated.AddMinutes(30);
+        AssertWireIdentical(
+            new
+            {
+                tenantId = "11111111-1111-1111-1111-111111111111",
+                status = "Failed",
+                historyRowKey = "20260918060000000_11111111-1111-1111-1111-111111111111",
+                initiatedAt = initiated,
+                initiatedBy = "alice@contoso.com",
+                retryCount = 5,
+                earliestProcessingAt = (DateTime?)initiated.AddMinutes(6),
+                drainCompletedAt = (DateTime?)initiated.AddMinutes(8),
+                completedAt = (DateTime?)null,
+                failedAt = (DateTime?)failed,
+                failedPhase = (string?)"max_dequeue",
+                errorMessage = (string?)"Poison queue: max dequeue count reached",
+            },
+            new TenantOffboardingStatusResponse
+            {
+                TenantId = "11111111-1111-1111-1111-111111111111",
+                Status = "Failed",
+                HistoryRowKey = "20260918060000000_11111111-1111-1111-1111-111111111111",
+                InitiatedAt = initiated,
+                InitiatedBy = "alice@contoso.com",
+                RetryCount = 5,
+                EarliestProcessingAt = initiated.AddMinutes(6),
+                DrainCompletedAt = initiated.AddMinutes(8),
+                CompletedAt = null,
+                FailedAt = failed,
+                FailedPhase = "max_dequeue",
+                ErrorMessage = "Poison queue: max dequeue count reached",
+            });
+    }
+
+    [Fact]
+    public void TenantOffboardingStatusResponse_keeps_null_slots_for_an_in_flight_record()
+    {
+        var initiated = new DateTime(2026, 9, 18, 6, 0, 0, DateTimeKind.Utc);
+        AssertWireIdentical(
+            new
+            {
+                tenantId = "11111111-1111-1111-1111-111111111111",
+                status = "InProgress",
+                historyRowKey = "20260918060000000_11111111-1111-1111-1111-111111111111",
+                initiatedAt = initiated,
+                initiatedBy = "alice@contoso.com",
+                retryCount = 0,
+                earliestProcessingAt = (DateTime?)initiated.AddMinutes(6),
+                drainCompletedAt = (DateTime?)null,
+                completedAt = (DateTime?)null,
+                failedAt = (DateTime?)null,
+                failedPhase = (string?)null,
+                errorMessage = (string?)null,
+            },
+            new TenantOffboardingStatusResponse
+            {
+                TenantId = "11111111-1111-1111-1111-111111111111",
+                Status = "InProgress",
+                HistoryRowKey = "20260918060000000_11111111-1111-1111-1111-111111111111",
+                InitiatedAt = initiated,
+                InitiatedBy = "alice@contoso.com",
+                EarliestProcessingAt = initiated.AddMinutes(6),
+            });
+    }
 }

src/Backend/AutopilotMonitor.Functions.Tests/TypedResponseGuardTests.cs

@@ -53,14 +53,16 @@ public class TypedResponseGuardTests
     private static readonly Dictionary<string, int> WriteBaseline = new(StringComparer.OrdinalIgnoreCase);
 
     // ── Bypass-shape guards (closed 2026-08-31) ─────────────────────────────────────────
-    // Regexes A/B only see the INLINE literal `...(new { ... })`. Three bypass shapes let a
+    // Regexes A/B only see the INLINE literal `...(new { ... })`. Four bypass shapes let a
     // response ship untyped anyway and are ratcheted here with EMPTY baselines:
     //   C: the literal parked in a variable first (`var result = new { ... };` →
     //      `WriteAsJsonAsync(result)`), which is how rule-stats escaped the 08-31 migration,
     //   D: hand-serialized bodies (`WriteStringAsync(JsonSerializer.Serialize(new { ... }))`),
     //   E: builder methods declared `object` / `Task<object>` returning `new { ... }`
-    //      (verdict-calibration's Build). A fourth shape — local `WriteJson(req, object)`
-    //      wrappers — is closed structurally: wrappers take a `T : IApiResponse` generic.
+    //      (verdict-calibration's Build),
+    //   F: local response wrappers taking the body as `object` (`WriteJsonAsync(req, status,
+    //      object body)`) — every call site behind one is invisible to A–D, which is how the
+    //      backup, session-restore and delegation bodies stayed anonymous until 2026-09-21.
 
     /// <summary>Identifier passed to WriteAsJsonAsync — flagged when the SAME file assigns that identifier an anonymous object.</summary>
     private static readonly Regex WriteAsJsonIdentifier =
@@ -72,6 +74,15 @@ public class TypedResponseGuardTests
     private static readonly Regex ObjectReturningBuilder =
         new(@"\b(?:object|Task<object>)\s+\w*(?:Build|Compute|Payload|Response)\w*\s*\(", RegexOptions.Compiled);
 
+    private static readonly Regex ObjectBodyResponseWrapper =
+        new(@"\b(?:Task<HttpResponseData>|HttpResponseData)\s+\w+\s*\([^)]*\bobject\??\s+\w+[^)]*\)", RegexOptions.Compiled);
+
+    /// <summary>
+    /// EMPTY. A response writer takes <c>T : IApiResponse</c> / <c>T : IApiErrorResponse</c>
+    /// (ResponseHelper), never <c>object</c>.
+    /// </summary>
+    private static readonly Dictionary<string, int> ObjectWrapperBaseline = new(StringComparer.OrdinalIgnoreCase);
+
     /// <summary>EMPTY — an anonymous object smuggled through a local variable is the same regression as an inline one.</summary>
     private static readonly Dictionary<string, int> IdentifierBaseline = new(StringComparer.OrdinalIgnoreCase);
 
@@ -140,6 +151,15 @@ public class TypedResponseGuardTests
             "object/Task<object>-returning Build*/Compute*/*Payload/*Response method");
     }
 
+    [Fact]
+    public void Response_wrappers_taking_an_object_body_are_flagged()
+    {
+        AssertRatchet(
+            text => ObjectBodyResponseWrapper.Matches(text).Count,
+            ObjectWrapperBaseline,
+            "HttpResponseData-returning wrapper with an object parameter");
+    }
+
     /// <summary>
     /// Wire DTOs must be flat: System.Text.Json serializes derived properties BEFORE base
     /// properties, so any base class would silently reorder JSON keys — and key order is part

src/Backend/AutopilotMonitor.Functions/DataAccess/TableStorage/TableAdminRepository.cs

@@ -520,28 +520,6 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage
             }
         }
 
-        public async Task<bool> SetTenantGroupChargeHomeTenantQuotaAsync(string groupId, bool chargeHomeTenantQuota)
-        {
-            if (string.IsNullOrWhiteSpace(groupId))
-                return false;
-
-            try
-            {
-                var result = await _tenantGroupsTableClient.GetEntityAsync<TenantGroupEntity>(
-                    groupId, TenantGroupEntity.MetaRowKey);
-                var entity = result.Value;
-                if (entity == null) return false;
-
-                entity.ChargeHomeTenantQuota = chargeHomeTenantQuota;
-                await _tenantGroupsTableClient.UpdateEntityAsync(entity, ETag.All);
-                return true;
-            }
-            catch (RequestFailedException ex) when (ex.Status == 404)
-            {
-                return false;
-            }
-        }
-
         public async Task<bool> DeleteTenantGroupAsync(string groupId)
         {
             if (string.IsNullOrWhiteSpace(groupId))
@@ -694,7 +672,6 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage
                 if (entity.RowKey == TenantGroupEntity.MetaRowKey)
                 {
                     metaBacked = true;
-                    membership.ChargeHomeTenantQuota = entity.ChargeHomeTenantQuota ?? false;
                 }
                 else
                 {
@@ -1044,7 +1021,6 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage
                 group.Name = entity.Name;
                 group.CreatedBy = entity.CreatedBy;
                 group.CreatedAt = entity.CreatedDate ?? default;
-                group.ChargeHomeTenantQuota = entity.ChargeHomeTenantQuota ?? false;
                 group.OwnerTenantId = string.IsNullOrEmpty(entity.OwnerTenantId) ? null : entity.OwnerTenantId;
                 return true;
             }

src/Backend/AutopilotMonitor.Functions/DataAccess/TableStorage/TableConfigRepository.cs

@@ -662,6 +662,7 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage
                 { "LastUpdated", config.LastUpdated },
                 { "UpdatedBy", config.UpdatedBy },
                 { "OnboardedBy", config.OnboardedBy },
+                { "DpaVersion", config.DpaVersion },
                 { "ContactEmail", config.ContactEmail },
                 { "CompanyName", config.CompanyName },
                 { "Disabled", config.Disabled },
@@ -775,6 +776,7 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage
                 LastUpdated = entity.GetDateTime("LastUpdated") ?? DateTime.UtcNow,
                 UpdatedBy = entity.GetString("UpdatedBy") ?? "Unknown",
                 OnboardedBy = entity.GetString("OnboardedBy"),
+                DpaVersion = entity.GetString("DpaVersion"),
                 ContactEmail = entity.GetString("ContactEmail"),
                 CompanyName = entity.GetString("CompanyName"),
                 Disabled = entity.GetBoolean("Disabled") ?? false,

src/Backend/AutopilotMonitor.Functions/DataAccess/TableStorage/TableMetricsRepository.cs

@@ -56,20 +56,27 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage
         public Task<PlatformStats?> GetPlatformStatsAsync()
             => _storage.GetPlatformStatsAsync();
 
-        public Task<bool> SavePlatformStatsAsync(PlatformStats stats)
-            => _storage.SavePlatformStatsAsync(stats);
+        public Task<PlatformStats?> RollupPlatformStatsAsync(
+            Func<PlatformStats?, PlatformRollupSources?, PlatformStats> merge, PlatformRollupSources sources)
+            => _storage.RollupPlatformStatsAsync(merge, sources);
 
         public Task IncrementPlatformStatAsync(string field, long amount = 1)
             => _storage.IncrementPlatformStatAsync(field, amount);
 
+        public Task<long> RecordSeenDeviceModelsAsync(IReadOnlyCollection<string> models)
+            => _storage.RecordSeenDeviceModelsAsync(models);
+
         public Task<TenantStats?> GetTenantStatsAsync(string tenantId)
             => _storage.GetTenantStatsAsync(tenantId);
 
+        public Task<List<TenantStats>> GetAllTenantStatsAsync()
+            => _storage.GetAllTenantStatsAsync();
+
         public Task IncrementTenantStatAsync(string tenantId, string field, long amount = 1)
             => _storage.IncrementTenantStatAsync(tenantId, field, amount);
 
-        public Task EnsureTenantStatFloorAsync(string tenantId, string field, long floor)
-            => _storage.EnsureTenantStatFloorAsync(tenantId, field, floor);
+        public Task<bool> EnsureTenantStatFloorsAsync(string tenantId, IReadOnlyDictionary<string, long> floors)
+            => _storage.EnsureTenantStatFloorsAsync(tenantId, floors);
 
         public Task RecordUserLoginAsync(string tenantId, string upn, string? displayName, string? objectId)
             => _storage.RecordUserLoginAsync(tenantId, upn, displayName, objectId);

src/Backend/AutopilotMonitor.Functions/DataAccess/TableStorage/TableRuleRepository.cs

@@ -77,5 +77,11 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage
 
         public Task<bool> DeleteImeLogPatternAsync(string tenantId, string patternId)
             => _storage.DeleteImeLogPatternAsync(tenantId, patternId);
+
+        public Task<RuleCatalogStamp?> GetRuleCatalogStampAsync(string kind)
+            => _storage.GetRuleCatalogStampAsync(kind);
+
+        public Task<bool> SetRuleCatalogStampAsync(RuleCatalogStamp stamp)
+            => _storage.SetRuleCatalogStampAsync(stamp);
     }
 }

src/Backend/AutopilotMonitor.Functions/DataAccess/TableStorage/TableSessionRepository.cs

@@ -126,6 +126,12 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage
                 // update the chain entry's status. Fail-soft + idempotent; the maintenance
                 // sweep self-heals any miss.
                 await _storage.UpdateDeviceHistoryForSessionAsync(tenantId, sessionId);
+
+                // Cumulative success counter, at the one seam every Succeeded writer passes:
+                // transitioned means the session was not Succeeded before, so each session
+                // counts once. Fail-soft.
+                if (status == SessionStatus.Succeeded)
+                    await _storage.IncrementTenantStatAsync(tenantId, nameof(TenantStats.SuccessfulEnrollments));
             }
 
             return transitioned;

src/Backend/AutopilotMonitor.Functions/DataAccess/TableStorage/TableUserUsageRepository.cs

@@ -204,7 +204,7 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage
 
         // ---- McpTenantUsage (organization-wide quota counters) ----
 
-        public Task IncrementTenantUsageAsync(string tenantId, string userId, string? userPrincipalName, string? homeTenantId)
+        public Task IncrementTenantUsageAsync(string tenantId, string userId, string? userPrincipalName)
         {
             if (string.IsNullOrWhiteSpace(tenantId) || string.IsNullOrWhiteSpace(userId))
                 return Task.CompletedTask;
@@ -220,10 +220,10 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage
                     {
                         ["RequestCount"] = ReadCount(read) + 1,
                         ["LastRequestAt"] = DateTimeOffset.UtcNow,
-                        // Attribution columns (added 2026-09): the UPN as last seen, and the caller's home
-                        // tenant when this row was charged by a delegated (MSP) read. Refreshed on every
-                        // increment so a row created before the columns existed heals on its next hit.
-                        ["HomeTenantId"] = homeTenantId ?? string.Empty,
+                        // Attribution column (added 2026-09): the UPN as last seen, refreshed on every increment
+                        // so a row created before the column existed heals on its next hit. Rows written before
+                        // 2026-09-11 may carry a HomeTenantId column (delegated reads used to be charged to the
+                        // managed tenant); it is neither written nor read any more and ages out with retention.
                     };
                     if (!string.IsNullOrEmpty(userPrincipalName))
                         patch["UserPrincipalName"] = userPrincipalName;
@@ -234,7 +234,6 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage
                     ["Date"] = date,
                     ["UserId"] = userId,
                     ["UserPrincipalName"] = userPrincipalName ?? string.Empty,
-                    ["HomeTenantId"] = homeTenantId ?? string.Empty,
                     ["RequestCount"] = 1L,
                     ["LastRequestAt"] = DateTimeOffset.UtcNow,
                 },
@@ -258,7 +257,6 @@ namespace AutopilotMonitor.Functions.DataAccess.TableStorage
                     TenantId = entity.PartitionKey,
                     UserId = entity.GetString("UserId") ?? string.Empty,
                     UserPrincipalName = entity.GetString("UserPrincipalName") ?? string.Empty,
-                    HomeTenantId = entity.GetString("HomeTenantId") ?? string.Empty,
                     Date = entity.GetString("Date") ?? entity.RowKey.Split('_')[0],
                     RequestCount = entity.TryGetValue("RequestCount", out var rc) ? Convert.ToInt64(rc) : 0L,
                     LastRequestAt = entity.GetDateTimeOffset("LastRequestAt")?.UtcDateTime,

src/Backend/AutopilotMonitor.Functions/Functions/Admin/AutopilotDeviceValidationConsentFunction.cs

@@ -92,7 +92,7 @@ public class AutopilotDeviceValidationConsentFunction
             return await req.ErrorAsync(HttpStatusCode.InternalServerError, Constants.ApiErrorCodes.InternalError, "Validator app client ID is not configured on the backend.");
         }
 
-        var query = System.Web.HttpUtility.ParseQueryString(req.Url.Query);
+        var query = req.Query;
         var redirectUri = query["redirectUri"];
         if (string.IsNullOrWhiteSpace(redirectUri))
         {

src/Backend/AutopilotMonitor.Functions/Functions/Admin/CustomsArchiveQueryFunction.cs

@@ -48,7 +48,7 @@ public class CustomsArchiveQueryFunction
     public async Task<HttpResponseData> ListRuns(
         [HttpTrigger(AuthorizationLevel.Anonymous, "get", Route = "global/customs-archive")] HttpRequestData req)
     {
-        var query = System.Web.HttpUtility.ParseQueryString(req.Url.Query ?? string.Empty);
+        var query = req.Query;
         var filterTenantId = query["tenantId"];
 
         var summaries = new Dictionary<string, CustomsArchiveRunSummary>(System.StringComparer.Ordinal);

src/Backend/AutopilotMonitor.Functions/Functions/Admin/DelegationSelfServiceFunction.cs

@@ -2,7 +2,6 @@ using System.Net;
 using AutopilotMonitor.Functions.Helpers;
 using AutopilotMonitor.Functions.Services;
 using AutopilotMonitor.Shared;
-using AutopilotMonitor.Shared.DataAccess;
 using AutopilotMonitor.Shared.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Azure.Functions.Worker;
@@ -19,27 +18,18 @@ namespace AutopilotMonitor.Functions.Functions.Admin;
 /// </summary>
 public class DelegationSelfServiceFunction
 {
-    /// <summary>Managed-tenant MCP usage is resolved for at most this many tenants per listing (Global Admin overrides can be large).</summary>
-    internal const int ManagedUsageCap = 25;
-
     private readonly ILogger<DelegationSelfServiceFunction> _logger;
     private readonly DelegationSelfService _svc;
     private readonly DelegatedSlotService _slots;
-    private readonly McpQuotaService _quota;
-    private readonly IUserUsageRepository _usage;
 
     public DelegationSelfServiceFunction(
         ILogger<DelegationSelfServiceFunction> logger,
         DelegationSelfService svc,
-        DelegatedSlotService slots,
-        McpQuotaService quota,
-        IUserUsageRepository usage)
+        DelegatedSlotService slots)
     {
         _logger = logger;
         _svc = svc;
         _slots = slots;
-        _quota = quota;
-        _usage = usage;
     }
 
     // ── Slots + managed tenants ──────────────────────────────────────────────────
@@ -51,10 +41,10 @@ public class DelegationSelfServiceFunction
         [HttpTrigger(AuthorizationLevel.Anonymous, "get", Route = "delegations/slots")] HttpRequestData req)
     {
         var usage = await _slots.GetUsageAsync(req.GetRequestContext().TenantId);
-        return await OkAsync(req, DelegatedSlotManagementFunction.ToResponse(usage));
+        return await req.OkAsync(DelegatedSlotManagementFunction.ToResponse(usage));
     }
 
-    /// <summary>GET /api/delegations/managed — the tenants the caller's tenant manages, with their MCP organization budget.</summary>
+    /// <summary>GET /api/delegations/managed — the tenants the caller's tenant manages.</summary>
     [Function("GetDelegationManagedTenants")]
     [Authorize]
     public async Task<HttpResponseData> GetManaged(
@@ -64,15 +54,8 @@ public class DelegationSelfServiceFunction
         var view = await _svc.ListManagedAsync(home);
 
         var items = new List<ManagedTenantItem>(view.Tenants.Count);
-        var resolved = 0;
         foreach (var t in view.Tenants)
         {
-            ManagedTenantQuotaUsage? usage = null;
-            if (resolved < ManagedUsageCap)
-            {
-                usage = await ReadManagedUsageAsync(t.TenantId);
-                resolved++;
-            }
             items.Add(new ManagedTenantItem
             {
                 TenantId = t.TenantId,
@@ -80,11 +63,10 @@ public class DelegationSelfServiceFunction
                 Source = t.Source,
                 SinceUtc = t.SinceUtc,
                 Removable = t.Removable,
-                Usage = usage,
             });
         }
 
-        return await OkAsync(req, new ManagedTenantListResponse
+        return await req.OkAsync(new ManagedTenantListResponse
         {
             HomeTenantId = home,
             Slots = DelegatedSlotManagementFunction.ToResponse(view.Slots),
@@ -106,7 +88,7 @@ public class DelegationSelfServiceFunction
             return await BadAsync(req, "a valid tenantId (GUID) is required");
 
         var result = await _svc.RemoveManagedAsync(ctx.TenantId, body.TenantId, ctx.UserPrincipalName);
-        return result.Ok ? await OkAsync(req, new { message = "Delegation ended" }) : await FailAsync(req, result.Failure!);
+        return result.Ok ? await req.OkAsync(new MessageResponse { Message = "Delegation ended" }) : await FailAsync(req, result.Failure!);
     }
 
     // ── Invitations ──────────────────────────────────────────────────────────────
@@ -136,7 +118,7 @@ public class DelegationSelfServiceFunction
                 HoldUntilUtc = r.HoldUntilUtc,
             });
         }
-        return await OkAsync(req, new DelegationInvitationListResponse { HomeTenantId = home, Invitations = items });
+        return await req.OkAsync(new DelegationInvitationListResponse { HomeTenantId = home, Invitations = items });
     }
 
     /// <summary>POST /api/delegations/invitations — mint a single-use invitation link (token shown once). TenantAdminOrGA.</summary>
@@ -165,7 +147,7 @@ public class DelegationSelfServiceFunction
     {
         var ctx = req.GetRequestContext();
         var result = await _svc.CancelInvitationAsync(ctx.TenantId, invitationId, ctx.UserPrincipalName);
-        return result.Ok ? await OkAsync(req, new { message = "Invitation cancelled" }) : await FailAsync(req, result.Failure!);
+        return result.Ok ? await req.OkAsync(new MessageResponse { Message = "Invitation cancelled" }) : await FailAsync(req, result.Failure!);
     }
 
     // ── Assignees (the managing tenant's own users) ──────────────────────────────
@@ -178,7 +160,7 @@ public class DelegationSelfServiceFunction
     {
         var home = req.GetRequestContext().TenantId;
         var assignees = await _svc.ListAssigneesAsync(home);
-        return await OkAsync(req, new DelegationAssigneeListResponse
+        return await req.OkAsync(new DelegationAssigneeListResponse
         {
             HomeTenantId = home,
             GroupId = Constants.TenantGroupIds.ForHomeTenant(home),
@@ -218,7 +200,7 @@ public class DelegationSelfServiceFunction
     {
         var ctx = req.GetRequestContext();
         var result = await _svc.UnassignAsync(ctx.TenantId, upn, ctx.UserPrincipalName);
-        return result.Ok ? await OkAsync(req, new { message = "Unassigned" }) : await FailAsync(req, result.Failure!);
+        return result.Ok ? await req.OkAsync(new MessageResponse { Message = "Unassigned" }) : await FailAsync(req, result.Failure!);
     }
 
     // ── Accept (the customer's tenant admin) ─────────────────────────────────────
@@ -235,7 +217,7 @@ public class DelegationSelfServiceFunction
         if (!result.Ok)
             return await FailAsync(req, result.Failure!);
         var p = result.Value!;
-        return await OkAsync(req, new DelegationAcceptPreviewResponse
+        return await req.OkAsync(new DelegationAcceptPreviewResponse
         {
             HomeTenantId = p.HomeTenantId,
             HomeTenantDomain = p.HomeTenantDomain,
@@ -263,37 +245,11 @@ public class DelegationSelfServiceFunction
         if (!result.Ok)
             return await FailAsync(req, result.Failure!);
         var o = result.Value!;
-        return await OkAsync(req, new AcceptDelegationInvitationResponse { HomeTenantId = o.HomeTenantId, HomeTenantDomain = o.HomeTenantDomain, ManagedTenantId = o.ManagedTenantId });
+        return await req.OkAsync(new AcceptDelegationInvitationResponse { HomeTenantId = o.HomeTenantId, HomeTenantDomain = o.HomeTenantDomain, ManagedTenantId = o.ManagedTenantId });
     }
 
     // ── Helpers ─────────────────────────────────────────────────────────────────
 
-    /// <summary>The managed tenant's organization MCP budget — its own plan's windows and counters.</summary>
-    private async Task<ManagedTenantQuotaUsage?> ReadManagedUsageAsync(string tenantId)
-    {
-        try
-        {
-            var limits = await _quota.ResolvePlanAsync(null, tenantId);
-            var nowUtc = DateTime.UtcNow;
-            var monthStart = new DateTime(nowUtc.Year, nowUtc.Month, 1, 0, 0, 0, DateTimeKind.Utc).ToString("yyyyMMdd");
-            var today = nowUtc.ToString("yyyyMMdd");
-            var rows = await _usage.GetTenantUsageAsync(tenantId, monthStart, today);
-            return new ManagedTenantQuotaUsage
-            {
-                TenantPlan = limits.TenantPlan,
-                TenantDailyLimit = limits.TenantDailyLimit,
-                TenantMonthlyLimit = limits.TenantMonthlyLimit,
-                TenantDailyUsed = rows.Where(r => r.Date == today).Sum(r => r.RequestCount),
-                TenantMonthlyUsed = rows.Sum(r => r.RequestCount),
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "[Delegation] Managed tenant usage lookup failed for {TenantId}", tenantId);
-            return null;
-        }
-    }
-
     internal static async Task<HttpResponseData> FailAsync(HttpRequestData req, DelegationFailure failure)
     {
         if (failure.SlotViolation != null)
@@ -301,13 +257,6 @@ public class DelegationSelfServiceFunction
         return await req.ErrorAsync((HttpStatusCode)failure.Status, failure.Code, failure.Message);
     }
 
-    private static async Task<HttpResponseData> OkAsync(HttpRequestData req, object body)
-    {
-        var response = req.CreateResponse(HttpStatusCode.OK);
-        await response.WriteAsJsonAsync(body);
-        return response;
-    }
-
     private static async Task<HttpResponseData> BadAsync(HttpRequestData req, string error)
     {
         return await req.BadRequestAsync(error);

src/Backend/AutopilotMonitor.Functions/Functions/Admin/GetActiveUsersFunction.cs

@@ -1,4 +1,3 @@
-using System.Web;
 using AutopilotMonitor.Functions.Helpers;
 using AutopilotMonitor.Shared.DataAccess;
 using AutopilotMonitor.Shared.Models;
@@ -35,7 +34,7 @@ namespace AutopilotMonitor.Functions.Functions.Admin
         {
             try
             {
-                var query = HttpUtility.ParseQueryString(req.Url.Query ?? string.Empty);
+                var query = req.Query;
                 var windowMinutes = QueryParams.Int(query["windowMinutes"], DefaultWindowMinutes, MinWindowMinutes, MaxWindowMinutes);
 
                 var now = DateTime.UtcNow;

src/Backend/AutopilotMonitor.Functions/Functions/Admin/GetAllBlockedDevicesFunction.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Net;
 using System.Threading.Tasks;
-using System.Web;
 using AutopilotMonitor.Functions.Services;
 using AutopilotMonitor.Shared.Models;
 using AutopilotMonitor.Functions.Helpers;
@@ -40,7 +39,7 @@ namespace AutopilotMonitor.Functions.Functions.Admin
             {
                 // Authentication + GlobalAdminOnly authorization enforced by PolicyEnforcementMiddleware
 
-                var query = HttpUtility.ParseQueryString(req.Url.Query ?? string.Empty);
+                var query = req.Query;
                 var (filterKind, tenantId) = ParseTenantFilter(query["tenantId"]);
 
                 if (filterKind == TenantFilterKind.Invalid)

src/Backend/AutopilotMonitor.Functions/Functions/Admin/GetAuditLogsFunction.cs

@@ -1,5 +1,4 @@
 using System.Net;
-using System.Web;
 using AutopilotMonitor.Functions.Helpers;
 using AutopilotMonitor.Functions.Pagination;
 using AutopilotMonitor.Shared.DataAccess;
@@ -34,7 +33,7 @@ namespace AutopilotMonitor.Functions.Functions.Admin
                 string tenantId = TenantHelper.GetTenantId(req);
                 string userIdentifier = TenantHelper.GetUserIdentifier(req);
 
-                var query = HttpUtility.ParseQueryString(req.Url.Query ?? string.Empty);
+                var query = req.Query;
                 var parsed = DateWindowPagination.ParseQuery(query);
                 if (parsed.Error != null)
                 {

src/Backend/AutopilotMonitor.Functions/Functions/Admin/GetGlobalAuditLogsFunction.cs

@@ -1,5 +1,4 @@
 using System.Net;
-using System.Web;
 using AutopilotMonitor.Functions.Helpers;
 using AutopilotMonitor.Functions.Pagination;
 using AutopilotMonitor.Shared.DataAccess;
@@ -36,7 +35,7 @@ namespace AutopilotMonitor.Functions.Functions.Admin
                 var userEmail = TenantHelper.GetUserIdentifier(req);
                 var callerTenantId = TenantHelper.GetTenantId(req);
 
-                var query = HttpUtility.ParseQueryString(req.Url.Query ?? string.Empty);
+                var query = req.Query;
                 var parsed = DateWindowPagination.ParseQuery(query);
                 if (parsed.Error != null)
                 {

src/Backend/AutopilotMonitor.Functions/Functions/Admin/GetOpsEventsFunction.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Net;
-using System.Web;
 using AutopilotMonitor.Functions.Helpers;
 using AutopilotMonitor.Functions.Pagination;
 using AutopilotMonitor.Shared.DataAccess;
@@ -45,7 +44,7 @@ namespace AutopilotMonitor.Functions.Functions.Admin
             try
             {
                 var callerTenantId = TenantHelper.GetTenantId(req);
-                var query = HttpUtility.ParseQueryString(req.Url.Query ?? string.Empty);
+                var query = req.Query;
                 var category = query["category"];
                 var filterTenantId = query["tenantId"];
 

src/Backend/AutopilotMonitor.Functions/Functions/Admin/ReseedFromGitHubFunction.cs

@@ -199,6 +199,8 @@ namespace AutopilotMonitor.Functions.Functions.Admin
             _logger.LogInformation(
                 "GitHub reseed gather: {Deleted} deleted, {Written} written, {OrphanCount} orphan per-tenant RuleState(s) cleaned across {SunsetTotal} sunset rule(s) ({Skipped} skipped on failure for retry)",
                 deleted, rules.Count, orphanStatesGcd, sunset.Count, sunsetSkipped);
+            await _ruleRepo.SetRuleCatalogStampAsync(AutopilotMonitor.Functions.Services.RuleCatalogSeedGate.Stamp(
+                AutopilotMonitor.Shared.Models.RuleCatalogStamp.KindGather, AutopilotMonitor.Shared.Models.RuleCatalogStamp.SourceGitHub, rules.Count));
             return (deleted, rules.Count, orphanStatesGcd, sunsetSkipped);
         }
 
@@ -279,6 +281,8 @@ namespace AutopilotMonitor.Functions.Functions.Admin
             _logger.LogInformation(
                 "GitHub reseed analyze: {Deleted} deleted, {Written} written, {OrphanCount} orphan per-tenant RuleState(s) cleaned across {SunsetTotal} sunset rule(s) ({Skipped} skipped on failure for retry)",
                 deleted, rules.Count, orphanStatesGcd, sunset.Count, sunsetSkipped);
+            await _ruleRepo.SetRuleCatalogStampAsync(AutopilotMonitor.Functions.Services.RuleCatalogSeedGate.Stamp(
+                AutopilotMonitor.Shared.Models.RuleCatalogStamp.KindAnalyze, AutopilotMonitor.Shared.Models.RuleCatalogStamp.SourceGitHub, rules.Count));
             return (deleted, rules.Count, orphanStatesGcd, sunsetSkipped);
         }
 
@@ -299,6 +303,8 @@ namespace AutopilotMonitor.Functions.Functions.Admin
             }
 
             _logger.LogInformation($"GitHub reseed IME: {deleted} deleted, {patterns.Count} written");
+            await _ruleRepo.SetRuleCatalogStampAsync(AutopilotMonitor.Functions.Services.RuleCatalogSeedGate.Stamp(
+                AutopilotMonitor.Shared.Models.RuleCatalogStamp.KindIme, AutopilotMonitor.Shared.Models.RuleCatalogStamp.SourceGitHub, patterns.Count));
             return (deleted, patterns.Count);
         }
 

src/Backend/AutopilotMonitor.Functions/Functions/Admin/TenantGroupManagementFunction.cs

@@ -100,10 +100,8 @@ public class TenantGroupManagementFunction
     }
 
     /// <summary>
-    /// PATCH /api/global/tenant-groups/{groupId} — update group metadata. GlobalAdminOnly.
-    /// Body: { "name"?: "...", "chargeHomeTenantQuota"?: true|false } — at least one field. A rename has no
-    /// scope effect; the quota flag re-attributes every assignee's MCP reads into the group's tenants (charged
-    /// to the assignee's home tenant instead of the managed tenant) and is audited under each tenant.
+    /// PATCH /api/global/tenant-groups/{groupId} — rename a group. GlobalAdminOnly.
+    /// Body: { "name": "..." }. A rename has no scope effect.
     /// </summary>
     [Function("UpdateTenantGroup")]
     [Authorize]
@@ -116,52 +114,16 @@ public class TenantGroupManagementFunction
         var read = await req.ReadAsync<UpdateTenantGroupRequest>();
         if (read.Error != null) return read.Error;
         var body = read.Value!;
-        if (string.IsNullOrWhiteSpace(body.Name) && body.ChargeHomeTenantQuota == null)
-            return await Bad(req, "name and/or chargeHomeTenantQuota is required");
+        if (string.IsNullOrWhiteSpace(body.Name))
+            return await Bad(req, "name is required");
 
-        if (!string.IsNullOrWhiteSpace(body.Name))
-        {
-            if (!await _delegatedAdminService.RenameGroupAsync(groupId, body.Name))
-                return await NotFound(req);
-            _logger.LogInformation("Tenant group renamed: {GroupId} -> '{Name}' by {By}", groupId, body.Name, currentUpn);
-        }
-
-        if (body.ChargeHomeTenantQuota is bool chargeHomeTenantQuota
-            && !await SetChargeModeCoreAsync(groupId, chargeHomeTenantQuota, currentUpn))
+        if (!await _delegatedAdminService.RenameGroupAsync(groupId, body.Name))
             return await NotFound(req);
+        _logger.LogInformation("Tenant group renamed: {GroupId} -> '{Name}' by {By}", groupId, body.Name, currentUpn);
 
         return await req.OkAsync(new MessageResponse { Message = "Group updated" });
     }
 
-    /// <summary>
-    /// Testable core of the quota-charge-mode flip (no HTTP plumbing). Returns false when the group does not
-    /// exist. An unchanged value is a no-op (no audit); a real change is audited under EVERY tenant in the group
-    /// — the customer's trail records whose budget the group's assignees draw on from now on.
-    /// </summary>
-    internal async Task<bool> SetChargeModeCoreAsync(string groupId, bool chargeHomeTenantQuota, string? currentUpn)
-    {
-        var group = await _delegatedAdminService.GetGroupAsync(groupId);
-        if (group == null)
-            return false;
-        if (group.ChargeHomeTenantQuota == chargeHomeTenantQuota)
-            return true;
-
-        if (!await _delegatedAdminService.SetChargeHomeTenantQuotaAsync(groupId, chargeHomeTenantQuota))
-            return false;
-
-        await AuditPerTenantAsync(group.TenantIds, "UPDATE", "*", currentUpn,
-            new Dictionary<string, string>
-            {
-                { "Group", group.Name },
-                { "GroupId", groupId },
-                { "Reason", "quota-charge-mode-changed" },
-                { "ChargeHomeTenantQuota", chargeHomeTenantQuota ? "true" : "false" },
-            });
-
-        _logger.LogInformation("Tenant group {GroupId} chargeHomeTenantQuota={Flag} by {By}", groupId, chargeHomeTenantQuota, currentUpn);
-        return true;
-    }
-
     /// <summary>DELETE /api/global/tenant-groups/{groupId} — delete group + all its assignments. GlobalAdminOnly.</summary>
     [Function("DeleteTenantGroup")]
     [Authorize]

src/Backend/AutopilotMonitor.Functions/Functions/Admin/TenantOffboardFunction.cs

@@ -506,6 +506,194 @@ public class TenantOffboardFunction
             EarliestProcessingAt: earliestProcessingAtForResponse);
     }
 
+    // ── Offboarding record + operator retry (Global Admin tooling) ────────────────────
+
+    /// <summary>
+    /// GET /api/global/tenants/{tenantId}/offboarding — the tenant's current offboarding record
+    /// (marker + history) for the admin tenant editor. 404 without a marker: the tenant was
+    /// never offboarded, or the Completed marker is already cleaned up
+    /// (<see cref="OffboardingMarkerCleanupFunction"/>, 15-min grace) — the normal end state,
+    /// nothing for an operator to do. Global Admin / Global Reader only (middleware-enforced).
+    /// </summary>
+    [Function("GetTenantOffboardingStatus")]
+    [Authorize]
+    public async Task<HttpResponseData> GetTenantOffboardingStatus(
+        [HttpTrigger(AuthorizationLevel.Anonymous, "get", Route = "global/tenants/{tenantId}/offboarding")] HttpRequestData req,
+        string tenantId,
+        FunctionContext context)
+    {
+        var targetTenantId = context.GetRequestContext().TargetTenantId;
+        if (string.IsNullOrEmpty(targetTenantId) || !SecurityValidator.IsValidGuid(targetTenantId))
+        {
+            return await req.BadRequestAsync("tenantId must be a valid GUID");
+        }
+
+        var normalizedTenantId = targetTenantId.ToLowerInvariant();
+        var marker = await _offboardingRepo.TryGetMarkerAsync(normalizedTenantId);
+        if (marker == null)
+        {
+            return await req.NotFoundAsync("No offboarding on record for this tenant");
+        }
+
+        var history = await _offboardingRepo.TryGetHistoryAsync(marker.OffboardingHistoryRowKey);
+        return await req.OkAsync(BuildStatusResponse(normalizedTenantId, marker, history));
+    }
+
+    internal static TenantOffboardingStatusResponse BuildStatusResponse(
+        string normalizedTenantId, OffboardingMarkerEntry marker, OffboardingHistoryEntry? history)
+        => new()
+        {
+            TenantId = normalizedTenantId,
+            Status = marker.Status,
+            HistoryRowKey = marker.OffboardingHistoryRowKey,
+            InitiatedAt = marker.InitiatedAt,
+            InitiatedBy = marker.InitiatedBy,
+            RetryCount = history?.RetryCount ?? 0,
+            EarliestProcessingAt = history?.EarliestProcessingAt,
+            DrainCompletedAt = history?.DrainCompletedAt,
+            CompletedAt = marker.CompletedAt,
+            FailedAt = marker.FailedAt,
+            FailedPhase = marker.FailedPhase,
+            ErrorMessage = history?.ErrorMessage,
+        };
+
+    /// <summary>
+    /// POST /api/global/tenants/{tenantId}/offboarding/retry — re-drives an offboarding whose
+    /// marker is Failed. Failed is fail-closed by design (the worker returns, the offboard
+    /// re-click refuses to re-enqueue), so this is the explicit operator action that design
+    /// asks for; nothing retries on its own. History and marker go back to Initiated — the
+    /// History row keeps its RowKey and <c>DrainCompletedAt</c> (the worker's resume anchor)
+    /// and counts the retry — and the ordinary resume path re-affirms the Disabled-gate,
+    /// computes the remaining drain barrier and enqueues the envelope. Global Admin only.
+    /// </summary>
+    [Function("RetryTenantOffboarding")]
+    [Authorize]
+    public async Task<HttpResponseData> RetryTenantOffboarding(
+        [HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = "global/tenants/{tenantId}/offboarding/retry")] HttpRequestData req,
+        string tenantId,
+        FunctionContext context)
+    {
+        var requestCtx = context.GetRequestContext();
+        var upn = requestCtx.UserPrincipalName;
+        var targetTenantId = requestCtx.TargetTenantId;
+
+        if (string.IsNullOrEmpty(targetTenantId) || !SecurityValidator.IsValidGuid(targetTenantId))
+        {
+            return await req.BadRequestAsync("tenantId must be a valid GUID");
+        }
+
+        var normalizedTenantId = targetTenantId.ToLowerInvariant();
+        var retry = await RetryFailedOffboardingAsync(normalizedTenantId, upn);
+
+        switch (retry.Kind)
+        {
+            case RetryOutcomeKind.Retried:
+            {
+                var response = req.CreateResponse(HttpStatusCode.Accepted);
+                await response.WriteAsJsonAsync(new OffboardResponse
+                {
+                    TenantId = normalizedTenantId,
+                    Status = "Queued",
+                    HistoryPartitionKey = Constants.OffboardingPartitionKeys.History,
+                    HistoryRowKey = retry.HistoryRowKey ?? string.Empty,
+                    EarliestProcessingAt = retry.EarliestProcessingAt,
+                    Message = retry.Message,
+                });
+                return response;
+            }
+            case RetryOutcomeKind.NotFound:
+                return await req.NotFoundAsync(retry.Message);
+            case RetryOutcomeKind.NotFailed:
+                return await req.ConflictAsync(retry.Message);
+            default:
+                return await Build500Async(req, retry.Message);
+        }
+    }
+
+    /// <summary>
+    /// Pure retry decision behind <see cref="RetryTenantOffboarding"/>; internal for unit tests.
+    /// Write order matters: History first (the worker's authority — a Failed history makes
+    /// it return early), Marker second (the HTTP idempotency anchor). A crash in between
+    /// leaves History=Initiated + Marker=Failed, and the next retry click resolves it the
+    /// same way. The worker's first pickup then flips History/Pointer/Marker to InProgress.
+    /// </summary>
+    internal async Task<RetryOutcome> RetryFailedOffboardingAsync(string normalizedTenantId, string upn)
+    {
+        var marker = await _offboardingRepo.TryGetMarkerAsync(normalizedTenantId);
+        if (marker == null)
+        {
+            return new RetryOutcome(RetryOutcomeKind.NotFound, "No offboarding on record for this tenant");
+        }
+
+        if (!string.Equals(marker.Status, "Failed", StringComparison.OrdinalIgnoreCase))
+        {
+            var message = string.Equals(marker.Status, "Completed", StringComparison.OrdinalIgnoreCase)
+                ? "Tenant offboarding already completed — nothing to retry"
+                : $"Tenant offboarding is {marker.Status} — not Failed; re-run the offboard action to resume it";
+            _logger.LogInformation(
+                "TenantOffboard retry for {TenantId} refused: marker status={Status}", normalizedTenantId, marker.Status);
+            return new RetryOutcome(RetryOutcomeKind.NotFailed, message, marker.OffboardingHistoryRowKey);
+        }
+
+        var history = await _offboardingRepo.TryGetHistoryAsync(marker.OffboardingHistoryRowKey);
+        if (history == null)
+        {
+            _logger.LogError(
+                "TenantOffboard retry for {TenantId}: History row {History} is missing — operator inspection required",
+                normalizedTenantId, marker.OffboardingHistoryRowKey);
+            return new RetryOutcome(
+                RetryOutcomeKind.HistoryMissing,
+                "Offboarding history row is missing — operator inspection required",
+                marker.OffboardingHistoryRowKey);
+        }
+
+        var failedPhase = marker.FailedPhase ?? "unknown";
+
+        history.Status = "Initiated";
+        history.RetryCount += 1;
+        history.ErrorMessage = null;
+        await _offboardingRepo.UpsertHistoryAsync(history);
+
+        marker.Status = "Initiated";
+        marker.FailedAt = null;
+        marker.FailedPhase = null;
+        await _offboardingRepo.UpsertMarkerAsync(marker);
+
+        _logger.LogWarning(
+            "TENANT OFFBOARD RETRY for {TenantId} by {Upn}: previous failure phase={Phase}; historyRowKey={History} retryCount={RetryCount}",
+            normalizedTenantId, upn, failedPhase, history.RowKey, history.RetryCount);
+
+        // Global audit row (survives the TenantConfiguration wipe like the initiation's DELETE row).
+        await _maintenanceRepo.LogAuditEntryAsync(
+            Constants.AuditGlobalTenantId,
+            "RETRY",
+            "TenantOffboarding",
+            normalizedTenantId,
+            upn,
+            new Dictionary<string, string>
+            {
+                ["failedPhase"] = failedPhase,
+                ["historyRowKey"] = history.RowKey,
+                ["retryCount"] = history.RetryCount.ToString(System.Globalization.CultureInfo.InvariantCulture),
+            });
+
+        var resume = await ResumeExistingMarkerAsync(marker, upn, normalizedTenantId, isRace: false);
+        if (resume.Kind == ResumeOutcomeKind.ReEnqueueFailed)
+        {
+            // Marker is Initiated now, so the ordinary offboard re-click resumes it.
+            return new RetryOutcome(
+                RetryOutcomeKind.ReEnqueueFailed,
+                "Failed to re-enqueue tenant offboarding — re-run the offboard action to resume it",
+                history.RowKey);
+        }
+
+        return new RetryOutcome(
+            RetryOutcomeKind.Retried,
+            $"Tenant offboarding retried after the failure in phase '{failedPhase}'",
+            history.RowKey,
+            resume.EarliestProcessingAt);
+    }
+
     /// <summary>
     /// Magic-string DisabledReason that identifies a TenantConfiguration row as the
     /// offboarding tombstone. Used by <c>EnsureTenantDisabledAsync</c> for the idempotent
@@ -775,3 +963,24 @@ internal enum ResumeOutcomeKind
     /// <summary>Marker classified as in-flight but re-enqueue threw; surface 500.</summary>
     ReEnqueueFailed,
 }
+
+/// <summary>Result of <see cref="TenantOffboardFunction.RetryFailedOffboardingAsync"/>.</summary>
+internal sealed record RetryOutcome(
+    RetryOutcomeKind Kind,
+    string Message,
+    string? HistoryRowKey = null,
+    DateTime? EarliestProcessingAt = null);
+
+internal enum RetryOutcomeKind
+{
+    /// <summary>Marker was Failed; history + marker reset to Initiated and the envelope re-enqueued (202).</summary>
+    Retried,
+    /// <summary>No marker on record (404).</summary>
+    NotFound,
+    /// <summary>Marker is Completed or in flight — nothing to retry (409).</summary>
+    NotFailed,
+    /// <summary>Marker points at a History row that no longer exists (500).</summary>
+    HistoryMissing,
+    /// <summary>Rows were reset but the re-enqueue threw (500); the offboard re-click resumes.</summary>
+    ReEnqueueFailed,
+}

src/Backend/AutopilotMonitor.Functions/Functions/Admin/TriggerMaintenanceFunction.cs

@@ -2,7 +2,7 @@ using System;
 using System.Net;
 using System.Threading.Tasks;
 using AutopilotMonitor.Functions.Helpers;
-using AutopilotMonitor.Functions.Services;
+using AutopilotMonitor.Functions.Services.Maintenance;
 using AutopilotMonitor.Shared.Models;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
@@ -11,24 +11,29 @@ using Microsoft.Extensions.Logging;
 namespace AutopilotMonitor.Functions.Functions.Admin
 {
     /// <summary>
-    /// Allows Global Admins to manually trigger maintenance tasks
+    /// <c>POST /api/maintenance/trigger</c> — manual Global Admin trigger of the platform
+    /// maintenance run. The run takes minutes, so the request only queues it:
+    /// <c>202 Accepted</c> when queued, <c>409</c> while a run (timer or manual) is active,
+    /// <c>500</c> when the enqueue failed — never a hollow success. Progress and the run report
+    /// surface as <c>Maintenance*</c> ops events.
     /// </summary>
     public class TriggerMaintenanceFunction
     {
         private readonly ILogger<TriggerMaintenanceFunction> _logger;
-        private readonly MaintenanceService _maintenanceService;
+        private readonly IMaintenanceTriggerProducer _producer;
+        private readonly MaintenanceRunGate _runGate;
 
         public TriggerMaintenanceFunction(
             ILogger<TriggerMaintenanceFunction> logger,
-            MaintenanceService maintenanceService)
+            IMaintenanceTriggerProducer producer,
+            MaintenanceRunGate runGate)
         {
             _logger = logger;
-            _maintenanceService = maintenanceService;
+            _producer = producer;
+            _runGate = runGate;
         }
 
         /// <summary>
-        /// POST /api/maintenance/trigger
-        /// Manually trigger maintenance tasks (Global Admin only)
         /// Query parameters:
         /// - date: Optional date to aggregate (yyyy-MM-dd). If not provided, uses yesterday.
         /// - aggregateOnly: If true, only runs aggregation (skips timeout and cleanup)
@@ -38,45 +43,42 @@ namespace AutopilotMonitor.Functions.Functions.Admin
             [HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = "maintenance/trigger")] HttpRequestData req,
             FunctionContext context)
         {
-            _logger.LogInformation("Manual maintenance trigger requested");
-
             // Authentication + GlobalAdminOnly authorization enforced by PolicyEnforcementMiddleware
-            var userEmail = TenantHelper.GetUserIdentifier(req);
-
-            _logger.LogInformation($"Maintenance trigger initiated by Global Admin: {userEmail}");
+            var userEmail = TenantHelper.GetUserIdentifier(req) ?? "GlobalAdmin";
+            var ct = context.CancellationToken;
 
             try
             {
-                // Parse query parameters
-                var dateParam = req.Query["date"];
-                var aggregateOnlyParam = req.Query["aggregateOnly"];
-
-                if (!QueryParams.TryUtcInstant(dateParam, "date", out var dateInstant, out _))
+                if (!QueryParams.TryUtcInstant(req.Query["date"], "date", out var dateInstant, out _))
                 {
                     return await req.BadRequestAsync("Invalid date format. Use yyyy-MM-dd");
                 }
                 DateTime? targetDate = dateInstant?.Date;
-                if (targetDate.HasValue)
+                bool aggregateOnly = req.Query["aggregateOnly"]?.ToLower() == "true";
+
+                if (await _runGate.IsRunActiveAsync(ct))
                 {
-                    _logger.LogInformation($"Manual maintenance for date: {targetDate:yyyy-MM-dd}");
+                    return await req.ConflictAsync("A maintenance run is already active.");
                 }
 
-                bool aggregateOnly = aggregateOnlyParam?.ToLower() == "true";
-
-                // Execute maintenance tasks
-                var result = await _maintenanceService.RunManualAsync(targetDate, aggregateOnly, userEmail);
-
-                var response = req.CreateResponse(HttpStatusCode.OK);
-                await response.WriteAsJsonAsync(new TriggerMaintenanceResponse
+                await _producer.EnqueueAsync(new MaintenanceTriggerEnvelope
                 {
-                    Success = true,
-                    Message = "Maintenance tasks completed",
-                    Result = result,
                     TriggeredBy = userEmail,
-                    TriggeredAt = DateTime.UtcNow
-                });
+                    TargetDate = targetDate,
+                    AggregateOnly = aggregateOnly,
+                }, ct);
 
-                return response;
+                _logger.LogInformation("TriggerMaintenance: run queued (triggeredBy={TriggeredBy}, date={Date:yyyy-MM-dd}, aggregateOnly={AggregateOnly})",
+                    userEmail, targetDate, aggregateOnly);
+
+                return await req.JsonAsync(HttpStatusCode.Accepted, new TriggerMaintenanceResponse
+                {
+                    Message = "Maintenance run queued",
+                    TriggeredBy = userEmail,
+                    TriggeredAt = DateTime.UtcNow,
+                    TargetDate = targetDate?.ToString("yyyy-MM-dd"),
+                    AggregateOnly = aggregateOnly,
+                });
             }
             catch (Exception ex)
             {

src/Backend/AutopilotMonitor.Functions/Functions/Annotations/ListSessionAnnotationsFunction.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Net;
-using System.Web;
 using AutopilotMonitor.Functions.Helpers;
 using AutopilotMonitor.Functions.Pagination;
 using AutopilotMonitor.Shared.DataAccess;
@@ -41,7 +40,7 @@ namespace AutopilotMonitor.Functions.Functions.Annotations
                 var requestCtx = req.GetRequestContext();
                 var callerTenantId = TenantHelper.GetTenantId(req);
 
-                var query = HttpUtility.ParseQueryString(req.Url.Query ?? string.Empty);
+                var query = req.Query;
                 var parsed = SessionAnnotationsPagination.ParseQuery(query);
                 if (parsed.Error != null)
                 {

src/Backend/AutopilotMonitor.Functions/Functions/Annotations/ListTenantSessionAnnotationsFunction.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Net;
-using System.Web;
 using AutopilotMonitor.Functions.Helpers;
 using AutopilotMonitor.Functions.Pagination;
 using AutopilotMonitor.Shared.DataAccess;
@@ -47,7 +46,7 @@ namespace AutopilotMonitor.Functions.Functions.Annotations
                 var requestCtx = req.GetRequestContext();
                 var callerTenantId = TenantHelper.GetTenantId(req);
 
-                var query = HttpUtility.ParseQueryString(req.Url.Query ?? string.Empty);
+                var query = req.Query;
                 var parsedRaw = SessionAnnotationsPagination.ParseQuery(query);
                 if (parsedRaw.Error != null)
                 {

src/Backend/AutopilotMonitor.Functions/Functions/Apps/GetAppAnalyticsFunction.cs

@@ -46,7 +46,7 @@ namespace AutopilotMonitor.Functions.Functions.Apps
                     return await req.BadRequestAsync("appName is required");
                 }
 
-                var query = System.Web.HttpUtility.ParseQueryString(req.Url.Query);
+                var query = req.Query;
                 var days = QueryParams.Int(query["days"], @default: 30, min: 1, max: 365);
 
                 var summaries = await AppsAnalyticsHelper.LoadSummariesAsync(_metricsRepo, tenantId, days);

src/Backend/AutopilotMonitor.Functions/Functions/Apps/GetAppSessionsFunction.cs

@@ -45,7 +45,7 @@ namespace AutopilotMonitor.Functions.Functions.Apps
                     return await req.BadRequestAsync("appName is required");
                 }
 
-                var query = System.Web.HttpUtility.ParseQueryString(req.Url.Query);
+                var query = req.Query;
                 var days = QueryParams.Int(query["days"], @default: 30, min: 1, max: 365);
 
                 var statusFilter = (query["status"] ?? "all").Trim().ToLowerInvariant();

src/Backend/AutopilotMonitor.Functions/Functions/Apps/GetAppsListFunction.cs

@@ -33,7 +33,7 @@ namespace AutopilotMonitor.Functions.Functions.Apps
                 // Authentication + MemberRead authorization enforced by PolicyEnforcementMiddleware
                 var tenantId = TenantHelper.GetTenantId(req);
 
-                var query = System.Web.HttpUtility.ParseQueryString(req.Url.Query);
+                var query = req.Query;
                 var days = QueryParams.Int(query["days"], @default: 30, min: 1, max: 365);
 
                 var paging = AppsAnalyticsHelper.ParseAppsPaging(query);

src/Backend/AutopilotMonitor.Functions/Functions/Apps/GetGlobalAppAnalyticsFunction.cs

@@ -46,7 +46,7 @@ namespace AutopilotMonitor.Functions.Functions.Apps
                     return await req.BadRequestAsync("appName is required");
                 }
 
-                var query = System.Web.HttpUtility.ParseQueryString(req.Url.Query);
+                var query = req.Query;
                 var scopedTenantId = query["tenantId"];
                 if (!AppsAnalyticsHelper.IsValidOptionalTenantIdQueryParam(scopedTenantId))
                 {

src/Backend/AutopilotMonitor.Functions/Functions/Apps/GetGlobalAppSessionsFunction.cs

@@ -45,7 +45,7 @@ namespace AutopilotMonitor.Functions.Functions.Apps
                     return await req.BadRequestAsync("appName is required");
                 }
 
-                var query = System.Web.HttpUtility.ParseQueryString(req.Url.Query);
+                var query = req.Query;
                 var scopedTenantId = query["tenantId"];
                 if (!AppsAnalyticsHelper.IsValidOptionalTenantIdQueryParam(scopedTenantId))
                 {

src/Backend/AutopilotMonitor.Functions/Functions/Apps/GetGlobalAppsListFunction.cs

@@ -32,7 +32,7 @@ namespace AutopilotMonitor.Functions.Functions.Apps
             try
             {
                 var userEmail = TenantHelper.GetUserIdentifier(req);
-                var query = System.Web.HttpUtility.ParseQueryString(req.Url.Query);
+                var query = req.Query;
 
                 var scopedTenantId = query["tenantId"];
                 if (!AppsAnalyticsHelper.IsValidOptionalTenantIdQueryParam(scopedTenantId))

src/Backend/AutopilotMonitor.Functions/Functions/Backup/GetBackupJobStatusFunction.cs

@@ -1,7 +1,7 @@
-using System.Net;
-using System.Text.Json;
 using System.Threading.Tasks;
 using AutopilotMonitor.Functions.DataAccess.TableStorage;
+using AutopilotMonitor.Functions.Helpers;
+using AutopilotMonitor.Shared;
 using AutopilotMonitor.Shared.Models.Backup;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
@@ -36,18 +36,9 @@ namespace AutopilotMonitor.Functions.Functions.Backup
             var (job, _) = await _jobs.GetWithETagAsync(jobId, req.FunctionContext.CancellationToken);
             if (job is null)
             {
-                return await WriteJsonAsync(req, HttpStatusCode.NotFound, new { error = "JobNotFound", jobId });
+                return await req.NotFoundAsync($"Backup job {jobId} not found.", Constants.BackupErrorCodes.JobNotFound);
             }
-            return await WriteJsonAsync(req, HttpStatusCode.OK, job);
-        }
-
-        private static async Task<HttpResponseData> WriteJsonAsync(HttpRequestData req, HttpStatusCode status, object body)
-        {
-            var response = req.CreateResponse(status);
-            response.Headers.Add("Content-Type", "application/json; charset=utf-8");
-            var json = JsonSerializer.Serialize(body, BackupManifestJson.SerializerOptions);
-            await response.WriteStringAsync(json);
-            return response;
+            return await req.OkAsync(job);
         }
     }
 }

src/Backend/AutopilotMonitor.Functions/Functions/Backup/RestoreRowFunction.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Net;
-using System.Text.Json;
 using System.Threading.Tasks;
 using AutopilotMonitor.Functions.Helpers;
 using AutopilotMonitor.Functions.Services;
 using AutopilotMonitor.Functions.Services.Backup;
+using AutopilotMonitor.Shared;
 using AutopilotMonitor.Shared.Models.Backup;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
@@ -61,7 +61,7 @@ namespace AutopilotMonitor.Functions.Functions.Backup
             }
             catch (BackupTerminalException ex)
             {
-                return await WriteErrorAsync(req, HttpStatusCode.BadRequest, ex.Code, ex.Message).ConfigureAwait(false);
+                return await req.BadRequestAsync(ex.Message, ex.Code).ConfigureAwait(false);
             }
 
             // 3. Dispatch on mode
@@ -71,7 +71,7 @@ namespace AutopilotMonitor.Functions.Functions.Backup
                 {
                     var preview = await _restoreService.PreviewRowAsync(
                         backupId, body.TableName, body.PartitionKey, body.RowKey, ct).ConfigureAwait(false);
-                    return await WriteJsonAsync(req, HttpStatusCode.OK, preview).ConfigureAwait(false);
+                    return await req.OkAsync(preview).ConfigureAwait(false);
                 }
                 else
                 {
@@ -92,13 +92,13 @@ namespace AutopilotMonitor.Functions.Functions.Backup
                         _logger.LogWarning(evtEx, "RestoreRow: ops event recording failed — write itself succeeded");
                     }
 
-                    return await WriteJsonAsync(req, HttpStatusCode.OK, commit).ConfigureAwait(false);
+                    return await req.OkAsync(commit).ConfigureAwait(false);
                 }
             }
             catch (BackupTerminalException ex)
             {
                 var status = MapErrorCodeToStatus(ex.Code);
-                return await WriteErrorAsync(req, status, ex.Code, ex.Message).ConfigureAwait(false);
+                return await req.ErrorAsync(status, ex.Code, ex.Message).ConfigureAwait(false);
             }
             catch (OperationCanceledException) when (ct.IsCancellationRequested)
             {
@@ -107,39 +107,26 @@ namespace AutopilotMonitor.Functions.Functions.Backup
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "RestoreRow: unexpected failure for backupId={BackupId} table={Table}", backupId, body.TableName);
-                return await WriteErrorAsync(req, HttpStatusCode.InternalServerError, "InternalError", ex.Message).ConfigureAwait(false);
+                // Sanitized envelope: the raw exception text stays in the log, the correlation id is the handle.
+                return await req.InternalServerErrorAsync(
+                    _logger, ex, $"RestoreRow backupId={backupId} table={body.TableName}").ConfigureAwait(false);
             }
         }
 
         private static HttpStatusCode MapErrorCodeToStatus(string code) => code switch
         {
-            "BackupNotFound"                => HttpStatusCode.NotFound,
-            "RowNotInBackup"                => HttpStatusCode.NotFound,
-            "TableNotInBackup"              => HttpStatusCode.Conflict,
-            "ManifestCorrupt"               => HttpStatusCode.Conflict,
-            "ManifestSchemaUnsupported"     => HttpStatusCode.Conflict,
-            "IntegrityCheckFailed"          => HttpStatusCode.Conflict,
-            "BlobChangedSinceValidation"    => HttpStatusCode.Conflict,
-            "RowChangedSinceValidation"     => HttpStatusCode.Conflict,
-            "CurrentRowChanged"             => HttpStatusCode.Conflict,
-            "MaintenanceInProgress"         => HttpStatusCode.Conflict,
-            "MaintenanceLeaseLost"          => HttpStatusCode.Conflict,
-            _                               => HttpStatusCode.BadRequest,
+            Constants.BackupErrorCodes.BackupNotFound               => HttpStatusCode.NotFound,
+            Constants.BackupErrorCodes.RowNotInBackup               => HttpStatusCode.NotFound,
+            Constants.BackupErrorCodes.TableNotInBackup             => HttpStatusCode.Conflict,
+            Constants.BackupErrorCodes.ManifestCorrupt              => HttpStatusCode.Conflict,
+            Constants.BackupErrorCodes.ManifestSchemaUnsupported    => HttpStatusCode.Conflict,
+            Constants.BackupErrorCodes.IntegrityCheckFailed         => HttpStatusCode.Conflict,
+            Constants.BackupErrorCodes.BlobChangedSinceValidation   => HttpStatusCode.Conflict,
+            Constants.BackupErrorCodes.RowChangedSinceValidation    => HttpStatusCode.Conflict,
+            Constants.BackupErrorCodes.CurrentRowChanged            => HttpStatusCode.Conflict,
+            Constants.BackupErrorCodes.MaintenanceInProgress        => HttpStatusCode.Conflict,
+            Constants.BackupErrorCodes.MaintenanceLeaseLost         => HttpStatusCode.Conflict,
+            _                                                       => HttpStatusCode.BadRequest,
         };
-
-        private static async Task<HttpResponseData> WriteJsonAsync(HttpRequestData req, HttpStatusCode status, object body)
-        {
-            var response = req.CreateResponse(status);
-            response.Headers.Add("Content-Type", "application/json; charset=utf-8");
-            var json = JsonSerializer.Serialize(body, BackupManifestJson.SerializerOptions);
-            await response.WriteStringAsync(json).ConfigureAwait(false);
-            return response;
-        }
-
-        private static async Task<HttpResponseData> WriteErrorAsync(HttpRequestData req, HttpStatusCode status, string code, string message)
-        {
-            return await WriteJsonAsync(req, status, new { error = code, message }).ConfigureAwait(false);
-        }
     }
 }