fix(profiler): address code review — error on unknown category, tighten reflection

Author: Scriptwonder

.claude/skills/unity-mcp-skill/references/tools-reference.md

@@ -20,7 +20,10 @@ internal static async Task<object> GetCountersAsync(JObject @params)
                 return new ErrorResponse(categoryResult.ErrorMessage);
 
             string categoryName = categoryResult.Value;
-            ProfilerCategory category = ResolveCategory(categoryName);
+            var resolved = ResolveCategory(categoryName, out string categoryError);
+            if (resolved == null)
+                return new ErrorResponse(categoryError);
+            ProfilerCategory category = resolved.Value;
 
             // Get counter names: explicit list or discover all in category
             var counterNames = GetRequestedCounters(p, category);
@@ -91,8 +94,16 @@ void Tick()
             return tcs.Task;
         }
 
-        private static ProfilerCategory ResolveCategory(string name)
+        private static readonly string[] ValidCategories = new[]
         {
+            "Render", "Scripts", "Memory", "Physics", "Physics2D", "Animation",
+            "Audio", "Lighting", "Network", "Gui", "UI", "Ai", "Video",
+            "Loading", "Input", "Vr", "Internal", "Particles", "FileIO", "VirtualTexturing"
+        };
+
+        internal static ProfilerCategory? ResolveCategory(string name, out string error)
+        {
+            error = null;
             switch (name.ToLowerInvariant())
             {
                 case "render": return ProfilerCategory.Render;
@@ -114,7 +125,9 @@ private static ProfilerCategory ResolveCategory(string name)
                 case "particles": return ProfilerCategory.Particles;
                 case "fileio": return ProfilerCategory.FileIO;
                 case "virtualtexturing": return ProfilerCategory.VirtualTexturing;
-                default: return ProfilerCategory.Render;
+                default:
+                    error = $"Unknown category '{name}'. Valid: {string.Join(", ", ValidCategories)}";
+                    return null;
             }
         }
     }

MCPForUnity/Editor/Tools/Profiler/Operations/CounterOps.cs

@@ -11,7 +11,6 @@ internal static class FrameDebuggerOps
         private static readonly Type UtilType;
         private static readonly PropertyInfo EventCountProp;
         private static readonly MethodInfo EnableMethod;
-        private static readonly MethodInfo DisableMethod;
         private static readonly MethodInfo GetEventDataMethod;
         private static readonly bool ReflectionAvailable;
 
@@ -24,9 +23,12 @@ static FrameDebuggerOps()
                 {
                     EventCountProp = UtilType.GetProperty("eventsCount", BindingFlags.Public | BindingFlags.Static)
                                   ?? UtilType.GetProperty("count", BindingFlags.Public | BindingFlags.Static);
-                    EnableMethod = UtilType.GetMethod("SetEnabled", BindingFlags.Public | BindingFlags.Static);
-                    DisableMethod = EnableMethod; // Same method, different arg
-                    GetEventDataMethod = UtilType.GetMethod("GetFrameEventData", BindingFlags.Public | BindingFlags.Static);
+                    EnableMethod = UtilType.GetMethod("SetEnabled", BindingFlags.Public | BindingFlags.Static,
+                                      null, new[] { typeof(bool), typeof(int) }, null)
+                                  ?? UtilType.GetMethod("SetEnabled", BindingFlags.Public | BindingFlags.Static);
+                    GetEventDataMethod = UtilType.GetMethod("GetFrameEventData", BindingFlags.Public | BindingFlags.Static,
+                                             null, new[] { typeof(int) }, null)
+                                         ?? UtilType.GetMethod("GetFrameEventData", BindingFlags.Public | BindingFlags.Static);
                 }
                 ReflectionAvailable = UtilType != null && EventCountProp != null;
             }

MCPForUnity/Editor/Tools/Profiler/Operations/FrameDebuggerOps.cs

