@mflrevan/ucp 0.5.1 → 0.6.0

package/bridge/com.ucp.bridge/Editor/Controllers/PlayModeController.cs

@@ -1,6 +1,4 @@
 using UnityEditor;
-using UnityEditor.SceneManagement;
-using UnityEngine.SceneManagement;
 using System.Collections.Generic;
 using System;
 
@@ -64,7 +62,10 @@ namespace UCP.Bridge
 
             var saveDirtyScenes = GetBoolParam(paramsJson, "saveDirtyScenes", true);
             var discardUntitled = GetBoolParam(paramsJson, "discardUntitled", true);
-            SaveDirtyScenesIfRequested(saveDirtyScenes, discardUntitled);
+            var logFile = GetStringParam(paramsJson, "logFile");
+            EditorModalGuard.SaveOpenDirtyScenes(saveDirtyScenes, discardUntitled);
+            if (!string.IsNullOrEmpty(logFile))
+                LogsController.StartFileCapture(logFile);
 
             lock (s_sessionLock)
             {
@@ -88,38 +89,6 @@ namespace UCP.Bridge
             return defaultValue;
         }
 
-        private static void SaveDirtyScenesIfRequested(bool saveDirtyScenes, bool discardUntitled)
-        {
-            if (!saveDirtyScenes)
-                return;
-
-            var requiresUntitledDiscard = false;
-
-            for (var index = 0; index < SceneManager.sceneCount; index++)
-            {
-                var scene = SceneManager.GetSceneAt(index);
-                if (!scene.isLoaded || !scene.isDirty)
-                    continue;
-
-                if (string.IsNullOrEmpty(scene.path))
-                {
-                    if (!discardUntitled)
-                        throw new System.InvalidOperationException("Dirty untitled scene cannot be auto-saved. Retry with discardUntitled=true.");
-
-                    requiresUntitledDiscard = true;
-                    continue;
-                }
-
-                if (!EditorSceneManager.SaveScene(scene))
-                    throw new System.InvalidOperationException($"Failed to auto-save dirty scene: {scene.path}");
-
-                SceneChangeTracker.ClearScene(scene);
-            }
-
-            if (requiresUntitledDiscard)
-                EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single);
-        }
-
         private static object HandleStop(string paramsJson)
         {
             if (!EditorApplication.isPlaying)
@@ -151,11 +120,21 @@ namespace UCP.Bridge
                         break;
                     case PlayModeStateChange.EnteredEditMode:
                         s_lastExitedPlayAtUtc = DateTime.UtcNow;
+                        LogsController.StopFileCapture();
                         break;
                 }
             }
         }
 
+        private static string GetStringParam(string paramsJson, string key)
+        {
+            var parameters = MiniJson.Deserialize(paramsJson) as Dictionary<string, object>;
+            if (parameters != null && parameters.TryGetValue(key, out var valueObj) && valueObj != null)
+                return valueObj.ToString();
+
+            return null;
+        }
+
         private static object SerializeSessionSnapshot(SessionSnapshot snapshot)
         {
             var now = DateTime.UtcNow;

package/bridge/com.ucp.bridge/Editor/Controllers/PrefabController.cs

@@ -179,8 +179,8 @@ namespace UCP.Bridge
                 ["status"] = "ok",
                 ["path"] = savePath,
                 ["name"] = prefab.name,
-                ["instanceId"] = prefab.GetInstanceID(),
-                ["sceneInstanceId"] = go.GetInstanceID(),
+                ["instanceId"] = prefab.GetId(),
+                ["sceneInstanceId"] = go.GetId(),
                 ["isPrefabInstance"] = PrefabUtility.IsPartOfPrefabInstance(go)
             };
         }
@@ -221,7 +221,7 @@ namespace UCP.Bridge
                 added.Add(new Dictionary<string, object>
                 {
                     ["component"] = ac.instanceComponent.GetType().Name,
-                    ["instanceId"] = ac.instanceComponent.GetInstanceID()
+                    ["instanceId"] = ac.instanceComponent.GetId()
                 });
             }
 

package/bridge/com.ucp.bridge/Editor/Controllers/PropertyController.cs

@@ -538,7 +538,7 @@ namespace UCP.Bridge
 
         private static GameObject FindInHierarchy(GameObject go, int instanceId)
         {
-            if (go.GetInstanceID() == instanceId) return go;
+            if (go.GetId() == instanceId) return go;
             for (int i = 0; i < go.transform.childCount; i++)
             {
                 var found = FindInHierarchy(go.transform.GetChild(i).gameObject, instanceId);

package/bridge/com.ucp.bridge/Editor/Controllers/ReferenceController.cs

@@ -31,7 +31,7 @@ namespace UCP.Bridge
                 {
                     { "serializationMode", mode },
                     { "forceText", mode == 2 },
-                    { "visibleMetaFiles", EditorSettings.externalVersionControl == "Visible Meta Files" }
+                    { "visibleMetaFiles", VersionControlSettings.mode == "Visible Meta Files" }
                 };
             }
             finally

package/bridge/com.ucp.bridge/Editor/Controllers/SceneChangeTracker.cs

@@ -17,7 +17,7 @@ namespace UCP.Bridge
             public HashSet<string> Components = new();
         }
 
