refactor subscription logic to leverage existing hooks, code cleanup

Author: jstricklin

Unity-MCP-Plugin/Assets/root/Editor/Scripts/Startup.Editor.cs

@@ -33,24 +33,28 @@ static void OnApplicationUnloading()
             if (UnityMcpPlugin.IsLogActive(LogLevel.Debug))
                 Debug.Log($"{DebugName} OnApplicationUnloading triggered");
             Disconnect();
+            LogUtils.SaveToFile();
         }
         static void OnApplicationQuitting()
         {
             if (UnityMcpPlugin.IsLogActive(LogLevel.Debug))
                 Debug.Log($"{DebugName} OnApplicationQuitting triggered");
             Disconnect();
+            LogUtils.SaveToFile();
         }
         static void OnBeforeAssemblyReload()
         {
             if (UnityMcpPlugin.IsLogActive(LogLevel.Debug))
                 Debug.Log($"{DebugName} OnBeforeAssemblyReload triggered");
             Disconnect();
+            LogUtils.SaveToFile();
         }
         static void OnAfterAssemblyReload()
         {
             if (UnityMcpPlugin.IsLogActive(LogLevel.Debug))
                 Debug.Log($"{DebugName} OnAfterReload triggered - BuildAndStart with openConnection: {!EnvironmentUtils.IsCi()}");
             UnityMcpPlugin.BuildAndStart(openConnectionIfNeeded: !EnvironmentUtils.IsCi());
+            LogUtils.LoadFromFile();
         }
 
         static void OnPlayModeStateChanged(PlayModeStateChange state)

Unity-MCP-Plugin/Assets/root/Runtime/Unity/Logs/LogCache.cs

@@ -7,17 +7,14 @@
 │  See the LICENSE file in the project root for more information.  │
 └──────────────────────────────────────────────────────────────────┘
 */
-#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+#nullable enable
 using System;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Threading;
 using System.Threading.Tasks;
 using com.IvanMurzak.ReflectorNet.Utils;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
 using R3;
 using UnityEngine;
 
@@ -40,18 +37,20 @@ public static class LogCache
         public static void Initialize()
         {
             if (_initialized) return;
+
             var subscription = Observable.Timer(
                 TimeSpan.FromSeconds(1),
                 TimeSpan.FromSeconds(1)
             )
             .Subscribe(x =>
             {
-                Task.Run(() => LogCache.HandleLogCache());
+                Task.Run(HandleLogCache);
             });
+
             _initialized = true;
         }
 
-        public static async void HandleLogCache()
+        public static async Task HandleLogCache()
         {
             if (LogUtils.LogEntries > 0)
             {

Unity-MCP-Plugin/Assets/root/Runtime/Unity/Logs/LogUtils.cs

@@ -7,8 +7,11 @@
 │  See the LICENSE file in the project root for more information.  │
 └──────────────────────────────────────────────────────────────────┘
 */
-#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+#nullable enable
 using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
 using com.IvanMurzak.ReflectorNet.Utils;
 using UnityEngine;
 
@@ -40,6 +43,16 @@ public static void ClearLogs()
             }
         }
 
+        public static void SaveToFile()
+        {
+            Task.Run(async () => await LogCache.CacheLogEntriesAsync(_logEntries.ToArray()));
+        }
+
+        public static void LoadFromFile()
+        {
+            Task.Run(async () => _logEntries = await LogCache.GetCachedLogEntriesAsync());
+        }
+
         public static LogEntry[] GetAllLogs()
         {
             lock (_lockObject)
@@ -55,7 +68,7 @@ static LogUtils()
 
         public static void EnsureSubscribed()
         {
-            MainThread.Instance.RunAsync(async () =>
+            MainThread.Instance.RunAsync(() =>
             {
                 lock (_lockObject)
                 {
@@ -66,7 +79,6 @@ public static void EnsureSubscribed()
                         _isSubscribed = true;
                     }
                 }
-                _logEntries = await LogCache.GetCachedLogEntriesAsync();
             });
         }
 

Unity-MCP-Plugin/Assets/root/Runtime/Unity/Logs/LogWrapper.cs

@@ -7,13 +7,13 @@
 │  See the LICENSE file in the project root for more information.  │
 └──────────────────────────────────────────────────────────────────┘
 */
-#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+#nullable enable
 
 namespace com.IvanMurzak.Unity.MCP
 {
     [System.Serializable]
     internal class LogWrapper
     {
-        public LogEntry[] entries;
+        public LogEntry[]? entries;
     }
 }

Unity-MCP-Plugin/Assets/root/Tests/Editor/Tool/Console/TestToolConsoleIntegration.cs

@@ -270,7 +270,7 @@ public IEnumerator GetLogs_Validate_ConsoleLogRetention()
             }
             LogUtils.ClearLogs();
             Assert.AreEqual(0, LogUtils.LogEntries, "Log entries and Log Cache count should be empty.");
-            LogUtils.EnsureSubscribed();
+            LogUtils.LoadFromFile();
             for (int i = 0; i < 10000; i++)
             {
                 yield return null;