@@ -38,7 +38,11 @@ internal static async Task<object> TakeSnapshotAsync(JObject @params)
                     new[] { typeof(string), typeof(Action<string, bool>), typeof(Action<string, bool, UnityEditor.DebugScreenCapture>), typeof(uint) });
 
                 if (takeMethod == null)
-                    takeMethod = MemoryProfilerType.GetMethod("TakeSnapshot");
+                {
+                    // Try 2-param overload: TakeSnapshot(string, Action<string, bool>)
+                    takeMethod = MemoryProfilerType.GetMethod("TakeSnapshot",
+                        new[] { typeof(string), typeof(Action<string, bool>) });
+                }
 
                 if (takeMethod == null)
                     return new ErrorResponse("Could not find TakeSnapshot method on MemoryProfiler. API may have changed.");
@@ -61,7 +65,13 @@ internal static async Task<object> TakeSnapshotAsync(JObject @params)
                     }
                 };
 
-                takeMethod.Invoke(null, new object[] { snapshotPath, callback, null, 0u });
+                int paramCount = takeMethod.GetParameters().Length;
+                if (paramCount == 4)
+                    takeMethod.Invoke(null, new object[] { snapshotPath, callback, null, 0u });
+                else if (paramCount == 2)
+                    takeMethod.Invoke(null, new object[] { snapshotPath, callback });
+                else
+                    return new ErrorResponse($"TakeSnapshot has unexpected {paramCount} parameters. API may have changed.");
             }
             catch (Exception ex)
             {

MCPForUnity/Editor/Tools/Profiler/Operations/MemorySnapshotOps.cs

@@ -20,7 +20,8 @@
 <details>
 <summary><strong>Recent Updates</strong></summary>
 
-* **v9.6.2 (beta)** — New `manage_physics` tool (21 actions): physics settings, layer collision matrix, physics materials, joints (5 3D + 9 2D types), queries (raycast, raycast_all, linecast, shapecast, overlap), force application (AddForce/AddTorque/AddExplosionForce), rigidbody configuration, scene-wide validation, and edit-mode simulation. Full 3D and 2D support.
+* **v9.6.3 (beta)** — New `manage_profiler` tool (14 actions): Profiler session control (start/stop/status/set areas), frame timing and counter reads, object memory queries, memory snapshots (take/list/compare via com.unity.memoryprofiler), and Frame Debugger (enable/disable/get events). Group: `profiling`.
+* **v9.6.2** — New `manage_physics` tool (21 actions): physics settings, layer collision matrix, physics materials, joints (5 3D + 9 2D types), queries (raycast, raycast_all, linecast, shapecast, overlap), force application (AddForce/AddTorque/AddExplosionForce), rigidbody configuration, scene-wide validation, and edit-mode simulation. Full 3D and 2D support.
 * **v9.6.1** — QoL extensions: `manage_editor` gains undo/redo actions. `manage_scene` gains multi-scene editing (additive load, close, set active, move GO between scenes), scene templates (3d_basic, 2d_basic, etc.), and scene validation with auto-repair. New `manage_build` tool: trigger player builds, switch platforms, configure player settings, manage build scenes and profiles (Unity 6+), run batch builds across multiple platforms, and async job tracking with polling. New `MaxPollSeconds` infrastructure for long-running tool operations.
 * **v9.5.4** — New `unity_reflect` and `unity_docs` tools for API verification: inspect live C# APIs via reflection and fetch official Unity documentation (ScriptReference, Manual, package docs). New `manage_packages` tool: install, remove, search, and manage Unity packages and scoped registries. Includes input validation, dependency checks on removal, and git URL warnings.
 * **v9.5.3** — New `manage_graphics` tool (33 actions): volume/post-processing, light baking, rendering stats, pipeline settings, URP renderer features. 3 new resources: `volumes`, `rendering_stats`, `renderer_features`.
@@ -96,7 +97,7 @@ openupm add com.coplaydev.unity-mcp
 * **Extensible** — Works with various MCP Clients
 
 ### Available Tools
-`apply_text_edits` • `batch_execute` • `create_script` • `debug_request_context` • `delete_script` • `execute_custom_tool` • `execute_menu_item` • `find_gameobjects` • `find_in_file` • `get_sha` • `get_test_job` • `manage_animation` • `manage_asset` • `manage_build` • `manage_camera` • `manage_components` • `manage_editor` • `manage_gameobject` • `manage_graphics` • `manage_material` • `manage_packages` • `manage_physics` • `manage_prefabs` • `manage_probuilder` • `manage_scene` • `manage_script` • `manage_script_capabilities` • `manage_scriptable_object` • `manage_shader` • `manage_texture` • `manage_tools` • `manage_ui` • `manage_vfx` • `read_console` • `refresh_unity` • `run_tests` • `script_apply_edits` • `set_active_instance` • `unity_docs` • `unity_reflect` • `validate_script`
+`apply_text_edits` • `batch_execute` • `create_script` • `debug_request_context` • `delete_script` • `execute_custom_tool` • `execute_menu_item` • `find_gameobjects` • `find_in_file` • `get_sha` • `get_test_job` • `manage_animation` • `manage_asset` • `manage_build` • `manage_camera` • `manage_components` • `manage_editor` • `manage_gameobject` • `manage_graphics` • `manage_material` • `manage_packages` • `manage_physics` • `manage_prefabs` • `manage_probuilder` • `manage_profiler` • `manage_scene` • `manage_script` • `manage_script_capabilities` • `manage_scriptable_object` • `manage_shader` • `manage_texture` • `manage_tools` • `manage_ui` • `manage_vfx` • `read_console` • `refresh_unity` • `run_tests` • `script_apply_edits` • `set_active_instance` • `unity_docs` • `unity_reflect` • `validate_script`
 
 ### Available Resources
 `cameras` • `custom_tools` • `renderer_features` • `rendering_stats` • `volumes` • `editor_active_tool` • `editor_prefab_stage` • `editor_selection` • `editor_state` • `editor_windows` • `gameobject` • `gameobject_api` • `gameobject_component` • `gameobject_components` • `get_tests` • `get_tests_for_mode` • `menu_items` • `prefab_api` • `prefab_hierarchy` • `prefab_info` • `project_info` • `project_layers` • `project_tags` • `tool_groups` • `unity_instances`

README.md

@@ -20,7 +20,8 @@
 <details>
 <summary><strong>最近更新</strong></summary>
 
-* **v9.6.2 (beta)** — 新增 `manage_physics` 工具（21个操作）：物理设置、层碰撞矩阵、物理材质、关节（5种3D + 9种2D类型）、查询（raycast、raycast_all、linecast、shapecast、overlap）、力施加（AddForce/AddTorque/AddExplosionForce）、刚体配置、场景物理验证与编辑器模式模拟。全面支持3D和2D物理。
+* **v9.6.3 (beta)** — 新增 `manage_profiler` 工具（14个操作）：Profiler 会话控制（启动/停止/状态/设置区域）、帧时间与计数器读取、对象内存查询、内存快照（通过 com.unity.memoryprofiler 进行拍摄/列表/比较）、帧调试器（启用/禁用/获取事件）。分组：`profiling`。
+* **v9.6.2** — 新增 `manage_physics` 工具（21个操作）：物理设置、层碰撞矩阵、物理材质、关节（5种3D + 9种2D类型）、查询（raycast、raycast_all、linecast、shapecast、overlap）、力施加（AddForce/AddTorque/AddExplosionForce）、刚体配置、场景物理验证与编辑器模式模拟。全面支持3D和2D物理。
 * **v9.6.1** — QoL 扩展：`manage_editor` 新增撤销/重做操作。`manage_scene` 新增多场景编辑（叠加加载、关闭、设置活动场景、跨场景移动物体）、场景模板（3d_basic、2d_basic 等）、场景验证与自动修复。新增 `manage_build` 工具：触发玩家构建、切换平台、配置玩家设置、管理构建场景和配置文件（Unity 6+）、跨多平台批量构建、异步任务跟踪与轮询。新增 `MaxPollSeconds` 基础设施，支持长时间运行的工具操作。
 * **v9.5.4** — 新增 `unity_reflect` 和 `unity_docs` 工具用于 API 验证：通过反射检查实时 C# API，获取官方 Unity 文档（ScriptReference、Manual、包文档）。新增 `manage_packages` 工具：安装、移除、搜索和管理 Unity 包及作用域注册表。包含输入验证、移除时依赖检查和 git URL 警告。
 * **v9.5.3** — 新增 `manage_graphics` 工具（33个操作）：体积/后处理、光照烘焙、渲染统计、管线设置、URP渲染器特性。3个新资源：`volumes`、`rendering_stats`、`renderer_features`。
@@ -96,7 +97,7 @@ openupm add com.coplaydev.unity-mcp
 * **可扩展** — 可与多种 MCP Client 配合使用
 
 ### 可用工具
-`apply_text_edits` • `batch_execute` • `create_script` • `debug_request_context` • `delete_script` • `execute_custom_tool` • `execute_menu_item` • `find_gameobjects` • `find_in_file` • `get_sha` • `get_test_job` • `manage_animation` • `manage_asset` • `manage_build` • `manage_camera` • `manage_components` • `manage_editor` • `manage_gameobject` • `manage_graphics` • `manage_material` • `manage_packages` • `manage_physics` • `manage_prefabs` • `manage_probuilder` • `manage_scene` • `manage_script` • `manage_script_capabilities` • `manage_scriptable_object` • `manage_shader` • `manage_texture` • `manage_tools` • `manage_ui` • `manage_vfx` • `read_console` • `refresh_unity` • `run_tests` • `script_apply_edits` • `set_active_instance` • `unity_docs` • `unity_reflect` • `validate_script`
+`apply_text_edits` • `batch_execute` • `create_script` • `debug_request_context` • `delete_script` • `execute_custom_tool` • `execute_menu_item` • `find_gameobjects` • `find_in_file` • `get_sha` • `get_test_job` • `manage_animation` • `manage_asset` • `manage_build` • `manage_camera` • `manage_components` • `manage_editor` • `manage_gameobject` • `manage_graphics` • `manage_material` • `manage_packages` • `manage_physics` • `manage_prefabs` • `manage_probuilder` • `manage_profiler` • `manage_scene` • `manage_script` • `manage_script_capabilities` • `manage_scriptable_object` • `manage_shader` • `manage_texture` • `manage_tools` • `manage_ui` • `manage_vfx` • `read_console` • `refresh_unity` • `run_tests` • `script_apply_edits` • `set_active_instance` • `unity_docs` • `unity_reflect` • `validate_script`
 
 ### 可用资源
 `cameras` • `custom_tools` • `renderer_features` • `rendering_stats` • `volumes` • `editor_active_tool` • `editor_prefab_stage` • `editor_selection` • `editor_state` • `editor_windows` • `gameobject` • `gameobject_api` • `gameobject_component` • `gameobject_components` • `get_tests` • `get_tests_for_mode` • `menu_items` • `prefab_api` • `prefab_hierarchy` • `prefab_info` • `project_info` • `project_layers` • `project_tags` • `tool_groups` • `unity_instances`

docs/i18n/README-zh.md

@@ -125,6 +125,10 @@
       "name": "manage_probuilder",
       "description": "Create and edit ProBuilder meshes, shapes, and geometry operations"
     },
