Merge query into manage_package

Author: Scriptwonder

README.md

@@ -20,7 +20,7 @@
 <details>
 <summary><strong>Recent Updates</strong></summary>
 
-* **v9.5.4 (beta)** — New `manage_packages` and `query_packages` tools: install, remove, search, and manage Unity packages and scoped registries. Includes input validation, dependency checks on removal, and git URL warnings.
+* **v9.5.4 (beta)** — 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`.
 * **v9.5.2** — New `manage_camera` tool with Cinemachine support (presets, priority, noise, blending, extensions), `cameras` resource, priority persistence fix via SerializedProperty.
 * **v9.4.8** — New editor UI, real-time tool toggling via `manage_tools`, skill sync window, multi-view screenshot, one-click Roslyn installer, Qwen Code & Gemini CLI clients, ProBuilder mesh editing via `manage_probuilder`.
@@ -94,7 +94,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_camera` • `manage_components` • `manage_editor` • `manage_gameobject` • `manage_graphics` • `manage_material` • `manage_packages` • `manage_prefabs` • `manage_probuilder` • `manage_scene` • `manage_script` • `manage_script_capabilities` • `manage_scriptable_object` • `manage_shader` • `manage_texture` • `manage_tools` • `manage_ui` • `manage_vfx` • `query_packages` • `read_console` • `refresh_unity` • `run_tests` • `script_apply_edits` • `set_active_instance` • `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_camera` • `manage_components` • `manage_editor` • `manage_gameobject` • `manage_graphics` • `manage_material` • `manage_packages` • `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` • `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`

Server/src/services/tools/manage_packages.py

@@ -8,12 +8,11 @@
 from transport.unity_transport import send_with_unity_instance
 from transport.legacy.unity_connection import async_send_command_with_retry
 
