gsadmin/AutopilotMonitor
1
0
Fork 0
mirror of https://github.com/okieselbach/AutopilotMonitor.git synced 2026-10-24 20:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix premature enrollment_complete during active ESP AccountSetup

Browse Source 
Desktop arrival during AccountSetup started Hello wait timer, which
timeout-resolved after 30s and triggered enrollment_complete via
desktop_hello path while ESP was still installing apps.

Three fixes:
- NotifyDesktopArrived: only start Hello timer when ESP is NOT active
- TryEmitEnrollmentComplete: ESP gate now blocks both desktop_arrival
  and desktop_hello sources
- OnFinalizingSetupPhaseTriggered: try composite completion after ESP
  final exit in case Hello was already resolved

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Oliver Kieselbach
2026-03-04 00:30:45 +01:00
parent 82919d4791
commit b7febc4bd5
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Tracking/EnrollmentTracker.cs
+17 -8
View File
@@ -806,6 +806,10 @@ namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking
// Start Hello wait timer (waits for Hello wizard to start or timeout)
_espAndHelloTracker?.StartHelloWaitTimer();
// If Hello was already resolved (e.g., via EventLog backfill or Event 300/301
// during AccountSetup), the composite signal can fire immediately.
TryEmitEnrollmentComplete("esp_hello_composite");
}
else
{
@@ -911,11 +915,13 @@ namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking
return;
}
// Desktop-Arrival Gate: Only allow desktop_arrival when ESP is NOT actively running
// WDP v2 has no ESP — skip the gate entirely
if (source == "desktop_arrival" && _enrollmentType != "v2" && _espEverSeen && !_espFinalExitSeen)
// Desktop-Arrival Gate: Block desktop-based completion when ESP is still actively running.
// Both "desktop_arrival" (direct) and "desktop_hello" (Hello resolved after desktop arrival)
// must be gated — otherwise Hello timeout during active AccountSetup triggers premature completion.
// WDP v2 has no ESP — skip the gate entirely.
if ((source == "desktop_arrival" || source == "desktop_hello") && _enrollmentType != "v2" && _espEverSeen && !_espFinalExitSeen)
{
_logger.Info("EnrollmentTracker: Desktop arrived but ESP still active — not completing yet");
_logger.Info($"EnrollmentTracker: Completion source '{source}' blocked — ESP still active");
EmitCompletionCheck(source, "blocked", "esp_active");
return;
}
@@ -1047,11 +1053,14 @@ namespace AutopilotMonitor.Agent.Core.Monitoring.Tracking
});
}
// Start Hello wait timer in no-ESP or post-ESP scenarios
// Without this, Hello would never timeout-resolve in no-ESP scenarios (WDP v2, ESP disabled)
if (_espAndHelloTracker != null && !_espAndHelloTracker.IsHelloCompleted)
// Start Hello wait timer ONLY when ESP is NOT actively running.
// During active ESP (AccountSetup runs in background with desktop visible),
// the Hello timer must wait until ESP exits (started in OnFinalizingSetupPhaseTriggered).
// Without this guard, Hello timeout-resolves while ESP still installs apps → premature completion.
if (_espAndHelloTracker != null && !_espAndHelloTracker.IsHelloCompleted
&& (!_espEverSeen || _espFinalExitSeen))
{
_logger.Info("EnrollmentTracker: Desktop arrived with Hello pending — starting Hello wait timer");
_logger.Info("EnrollmentTracker: Desktop arrived with Hello pending (no active ESP) — starting Hello wait timer");
_espAndHelloTracker.StartHelloWaitTimer();
}