+    {
+      "name": "manage_profiler",
+      "description": "Unity Profiler session control, counter reads, memory snapshots, and Frame Debugger (group: profiling)"
+    },
     {
       "name": "manage_scene",
       "description": "Load, save, query hierarchy, multi-scene editing, templates, validation, and manage Unity scenes"

manifest.json

@@ -20,6 +20,7 @@ Complete reference for all MCP tools. Each tool includes parameters, types, and
 - [Package Tools](#package-tools)
 - [Physics Tools](#physics-tools)
 - [ProBuilder Tools](#probuilder-tools)
+- [Profiler Tools](#profiler-tools)
 - [Docs Tools](#docs-tools)
 
 ---
@@ -1423,6 +1424,77 @@ See also: [ProBuilder Workflow Guide](probuilder-guide.md) for detailed patterns
 
 ---
 
+## Profiler Tools
+
+### `manage_profiler`
+
+Unity Profiler session control, counter reads, memory snapshots, and Frame Debugger. Group: `profiling` (opt-in via `manage_tools`).
+
+| Parameter | Type | Required | Description |
+|-----------|------|----------|-------------|
+| `action` | string | Yes | See action groups below |
+| `category` | string | For get_counters | Profiler category name (e.g. `Render`, `Scripts`, `Memory`, `Physics`) |
+| `counters` | list[str] | No | Specific counter names for get_counters. Omit to read all in category |
+| `object_path` | string | For get_object_memory | Scene hierarchy or asset path |
+| `log_file` | string | No | Path to `.raw` file for profiler_start recording |
+| `enable_callstacks` | bool | No | Enable allocation callstacks for profiler_start |
+| `areas` | dict[str, bool] | For profiler_set_areas | Area name to enabled/disabled mapping |
+| `snapshot_path` | string | No | Output path for memory_take_snapshot |
+| `search_path` | string | No | Search directory for memory_list_snapshots |
+| `snapshot_a` | string | For memory_compare_snapshots | First snapshot file path |
+| `snapshot_b` | string | For memory_compare_snapshots | Second snapshot file path |
+| `page_size` | int | No | Page size for frame_debugger_get_events (default 50) |
+| `cursor` | int | No | Cursor offset for frame_debugger_get_events |
+
+**Action groups:**
+
+- **Session:** `profiler_start`, `profiler_stop`, `profiler_status`, `profiler_set_areas`
+- **Counters:** `get_frame_timing`, `get_counters`, `get_object_memory`
+- **Memory Snapshot:** `memory_take_snapshot`, `memory_list_snapshots`, `memory_compare_snapshots` (requires `com.unity.memoryprofiler`)
+- **Frame Debugger:** `frame_debugger_enable`, `frame_debugger_disable`, `frame_debugger_get_events`
+- **Utility:** `ping`
+
+```python
+# Check profiler availability
+manage_profiler(action="ping")
+
+# Start profiling (optionally record to file)
+manage_profiler(action="profiler_start")
+manage_profiler(action="profiler_start", log_file="Assets/profiler.raw", enable_callstacks=True)
+
+# Check profiler status
+manage_profiler(action="profiler_status")
+
+# Toggle profiler areas
+manage_profiler(action="profiler_set_areas", areas={"CPU": True, "GPU": True, "Rendering": True, "Memory": False})
+
+# Stop profiling
+manage_profiler(action="profiler_stop")
+
+# Read frame timing data (12 fields from FrameTimingManager)
+manage_profiler(action="get_frame_timing")
+
+# Read counters by category
+manage_profiler(action="get_counters", category="Render")
+manage_profiler(action="get_counters", category="Memory", counters=["Total Used Memory", "GC Used Memory"])
+
+# Get memory size of a specific object
+manage_profiler(action="get_object_memory", object_path="Player/Mesh")
+
+# Memory snapshots (requires com.unity.memoryprofiler)
+manage_profiler(action="memory_take_snapshot")
+manage_profiler(action="memory_take_snapshot", snapshot_path="Assets/Snapshots/baseline.snap")
+manage_profiler(action="memory_list_snapshots")
+manage_profiler(action="memory_compare_snapshots", snapshot_a="Assets/Snapshots/before.snap", snapshot_b="Assets/Snapshots/after.snap")
+
+# Frame Debugger
+manage_profiler(action="frame_debugger_enable")
+manage_profiler(action="frame_debugger_get_events", page_size=20, cursor=0)
+manage_profiler(action="frame_debugger_disable")
+```
+
+---
+
 ## Docs Tools
 
 Tools for verifying Unity C# APIs and fetching official documentation. Group: `docs`.