From e1117d7db87cd6cfbbdd9db06fc27467a172b778 Mon Sep 17 00:00:00 2001 From: Oliver Kieselbach Date: Thu, 16 Apr 2026 01:30:05 +0200 Subject: [PATCH] refactor(agent): move Core orchestrators to Runtime/, flatten Interop/ Part 1 of 5 in Monitoring/ bounded-context restructure. Moves Monitoring/Core/* (minus EventSpool/EventUploadOrchestrator/DeviceInfoProvider/EnrollmentCompletionHandler which belong to later PRs) into Monitoring/Runtime/. Interop/ stays on Monitoring root. Pure folder move + namespace update; no behavior change. Co-Authored-By: Claude Opus 4.6 (1M context) --- .../Core/CollectorCoordinatorTests.cs | 1 + .../Core/EnrollmentCompletionHandlerTests.cs | 1 + .../Core/EventUploadOrchestratorTests.cs | 1 + .../Core/SessionPersistenceTests.cs | 1 + .../Core/VersionCheckEventBuilderTests.cs | 1 + .../Collectors/GatherCollectors/FileCollector.cs | 2 ++ .../Collectors/GatherCollectors/JsonCollector.cs | 2 ++ .../Collectors/GatherCollectors/LogParserCollector.cs | 2 ++ .../Collectors/GatherCollectors/XmlCollector.cs | 2 ++ .../Monitoring/Collectors/ProvisioningStatusTracker.cs | 1 + .../Monitoring/Core/EnrollmentCompletionHandler.cs | 1 + .../Monitoring/Core/EventUploadOrchestrator.cs | 1 + .../Monitoring/{Core => Runtime}/AnalyzerManager.cs | 2 +- .../Monitoring/{Core => Runtime}/CleanupService.cs | 2 +- .../Monitoring/{Core => Runtime}/CollectorCoordinator.cs | 3 ++- .../{Core => Runtime}/DiagnosticsPackageService.cs | 9 +++++---- .../Monitoring/{Core => Runtime}/MonitoringService.cs | 3 ++- .../{Core => Runtime}/PeriodicCollectorManager.cs | 3 ++- .../Monitoring/{Core => Runtime}/RegistryWatcher.cs | 2 +- .../{Core => Runtime}/ServerActionDispatcher.cs | 2 +- .../Monitoring/{Core => Runtime}/SessionPersistence.cs | 2 +- .../{Collectors => Runtime}/UserProfileResolver.cs | 3 ++- .../{Core => Runtime}/UserSessionProcessLauncher.cs | 2 +- .../{Core => Runtime}/VersionCheckEventBuilder.cs | 2 +- .../AutopilotMonitor.Agent/Program.Configuration.cs | 1 + .../AutopilotMonitor.Agent/Program.GatherRulesMode.cs | 1 + src/Agent/AutopilotMonitor.Agent/Program.cs | 1 + 27 files changed, 39 insertions(+), 15 deletions(-) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Core => Runtime}/AnalyzerManager.cs (98%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Core => Runtime}/CleanupService.cs (98%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Core => Runtime}/CollectorCoordinator.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Core => Runtime}/DiagnosticsPackageService.cs (97%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Core => Runtime}/MonitoringService.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Core => Runtime}/PeriodicCollectorManager.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Core => Runtime}/RegistryWatcher.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Core => Runtime}/ServerActionDispatcher.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Core => Runtime}/SessionPersistence.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Collectors => Runtime}/UserProfileResolver.cs (98%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Core => Runtime}/UserSessionProcessLauncher.cs (99%) rename src/Agent/AutopilotMonitor.Agent.Core/Monitoring/{Core => Runtime}/VersionCheckEventBuilder.cs (99%) diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/CollectorCoordinatorTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/CollectorCoordinatorTests.cs index 3f9601b6..4fc58215 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/CollectorCoordinatorTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/CollectorCoordinatorTests.cs @@ -1,4 +1,5 @@ using AutopilotMonitor.Agent.Core.Monitoring.Core; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using Xunit; namespace AutopilotMonitor.Agent.Core.Tests.Core diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EnrollmentCompletionHandlerTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EnrollmentCompletionHandlerTests.cs index 528509d1..4acea290 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EnrollmentCompletionHandlerTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EnrollmentCompletionHandlerTests.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Monitoring.Core; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Agent.Core.Monitoring.Network; using AutopilotMonitor.Agent.Core.Tests.Helpers; using AutopilotMonitor.Shared; diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EventUploadOrchestratorTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EventUploadOrchestratorTests.cs index 7b04e3b1..dca220b0 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EventUploadOrchestratorTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/EventUploadOrchestratorTests.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Monitoring.Core; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Agent.Core.Monitoring.Network; using AutopilotMonitor.Agent.Core.Tests.Helpers; using AutopilotMonitor.Shared; diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/SessionPersistenceTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/SessionPersistenceTests.cs index d0dae9a5..f9de3fbd 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/SessionPersistenceTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/SessionPersistenceTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using AutopilotMonitor.Agent.Core.Monitoring.Core; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using Xunit; namespace AutopilotMonitor.Agent.Core.Tests.Core diff --git a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/VersionCheckEventBuilderTests.cs b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/VersionCheckEventBuilderTests.cs index d38cbfde..f70baaa2 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/VersionCheckEventBuilderTests.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core.Tests/Core/VersionCheckEventBuilderTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using AutopilotMonitor.Agent.Core.Monitoring.Core; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; using Newtonsoft.Json.Linq; diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/FileCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/FileCollector.cs index 0aab28c4..1b186889 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/FileCollector.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/FileCollector.cs @@ -4,6 +4,8 @@ using System.IO; using System.Linq; using AutopilotMonitor.Shared.Models; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; + namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors { public class FileCollector : IGatherRuleCollector diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/JsonCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/JsonCollector.cs index 86c2f6c7..2e7cb764 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/JsonCollector.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/JsonCollector.cs @@ -5,6 +5,8 @@ using System.Linq; using AutopilotMonitor.Shared.Models; using Newtonsoft.Json.Linq; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; + namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors { public class JsonCollector : IGatherRuleCollector diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/LogParserCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/LogParserCollector.cs index d5e3962c..b3d3b001 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/LogParserCollector.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/LogParserCollector.cs @@ -7,6 +7,8 @@ using System.Text.RegularExpressions; using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using AutopilotMonitor.Shared.Models; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; + namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors { public class LogParserCollector : IGatherRuleCollector diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/XmlCollector.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/XmlCollector.cs index d4cdf325..79250dce 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/XmlCollector.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/GatherCollectors/XmlCollector.cs @@ -7,6 +7,8 @@ using System.Xml.Linq; using System.Xml.XPath; using AutopilotMonitor.Shared.Models; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; + namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors.GatherCollectors { public class XmlCollector : IGatherRuleCollector diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ProvisioningStatusTracker.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ProvisioningStatusTracker.cs index b4c14700..44572ce9 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ProvisioningStatusTracker.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/ProvisioningStatusTracker.cs @@ -6,6 +6,7 @@ using System.Threading; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Interop; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; using Microsoft.Win32; diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/EnrollmentCompletionHandler.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/EnrollmentCompletionHandler.cs index e76ce476..14818f80 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/EnrollmentCompletionHandler.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/EnrollmentCompletionHandler.cs @@ -8,6 +8,7 @@ using System.Threading; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Shared; using AutopilotMonitor.Agent.Core.Security; using AutopilotMonitor.Shared.Models; diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/EventUploadOrchestrator.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/EventUploadOrchestrator.cs index a1f166c2..f5bf73f3 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/EventUploadOrchestrator.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/EventUploadOrchestrator.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Agent.Core.Monitoring.Network; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/AnalyzerManager.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/AnalyzerManager.cs similarity index 98% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/AnalyzerManager.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/AnalyzerManager.cs index 953cafb1..13945e99 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/AnalyzerManager.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/AnalyzerManager.cs @@ -6,7 +6,7 @@ using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Agent.Core.Monitoring.Analyzers; using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Core +namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { /// /// Manages agent analyzers: initialization from remote config, startup execution diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/CleanupService.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CleanupService.cs similarity index 98% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/CleanupService.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CleanupService.cs index 99e43533..76981aa7 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/CleanupService.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CleanupService.cs @@ -5,7 +5,7 @@ using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Agent.Core.Security; -namespace AutopilotMonitor.Agent.Core.Monitoring.Core +namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { /// /// Handles agent cleanup on enrollment completion: diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/CollectorCoordinator.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CollectorCoordinator.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/CollectorCoordinator.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CollectorCoordinator.cs index c3c7b172..317e2d6c 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/CollectorCoordinator.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/CollectorCoordinator.cs @@ -5,13 +5,14 @@ using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Agent.Core.Monitoring.Collectors; +using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Network; using AutopilotMonitor.Agent.Core.Monitoring.Replay; using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Core +namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { /// /// Manages collector lifecycle: start/stop, idle detection, restart after activity, diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/DiagnosticsPackageService.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/DiagnosticsPackageService.cs similarity index 97% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/DiagnosticsPackageService.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/DiagnosticsPackageService.cs index 4afce69d..24cdfd67 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/DiagnosticsPackageService.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/DiagnosticsPackageService.cs @@ -6,10 +6,11 @@ using System.Text; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; +using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Network; using AutopilotMonitor.Shared; -namespace AutopilotMonitor.Agent.Core.Monitoring.Core +namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { /// /// Result of a diagnostics package upload attempt. @@ -134,15 +135,15 @@ namespace AutopilotMonitor.Agent.Core.Monitoring.Core foreach (var entry in _configuration.DiagnosticsLogPaths ?? new System.Collections.Generic.List()) { // Resolve %LOGGED_ON_USER_PROFILE% token and get profile path for guard exception - var userProfilePath = Collectors.UserProfileResolver.ContainsUserProfileToken(entry.Path) - ? Collectors.UserProfileResolver.GetLoggedOnUserProfilePath() : null; + var userProfilePath = UserProfileResolver.ContainsUserProfileToken(entry.Path) + ? UserProfileResolver.GetLoggedOnUserProfilePath() : null; if (!Collectors.DiagnosticsPathGuards.IsDiagnosticsPathAllowed(entry.Path, _configuration.UnrestrictedMode, userProfilePath)) { _logger.Warning($"Diagnostics path blocked by guard: {entry.Path}"); continue; } - var expandedPath = Collectors.UserProfileResolver.ExpandCustomTokens(entry.Path); + var expandedPath = UserProfileResolver.ExpandCustomTokens(entry.Path); if (expandedPath == null) { _logger.Warning($"Diagnostics path skipped (no user session for token): {entry.Path}"); diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/MonitoringService.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/MonitoringService.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/MonitoringService.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/MonitoringService.cs index 015cc67e..4a8f4d85 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/MonitoringService.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/MonitoringService.cs @@ -7,12 +7,13 @@ using System.Threading; using System.Threading.Tasks; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; +using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Network; using AutopilotMonitor.Agent.Core.Monitoring.Tracking; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Core +namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { /// /// Thin coordinator for the Autopilot Monitor Agent. Delegates to: diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/PeriodicCollectorManager.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/PeriodicCollectorManager.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/PeriodicCollectorManager.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/PeriodicCollectorManager.cs index b2537182..d50dd53b 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/PeriodicCollectorManager.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/PeriodicCollectorManager.cs @@ -4,11 +4,12 @@ using System.Threading; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Agent.Core.Monitoring.Collectors; +using AutopilotMonitor.Agent.Core.Monitoring.Core; using AutopilotMonitor.Agent.Core.Monitoring.Network; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Core +namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { /// /// Manages periodic collectors (PerformanceCollector, AgentSelfMetricsCollector) and their diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/RegistryWatcher.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/RegistryWatcher.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/RegistryWatcher.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/RegistryWatcher.cs index 90fa039b..261bdbab 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/RegistryWatcher.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/RegistryWatcher.cs @@ -5,7 +5,7 @@ using AutopilotMonitor.Agent.Core.Monitoring.Interop; using Microsoft.Win32; using Microsoft.Win32.SafeHandles; -namespace AutopilotMonitor.Agent.Core.Monitoring.Core +namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { /// /// Watches a registry key for changes using RegNotifyChangeKeyValue. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/ServerActionDispatcher.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/ServerActionDispatcher.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/ServerActionDispatcher.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/ServerActionDispatcher.cs index f746bc8e..2c062c21 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/ServerActionDispatcher.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/ServerActionDispatcher.cs @@ -5,7 +5,7 @@ using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Shared.Models; -namespace AutopilotMonitor.Agent.Core.Monitoring.Core +namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { /// /// Executes server-issued actions delivered via ingest responses. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/SessionPersistence.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/SessionPersistence.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/SessionPersistence.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/SessionPersistence.cs index 7faca1cc..e855319b 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/SessionPersistence.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/SessionPersistence.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace AutopilotMonitor.Agent.Core.Monitoring.Core +namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { /// /// Manages persistent session ID storage to maintain tracking across agent restarts diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/UserProfileResolver.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/UserProfileResolver.cs similarity index 98% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/UserProfileResolver.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/UserProfileResolver.cs index 66985938..0d35edf2 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Collectors/UserProfileResolver.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/UserProfileResolver.cs @@ -2,8 +2,9 @@ using System; using System.Diagnostics; using System.IO; using System.Management; +using AutopilotMonitor.Agent.Core.Monitoring.Collectors; -namespace AutopilotMonitor.Agent.Core.Monitoring.Collectors +namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { /// /// Resolves the custom %LOGGED_ON_USER_PROFILE% token to the logged-on user's profile path. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/UserSessionProcessLauncher.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/UserSessionProcessLauncher.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/UserSessionProcessLauncher.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/UserSessionProcessLauncher.cs index f18a7c06..e97fd0eb 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/UserSessionProcessLauncher.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/UserSessionProcessLauncher.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Agent.Core.Monitoring.Interop; -namespace AutopilotMonitor.Agent.Core.Monitoring.Core +namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { /// /// Launches a process in the logged-in user's desktop session from a SYSTEM context. diff --git a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/VersionCheckEventBuilder.cs b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/VersionCheckEventBuilder.cs similarity index 99% rename from src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/VersionCheckEventBuilder.cs rename to src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/VersionCheckEventBuilder.cs index 07728e68..cfed87d0 100644 --- a/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Core/VersionCheckEventBuilder.cs +++ b/src/Agent/AutopilotMonitor.Agent.Core/Monitoring/Runtime/VersionCheckEventBuilder.cs @@ -5,7 +5,7 @@ using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; using Newtonsoft.Json.Linq; -namespace AutopilotMonitor.Agent.Core.Monitoring.Core +namespace AutopilotMonitor.Agent.Core.Monitoring.Runtime { /// /// Consumes the three self-update marker files written by SelfUpdater on every agent startup diff --git a/src/Agent/AutopilotMonitor.Agent/Program.Configuration.cs b/src/Agent/AutopilotMonitor.Agent/Program.Configuration.cs index 79620fc3..d5e46e82 100644 --- a/src/Agent/AutopilotMonitor.Agent/Program.Configuration.cs +++ b/src/Agent/AutopilotMonitor.Agent/Program.Configuration.cs @@ -5,6 +5,7 @@ using System.Reflection; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Agent.Core.Monitoring.Core; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Shared; using Microsoft.Win32; diff --git a/src/Agent/AutopilotMonitor.Agent/Program.GatherRulesMode.cs b/src/Agent/AutopilotMonitor.Agent/Program.GatherRulesMode.cs index eff7aa6e..1365f059 100644 --- a/src/Agent/AutopilotMonitor.Agent/Program.GatherRulesMode.cs +++ b/src/Agent/AutopilotMonitor.Agent/Program.GatherRulesMode.cs @@ -6,6 +6,7 @@ using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Monitoring.Collectors; using AutopilotMonitor.Agent.Core.Monitoring.Core; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Agent.Core.Monitoring.Network; using AutopilotMonitor.Shared; using AutopilotMonitor.Shared.Models; diff --git a/src/Agent/AutopilotMonitor.Agent/Program.cs b/src/Agent/AutopilotMonitor.Agent/Program.cs index a7399dff..c42af50c 100644 --- a/src/Agent/AutopilotMonitor.Agent/Program.cs +++ b/src/Agent/AutopilotMonitor.Agent/Program.cs @@ -6,6 +6,7 @@ using System.Linq; using AutopilotMonitor.Agent.Core.Configuration; using AutopilotMonitor.Agent.Core.Logging; using AutopilotMonitor.Agent.Core.Monitoring.Core; +using AutopilotMonitor.Agent.Core.Monitoring.Runtime; using AutopilotMonitor.Agent.Core.Security; using AutopilotMonitor.Shared;