-QUERY_ACTIONS = ["list_packages", "search_packages", "get_package_info", "ping", "status"]
-MUTATE_ACTIONS = [
+ALL_ACTIONS = [
+    "list_packages", "search_packages", "get_package_info", "ping", "status",
     "add_package", "remove_package", "embed_package", "resolve_packages",
     "add_registry", "remove_registry",
 ]
-ALL_ACTIONS = QUERY_ACTIONS + MUTATE_ACTIONS
 
 
 async def _send_packages_command(
@@ -30,46 +29,13 @@ async def _send_packages_command(
 @mcp_for_unity_tool(
     group="core",
     description=(
-        "Query Unity package information (read-only).\n\n"
+        "Manage Unity packages: query, install, remove, embed, and configure registries.\n\n"
+        "QUERY (read-only):\n"
         "- list_packages: List all installed packages\n"
         "- search_packages: Search Unity registry by keyword\n"
         "- get_package_info: Get details about a specific installed package\n"
         "- ping: Check package manager availability\n"
-        "- status: Poll async job status (for add/remove/list/search operations)"
-    ),
-    annotations=ToolAnnotations(
-        title="Query Packages",
-        readOnlyHint=True,
-        destructiveHint=False,
-    ),
-)
-async def query_packages(
-    ctx: Context,
-    action: Annotated[str, "The query action to perform."],
-    package: Annotated[Optional[str], "Package name for get_package_info."] = None,
-    query: Annotated[Optional[str], "Search query for search_packages."] = None,
-    job_id: Annotated[Optional[str], "Job ID for polling status."] = None,
-) -> dict[str, Any]:
-    action_lower = action.lower()
-    if action_lower not in QUERY_ACTIONS:
-        return {
-            "success": False,
-            "message": f"Unknown query action '{action}'. Valid actions: {', '.join(QUERY_ACTIONS)}",
-        }
-
-    params_dict: dict[str, Any] = {"action": action_lower}
-    for key, val in [("package", package), ("query", query), ("job_id", job_id)]:
-        if val is not None:
-            params_dict[key] = val
-
-    return await _send_packages_command(ctx, params_dict)
-
-
-@mcp_for_unity_tool(
-    group="core",
-    description=(
-        "Modify Unity packages: install, remove, embed, and configure registries. "
-        "Triggers domain reload on add/remove.\n\n"
+        "- status: Poll async job status (for add/remove/list/search operations)\n\n"
         "INSTALL/REMOVE:\n"
         "- add_package: Install a package (name, name@version, git URL, or file: path)\n"
         "- remove_package: Remove a package (checks dependents; use force=true to override)\n\n"
@@ -91,21 +57,25 @@ async def manage_packages(
     action: Annotated[str, "The package action to perform."],
     package: Annotated[Optional[str], "Package identifier (name, name@version, git URL, or file: path)."] = None,
     force: Annotated[Optional[bool], "Force removal even if other packages depend on it."] = None,
-    name: Annotated[Optional[str], "Registry name for add_registry."] = None,
+    query: Annotated[Optional[str], "Search query for search_packages."] = None,
+    job_id: Annotated[Optional[str], "Job ID for polling status."] = None,
+    name: Annotated[Optional[str], "Registry name for add_registry/remove_registry."] = None,
     url: Annotated[Optional[str], "Registry URL for add_registry."] = None,
     scopes: Annotated[Optional[list[str]], "Registry scopes for add_registry."] = None,
 ) -> dict[str, Any]:
     action_lower = action.lower()
-    if action_lower not in MUTATE_ACTIONS:
+    if action_lower not in ALL_ACTIONS:
         return {
             "success": False,
-            "message": f"Unknown action '{action}'. Valid actions: {', '.join(MUTATE_ACTIONS)}",
+            "message": f"Unknown action '{action}'. Valid actions: {', '.join(ALL_ACTIONS)}",
         }
 
     params_dict: dict[str, Any] = {"action": action_lower}
     param_map = {
         "package": package,
         "force": force,
+        "query": query,
+        "job_id": job_id,
         "name": name,
         "url": url,
         "scopes": scopes,

docs/i18n/README-zh.md

@@ -20,7 +20,7 @@
 <details>
 <summary><strong>最近更新</strong></summary>
 
-* **v9.5.4 (beta)** — 新增 `manage_packages` 和 `query_packages` 工具：安装、移除、搜索和管理 Unity 包及作用域注册表。包含输入验证、移除时依赖检查和 git URL 警告。
+* **v9.5.4 (beta)** — 新增 `manage_packages` 工具：安装、移除、搜索和管理 Unity 包及作用域注册表。包含输入验证、移除时依赖检查和 git URL 警告。
 * **v9.5.3** — 新增 `manage_graphics` 工具（33个操作）：体积/后处理、光照烘焙、渲染统计、管线设置、URP渲染器特性。3个新资源：`volumes`、`rendering_stats`、`renderer_features`。
 * **v9.5.2** — 新增 `manage_camera` 工具，支持 Cinemachine（预设、优先级、噪声、混合、扩展）、`cameras` 资源、通过 SerializedProperty 修复优先级持久化问题。
 * **v9.4.8** — 新编辑器 UI、通过 `manage_tools` 实时切换工具、技能同步窗口、多视图截图、一键 Roslyn 安装器、支持 Qwen Code 与 Gemini CLI 客户端、通过 `manage_probuilder` 进行 ProBuilder 网格编辑。
@@ -94,7 +94,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_camera` • `manage_components` • `manage_editor` • `manage_gameobject` • `manage_graphics` • `manage_material` • `manage_packages` • `manage_prefabs` • `manage_probuilder` • `manage_scene` • `manage_script` • `manage_script_capabilities` • `manage_scriptable_object` • `manage_shader` • `manage_texture` • `manage_tools` • `manage_ui` • `manage_vfx` • `query_packages` • `read_console` • `refresh_unity` • `run_tests` • `script_apply_edits` • `set_active_instance` • `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_camera` • `manage_components` • `manage_editor` • `manage_gameobject` • `manage_graphics` • `manage_material` • `manage_packages` • `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` • `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`

manifest.json

@@ -153,10 +153,6 @@
       "name": "manage_vfx",
       "description": "Manage Visual Effects, particle systems, and trails"
     },
-    {
-      "name": "query_packages",
-      "description": "Query Unity package information: list, search, info, and status"
-    },
     {
       "name": "read_console",
       "description": "Read Unity Editor console output (logs, warnings, errors)"

unity-mcp-skill/SKILL.md

@@ -164,7 +164,7 @@ uri="file:///full/path/to/file.cs"
 | **Batch** | `batch_execute` | Parallel/bulk operations |
 | **Camera** | `manage_camera` | Camera management (Unity Camera + Cinemachine). **Tier 1** (always available): create, target, lens, priority, list, screenshot. **Tier 2** (requires `com.unity.cinemachine`): brain, body/aim/noise pipeline, extensions, blending, force/release. 7 presets: follow, third_person, freelook, dolly, static, top_down, side_scroller. Resource: `mcpforunity://scene/cameras`. Use `ping` to check Cinemachine availability. See [tools-reference.md](references/tools-reference.md#camera-tools). |
 | **Graphics** | `manage_graphics` | Rendering and post-processing management. 33 actions across 5 groups: **Volume** (create/configure volumes and effects, URP/HDRP), **Bake** (lightmaps, light probes, reflection probes, Edit mode only), **Stats** (draw calls, batches, memory), **Pipeline** (quality levels, pipeline settings), **Features** (URP renderer features: add, remove, toggle, reorder). Resources: `mcpforunity://scene/volumes`, `mcpforunity://rendering/stats`, `mcpforunity://pipeline/renderer-features`. Use `ping` to check pipeline status. See [tools-reference.md](references/tools-reference.md#graphics-tools). |
-| **Packages** | `query_packages` (read-only), `manage_packages` (mutating) | Install, remove, search, and manage Unity packages and scoped registries. `query_packages`: list installed, search registry, get info, ping, poll status. `manage_packages`: add/remove packages, embed for editing, add/remove scoped registries, force resolve. Validates identifiers, warns on git URLs, checks dependents before removal (`force=true` to override). See [tools-reference.md](references/tools-reference.md#package-tools). |
+| **Packages** | `manage_packages` | Install, remove, search, and manage Unity packages and scoped registries. Query actions: list installed, search registry, get info, ping, poll status. Mutating actions: add/remove packages, embed for editing, add/remove scoped registries, force resolve. Validates identifiers, warns on git URLs, checks dependents before removal (`force=true` to override). See [tools-reference.md](references/tools-reference.md#package-tools). |
 | **ProBuilder** | `manage_probuilder` | 3D modeling, mesh editing, complex geometry. **When `com.unity.probuilder` is installed, prefer ProBuilder shapes over primitive GameObjects** for editable geometry, multi-material faces, or complex shapes. Supports 12 shape types, face/edge/vertex editing, smoothing, and per-face materials. See [ProBuilder Guide](references/probuilder-guide.md). |
 | **UI** | `manage_ui`, `batch_execute` with `manage_gameobject` + `manage_components` | **UI Toolkit**: Use `manage_ui` to create UXML/USS files, attach UIDocument, inspect visual trees. **uGUI (Canvas)**: Use `batch_execute` for Canvas, Panel, Button, Text, Slider, Toggle, Input Field. **Read `mcpforunity://project/info` first** to detect uGUI/TMP/Input System/UI Toolkit availability. (see [UI workflows](references/workflows.md#ui-creation-workflows)) |
 

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

@@ -1074,11 +1074,11 @@ manage_graphics(action="feature_reorder", order=[2, 0, 1])
 
 ## Package Tools
 
-### query_packages (read-only)
+### manage_packages
 
-Query Unity package information. Use this for all read operations — it has `readOnlyHint=true` so clients know it's safe.
+Manage Unity packages: query, install, remove, embed, and configure registries. Install/remove trigger domain reload.
 
-**Actions:**
+**Query Actions (read-only):**
 
 | Action | Parameters | Description |
 |--------|-----------|-------------|
@@ -1088,23 +1088,7 @@ Query Unity package information. Use this for all read operations — it has `re
 | `ping` | — | Check package manager availability, Unity version, package count |
 | `status` | `job_id` (optional) | Poll async job status; omit job_id for latest job |
 
-**Example — List installed packages:**
-```python
-query_packages(action="list_packages")
-# Returns job_id, then poll:
-query_packages(action="status", job_id="<job_id>")
-```
-
-**Example — Search for a package:**
-```python
-query_packages(action="search_packages", query="input system")
-```
-
-### manage_packages (destructive)
-
-Modify Unity packages. Has `destructiveHint=true` — install/remove trigger domain reload.
-
-**Actions:**
+**Mutating Actions:**
 
 | Action | Parameters | Description |
 |--------|-----------|-------------|
@@ -1121,11 +1105,23 @@ Modify Unity packages. Has `destructiveHint=true` — install/remove trigger dom
 - `file:` paths: allowed with warning
 - Invalid names (uppercase, missing dots): rejected
 
+**Example — List installed packages:**
+```python
+manage_packages(action="list_packages")
+# Returns job_id, then poll:
+manage_packages(action="status", job_id="<job_id>")
+```
+
+**Example — Search for a package:**
+```python
+manage_packages(action="search_packages", query="input system")
+```
+
 **Example — Install a package:**
 ```python
 manage_packages(action="add_package", package="com.unity.inputsystem")
 # Poll until complete:
-query_packages(action="status", job_id="<job_id>")
+manage_packages(action="status", job_id="<job_id>")
 ```
 
 **Example — Remove with dependency check:**

unity-mcp-skill/references/workflows.md

@@ -1753,21 +1753,21 @@ manage_graphics(action="stats_get")
 
 ```python
 # 1. Check what's installed
-query_packages(action="ping")
-query_packages(action="list_packages")
+manage_packages(action="ping")
+manage_packages(action="list_packages")
 # Poll status until complete
-query_packages(action="status", job_id="<job_id>")
+manage_packages(action="status", job_id="<job_id>")
 
 # 2. Install the package
 manage_packages(action="add_package", package="com.unity.inputsystem")
 # Poll until domain reload completes
-query_packages(action="status", job_id="<job_id>")
+manage_packages(action="status", job_id="<job_id>")
 
 # 3. Verify no compilation errors
 read_console(types=["error"], count=10)
 
 # 4. Confirm it's installed
-query_packages(action="get_package_info", package="com.unity.inputsystem")
+manage_packages(action="get_package_info", package="com.unity.inputsystem")
 ```
 
 ### Add OpenUPM Registry and Install Package
@@ -1786,7 +1786,7 @@ manage_packages(action="resolve_packages")
 
 # 3. Install a package from OpenUPM
 manage_packages(action="add_package", package="com.cysharp.unitask")
-query_packages(action="status", job_id="<job_id>")
+manage_packages(action="status", job_id="<job_id>")
 ```
 
 ### Safe Package Removal
@@ -1798,7 +1798,7 @@ manage_packages(action="remove_package", package="com.unity.modules.ui")
 
 # 2. Force removal if you're sure
 manage_packages(action="remove_package", package="com.unity.modules.ui", force=True)
-query_packages(action="status", job_id="<job_id>")
+manage_packages(action="status", job_id="<job_id>")
 ```
 
 ### Install from Git URL (e.g., NuGetForUnity)
@@ -1809,7 +1809,7 @@ manage_packages(
     action="add_package",
     package="https://github.com/GlitchEnzo/NuGetForUnity.git?path=/src/NuGetForUnity"
 )
-query_packages(action="status", job_id="<job_id>")
+manage_packages(action="status", job_id="<job_id>")
 ```
 
 ---