@alpsckr/unitycli 0.4.4 → 0.5.0

package/unitypkg/Editor/Tools/{go → game-object}/modify.cs

@@ -7,7 +7,7 @@ using UnityEngine;
 namespace UnityCli
 {
     /// <summary>
-    /// go.modify — 修改一个或多个 GameObject 的名称/active/标签/层/绝对变换。
+    /// game-object.modify — 修改一个或多个 GameObject 的名称/active/标签/层/绝对变换。
     /// </summary>
     public class GameObjectModifyTool : IUnityCliTool<GameObjectModifyTool.Request, GameObjectModifyTool.Result>
     {
@@ -41,10 +41,10 @@ namespace UnityCli
 
         public ToolDescriptor Describe() => new()
         {
-            Name = "go.modify",
+            Name = "game-object.modify",
             Summary = "Modify one or more GameObjects' name, active state, tag, layer, absolute transform values, or parent.",
             Description = "Modify one or more GameObjects' name, active state, tag, layer, absolute transform values, or parent. Pass target for one object or targets[] to apply the same mutation to multiple objects in one all-or-none call; every target must resolve uniquely before any scene object is changed.",
-            Group = "go",
+            Group = "game-object",
             DestructiveHint = false,
             SideEffects = new[] { "scene-modify", "undo-stack" },
             Target = "editor",
@@ -60,7 +60,7 @@ namespace UnityCli
 
         public System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request request, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
-            GameObjectToolSupport.EnsureEditorNotBusy("go.modify");
+            GameObjectToolSupport.EnsureEditorNotBusy("game-object.modify");
             // 先完整校验,避免前半成功后半失败的部分写入
             GameObjectToolSupport.ValidateMutationInputs(request.TagValue, request.LayerValue);
             GameObjectToolSupport.ValidateTransformMutationValues(request.X, request.Y, request.Z, request.RotationX, request.RotationY, request.RotationZ, request.ScaleX, request.ScaleY, request.ScaleZ);
@@ -77,7 +77,7 @@ namespace UnityCli
                 }
             }
             ctx.CommitEffect();
-            var undoGroup = UnityCliSceneMutation.BeginUndoGroup("go.modify");
+            var undoGroup = UnityCliSceneMutation.BeginUndoGroup("game-object.modify");
             try
             {
                 var details = new List<GameObjectDetail>();
@@ -86,8 +86,8 @@ namespace UnityCli
                 {
                     var gameObject = EditorUtility.InstanceIDToObject(plan.Id) as GameObject;
                     if (gameObject == null) throw new UnityCliBridge.BridgeCommandException("E_TARGET_NOT_FOUND", "GameObject disappeared before modification.", "Retry after the Editor is idle.");
-                    UnityCliSceneMutation.RecordObject(gameObject.transform, "go.modify");
-                    UnityCliSceneMutation.RecordObject(gameObject, "go.modify");
+                    UnityCliSceneMutation.RecordObject(gameObject.transform, "game-object.modify");
+                    UnityCliSceneMutation.RecordObject(gameObject, "game-object.modify");
                     GameObjectToolSupport.ApplyGameObjectMutations(gameObject, request.NewName, request.Active, request.TagValue, request.LayerValue,
                         request.X, request.Y, request.Z, request.RotationX, request.RotationY, request.RotationZ, request.ScaleX, request.ScaleY, request.ScaleZ);
                     if (parent != null) gameObject.transform.SetParent(parent.transform, true);
@@ -99,7 +99,7 @@ namespace UnityCli
                     if (observed == null || !MatchesRequest(observed, request) || (request.Parent != null && (observed.transform.parent == null || observed.transform.parent.GetInstanceID() != parentId)))
                         throw new UnityCliBridge.BridgeCommandException("E_GO_MODIFY_STATE_MISMATCH", "GameObject did not satisfy the requested mutation after write.", "Inspect the scene object and retry after the Editor is idle.");
                     details.Add(GameObjectToolSupport.BuildGameObjectDetail(observed));
-                    effects.Add(new GameObjectPlannedEffect { Type = "go.modify", Target = GameObjectToolSupport.HierarchyPath(observed) });
+                    effects.Add(new GameObjectPlannedEffect { Type = "game-object.modify", Target = GameObjectToolSupport.HierarchyPath(observed) });
                 }
                 if (details.Count == 1) return new System.Threading.Tasks.ValueTask<Result>(new Result { GameObject = details[0], ModifiedCount = 1, PlannedEffects = effects });
                 return new System.Threading.Tasks.ValueTask<Result>(new Result { GameObjects = details, ModifiedCount = details.Count, PlannedEffects = effects });
@@ -107,7 +107,7 @@ namespace UnityCli
             finally { UnityCliSceneMutation.EndUndoGroup(undoGroup); }
         }
 
-        // go.modify 支持 targets[] 批量修改;先完整解析,避免部分写入
+        // game-object.modify 支持 targets[] 批量修改;先完整解析,避免部分写入
         private sealed class ModifyPlan { public int Id { get; set; } }
 
         private static bool MatchesRequest(GameObject observed, Request request)

package/unitypkg/Editor/Tools/{go → game-object}/move-relative.cs

@@ -7,7 +7,7 @@ using UnityEngine;
 namespace UnityCli
 {
     /// <summary>
-    /// go.move-relative — 按 XYZ 偏移移动 GameObject,不替换绝对变换。
+    /// game-object.move-relative — 按 XYZ 偏移移动 GameObject,不替换绝对变换。
     /// </summary>
     public class GameObjectMoveRelativeTool : IUnityCliTool<GameObjectMoveRelativeTool.Request, GameObjectMoveRelativeTool.Result>
     {
@@ -27,10 +27,10 @@ namespace UnityCli
 
         public ToolDescriptor Describe() => new()
         {
-            Name = "go.move-relative",
+            Name = "game-object.move-relative",
             Summary = "Move a GameObject by a relative XYZ offset without replacing its absolute transform.",
-            Description = "Move a GameObject by a relative XYZ offset without replacing its absolute transform. Use go.modify when you need absolute position; prefer hierarchy paths or instance ids after create/duplicate operations.",
-            Group = "go",
+            Description = "Move a GameObject by a relative XYZ offset without replacing its absolute transform. Use game-object.modify when you need absolute position; prefer hierarchy paths or instance ids after create/duplicate operations.",
+            Group = "game-object",
             DestructiveHint = false,
             SideEffects = new[] { "scene-modify", "undo-stack" },
             Target = "editor",
@@ -45,7 +45,7 @@ namespace UnityCli
 
         public System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request request, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
-            GameObjectToolSupport.EnsureEditorNotBusy("go.move-relative");
+            GameObjectToolSupport.EnsureEditorNotBusy("game-object.move-relative");
             if (string.IsNullOrEmpty(request.Target))
             {
                 throw new UnityCliBridge.BridgeCommandException("E_TARGET_NOT_FOUND", "GameObject move-relative requires a target.", "Pass a GameObject name, hierarchy path or instance id.");
@@ -57,7 +57,7 @@ namespace UnityCli
             // 以写入前位置加请求偏移冻结期望值，不能用写后旧引用自证。
             var expectedPosition = gameObject.transform.position + offset;
             ctx.CommitEffect();
-            UnityCliSceneMutation.RecordObject(gameObject.transform, "go.move-relative");
+            UnityCliSceneMutation.RecordObject(gameObject.transform, "game-object.move-relative");
             gameObject.transform.position = expectedPosition;
             UnityCliSceneMutation.MarkSceneDirty(gameObject.scene);
             var observed = EditorUtility.InstanceIDToObject(gameObjectId) as GameObject;
@@ -66,7 +66,7 @@ namespace UnityCli
             return new System.Threading.Tasks.ValueTask<Result>(new Result
             {
                 GameObject = GameObjectToolSupport.BuildGameObjectDetail(observed),
-                PlannedEffects = new List<GameObjectPlannedEffect> { new GameObjectPlannedEffect { Type = "go.move-relative", Target = GameObjectToolSupport.HierarchyPath(gameObject) } }
+                PlannedEffects = new List<GameObjectPlannedEffect> { new GameObjectPlannedEffect { Type = "game-object.move-relative", Target = GameObjectToolSupport.HierarchyPath(gameObject) } }
             });
         }
     }

package/unitypkg/Editor/Tools/{scene/move-object.cs → game-object/move-to-scene.cs}

@@ -7,9 +7,9 @@ using UnityEngine.SceneManagement;
 namespace UnityCli
 {
     /// <summary>
-    /// scene.move-object — 将 GameObject 移动到另一个已加载场景。
+    /// game-object.move-to-scene — 将 GameObject 移动到另一个已加载场景。
     /// </summary>
-    public class SceneMoveObjectTool : IUnityCliTool<SceneMoveObjectTool.Request, SceneMoveObjectTool.Result>
+    public class GameObjectMoveToSceneTool : IUnityCliTool<GameObjectMoveToSceneTool.Request, GameObjectMoveToSceneTool.Result>
     {
         public sealed class Request
         {
@@ -32,10 +32,10 @@ namespace UnityCli
 
         public ToolDescriptor Describe() => new()
         {
-            Name = "scene.move-object",
+            Name = "game-object.move-to-scene",
             Summary = "Move a GameObject from its current scene into another already-loaded scene.",
             Description = "Move a GameObject (resolved by target path or instanceId) into another already-loaded destination scene (--scene path). Useful for multi-scene editing. Requires the destination scene to be loaded (scene.load); returns moved=false if the object is already in the destination.",
-            Group = "scene",
+            Group = "game-object",
             DestructiveHint = false,
             SupportsDryRun = true,
             SideEffects = new[] { "scene-modify" },
@@ -52,13 +52,13 @@ namespace UnityCli
         // 移动对象后读取场景标识，确保返回的是已生效的场景归属。
         public System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request request, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
-            SceneToolSupport.EnsureEditorNotBusy("scene.move-object");
+            SceneToolSupport.EnsureEditorNotBusy("game-object.move-to-scene");
             var target = request.Target ?? request.Path;
             var instanceId = request.InstanceId;
             var destScenePath = request.Scene;
             if (string.IsNullOrEmpty(destScenePath))
             {
-                throw new UnityCliBridge.BridgeCommandException("E_SCENE_DESTINATION_REQUIRED", "scene.move-object requires --scene (destination scene path).", "Run tools run scene.list-opened to list loaded scenes.");
+                throw new UnityCliBridge.BridgeCommandException("E_SCENE_DESTINATION_REQUIRED", "game-object.move-to-scene requires --scene (destination scene path).", "Run tools run scene.list-opened to list loaded scenes.");
             }
             GameObject go = null;
             if (instanceId.HasValue && instanceId.Value != 0)
@@ -96,7 +96,7 @@ namespace UnityCli
                     DryRun = true,
                     PlannedEffects = new List<ScenePlannedEffect>
                     {
-                        new ScenePlannedEffect { Type = "scene.move-object", Target = go.name }
+                        new ScenePlannedEffect { Type = "game-object.move-to-scene", Target = go.name }
                     }
                 });
             }

package/unitypkg/Editor/Tools/{go → game-object}/set-parent.cs

@@ -7,7 +7,7 @@ using UnityEngine;
 namespace UnityCli
 {
     /// <summary>
-    /// go.set-parent — 将 GameObject 重新父级化到另一个 GameObject 或脱离到场景根。支持 dryRun。
+    /// game-object.set-parent — 将 GameObject 重新父级化到另一个 GameObject 或脱离到场景根。支持 dryRun。
     /// </summary>
     public class GameObjectSetParentTool : IUnityCliTool<GameObjectSetParentTool.Request, GameObjectSetParentTool.Result>
     {
@@ -26,10 +26,10 @@ namespace UnityCli
 
         public ToolDescriptor Describe() => new()
         {
-            Name = "go.set-parent",
+            Name = "game-object.set-parent",
             Summary = "Reparent a GameObject under another GameObject or detach it to the scene root.",
             Description = "Reparent a GameObject under another GameObject or detach it to the scene root. Prefer hierarchy paths or instance ids for target and parent; plain names can be ambiguous after duplicate/create operations. Use --dry-run first for hierarchy work; worldPositionStays defaults to true.",
-            Group = "go",
+            Group = "game-object",
             DestructiveHint = false,
             SupportsDryRun = true,
             SideEffects = new[] { "scene-modify", "undo-stack", "hierarchy-reparent" },
@@ -46,12 +46,12 @@ namespace UnityCli
 
         public System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request request, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
-            GameObjectToolSupport.EnsureEditorNotBusy("go.set-parent");
+            GameObjectToolSupport.EnsureEditorNotBusy("game-object.set-parent");
             if (string.IsNullOrEmpty(request.Target))
             {
-                throw new UnityCliBridge.BridgeCommandException("E_TARGET_NOT_FOUND", "go.set-parent requires a target.", "Pass a GameObject name, hierarchy path or instance id.");
+                throw new UnityCliBridge.BridgeCommandException("E_TARGET_NOT_FOUND", "game-object.set-parent requires a target.", "Pass a GameObject name, hierarchy path or instance id.");
             }
-            var gameObject = GameObjectToolSupport.ResolveUniqueTarget(request.Target, "go.set-parent requires a target.");
+            var gameObject = GameObjectToolSupport.ResolveUniqueTarget(request.Target, "game-object.set-parent requires a target.");
             var parentName = request.Parent;
             var worldPositionStays = request.WorldPositionStays ?? true;
             var newParent = string.IsNullOrEmpty(parentName) ? null : GameObjectToolSupport.ResolveUniqueTarget(parentName, "Parent GameObject is required.").transform;
@@ -64,11 +64,11 @@ namespace UnityCli
                 return new System.Threading.Tasks.ValueTask<Result>(new Result
                 {
                     DryRun = true,
-                    PlannedEffects = new List<GameObjectPlannedEffect> { new GameObjectPlannedEffect { Type = "go.set-parent", Parent = parentName ?? "<root>" } }
+                    PlannedEffects = new List<GameObjectPlannedEffect> { new GameObjectPlannedEffect { Type = "game-object.set-parent", Parent = parentName ?? "<root>" } }
                 });
             }
             ctx.CommitEffect();
-            UnityCliSceneMutation.SetParent(gameObject.transform, newParent, "go.set-parent", worldPositionStays);
+            UnityCliSceneMutation.SetParent(gameObject.transform, newParent, "game-object.set-parent", worldPositionStays);
             UnityCliSceneMutation.MarkSceneDirty(gameObject.scene);
             var observed = EditorUtility.InstanceIDToObject(targetId) as GameObject;
             var observedParent = parentId == 0 ? null : EditorUtility.InstanceIDToObject(parentId) as Transform;
@@ -76,7 +76,7 @@ namespace UnityCli
                 throw new UnityCliBridge.BridgeCommandException("E_GO_SET_PARENT_STATE_MISMATCH", "GameObject hierarchy did not match the requested parent after write.", "Inspect the hierarchy and retry after the Editor is idle.");
             return new System.Threading.Tasks.ValueTask<Result>(new Result
             {
-                PlannedEffects = new List<GameObjectPlannedEffect> { new GameObjectPlannedEffect { Type = "go.set-parent" } }
+                PlannedEffects = new List<GameObjectPlannedEffect> { new GameObjectPlannedEffect { Type = "game-object.set-parent" } }
             });
         }
     }

package/unitypkg/Editor/Tools/{graphics/bake-cancel.cs → lighting/bake/cancel.cs}

@@ -6,12 +6,12 @@ using UnityEngine.SceneManagement;
 
 namespace UnityCli
 {
-    /// <summary>graphics.bake-cancel — 取消正在运行的光照烘焙。</summary>
-    public class GraphicsBakeCancelTool : IUnityCliTool<GraphicsBakeCancelTool.Request, GraphicsBakeCancelTool.Result>
+    /// <summary>lighting.bake.cancel — 取消正在运行的光照烘焙。</summary>
+    public class LightingBakeCancelTool : IUnityCliTool<LightingBakeCancelTool.Request, LightingBakeCancelTool.Result>
     {
         public sealed class Request { }
         public sealed class Result { public bool Baking { get; set; } public bool Cancelled { get; set; } public List<GraphicsPlannedEffect> PlannedEffects { get; set; } }
-        public ToolDescriptor Describe() => new() { Name = "graphics.bake-cancel", Summary = "Cancel a running lightmap bake.", Description = "Cancel the active Lightmapping bake if one is running. Returns cancelled=true only when a bake was in progress.", Group = "graphics",DestructiveHint = false, SideEffects = new[] { "lightmapping-bake-cancel" }, Target = "editor", PlayModeSupport = "editor-only", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Cancel bake", Input = new Request { } } } };
+        public ToolDescriptor Describe() => new() { Name = "lighting.bake.cancel", Summary = "Cancel a running lightmap bake.", Description = "Cancel the active Lightmapping bake if one is running. Returns cancelled=true only when a bake was in progress.", Group = "lighting",DestructiveHint = false, SideEffects = new[] { "lightmapping-bake-cancel" }, Target = "editor", PlayModeSupport = "editor-only", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Cancel bake", Input = new Request { } } } };
         public async System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request r, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
             var wasRunning = Lightmapping.isRunning;
@@ -20,7 +20,7 @@ namespace UnityCli
             var observed = await ctx.Wait.UntilStable(() => !Lightmapping.isRunning, System.TimeSpan.FromMilliseconds(ctx.TimeoutMs), ct: ct);
             if (!observed) throw new UnityCliBridge.BridgeCommandException("E_BAKE_CANCEL_TIMEOUT", "Lightmapping did not leave the baking state before timeout.", "Wait for the current bake to finish or inspect Unity Console before retrying.");
             var baking = Lightmapping.isRunning;
-            return new Result { Baking = baking, Cancelled = wasRunning, PlannedEffects = new List<GraphicsPlannedEffect> { new GraphicsPlannedEffect { Type = "graphics.bake-cancel", Property = "bake", Value = "cancelled" } } };
+            return new Result { Baking = baking, Cancelled = wasRunning, PlannedEffects = new List<GraphicsPlannedEffect> { new GraphicsPlannedEffect { Type = "lighting.bake.cancel", Property = "bake", Value = "cancelled" } } };
         }
     }
 }

package/unitypkg/Editor/Tools/{graphics/bake-clear.cs → lighting/bake/clear.cs}

@@ -6,12 +6,12 @@ using UnityEngine.SceneManagement;
 
 namespace UnityCli
 {
-    /// <summary>graphics.bake-clear — 清除光照烘焙数据。</summary>
-    public class GraphicsBakeClearTool : IUnityCliTool<GraphicsBakeClearTool.Request, GraphicsBakeClearTool.Result>
+    /// <summary>lighting.bake.clear — 清除光照烘焙数据。</summary>
+    public class LightingBakeClearTool : IUnityCliTool<LightingBakeClearTool.Request, LightingBakeClearTool.Result>
     {
         public sealed class Request { public bool? BakedData { get; set; } public bool? RealtimeData { get; set; } }
         public sealed class Result { public bool ClearedBakedData { get; set; } public bool ClearedRealtimeData { get; set; } public List<GraphicsPlannedEffect> PlannedEffects { get; set; } }
-        public ToolDescriptor Describe() => new() { Name = "graphics.bake-clear", Summary = "Clear the observable baked lighting data asset.", Description = "Clear the baked lighting data asset and verify Lightmapping.lightingDataAsset is null. realtimeData=true is rejected because Unity exposes no reliable realtime-data completion readback.", Group = "graphics",DestructiveHint = true, SideEffects = new[] { "bake" }, Target = "editor", PlayModeSupport = "editor-only", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Clear baked lighting data", Input = new Request { BakedData = true } } } };
+        public ToolDescriptor Describe() => new() { Name = "lighting.bake.clear", Summary = "Clear the observable baked lighting data asset.", Description = "Clear the baked lighting data asset and verify Lightmapping.lightingDataAsset is null. realtimeData=true is rejected because Unity exposes no reliable realtime-data completion readback.", Group = "lighting",DestructiveHint = true, SideEffects = new[] { "bake" }, Target = "editor", PlayModeSupport = "editor-only", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Clear baked lighting data", Input = new Request { BakedData = true } } } };
         // 清除可验证的烘焙数据，并拒绝无法可靠证明的实时数据请求。
         public System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request r, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
@@ -24,7 +24,7 @@ namespace UnityCli
             var observedBakedCleared = Lightmapping.lightingDataAsset == null;
             if (clearedBaked && !observedBakedCleared)
                 throw new UnityCliBridge.BridgeCommandException("E_GRAPHICS_BAKED_CLEAR_STATE_MISMATCH", "Unity still exposes a baked lighting data asset after clearing.", "Inspect the Lighting window and retry after the Editor is idle.");
-            return new System.Threading.Tasks.ValueTask<Result>(new Result { ClearedBakedData = clearedBaked && observedBakedCleared, ClearedRealtimeData = false, PlannedEffects = new List<GraphicsPlannedEffect> { new GraphicsPlannedEffect { Type = "graphics.bake-clear", Property = "lightingData", Value = "cleared" } } });
+            return new System.Threading.Tasks.ValueTask<Result>(new Result { ClearedBakedData = clearedBaked && observedBakedCleared, ClearedRealtimeData = false, PlannedEffects = new List<GraphicsPlannedEffect> { new GraphicsPlannedEffect { Type = "lighting.bake.clear", Property = "lightingData", Value = "cleared" } } });
         }
     }
 }

package/unitypkg/Editor/Tools/{graphics/bake-reflection-probe.cs → lighting/bake/reflection-probe.cs}

@@ -5,11 +5,11 @@ using UnityEditor;
 using UnityEngine;
 namespace UnityCli
 {
-    public class GraphicsBakeReflectionProbeTool : IUnityCliTool<GraphicsBakeReflectionProbeTool.Request, GraphicsBakeReflectionProbeTool.Result>
+    public class LightingBakeReflectionProbeTool : IUnityCliTool<LightingBakeReflectionProbeTool.Request, LightingBakeReflectionProbeTool.Result>
     {
         public sealed class Request { public string Target { get; set; } public string Path { get; set; } }
         public sealed class Result { public ReflectionProbeInfo Probe { get; set; } public bool Baked { get; set; } public string ArtifactPath { get; set; } public long SizeBytes { get; set; } public string Sha256 { get; set; } public List<GraphicsPlannedEffect> PlannedEffects { get; set; } }
-        public ToolDescriptor Describe() => new() { Name = "graphics.bake-reflection-probe", Summary = "Bake a single ReflectionProbe to an .exr cubemap asset.", Description = "Bake a ReflectionProbe to an .exr path. The parent Assets folder must already exist; a missing parent fails before Unity starts the bake.", Group = "graphics",DestructiveHint = true, SideEffects = new[] { "bake", "asset-write" }, Target = "editor", PlayModeSupport = "editor-only", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Bake one reflection probe", Input = new Request { Target = "ReflectionProbe", Path = "Assets/Reflections/ReflectionProbe.exr" } } } };
+        public ToolDescriptor Describe() => new() { Name = "lighting.bake.reflection-probe", Summary = "Bake a single ReflectionProbe to an .exr cubemap asset.", Description = "Bake a ReflectionProbe to an .exr path. The parent Assets folder must already exist; a missing parent fails before Unity starts the bake.", Group = "lighting",DestructiveHint = true, SideEffects = new[] { "bake", "asset-write" }, Target = "editor", PlayModeSupport = "editor-only", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Bake one reflection probe", Input = new Request { Target = "ReflectionProbe", Path = "Assets/Reflections/ReflectionProbe.exr" } } } };
         public System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request r, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
             var probe = PhysicsToolSupport.ResolveReflectionProbe(r.Target); if (probe == null) throw new UnityCliBridge.BridgeCommandException("E_REFLECTION_PROBE_NOT_FOUND", "ReflectionProbe not found: " + r.Target, "Pass an existing ReflectionProbe target.");
@@ -28,7 +28,7 @@ namespace UnityCli
             if (!exr) throw new UnityCliBridge.BridgeCommandException("E_REFLECTION_PROBE_BAKE_ARTIFACT_INVALID", "Bake did not write a valid EXR artifact.", "Use an .exr output path.");
             if (oldExists && oldDigest == digest) throw new UnityCliBridge.BridgeCommandException("E_REFLECTION_PROBE_BAKE_ARTIFACT_UNPROVEN", "The EXR digest did not change, so this bake cannot be attributed to this request.", "Choose a new output path or remove the old artifact before retrying.");
             if (info.LastWriteTimeUtc < started || info.Length != bytes.LongLength) throw new UnityCliBridge.BridgeCommandException("E_REFLECTION_PROBE_BAKE_ARTIFACT_UNPROVEN", "The EXR metadata cannot be attributed to this request.", "Choose a new output path and retry.");
-            return new System.Threading.Tasks.ValueTask<Result>(new Result { Probe = GraphicsToolSupport.BuildReflectionProbeInfo(probe), Baked = true, ArtifactPath = outputPath, SizeBytes = bytes.LongLength, Sha256 = digest, PlannedEffects = new List<GraphicsPlannedEffect> { new GraphicsPlannedEffect { Type = "graphics.bake-reflection-probe", Property = "probe", Value = GameObjectToolSupport.HierarchyPath(probe.gameObject) } } });
+            return new System.Threading.Tasks.ValueTask<Result>(new Result { Probe = GraphicsToolSupport.BuildReflectionProbeInfo(probe), Baked = true, ArtifactPath = outputPath, SizeBytes = bytes.LongLength, Sha256 = digest, PlannedEffects = new List<GraphicsPlannedEffect> { new GraphicsPlannedEffect { Type = "lighting.bake.reflection-probe", Property = "probe", Value = GameObjectToolSupport.HierarchyPath(probe.gameObject) } } });
         }
     }
 }

package/unitypkg/Editor/Tools/{graphics/bake-settings.cs → lighting/bake/settings.cs}

@@ -6,12 +6,12 @@ using UnityEngine.SceneManagement;
 
 namespace UnityCli
 {
-    /// <summary>graphics.bake-settings — 读取/写入 LightingSettings。</summary>
-    public class GraphicsBakeSettingsTool : IUnityCliTool<GraphicsBakeSettingsTool.Request, GraphicsBakeSettingsTool.Result>
+    /// <summary>lighting.bake.settings — 读取/写入 LightingSettings。</summary>
+    public class LightingBakeSettingsTool : IUnityCliTool<LightingBakeSettingsTool.Request, LightingBakeSettingsTool.Result>
     {
         public sealed class Request { public string Scene { get; set; } public string LightingMode { get; set; } public bool? BakedGI { get; set; } public bool? RealtimeGI { get; set; } public int? DirectSamples { get; set; } public int? IndirectSamples { get; set; } public int? EnvironmentSamples { get; set; } public int? Bounces { get; set; } public string Filtering { get; set; } }
         public sealed class Result { public LightingSettingsInfo Settings { get; set; } public string ScenePath { get; set; } public List<GraphicsPlannedEffect> PlannedEffects { get; set; } }
-        public ToolDescriptor Describe() => new() { Name = "graphics.bake-settings", Summary = "Read or update LightingSettings for a scene.", Description = "Read or write LightingSettings (lightingMode, bakedGI, realtimeGI, samples, bounces, filtering). scene defaults to the active scene.", Group = "graphics", DestructiveHint = true, SideEffects = new[] { "scene-modify" }, Target = "editor", PlayModeSupport = "editor-only", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Read bake settings", Input = new Request { } } } };
+        public ToolDescriptor Describe() => new() { Name = "lighting.bake.settings", Summary = "Read or update LightingSettings for a scene.", Description = "Read or write LightingSettings (lightingMode, bakedGI, realtimeGI, samples, bounces, filtering). scene defaults to the active scene.", Group = "lighting", DestructiveHint = true, SideEffects = new[] { "scene-modify" }, Target = "editor", PlayModeSupport = "editor-only", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Read bake settings", Input = new Request { } } } };
         public System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request r, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
             var scene = ResolveLightingScene(r.Scene);
@@ -26,7 +26,7 @@ namespace UnityCli
             var filtering = string.IsNullOrEmpty(r.Filtering) ? (LightingSettings.FilterType?)null : GraphicsToolSupport.ParseEnum<LightingSettings.FilterType>(r.Filtering, "filtering");
             if ((r.DirectSamples.HasValue && r.DirectSamples.Value <= 0) || (r.IndirectSamples.HasValue && r.IndirectSamples.Value <= 0) || (r.EnvironmentSamples.HasValue && r.EnvironmentSamples.Value <= 0) || (r.Bounces.HasValue && r.Bounces.Value < 0)) throw new UnityCliBridge.BridgeCommandException("E_BAKE_SETTINGS_RANGE_INVALID", "Bake samples must be positive and bounces non-negative.", "Pass valid bake sample and bounce values.");
             if (hasWrite) ctx.CommitEffect();
-            if (ls == null && hasWrite) { ls = new LightingSettings(); effects.Add(new GraphicsPlannedEffect { Type = "graphics.bake-settings", Property = "lightingSettings", Value = "created" }); }
+            if (ls == null && hasWrite) { ls = new LightingSettings(); effects.Add(new GraphicsPlannedEffect { Type = "lighting.bake.settings", Property = "lightingSettings", Value = "created" }); }
             if (ls != null)
             {
                 if (!string.IsNullOrEmpty(r.LightingMode))
@@ -36,15 +36,15 @@ namespace UnityCli
 #else
                     ls.mixedBakeMode = lightingMode.Value;
 #endif
-                    effects.Add(new GraphicsPlannedEffect { Type = "graphics.bake-settings", Property = "lightingMode", Value = r.LightingMode });
+                    effects.Add(new GraphicsPlannedEffect { Type = "lighting.bake.settings", Property = "lightingMode", Value = r.LightingMode });
                 }
-                if (r.BakedGI.HasValue) { ls.bakedGI = r.BakedGI.Value; effects.Add(new GraphicsPlannedEffect { Type = "graphics.bake-settings", Property = "bakedGI", Value = r.BakedGI.Value.ToString().ToLowerInvariant() }); }
-                if (r.RealtimeGI.HasValue) { ls.realtimeGI = r.RealtimeGI.Value; effects.Add(new GraphicsPlannedEffect { Type = "graphics.bake-settings", Property = "realtimeGI", Value = r.RealtimeGI.Value.ToString().ToLowerInvariant() }); }
-                if (r.DirectSamples.HasValue) { SetDirectSamples(ls, r.DirectSamples.Value); effects.Add(new GraphicsPlannedEffect { Type = "graphics.bake-settings", Property = "directSamples", Value = r.DirectSamples.Value.ToString() }); }
-                if (r.IndirectSamples.HasValue) { SetIndirectSamples(ls, r.IndirectSamples.Value); effects.Add(new GraphicsPlannedEffect { Type = "graphics.bake-settings", Property = "indirectSamples", Value = r.IndirectSamples.Value.ToString() }); }
-                if (r.EnvironmentSamples.HasValue) { SetEnvSamples(ls, r.EnvironmentSamples.Value); effects.Add(new GraphicsPlannedEffect { Type = "graphics.bake-settings", Property = "environmentSamples", Value = r.EnvironmentSamples.Value.ToString() }); }
-                if (r.Bounces.HasValue) { SetBounces(ls, r.Bounces.Value); effects.Add(new GraphicsPlannedEffect { Type = "graphics.bake-settings", Property = "bounces", Value = r.Bounces.Value.ToString() }); }
-                if (filtering.HasValue) { SetFiltering(ls, filtering.Value); effects.Add(new GraphicsPlannedEffect { Type = "graphics.bake-settings", Property = "filtering", Value = r.Filtering }); }
+                if (r.BakedGI.HasValue) { ls.bakedGI = r.BakedGI.Value; effects.Add(new GraphicsPlannedEffect { Type = "lighting.bake.settings", Property = "bakedGI", Value = r.BakedGI.Value.ToString().ToLowerInvariant() }); }
+                if (r.RealtimeGI.HasValue) { ls.realtimeGI = r.RealtimeGI.Value; effects.Add(new GraphicsPlannedEffect { Type = "lighting.bake.settings", Property = "realtimeGI", Value = r.RealtimeGI.Value.ToString().ToLowerInvariant() }); }
+                if (r.DirectSamples.HasValue) { SetDirectSamples(ls, r.DirectSamples.Value); effects.Add(new GraphicsPlannedEffect { Type = "lighting.bake.settings", Property = "directSamples", Value = r.DirectSamples.Value.ToString() }); }
+                if (r.IndirectSamples.HasValue) { SetIndirectSamples(ls, r.IndirectSamples.Value); effects.Add(new GraphicsPlannedEffect { Type = "lighting.bake.settings", Property = "indirectSamples", Value = r.IndirectSamples.Value.ToString() }); }
+                if (r.EnvironmentSamples.HasValue) { SetEnvSamples(ls, r.EnvironmentSamples.Value); effects.Add(new GraphicsPlannedEffect { Type = "lighting.bake.settings", Property = "environmentSamples", Value = r.EnvironmentSamples.Value.ToString() }); }
+                if (r.Bounces.HasValue) { SetBounces(ls, r.Bounces.Value); effects.Add(new GraphicsPlannedEffect { Type = "lighting.bake.settings", Property = "bounces", Value = r.Bounces.Value.ToString() }); }
+                if (filtering.HasValue) { SetFiltering(ls, filtering.Value); effects.Add(new GraphicsPlannedEffect { Type = "lighting.bake.settings", Property = "filtering", Value = r.Filtering }); }
                 if (hasWrite)
                 {
                     Lightmapping.SetLightingSettingsForScene(scene, ls);

package/unitypkg/Editor/Tools/{graphics/bake-start.cs → lighting/bake/start.cs}

@@ -6,21 +6,21 @@ using UnityEngine.SceneManagement;
 
 namespace UnityCli
 {
-    /// <summary>graphics.bake-start — 异步启动光照烘焙。</summary>
-    public class GraphicsBakeStartTool : IUnityCliTool<GraphicsBakeStartTool.Request, GraphicsBakeStartTool.Result>
+    /// <summary>lighting.bake.start — 异步启动光照烘焙。</summary>
+    public class LightingBakeStartTool : IUnityCliTool<LightingBakeStartTool.Request, LightingBakeStartTool.Result>
     {
         public sealed class Request { }
         public sealed class Result { public bool Baking { get; set; } public List<GraphicsPlannedEffect> PlannedEffects { get; set; } }
-        public ToolDescriptor Describe() => new() { Name = "graphics.bake-start", Summary = "Start asynchronous lightmap baking.", Description = "Start Lightmapping.BakeAsync. Returns error if a bake is already running.", Group = "graphics",DestructiveHint = true, SideEffects = new[] { "bake" }, Target = "editor", PlayModeSupport = "editor-only", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Start baking", Input = new Request { } } } };
+        public ToolDescriptor Describe() => new() { Name = "lighting.bake.start", Summary = "Start asynchronous lightmap baking.", Description = "Start Lightmapping.BakeAsync. Returns error if a bake is already running.", Group = "lighting",DestructiveHint = true, SideEffects = new[] { "bake" }, Target = "editor", PlayModeSupport = "editor-only", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Start baking", Input = new Request { } } } };
         public async System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request r, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
-            if (Lightmapping.isRunning) throw new UnityCliBridge.BridgeCommandException("E_BAKE_ALREADY_RUNNING", "Lightmapping bake is already running.", "Run tools run graphics.bake-status to inspect progress or graphics.bake-cancel to stop it.");
+            if (Lightmapping.isRunning) throw new UnityCliBridge.BridgeCommandException("E_BAKE_ALREADY_RUNNING", "Lightmapping bake is already running.", "Run tools run lighting.bake.status to inspect progress or lighting.bake.cancel to stop it.");
             ctx.CommitEffect();
             Lightmapping.BakeAsync();
             var observed = await ctx.Wait.UntilStable(() => Lightmapping.isRunning, System.TimeSpan.FromMilliseconds(ctx.TimeoutMs), ct: ct);
             if (!observed) throw new UnityCliBridge.BridgeCommandException("E_BAKE_START_TIMEOUT", "Lightmapping did not enter the baking state before timeout.", "Check Lighting settings and Unity Console, then retry.");
             var baking = Lightmapping.isRunning;
-            return new Result { Baking = baking, PlannedEffects = new List<GraphicsPlannedEffect> { new GraphicsPlannedEffect { Type = "graphics.bake-start", Property = "bake", Value = "async" } } };
+            return new Result { Baking = baking, PlannedEffects = new List<GraphicsPlannedEffect> { new GraphicsPlannedEffect { Type = "lighting.bake.start", Property = "bake", Value = "async" } } };
         }
     }
 }

package/unitypkg/Editor/Tools/{graphics/bake-status.cs → lighting/bake/status.cs}

@@ -6,12 +6,12 @@ using UnityEngine.SceneManagement;
 
 namespace UnityCli
 {
-    /// <summary>graphics.bake-status — 读取光照烘焙状态。</summary>
-    public class GraphicsBakeStatusTool : IUnityCliTool<GraphicsBakeStatusTool.Request, GraphicsBakeStatusTool.Result>
+    /// <summary>lighting.bake.status — 读取光照烘焙状态。</summary>
+    public class LightingBakeStatusTool : IUnityCliTool<LightingBakeStatusTool.Request, LightingBakeStatusTool.Result>
     {
         public sealed class Request { }
         public sealed class Result { public bool Baking { get; set; } public double Progress { get; set; } public BakeModeInfo Mode { get; set; } }
-        public ToolDescriptor Describe() => new() { Name = "graphics.bake-status", Summary = "Read lightmap baking progress and mode.", Description = "Read-only: returns baking state, progress (0-1), and lighting mode.", Group = "graphics",DestructiveHint = false, Target = "editor", PlayModeSupport = "supported", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Check bake status", Input = new Request { } } } };
+        public ToolDescriptor Describe() => new() { Name = "lighting.bake.status", Summary = "Read lightmap baking progress and mode.", Description = "Read-only: returns baking state, progress (0-1), and lighting mode.", Group = "lighting",DestructiveHint = false, Target = "editor", PlayModeSupport = "supported", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Check bake status", Input = new Request { } } } };
         public System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request r, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
 #if UNITY_2023_2_OR_NEWER

package/unitypkg/Editor/Tools/{graphics → lighting}/light-probe-group.cs

@@ -7,18 +7,18 @@ using UnityEngine.Rendering;
 
 namespace UnityCli
 {
-    /// <summary>graphics.light-probe-group — 管理 LightProbeGroup 组件与探针位置。</summary>
-    public class GraphicsLightProbeGroupTool : IUnityCliTool<GraphicsLightProbeGroupTool.Request, GraphicsLightProbeGroupTool.Result>
+    /// <summary>lighting.light-probe-group — 管理 LightProbeGroup 组件与探针位置。</summary>
+    public class LightingLightProbeGroupTool : IUnityCliTool<LightingLightProbeGroupTool.Request, LightingLightProbeGroupTool.Result>
     {
         public sealed class Request { public string Target { get; set; } public bool? Create { get; set; } public string Positions { get; set; } }
         public sealed class Result { public GraphicsProbeTarget Target { get; set; } public long ProbeCount { get; set; } public List<Vector3Data> Positions { get; set; } public List<GraphicsPlannedEffect> PlannedEffects { get; set; } }
-        public ToolDescriptor Describe() => new() { Name = "graphics.light-probe-group", Summary = "Read, create, or set one LightProbeGroup's probe positions.", Description = "Dedicated LightProbeGroup Tool for Edit and Play mode. Resolve one target, set create=true to add the object/component when missing, and pass positions as space-separated x,y,z vectors to replace the array. Success re-resolves the component and returns fresh target identity, probe count, and positions.", Group = "graphics",DestructiveHint = false, SideEffects = new[] { "scene-modify" }, Target = "editor", PlayModeSupport = "supported", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Read light probe positions", Input = new Request { Target = "LightProbes" } }, new ToolExample { Description = "Set two light probe positions", Input = new Request { Target = "LightProbes", Positions = "0,0,0 0,2,0" } } } };
+        public ToolDescriptor Describe() => new() { Name = "lighting.light-probe-group", Summary = "Read, create, or set one LightProbeGroup's probe positions.", Description = "Dedicated LightProbeGroup Tool for Edit and Play mode. Resolve one target, set create=true to add the object/component when missing, and pass positions as space-separated x,y,z vectors to replace the array. Success re-resolves the component and returns fresh target identity, probe count, and positions.", Group = "lighting",DestructiveHint = false, SideEffects = new[] { "scene-modify" }, Target = "editor", PlayModeSupport = "supported", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Read light probe positions", Input = new Request { Target = "LightProbes" } }, new ToolExample { Description = "Set two light probe positions", Input = new Request { Target = "LightProbes", Positions = "0,0,0 0,2,0" } } } };
         public System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request r, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
             var createdObject = string.IsNullOrEmpty(r.Target);
             if (createdObject && r.Create != true)
-                throw new UnityCliBridge.BridgeCommandException("E_LIGHT_PROBE_GROUP_TARGET_REQUIRED", "graphics.light-probe-group requires target unless create is true.", "Pass a target or set create=true.");
-            var go = createdObject ? null : GameObjectToolSupport.ResolveUniqueTarget(r.Target, "graphics.light-probe-group requires --target or create a new one.");
+                throw new UnityCliBridge.BridgeCommandException("E_LIGHT_PROBE_GROUP_TARGET_REQUIRED", "lighting.light-probe-group requires target unless create is true.", "Pass a target or set create=true.");
+            var go = createdObject ? null : GameObjectToolSupport.ResolveUniqueTarget(r.Target, "lighting.light-probe-group requires --target or create a new one.");
             var positions = string.IsNullOrEmpty(r.Positions) ? null : GraphicsToolSupport.ParseVector3Array(r.Positions);
             var probe = go == null ? null : go.GetComponent<LightProbeGroup>();
             if (!createdObject && probe == null && r.Create != true)
@@ -36,8 +36,8 @@ namespace UnityCli
                 if (addComponent) probe = UnityCliSceneMutation.AddComponent<LightProbeGroup>(go);
             }
             var effects = new List<GraphicsPlannedEffect>();
-            if (addComponent) effects.Add(new GraphicsPlannedEffect { Type = "graphics.light-probe-group", Property = "component", Value = "added" });
-            if (positions != null) { UnityCliSceneMutation.RecordObject(probe, "Set light probe positions"); probe.probePositions = positions; effects.Add(new GraphicsPlannedEffect { Type = "graphics.light-probe-group", Property = "probePositions", Value = positions.Length.ToString() }); }
+            if (addComponent) effects.Add(new GraphicsPlannedEffect { Type = "lighting.light-probe-group", Property = "component", Value = "added" });
+            if (positions != null) { UnityCliSceneMutation.RecordObject(probe, "Set light probe positions"); probe.probePositions = positions; effects.Add(new GraphicsPlannedEffect { Type = "lighting.light-probe-group", Property = "probePositions", Value = positions.Length.ToString() }); }
             if (mutates) { UnityCliSceneMutation.MarkSceneObjectDirty(probe); UnityCliSceneMutation.MarkSceneDirty(go.scene); }
             var observedObject = GameObjectToolSupport.ResolveUniqueTarget(go.GetInstanceID().ToString(CultureInfo.InvariantCulture), "LightProbeGroup could not be re-resolved after mutation.");
             var observedProbe = observedObject.GetComponent<LightProbeGroup>();

package/unitypkg/Editor/Tools/{graphics → lighting}/reflection-probe.cs

@@ -8,18 +8,18 @@ using UnityEngine.Rendering;
 
 namespace UnityCli
 {
-    /// <summary>graphics.reflection-probe — 管理 ReflectionProbe 组件。</summary>
-    public class GraphicsReflectionProbeTool : IUnityCliTool<GraphicsReflectionProbeTool.Request, GraphicsReflectionProbeTool.Result>
+    /// <summary>lighting.reflection-probe — 管理 ReflectionProbe 组件。</summary>
+    public class LightingReflectionProbeTool : IUnityCliTool<LightingReflectionProbeTool.Request, LightingReflectionProbeTool.Result>
     {
         public sealed class Request { public string Target { get; set; } public bool? Create { get; set; } public string Mode { get; set; } public int? Resolution { get; set; } public int? Bounces { get; set; } public bool? Hdr { get; set; } public string BoxSize { get; set; } public string BoxOffset { get; set; } }
         public sealed class Result { public GraphicsProbeTarget Target { get; set; } public ReflectionProbeInfo Probe { get; set; } public List<GraphicsPlannedEffect> PlannedEffects { get; set; } }
-        public ToolDescriptor Describe() => new() { Name = "graphics.reflection-probe", Summary = "Read, create, or configure one ReflectionProbe component.", Description = "Dedicated ReflectionProbe Tool for Edit and Play mode. Resolve one target, set create=true to add the object/component when missing, and configure mode, resolution, bounces, hdr, boxSize, or boxOffset. Success re-resolves the component and returns fresh target identity and probe state.", Group = "graphics",DestructiveHint = false, SideEffects = new[] { "scene-modify" }, Target = "editor", PlayModeSupport = "supported", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Read reflection probe", Input = new Request { Target = "ReflectionProbe" } } } };
+        public ToolDescriptor Describe() => new() { Name = "lighting.reflection-probe", Summary = "Read, create, or configure one ReflectionProbe component.", Description = "Dedicated ReflectionProbe Tool for Edit and Play mode. Resolve one target, set create=true to add the object/component when missing, and configure mode, resolution, bounces, hdr, boxSize, or boxOffset. Success re-resolves the component and returns fresh target identity and probe state.", Group = "lighting",DestructiveHint = false, SideEffects = new[] { "scene-modify" }, Target = "editor", PlayModeSupport = "supported", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Read reflection probe", Input = new Request { Target = "ReflectionProbe" } } } };
         public System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request r, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
             var createdObject = string.IsNullOrEmpty(r.Target);
             if (createdObject && r.Create != true)
-                throw new UnityCliBridge.BridgeCommandException("E_REFLECTION_PROBE_TARGET_REQUIRED", "graphics.reflection-probe requires target unless create is true.", "Pass a target or set create=true.");
-            var go = createdObject ? null : GameObjectToolSupport.ResolveUniqueTarget(r.Target, "graphics.reflection-probe requires --target or create a new one.");
+                throw new UnityCliBridge.BridgeCommandException("E_REFLECTION_PROBE_TARGET_REQUIRED", "lighting.reflection-probe requires target unless create is true.", "Pass a target or set create=true.");
+            var go = createdObject ? null : GameObjectToolSupport.ResolveUniqueTarget(r.Target, "lighting.reflection-probe requires --target or create a new one.");
             var mode = default(UnityEngine.Rendering.ReflectionProbeMode);
             var hasMode = !string.IsNullOrEmpty(r.Mode);
             if (hasMode && (!Enum.TryParse<UnityEngine.Rendering.ReflectionProbeMode>(r.Mode, true, out mode) || !Enum.IsDefined(typeof(UnityEngine.Rendering.ReflectionProbeMode), mode)))
@@ -44,14 +44,14 @@ namespace UnityCli
                 if (addComponent) probe = UnityCliSceneMutation.AddComponent<ReflectionProbe>(go);
             }
             var effects = new List<GraphicsPlannedEffect>();
-            if (addComponent) effects.Add(new GraphicsPlannedEffect { Type = "graphics.reflection-probe", Property = "component", Value = "added" });
+            if (addComponent) effects.Add(new GraphicsPlannedEffect { Type = "lighting.reflection-probe", Property = "component", Value = "added" });
             if (mutates) UnityCliSceneMutation.RecordObject(probe, "Configure ReflectionProbe");
-            if (hasMode) { probe.mode = mode; effects.Add(new GraphicsPlannedEffect { Type = "graphics.reflection-probe", Property = "mode", Value = probe.mode.ToString() }); }
-            if (r.Resolution.HasValue) { probe.resolution = r.Resolution.Value; effects.Add(new GraphicsPlannedEffect { Type = "graphics.reflection-probe", Property = "resolution", Value = probe.resolution.ToString() }); }
-            if (r.Bounces.HasValue) { SetBounces(probe, r.Bounces.Value); effects.Add(new GraphicsPlannedEffect { Type = "graphics.reflection-probe", Property = "bounces", Value = r.Bounces.Value.ToString() }); }
-            if (r.Hdr.HasValue) { probe.hdr = r.Hdr.Value; effects.Add(new GraphicsPlannedEffect { Type = "graphics.reflection-probe", Property = "hdr", Value = probe.hdr.ToString().ToLowerInvariant() }); }
-            if (boxSize.HasValue) { probe.size = boxSize.Value; effects.Add(new GraphicsPlannedEffect { Type = "graphics.reflection-probe", Property = "boxSize", Value = probe.size.ToString() }); }
-            if (boxOffset.HasValue) { probe.center = boxOffset.Value; effects.Add(new GraphicsPlannedEffect { Type = "graphics.reflection-probe", Property = "boxOffset", Value = probe.center.ToString() }); }
+            if (hasMode) { probe.mode = mode; effects.Add(new GraphicsPlannedEffect { Type = "lighting.reflection-probe", Property = "mode", Value = probe.mode.ToString() }); }
+            if (r.Resolution.HasValue) { probe.resolution = r.Resolution.Value; effects.Add(new GraphicsPlannedEffect { Type = "lighting.reflection-probe", Property = "resolution", Value = probe.resolution.ToString() }); }
+            if (r.Bounces.HasValue) { SetBounces(probe, r.Bounces.Value); effects.Add(new GraphicsPlannedEffect { Type = "lighting.reflection-probe", Property = "bounces", Value = r.Bounces.Value.ToString() }); }
+            if (r.Hdr.HasValue) { probe.hdr = r.Hdr.Value; effects.Add(new GraphicsPlannedEffect { Type = "lighting.reflection-probe", Property = "hdr", Value = probe.hdr.ToString().ToLowerInvariant() }); }
+            if (boxSize.HasValue) { probe.size = boxSize.Value; effects.Add(new GraphicsPlannedEffect { Type = "lighting.reflection-probe", Property = "boxSize", Value = probe.size.ToString() }); }
+            if (boxOffset.HasValue) { probe.center = boxOffset.Value; effects.Add(new GraphicsPlannedEffect { Type = "lighting.reflection-probe", Property = "boxOffset", Value = probe.center.ToString() }); }
             if (mutates) { UnityCliSceneMutation.MarkSceneObjectDirty(probe); UnityCliSceneMutation.MarkSceneDirty(go.scene); }
             var observedObject = GameObjectToolSupport.ResolveUniqueTarget(go.GetInstanceID().ToString(CultureInfo.InvariantCulture), "ReflectionProbe could not be re-resolved after mutation.");
             var observedProbe = observedObject.GetComponent<ReflectionProbe>();

package/unitypkg/Editor/Tools/{graphics/skybox-get.cs → lighting/skybox/get.cs}

@@ -6,12 +6,12 @@ using UnityEngine.Rendering;
 
 namespace UnityCli
 {
-    /// <summary>graphics.skybox-get — 读取天空盒/环境/雾/反射设置。</summary>
-    public class GraphicsSkyboxGetTool : IUnityCliTool<GraphicsSkyboxGetTool.Request, GraphicsSkyboxGetTool.Result>
+    /// <summary>lighting.skybox.get — 读取天空盒/环境/雾/反射设置。</summary>
+    public class LightingSkyboxGetTool : IUnityCliTool<LightingSkyboxGetTool.Request, LightingSkyboxGetTool.Result>
     {
         public sealed class Request { }
         public sealed class Result { public SkyboxInfo Skybox { get; set; } }
-        public ToolDescriptor Describe() => new() { Name = "graphics.skybox-get", Summary = "Read skybox material, sun, ambient, fog and reflection environment settings.", Description = "Read-only: returns RenderSettings skybox, sun, ambient mode/intensity/color, fog settings, and reflection settings.", Group = "graphics",DestructiveHint = false, Target = "editor", PlayModeSupport = "supported", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Read skybox settings", Input = new Request { } } } };
+        public ToolDescriptor Describe() => new() { Name = "lighting.skybox.get", Summary = "Read skybox material, sun, ambient, fog and reflection environment settings.", Description = "Read-only: returns RenderSettings skybox, sun, ambient mode/intensity/color, fog settings, and reflection settings.", Group = "lighting",DestructiveHint = false, Target = "editor", PlayModeSupport = "supported", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Read skybox settings", Input = new Request { } } } };
         public System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request r, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
             var skybox = RenderSettings.skybox;

package/unitypkg/Editor/Tools/{graphics/skybox-set-ambient.cs → lighting/skybox/set-ambient.cs}

@@ -4,11 +4,11 @@ using UnityEngine;
 using UnityEngine.Rendering;
 namespace UnityCli
 {
-    public class GraphicsSkyboxSetAmbientTool : IUnityCliTool<GraphicsSkyboxSetAmbientTool.Request, GraphicsSkyboxSetAmbientTool.Result>
+    public class LightingSkyboxSetAmbientTool : IUnityCliTool<LightingSkyboxSetAmbientTool.Request, LightingSkyboxSetAmbientTool.Result>
     {
         public sealed class Request { public string Mode { get; set; } public float? Intensity { get; set; } public string Color { get; set; } public string AmbientEquatorColor { get; set; } public string AmbientGroundColor { get; set; } public string AmbientSkyColor { get; set; } }
         public sealed class Result { public string AmbientMode { get; set; } public double AmbientIntensity { get; set; } public List<GraphicsPlannedEffect> PlannedEffects { get; set; } }
-        public ToolDescriptor Describe() => new() { Name = "graphics.skybox-set-ambient", Summary = "Set ambient lighting.", Description = "Set RenderSettings ambient values.", Group = "graphics",SideEffects = new[] { "settings-write" }, Target = "editor", PlayModeSupport = "supported", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Set flat ambient lighting", Input = new Request { Mode = "Flat", Intensity = 1f, Color = "#808080" } } } };
+        public ToolDescriptor Describe() => new() { Name = "lighting.skybox.set-ambient", Summary = "Set ambient lighting.", Description = "Set RenderSettings ambient values.", Group = "lighting",SideEffects = new[] { "settings-write" }, Target = "editor", PlayModeSupport = "supported", DefaultTimeoutMs = 30000, MaxTimeoutMs = 600000, Examples = new[] { new ToolExample { Description = "Set flat ambient lighting", Input = new Request { Mode = "Flat", Intensity = 1f, Color = "#808080" } } } };
         public System.Threading.Tasks.ValueTask<Result> ExecuteAsync(Request r, UnityCliProjectToolContext ctx, System.Threading.CancellationToken ct = default)
         {
             AmbientMode? mode = string.IsNullOrEmpty(r.Mode) ? (AmbientMode?)null : GraphicsToolSupport.ParseEnum<AmbientMode>(r.Mode, "mode");
@@ -17,7 +17,7 @@ namespace UnityCli
             if (!mode.HasValue && !intensity.HasValue && !color.HasValue && !equator.HasValue && !ground.HasValue && !sky.HasValue) return new System.Threading.Tasks.ValueTask<Result>(new Result { AmbientMode = RenderSettings.ambientMode.ToString(), AmbientIntensity = RenderSettings.ambientIntensity, PlannedEffects = new List<GraphicsPlannedEffect>() });
             ctx.CommitEffect(); if (mode.HasValue) RenderSettings.ambientMode = mode.Value; if (intensity.HasValue) RenderSettings.ambientIntensity = intensity.Value; if (color.HasValue) RenderSettings.ambientLight = color.Value; if (equator.HasValue) RenderSettings.ambientEquatorColor = equator.Value; if (ground.HasValue) RenderSettings.ambientGroundColor = ground.Value; if (sky.HasValue) RenderSettings.ambientSkyColor = sky.Value;
             if ((mode.HasValue && RenderSettings.ambientMode != mode.Value) || (intensity.HasValue && !Mathf.Approximately(RenderSettings.ambientIntensity, intensity.Value)) || (color.HasValue && !GraphicsToolSupport.SameColor(RenderSettings.ambientLight, color.Value)) || (equator.HasValue && !GraphicsToolSupport.SameColor(RenderSettings.ambientEquatorColor, equator.Value)) || (ground.HasValue && !GraphicsToolSupport.SameColor(RenderSettings.ambientGroundColor, ground.Value)) || (sky.HasValue && !GraphicsToolSupport.SameColor(RenderSettings.ambientSkyColor, sky.Value))) throw new UnityCliBridge.BridgeCommandException("E_AMBIENT_STATE_MISMATCH", "Ambient settings readback did not match the request.", "Retry after the editor is idle.");
-            return new System.Threading.Tasks.ValueTask<Result>(new Result { AmbientMode = RenderSettings.ambientMode.ToString(), AmbientIntensity = RenderSettings.ambientIntensity, PlannedEffects = new List<GraphicsPlannedEffect> { new GraphicsPlannedEffect { Type = "graphics.skybox-set-ambient", Property = "ambient", Value = "updated" } } });
+            return new System.Threading.Tasks.ValueTask<Result>(new Result { AmbientMode = RenderSettings.ambientMode.ToString(), AmbientIntensity = RenderSettings.ambientIntensity, PlannedEffects = new List<GraphicsPlannedEffect> { new GraphicsPlannedEffect { Type = "lighting.skybox.set-ambient", Property = "ambient", Value = "updated" } } });
         }
     }
 }