Merge remote-tracking branch 'origin/main' into agent-3/issue-32-implement-heartbeat-and-watchdog

# Conflicts:
#	src/MxGateway.Worker/Ipc/WorkerPipeSession.cs
#	src/MxGateway.Worker/MxAccess/MxAccessStaSession.cs

src/MxGateway.Worker/MxAccess/MxAccessStaSession.cs

@@ -11,6 +11,7 @@ public sealed class MxAccessStaSession : IWorkerRuntimeSession
 {
     private readonly IMxAccessComObjectFactory factory;
     private readonly IMxAccessEventSink eventSink;
+    private readonly MxAccessEventQueue eventQueue;
     private readonly StaRuntime staRuntime;
     private StaCommandDispatcher? commandDispatcher;
     private MxAccessSession? session;
@@ -20,7 +21,7 @@ public sealed class MxAccessStaSession : IWorkerRuntimeSession
         : this(
             new StaRuntime(),
             new MxAccessComObjectFactory(),
-            new MxAccessBaseEventSink())
+            new MxAccessEventQueue())
     {
     }
 
@@ -28,13 +29,41 @@ public sealed class MxAccessStaSession : IWorkerRuntimeSession
         StaRuntime staRuntime,
         IMxAccessComObjectFactory factory,
         IMxAccessEventSink eventSink)
+        : this(staRuntime, factory, eventSink, new MxAccessEventQueue())
+    {
+    }
+
+    public MxAccessStaSession(
+        StaRuntime staRuntime,
+        IMxAccessComObjectFactory factory,
+        MxAccessEventQueue eventQueue)
+        : this(staRuntime, factory, new MxAccessBaseEventSink(eventQueue), eventQueue)
+    {
+    }
+
+    public MxAccessStaSession(
+        StaRuntime staRuntime,
+        IMxAccessComObjectFactory factory,
+        IMxAccessEventSink eventSink,
+        MxAccessEventQueue eventQueue)
     {
         this.staRuntime = staRuntime ?? throw new ArgumentNullException(nameof(staRuntime));
         this.factory = factory ?? throw new ArgumentNullException(nameof(factory));
         this.eventSink = eventSink ?? throw new ArgumentNullException(nameof(eventSink));
+        this.eventQueue = eventQueue ?? throw new ArgumentNullException(nameof(eventQueue));
+    }
+
+    public MxAccessEventQueue EventQueue => eventQueue;
+
+    public Task<WorkerReady> StartAsync(
+        int workerProcessId,
+        CancellationToken cancellationToken = default)
+    {
+        return StartAsync(string.Empty, workerProcessId, cancellationToken);
     }
 
     public Task<WorkerReady> StartAsync(
+        string sessionId,
         int workerProcessId,
         CancellationToken cancellationToken = default)
     {
@@ -48,7 +77,7 @@ public sealed class MxAccessStaSession : IWorkerRuntimeSession
                     throw new InvalidOperationException("MXAccess COM session has already been created.");
                 }
 
-                session = MxAccessSession.Create(factory, eventSink);
+                session = MxAccessSession.Create(factory, eventSink, sessionId);
                 commandDispatcher = new StaCommandDispatcher(
                     staRuntime,
                     new MxAccessCommandExecutor(session));
@@ -82,8 +111,8 @@ public sealed class MxAccessStaSession : IWorkerRuntimeSession
         return new WorkerRuntimeHeartbeatSnapshot(
             staRuntime.LastActivityUtc,
             pendingCommandCount,
-            outboundEventQueueDepth: 0,
-            lastEventSequence: 0,
+            (uint)eventQueue.Count,
+            eventQueue.LastEventSequence,
             currentCommandCorrelationId);
     }
 
@@ -92,6 +121,11 @@ public sealed class MxAccessStaSession : IWorkerRuntimeSession
         commandDispatcher?.RequestShutdown();
     }
 
+    public IReadOnlyList<WorkerEvent> DrainEvents(uint maxEvents)
+    {
+        return eventQueue.Drain(maxEvents);
+    }
+
     public Task<IReadOnlyList<RegisteredServerHandle>> GetRegisteredServerHandlesAsync(
         CancellationToken cancellationToken = default)
     {
@@ -118,6 +152,19 @@ public sealed class MxAccessStaSession : IWorkerRuntimeSession
             cancellationToken);
     }
 
+    public Task<IReadOnlyList<RegisteredAdviceHandle>> GetRegisteredAdviceHandlesAsync(
+        CancellationToken cancellationToken = default)
+    {
+        if (session is null)
+        {
+            throw new InvalidOperationException("MXAccess COM session has not been started.");
+        }
+
+        return staRuntime.InvokeAsync(
+            () => session.HandleRegistry.AdviceHandles,
+            cancellationToken);
+    }
+
     public void Dispose()
     {
         if (disposed)