mcpforunityserver 9.2.0__py3-none-any.whl → 9.3.0b20260128055651__py3-none-any.whl

cli/commands/editor.py

@@ -6,7 +6,8 @@ from typing import Optional, Any
 
 from cli.utils.config import get_config
 from cli.utils.output import format_output, print_error, print_success, print_info
-from cli.utils.connection import run_command, UnityConnectionError
+from cli.utils.connection import run_command, run_list_custom_tools, UnityConnectionError
+from cli.utils.suggestions import suggest_matches, format_suggestions
 
 
 @click.group()
@@ -472,6 +473,9 @@ def custom_tool(tool_name: str, params: str):
         params_dict = json.loads(params)
     except json.JSONDecodeError as e:
         print_error(f"Invalid JSON for params: {e}")
+        print_info("Example: --params '{\"key\":\"value\"}'")
+        print_info(
+            "Tip: wrap JSON in single quotes to avoid shell escaping issues.")
         sys.exit(1)
 
     try:
@@ -482,6 +486,28 @@ def custom_tool(tool_name: str, params: str):
         click.echo(format_output(result, config.format))
         if result.get("success"):
             print_success(f"Executed custom tool: {tool_name}")
+        else:
+            message = (result.get("message")
+                       or result.get("error") or "").lower()
+            if "not found" in message and "tool" in message:
+                try:
+                    tools_result = run_list_custom_tools(config)
+                    tools = tools_result.get("tools")
+                    if tools is None:
+                        data = tools_result.get("data", {})
+                        tools = data.get("tools") if isinstance(
+                            data, dict) else None
+                    names = [
+                        t.get("name") for t in tools if isinstance(t, dict) and t.get("name")
+                    ] if isinstance(tools, list) else []
+                    matches = suggest_matches(tool_name, names)
+                    suggestion = format_suggestions(matches)
+                    if suggestion:
+                        print_info(suggestion)
+                        print_info(
+                            f'Example: unity-mcp editor custom-tool "{matches[0]}"')
+                except UnityConnectionError:
+                    pass
     except UnityConnectionError as e:
         print_error(str(e))
         sys.exit(1)

cli/commands/prefab.py

@@ -11,18 +11,13 @@ from cli.utils.connection import run_command, UnityConnectionError
 
 @click.group()
 def prefab():
-    """Prefab operations - open, save, create prefabs."""
+    """Prefab operations - info, hierarchy, open, save, close, create prefabs."""
     pass
 
 
 @prefab.command("open")
 @click.argument("path")
-@click.option(
-    "--mode", "-m",
-    default="InIsolation",
-    help="Prefab stage mode (InIsolation)."
-)
-def open_stage(path: str, mode: str):
+def open_stage(path: str):
     """Open a prefab in the prefab stage for editing.
 
     \b
@@ -34,7 +29,6 @@ def open_stage(path: str, mode: str):
     params: dict[str, Any] = {
         "action": "open_stage",
         "prefabPath": path,
-        "mode": mode,
     }
 
     try:
@@ -80,18 +74,29 @@ def close_stage(save: bool):
 
 
 @prefab.command("save")
-def save_stage():
+@click.option(
+    "--force", "-f",
+    is_flag=True,
+    help="Force save even if no changes detected. Useful for automated workflows."
+)
+def save_stage(force: bool):
     """Save the currently open prefab stage.
 
     \b
     Examples:
         unity-mcp prefab save