-        private static readonly Dictionary<int, Dictionary<string, TrackedSceneChange>> s_changesByScene = new();
+        private static readonly Dictionary<long, Dictionary<string, TrackedSceneChange>> s_changesByScene = new();
 
         static SceneChangeTracker()
         {
@@ -33,7 +33,7 @@ namespace UCP.Bridge
             if (gameObject == null)
                 return;
 
-            RecordSceneChange(gameObject.scene, gameObject.GetInstanceID(), gameObject.name, componentName);
+            RecordSceneChange(gameObject.scene, gameObject.GetId(), gameObject.name, componentName);
         }
 
         public static void RecordDeletedObject(Scene scene, int instanceId, string name, string componentName)
@@ -56,7 +56,7 @@ namespace UCP.Bridge
             var modifications = new List<object>();
             var omittedCount = 0;
 
-            if (scene.IsValid() && s_changesByScene.TryGetValue(scene.handle, out var trackedChanges))
+            if (scene.IsValid() && s_changesByScene.TryGetValue(UnityObjectCompat.GetSceneHandle(scene), out var trackedChanges))
             {
                 var ordered = trackedChanges.Values
                     .OrderBy(change => change.InstanceId.HasValue ? 0 : 1)
@@ -101,7 +101,7 @@ namespace UCP.Bridge
             if (!scene.IsValid())
                 return;
 
-            s_changesByScene.Remove(scene.handle);
+            s_changesByScene.Remove(UnityObjectCompat.GetSceneHandle(scene));
         }
 
         private static UndoPropertyModification[] OnPostprocessModifications(UndoPropertyModification[] modifications)
@@ -140,10 +140,10 @@ namespace UCP.Bridge
             if (!scene.IsValid() || !scene.isLoaded)
                 return;
 
-            if (!s_changesByScene.TryGetValue(scene.handle, out var sceneChanges))
+            if (!s_changesByScene.TryGetValue(UnityObjectCompat.GetSceneHandle(scene), out var sceneChanges))
             {
                 sceneChanges = new Dictionary<string, TrackedSceneChange>();
-                s_changesByScene[scene.handle] = sceneChanges;
+                s_changesByScene[UnityObjectCompat.GetSceneHandle(scene)] = sceneChanges;
             }
 
             var key = instanceId.HasValue ? instanceId.Value.ToString() : $"scene::{name}";

package/bridge/com.ucp.bridge/Editor/Controllers/SceneController.cs

@@ -54,7 +54,7 @@ namespace UCP.Bridge
             }
             else
             {
-                SaveDirtyScenesIfRequested(saveDirtyScenes, discardUntitled);
+                EditorModalGuard.SaveOpenDirtyScenes(saveDirtyScenes, discardUntitled);
                 EditorSceneManager.OpenScene(path, additive ? OpenSceneMode.Additive : OpenSceneMode.Single);
             }
 
@@ -74,38 +74,6 @@ namespace UCP.Bridge
             return defaultValue;
         }
 
