Merge pull request #38 from notargs/brush_up_get_logs

Implement GetCurrentConsoleLogs & ClearConsoleLogs

Author: notargs

README.ja.md

@@ -49,7 +49,8 @@ Node.jsで実装された、MCPクライアントとUnity間の通信を中継
 現在、次のMCPツールが実装されています。
 
 - **RefreshAssets**: Unity Editorのアセットを更新
-- **GetLogHistory**: Unity Consoleのログ履歴を取得
+- **GetCurrentConsoleLogs**: Unity Consoleのログを取得
+- **ClearConsoleLogs**: Unity Consoleのログをクリア
 
 ## Installation
 

README.md

@@ -49,7 +49,8 @@ A Unity project for functional verification and as a sample.
 Currently, the following MCP tools are implemented:
 
 - **RefreshAssets**: Refresh Unity Editor assets
-- **GetLogHistory**: Get Unity Console log history
+- **GetCurrentConsoleLogs**: Get Unity Console log history
+- **ClearConsoleLogs**: Clear Unity Console logs
 
 ## Installation
 

UnityNaturalMCPServer/Editor/McpServerRunner.cs

@@ -14,7 +14,6 @@ internal static class McpServerRunner
         [InitializeOnLoadMethod]
         private static void Init()
         {
-            LogCollector.Initialize();
             var cancellationTokenSource = new CancellationTokenSource();
             cancellationTokenSource.AddTo(Application.exitCancellationToken);
             _mcpServerApplication = new McpServerApplication();

UnityNaturalMCPServer/Editor/McpTools/LogCollector.cs

@@ -0,0 +1,4 @@
+namespace UnityNaturalMCP.Editor.McpTools
+{
+    internal record LogEntry(string Condition, string Type);
+}

UnityNaturalMCPServer/Editor/McpTools/LogCollector.cs.meta

@@ -0,0 +1,30 @@
+using System;
+
+namespace UnityNaturalMCP.Editor.McpTools
+{
+    [Flags]
+    internal enum LogMessageFlags : int
+    {
+        NoLogMessageFlags = 0,
+        Error = 1 << 0,
+        Assert = 1 << 1,
+        Log = 1 << 2,
+        Fatal = 1 << 4,
+        AssetImportError = 1 << 6,
+        AssetImportWarning = 1 << 7,
+        ScriptingError = 1 << 8,
+        ScriptingWarning = 1 << 9,
+        ScriptingLog = 1 << 10,
+        ScriptCompileError = 1 << 11,
+        ScriptCompileWarning = 1 << 12,
+        StickyLog = 1 << 13,
+        MayIgnoreLineNumber = 1 << 14,
+        ReportBug = 1 << 15,
+        DisplayPreviousErrorInStatusBar = 1 << 16,
+        ScriptingException = 1 << 17,
+        DontExtractStacktrace = 1 << 18,
+        ScriptingAssertion = 1 << 21,
+        StacktraceIsPostprocessed = 1 << 22,
+        IsCalledFromManaged = 1 << 23
+    }
+}

UnityNaturalMCPServer/Editor/McpTools/LogEntry.cs

@@ -1,10 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using Cysharp.Threading.Tasks;
 using ModelContextProtocol.Server;
 using UnityEditor;
 using UnityEngine;
+using Assert = UnityEngine.Assertions.Assert;
 
 namespace UnityNaturalMCP.Editor.McpTools
 {
@@ -14,30 +19,119 @@ internal sealed class McpUnityEditorTool
         [McpServerTool, Description("Execute AssetDatabase.Refresh")]
         public async UniTask RefreshAssets()
         {
-            await UniTask.SwitchToMainThread();
-            AssetDatabase.Refresh();
+            try
+            {
+                await UniTask.SwitchToMainThread();
+                AssetDatabase.Refresh();
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+                throw;
+            }
         }
-        [McpServerTool, Description("Get log history.")]
-        public IReadOnlyList<LogEntry> GetLogHistory(
-            [Description("Filter logs by type. Valid values: \"All\", \"Error\", \"Assert\", \"Warning\", \"Exception\"")]
-            string logType)
+
+        [McpServerTool, Description("Get current console logs. Recommend calling ClearConsoleLogs beforehand.")]
+        public async Task<IReadOnlyList<LogEntry>> GetCurrentConsoleLogs(
+            [Description(
+                "Filter logs by type. Valid values: \"\"(Maches all logs), \"error\", \"warning\", \"log\", \"compile-error\"(This is all you need to check for compilation errors.), \"compile-warning\"")]
+            string logType = "",
+            [Description("Filter by regex. If empty, all logs are returned.")]
+            string filter = "",
+            [Description("Log count limit. Set to 0 for no limit(Not recommended).")]
+            int maxCount = 20,
+            [Description("Get only first line of the log message. If false, the whole message is returned.(To save tokens, recommend calling this with true.)")]
+            bool onlyFirstLine = true,
+            [Description(
+                "If true, the logs will be sorted by time in chronological order(oldest first). If false, newest first.")]
+            bool isChronological = false)
         {
-            if (logType.ToLower() == "all")
+            try
+            {
+                await UniTask.SwitchToMainThread();
+                var logTypeToLower = logType.ToLower();
+                var logs = new List<LogEntry>();
+                var logEntries = Type.GetType("UnityEditor.LogEntries,UnityEditor.dll");
+                Assert.IsNotNull(logEntries);
+
+                var getCountMethod = logEntries.GetMethod("GetCount", BindingFlags.Public | BindingFlags.Static);
+                var getEntryInternalMethod = logEntries.GetMethod("GetEntryInternal", BindingFlags.Public | BindingFlags.Static);
+
+                Assert.IsNotNull(getCountMethod);
+                Assert.IsNotNull(getEntryInternalMethod);
+
+                var count = (int)getCountMethod.Invoke(null, null);
+
+                for (var i = 0; i < count; i++)
+                {
+                    var logEntryType = Type.GetType("UnityEditor.LogEntry,UnityEditor.dll");
+                    Assert.IsNotNull(logEntryType);
+
+                    var logEntry = Activator.CreateInstance(logEntryType);
+
+                    getEntryInternalMethod.Invoke(null, new[] { i, logEntry });
+
+                    var message = logEntry.GetType().GetField("message").GetValue(logEntry) as string ?? "";
+                    var file = logEntry.GetType().GetField("file").GetValue(logEntry) as string ?? "";
+                    var mode = (int)logEntry.GetType().GetField("mode").GetValue(logEntry);
+                    var logTypeValue = UnityInternalLogModeToLogType(mode);
+
+                    if ((string.IsNullOrEmpty(logTypeToLower) || logTypeValue.Equals(logTypeToLower))
+                        && (string.IsNullOrEmpty(filter) || Regex.IsMatch(message, filter)))
+                    {
+                        logs.Add(new LogEntry(onlyFirstLine ? message.Split('\n')[0] : message, logTypeValue));
+                    }
+                }
+
+                if (!isChronological)
+                {
+                    logs = ((IEnumerable<LogEntry>)logs).Reverse().ToList();
+                }
+
+                if (maxCount > 0)
+                {
+                    logs = logs.Take(maxCount).ToList();
+                }
+
+                return logs;
+            }
+            catch (Exception e)
             {
-                return LogCollector.LogHistory;
+                Debug.LogError(e);
+                throw;
             }
+        }
+
+        [McpServerTool, Description("Clear console logs. It is recommended to call it before GetCurrentConsoleLogs.")]
+        public async Task ClearConsoleLogs()
+        {
+            try
+            {
+                await UniTask.SwitchToMainThread();
+                var logEntries = Type.GetType("UnityEditor.LogEntries,UnityEditor.dll");
+                Assert.IsNotNull(logEntries);
+
+                var clearMethod = logEntries.GetMethod("Clear", BindingFlags.Public | BindingFlags.Static);
 
-            var logTypeEnum = logType.ToLower() switch
+                Assert.IsNotNull(clearMethod);
+
+                clearMethod.Invoke(null, null);
+            }
+            catch (Exception e)
             {
-                "error" => LogType.Error,
-                "assert" => LogType.Assert,
-                "warning" => LogType.Warning,
-                "log" => LogType.Log,
-                "exception" => LogType.Exception,
-                _ => throw new ArgumentOutOfRangeException(nameof(logType), logType, null)
-            };
-
-            return LogCollector.GetLogHistory(logTypeEnum);
+                Debug.LogError(e);
+                throw;
+            }
         }
+
+        private string UnityInternalLogModeToLogType(int mode) => mode switch
+        {
+            _ when (mode & (int)LogMessageFlags.ScriptingError) != 0 => "error",
+            _ when (mode & (int)LogMessageFlags.ScriptingWarning) != 0 => "warning",
+            _ when (mode & (int)LogMessageFlags.ScriptingLog) != 0 => "log",
+            _ when (mode & (int)LogMessageFlags.ScriptCompileError) != 0 => "compile-error",
+            _ when (mode & (int)LogMessageFlags.ScriptCompileWarning) != 0 => "compile-warning",
+            _ => "unknown"
+        };
     }
 }