+        unity-mcp prefab save --force
     """
     config = get_config()
 
+    params: dict[str, Any] = {
+        "action": "save_open_stage",
+    }
+    if force:
+        params["force"] = True
+
     try:
-        result = run_command("manage_prefabs", {
-                             "action": "save_open_stage"}, config)
+        result = run_command("manage_prefabs", params, config)
         click.echo(format_output(result, config.format))
         if result.get("success"):
             print_success("Saved prefab")
@@ -100,6 +105,115 @@ def save_stage():
         sys.exit(1)
 
 
+@prefab.command("info")
+@click.argument("path")
+@click.option(
+    "--compact", "-c",
+    is_flag=True,
+    help="Show compact output (key values only)."
+)
+def info(path: str, compact: bool):
+    """Get information about a prefab asset.
+
+    \b
+    Examples:
+        unity-mcp prefab info "Assets/Prefabs/Player.prefab"
+        unity-mcp prefab info "Assets/Prefabs/UI.prefab" --compact
+    """
+    config = get_config()
+
+    params: dict[str, Any] = {
+        "action": "get_info",
+        "prefabPath": path,
+    }
+
+    try:
+        result = run_command("manage_prefabs", params, config)
+        # Get the actual response data from the wrapped result structure
+        response_data = result.get("result", result)
+        if compact and response_data.get("success") and response_data.get("data"):
+            data = response_data["data"]
+            click.echo(f"Prefab: {data.get('assetPath', path)}")
+            click.echo(f"  Type: {data.get('prefabType', 'Unknown')}")
+            click.echo(f"  Root: {data.get('rootObjectName', 'N/A')}")
+            click.echo(f"  GUID: {data.get('guid', 'N/A')}")
+            click.echo(
+                f"  Components: {len(data.get('rootComponentTypes', []))}")
+            click.echo(f"  Children: {data.get('childCount', 0)}")
+            if data.get('isVariant'):
+                click.echo(f"  Variant of: {data.get('parentPrefab', 'N/A')}")
+        else:
+            click.echo(format_output(result, config.format))
+    except UnityConnectionError as e:
+        print_error(str(e))
+        sys.exit(1)
+
+
+@prefab.command("hierarchy")
+@click.argument("path")
+@click.option(
+    "--compact", "-c",
+    is_flag=True,
+    help="Show compact output (names and paths only)."
+)
+@click.option(
+    "--show-prefab-info", "-p",
+    is_flag=True,
+    help="Show prefab nesting information."
+)
+def hierarchy(path: str, compact: bool, show_prefab_info: bool):
+    """Get the hierarchical structure of a prefab.
+
+    \b
+    Examples:
+        unity-mcp prefab hierarchy "Assets/Prefabs/Player.prefab"
+        unity-mcp prefab hierarchy "Assets/Prefabs/UI.prefab" --compact
+        unity-mcp prefab hierarchy "Assets/Prefabs/Complex.prefab" --show-prefab-info
+    """
+    config = get_config()
+
+    params: dict[str, Any] = {
+        "action": "get_hierarchy",
+        "prefabPath": path,
+    }
+
+    try:
+        result = run_command("manage_prefabs", params, config)
+        # Get the actual response data from the wrapped result structure
+        response_data = result.get("result", result)
+        if compact and response_data.get("success") and response_data.get("data"):
+            data = response_data["data"]
+            items = data.get("items", [])
+            for item in items:
+                indent = "  " * item.get("path", "").count("/")
+                prefab_info = ""
+                if show_prefab_info and item.get("prefab", {}).get("isNestedRoot"):
+                    prefab_info = f" [nested: {item['prefab']['assetPath']}]"
+                click.echo(f"{indent}{item.get('name')}{prefab_info}")
+            click.echo(f"\nTotal: {data.get('total', 0)} objects")
+        elif show_prefab_info:
+            # Show prefab info in readable format
+            if response_data.get("success") and response_data.get("data"):
+                data = response_data["data"]
+                items = data.get("items", [])
+                for item in items:
+                    prefab = item.get("prefab", {})
+                    prefab_info = ""
+                    if prefab.get("isRoot"):
+                        prefab_info = " [root]"
+                    elif prefab.get("isNestedRoot"):
+                        prefab_info = f" [nested: {prefab.get('nestingDepth', 0)}]"
+                    click.echo(f"{item.get('path')}{prefab_info}")
+                click.echo(f"\nTotal: {data.get('total', 0)} objects")
+            else:
+                click.echo(format_output(result, config.format))
+        else:
+            click.echo(format_output(result, config.format))
+    except UnityConnectionError as e:
+        print_error(str(e))
+        sys.exit(1)
+
+
 @prefab.command("create")
 @click.argument("target")
 @click.argument("path")
@@ -113,13 +227,19 @@ def save_stage():
     is_flag=True,
     help="Include inactive objects when finding target."
 )
-def create(target: str, path: str, overwrite: bool, include_inactive: bool):
+@click.option(
+    "--unlink-if-instance",
+    is_flag=True,
+    help="Unlink from existing prefab before creating new one."
+)
+def create(target: str, path: str, overwrite: bool, include_inactive: bool, unlink_if_instance: bool):
     """Create a prefab from a scene GameObject.
 
     \b
     Examples:
         unity-mcp prefab create "Player" "Assets/Prefabs/Player.prefab"
         unity-mcp prefab create "Enemy" "Assets/Prefabs/Enemy.prefab" --overwrite
+        unity-mcp prefab create "EnemyInstance" "Assets/Prefabs/BossEnemy.prefab" --unlink-if-instance
     """
     config = get_config()
 
@@ -133,6 +253,8 @@ def create(target: str, path: str, overwrite: bool, include_inactive: bool):
         params["allowOverwrite"] = True
     if include_inactive:
         params["searchInactive"] = True
+    if unlink_if_instance:
+        params["unlinkIfInstance"] = True
 
     try:
         result = run_command("manage_prefabs", params, config)