-        private static void SaveDirtyScenesIfRequested(bool saveDirtyScenes, bool discardUntitled)
-        {
-            if (!saveDirtyScenes)
-                return;
-
-            var requiresUntitledDiscard = false;
-
-            for (var index = 0; index < SceneManager.sceneCount; index++)
-            {
-                var scene = SceneManager.GetSceneAt(index);
-                if (!scene.isLoaded || !scene.isDirty)
-                    continue;
-
-                if (string.IsNullOrEmpty(scene.path))
-                {
-                    if (!discardUntitled)
-                        throw new System.InvalidOperationException("Dirty untitled scene cannot be auto-saved. Retry with discardUntitled=true.");
-
-                    requiresUntitledDiscard = true;
-                    continue;
-                }
-
-                if (!EditorSceneManager.SaveScene(scene))
-                    throw new System.InvalidOperationException($"Failed to auto-save dirty scene: {scene.path}");
-
-                SceneChangeTracker.ClearScene(scene);
-            }
-
-            if (requiresUntitledDiscard)
-                EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single);
-        }
-
         private static object HandleSaveActive(string paramsJson)
         {
             var scene = SceneManager.GetActiveScene();
@@ -302,7 +270,7 @@ namespace UCP.Bridge
 
         private static GameObject FindInHierarchy(GameObject gameObject, int instanceId)
         {
-            if (gameObject.GetInstanceID() == instanceId)
+            if (gameObject.GetId() == instanceId)
                 return gameObject;
 
             foreach (Transform child in gameObject.transform)

package/bridge/com.ucp.bridge/Editor/Controllers/ShaderController.cs

@@ -0,0 +1,151 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using UnityEditor;
+using UnityEngine;
+
+namespace UCP.Bridge
+{
+    public static class ShaderController
+    {
+        public static void Register(CommandRouter router)
+        {
+            router.Register("shader/errors", HandleErrors);
+        }
+
+        private static object HandleErrors(string paramsJson)
+        {
+            var p = MiniJson.Deserialize(paramsJson) as Dictionary<string, object>;
+            var errorsOnly = p != null && p.TryGetValue("errorsOnly", out var errorsOnlyObj) && errorsOnlyObj != null && Convert.ToBoolean(errorsOnlyObj);
+            var filter = p != null && p.TryGetValue("filter", out var filterObj) && filterObj != null ? filterObj.ToString() : null;
+
+            AssetDatabase.Refresh(ImportAssetOptions.ForceSynchronousImport);
+
+            var diagnostics = new List<object>();
+            var scanned = 0;
+            foreach (var guid in AssetDatabase.FindAssets("t:Shader"))
+            {
+                var path = AssetDatabase.GUIDToAssetPath(guid);
+                var shader = AssetDatabase.LoadAssetAtPath<Shader>(path);
+                if (shader == null)
+                    continue;
+                if (!MatchesFilter(shader.name, path, filter))
+                    continue;
+
+                scanned++;
+                foreach (var diagnostic in ReadShaderDiagnostics(shader, path, errorsOnly))
+                    diagnostics.Add(diagnostic);
+            }
+
+            return new Dictionary<string, object>
+            {
+                ["status"] = "ok",
+                ["capability"] = FindShaderMessageMethod() != null ? "shader-messages" : "fallback",
+                ["scanned"] = scanned,
+                ["count"] = diagnostics.Count,
+                ["diagnostics"] = diagnostics
+            };
+        }
+
+        private static IEnumerable<object> ReadShaderDiagnostics(Shader shader, string path, bool errorsOnly)
+        {
+            var method = FindShaderMessageMethod();
+            if (method == null)
+                yield break;
+
+            var messages = method.Invoke(null, new object[] { shader }) as Array;
+            if (messages == null)
+                yield break;
+
+            foreach (var message in messages)
+            {
+                var isWarning = ReadBoolMember(message, "warning", "isWarning");
+                if (errorsOnly && isWarning)
+                    continue;
+
+                yield return new Dictionary<string, object>
+                {
+                    ["shader"] = shader.name,
+                    ["path"] = path,
+                    ["severity"] = isWarning ? "warning" : "error",
+                    ["message"] = ReadStringMember(message, "message", "messageDetails"),
+                    ["line"] = ReadIntMember(message, "line"),
+                    ["platform"] = ReadStringMember(message, "platform"),
+                    ["file"] = ReadStringMember(message, "file")
+                };
+            }
+        }
+
+        private static MethodInfo FindShaderMessageMethod()
+        {
+            var shaderUtil = typeof(Editor).Assembly.GetType("UnityEditor.ShaderUtil");
+            return FindShaderMethod(shaderUtil, "GetShaderMessages")
+                ?? FindShaderMethod(shaderUtil, "GetShaderErrors");
+        }
+
+        private static MethodInfo FindShaderMethod(Type shaderUtil, string name)
+        {
+            if (shaderUtil == null)
+                return null;
+
+            foreach (var method in shaderUtil.GetMethods(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic))
+            {
+                if (method.Name != name)
+                    continue;
+                var parameters = method.GetParameters();
+                if (parameters.Length == 1 && parameters[0].ParameterType == typeof(Shader))
+                    return method;
+            }
+
+            return null;
+        }
+
+        private static bool MatchesFilter(string shaderName, string path, string filter)
+        {
+            if (string.IsNullOrEmpty(filter))
+                return true;
+            return shaderName.IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0
+                || path.IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0;
+        }
+
+        private static string ReadStringMember(object target, params string[] names)
+        {
+            foreach (var name in names)
+            {
+                var value = ReadMember(target, name);
+                if (value != null)
+                    return value.ToString();
+            }
+
+            return string.Empty;
+        }
+
+        private static int ReadIntMember(object target, string name)
+        {
+            var value = ReadMember(target, name);
+            return value != null ? Convert.ToInt32(value) : 0;
+        }
+
+        private static bool ReadBoolMember(object target, params string[] names)
+        {
+            foreach (var name in names)
+            {
+                var value = ReadMember(target, name);
+                if (value != null)
+                    return Convert.ToBoolean(value);
+            }
+
+            return false;
+        }
+
+        private static object ReadMember(object target, string name)
+        {
+            var type = target.GetType();
+            var field = type.GetField(name, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+            if (field != null)
+                return field.GetValue(target);
+            var property = type.GetProperty(name, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+            return property?.GetValue(target);
+        }
+    }
+}

package/bridge/com.ucp.bridge/Editor/Controllers/ShaderController.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 4cfbd1702c2741b48996b2de530bcb96