mcpforunityserver 9.3.0b20260128055651__py3-none-any.whl → 9.3.0b20260129121506__py3-none-any.whl

cli/commands/gameobject.py

@@ -7,7 +7,9 @@ from typing import Optional, Tuple, Any
 
 from cli.utils.config import get_config
 from cli.utils.output import format_output, print_error, print_success, print_warning
-from cli.utils.connection import run_command, UnityConnectionError
+from cli.utils.connection import run_command, handle_unity_errors, UnityConnectionError
+from cli.utils.constants import SEARCH_METHOD_CHOICE_FULL, SEARCH_METHOD_CHOICE_TAGGED
+from cli.utils.confirmation import confirm_destructive_action
 
 
 @click.group()
@@ -20,8 +22,7 @@ def gameobject():
 @click.argument("search_term")
 @click.option(
     "--method", "-m",
-    type=click.Choice(["by_name", "by_tag", "by_layer",
-                      "by_component", "by_path", "by_id"]),
+    type=SEARCH_METHOD_CHOICE_FULL,
     default="by_name",
     help="Search method."
 )
@@ -42,6 +43,7 @@ def gameobject():
     type=int,
     help="Pagination cursor (offset)."
 )
+@handle_unity_errors
 def find(search_term: str, method: str, include_inactive: bool, limit: int, cursor: int):
     """Find GameObjects by search criteria.
 
@@ -54,19 +56,14 @@ def find(search_term: str, method: str, include_inactive: bool, limit: int, curs
         unity-mcp gameobject find "/Canvas/Panel" --method by_path
     """
     config = get_config()
-
-    try:
-        result = run_command("find_gameobjects", {
-            "searchMethod": method,
-            "searchTerm": search_term,
-            "includeInactive": include_inactive,
-            "pageSize": limit,
-            "cursor": cursor,
-        }, config)
-        click.echo(format_output(result, config.format))
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("find_gameobjects", {
+        "searchMethod": method,
+        "searchTerm": search_term,
+        "includeInactive": include_inactive,
+        "pageSize": limit,
+        "cursor": cursor,
+    }, config)
+    click.echo(format_output(result, config.format))
 
 
 @gameobject.command("create")
@@ -128,6 +125,7 @@ def find(search_term: str, method: str, include_inactive: bool, limit: int, curs
     default=None,
     help="Path for prefab (e.g., Assets/Prefabs/MyPrefab.prefab)."
 )
+@handle_unity_errors
 def create(
     name: str,
     primitive: Optional[str],
@@ -177,32 +175,27 @@ def create(
     if prefab_path:
         params["prefabPath"] = prefab_path
 
-    try:
-        result = run_command("manage_gameobject", params, config)
-
-        # Add components separately since componentsToAdd doesn't work
-        if components and (result.get("success") or result.get("data") or result.get("result")):
-            component_list = [c.strip() for c in components.split(",")]
-            failed_components = []
-            for component in component_list:
-                try:
-                    run_command("manage_components", {
-                        "action": "add",
-                        "target": name,
-                        "componentType": component,
-                    }, config)
-                except UnityConnectionError:
-                    failed_components.append(component)
-            if failed_components:
-                print_warning(
-                    f"Failed to add components: {', '.join(failed_components)}")
-
-        click.echo(format_output(result, config.format))
-        if result.get("success") or result.get("result"):
-            print_success(f"Created GameObject '{name}'")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_gameobject", params, config)
+
+    # Add components separately since componentsToAdd doesn't work
+    if components and (result.get("success") or result.get("data") or result.get("result")):
+        component_list = [c.strip() for c in components.split(",")]
+        failed_components = []
+        for component in component_list:
+            try:
+                run_command("manage_components", {
+                    "action": "add",
+                    "target": name,
+                    "componentType": component,
+                }, config)
+            except UnityConnectionError:
+                failed_components.append(component)
+        if failed_components:
+            print_warning(f"Failed to add components: {', '.join(failed_components)}")
+
+    click.echo(format_output(result, config.format))
+    if result.get("success") or result.get("result"):
+        print_success(f"Created GameObject '{name}'")
 
 
 @gameobject.command("modify")
@@ -265,10 +258,11 @@ def create(
 )
 @click.option(
     "--search-method",
-    type=click.Choice(["by_name", "by_path", "by_tag", "by_id"]),
+    type=SEARCH_METHOD_CHOICE_TAGGED,
     default=None,
     help="How to find the target GameObject."
 )
+@handle_unity_errors
 def modify(
     target: str,
     name: Optional[str],
@@ -319,27 +313,21 @@ def modify(
     if active is not None:
         params["setActive"] = active
     if add_components:
-        params["componentsToAdd"] = [c.strip()
-                                     for c in add_components.split(",")]
+        params["componentsToAdd"] = [c.strip() for c in add_components.split(",")]
     if remove_components:
-        params["componentsToRemove"] = [c.strip()
-                                        for c in remove_components.split(",")]
+        params["componentsToRemove"] = [c.strip() for c in remove_components.split(",")]
     if search_method:
         params["searchMethod"] = search_method
 
-    try:
-        result = run_command("manage_gameobject", params, config)
-        click.echo(format_output(result, config.format))
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_gameobject", params, config)
+    click.echo(format_output(result, config.format))
 
 
 @gameobject.command("delete")
 @click.argument("target")
 @click.option(
     "--search-method",
-    type=click.Choice(["by_name", "by_path", "by_tag", "by_id"]),
+    type=SEARCH_METHOD_CHOICE_TAGGED,
     default=None,
     help="How to find the target GameObject."
 )
@@ -348,6 +336,7 @@ def modify(
     is_flag=True,
     help="Skip confirmation prompt."
 )
+@handle_unity_errors
 def delete(target: str, search_method: Optional[str], force: bool):
     """Delete a GameObject.
 
@@ -359,8 +348,7 @@ def delete(target: str, search_method: Optional[str], force: bool):
     """
     config = get_config()
 
-    if not force:
-        click.confirm(f"Delete GameObject '{target}'?", abort=True)
+    confirm_destructive_action("Delete", "GameObject", target, force)
 
     params = {
         "action": "delete",
@@ -370,14 +358,10 @@ def delete(target: str, search_method: Optional[str], force: bool):
     if search_method:
         params["searchMethod"] = search_method
 
-    try:
-        result = run_command("manage_gameobject", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Deleted GameObject '{target}'")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_gameobject", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Deleted GameObject '{target}'")
 
 
 @gameobject.command("duplicate")
@@ -396,10 +380,11 @@ def delete(target: str, search_method: Optional[str], force: bool):
 )
 @click.option(
     "--search-method",
-    type=click.Choice(["by_name", "by_path", "by_tag", "by_id"]),
+    type=SEARCH_METHOD_CHOICE_TAGGED,
     default=None,
     help="How to find the target GameObject."
 )
+@handle_unity_errors
 def duplicate(
     target: str,
     name: Optional[str],
@@ -428,14 +413,10 @@ def duplicate(
     if search_method:
         params["searchMethod"] = search_method
 
-    try:
-        result = run_command("manage_gameobject", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Duplicated GameObject '{target}'")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_gameobject", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Duplicated GameObject '{target}'")
 
 
 @gameobject.command("move")
@@ -465,10 +446,11 @@ def duplicate(
 )
 @click.option(
     "--search-method",
-    type=click.Choice(["by_name", "by_path", "by_tag", "by_id"]),
+    type=SEARCH_METHOD_CHOICE_TAGGED,
     default=None,
     help="How to find the target GameObject."
 )
+@handle_unity_errors
 def move(
     target: str,
     reference: str,
@@ -499,12 +481,7 @@ def move(
     if search_method:
         params["searchMethod"] = search_method
 
-    try:
-        result = run_command("manage_gameobject", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(
-                f"Moved '{target}' {direction} of '{reference}' by {distance} units")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_gameobject", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Moved '{target}' {direction} of '{reference}' by {distance} units")

cli/commands/instance.py

@@ -1,12 +1,11 @@
 """Instance CLI commands for managing Unity instances."""
 
-import sys
 import click
 from typing import Optional
 
 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, run_list_instances, UnityConnectionError
+from cli.utils.connection import run_command, run_list_instances, handle_unity_errors
 
 
 @click.group()
@@ -16,6 +15,7 @@ def instance():
 
 
 @instance.command("list")
+@handle_unity_errors
 def list_instances():
     """List available Unity instances.
 
@@ -25,35 +25,31 @@ def list_instances():
     """
     config = get_config()
 
-    try:
-        result = run_list_instances(config)
-        instances = result.get("instances", []) if isinstance(
-            result, dict) else []
+    result = run_list_instances(config)
+    instances = result.get("instances", []) if isinstance(
+        result, dict) else []
 
-        if not instances:
-            print_info("No Unity instances currently connected")
-            return
+    if not instances:
+        print_info("No Unity instances currently connected")
+        return
 
-        click.echo("Available Unity instances:")
-        for inst in instances:
-            project = inst.get("project", "Unknown")
-            version = inst.get("unity_version", "Unknown")
-            hash_id = inst.get("hash", "")
-            session_id = inst.get("session_id", "")
+    click.echo("Available Unity instances:")
+    for inst in instances:
+        project = inst.get("project", "Unknown")
+        version = inst.get("unity_version", "Unknown")
+        hash_id = inst.get("hash", "")
+        session_id = inst.get("session_id", "")
 
-            # Format: ProjectName@hash (Unity version)
-            display_id = f"{project}@{hash_id}" if hash_id else project
-            click.echo(f"  • {display_id} (Unity {version})")
-            if session_id:
-                click.echo(f"    Session: {session_id[:8]}...")
-
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+        # Format: ProjectName@hash (Unity version)
+        display_id = f"{project}@{hash_id}" if hash_id else project
+        click.echo(f"  • {display_id} (Unity {version})")
+        if session_id:
+            click.echo(f"    Session: {session_id[:8]}...")
 
 
 @instance.command("set")
 @click.argument("instance_id")
+@handle_unity_errors
 def set_instance(instance_id: str):
     """Set the active Unity instance.
 
@@ -66,18 +62,14 @@ def set_instance(instance_id: str):
     """
     config = get_config()
 
-    try:
-        result = run_command("set_active_instance", {
-            "instance": instance_id,
-        }, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            data = result.get("data", {})
-            active = data.get("instance", instance_id)
-            print_success(f"Active instance set to: {active}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("set_active_instance", {
+        "instance": instance_id,
+    }, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        data = result.get("data", {})
+        active = data.get("instance", instance_id)
+        print_success(f"Active instance set to: {active}")
 
 
 @instance.command("current")

cli/commands/lighting.py

@@ -1,12 +1,11 @@
 """Lighting CLI commands."""
 
-import sys
 import click
 from typing import Optional, Tuple
 
 from cli.utils.config import get_config
 from cli.utils.output import format_output, print_error, print_success
-from cli.utils.connection import run_command, UnityConnectionError
+from cli.utils.connection import run_command, handle_unity_errors
 
 
 @click.group()
@@ -44,6 +43,7 @@ def lighting():
     type=float,
     help="Light intensity."
 )
+@handle_unity_errors
 def create(name: str, light_type: str, position: Tuple[float, float, float], color: Optional[Tuple[float, float, float]], intensity: Optional[float]):
     """Create a new light.
 
@@ -55,74 +55,69 @@ def create(name: str, light_type: str, position: Tuple[float, float, float], col
     """
     config = get_config()
 
-    try:
-        # Step 1: Create empty GameObject with position
-        create_result = run_command("manage_gameobject", {
-            "action": "create",
-            "name": name,
-            "position": list(position),
-        }, config)
-
-        if not (create_result.get("success")):
-            click.echo(format_output(create_result, config.format))
-            return
+    # Step 1: Create empty GameObject with position
+    create_result = run_command("manage_gameobject", {
+        "action": "create",
+        "name": name,
+        "position": list(position),
+    }, config)
 
-        # Step 2: Add Light component using manage_components
-        add_result = run_command("manage_components", {
-            "action": "add",
+    if not (create_result.get("success")):
+        click.echo(format_output(create_result, config.format))
+        return
+
+    # Step 2: Add Light component using manage_components
+    add_result = run_command("manage_components", {
+        "action": "add",
+        "target": name,
+        "componentType": "Light",
+    }, config)
+
+    if not add_result.get("success"):
+        click.echo(format_output(add_result, config.format))
+        return
+
+    # Step 3: Set light type using manage_components set_property
+    type_result = run_command("manage_components", {
+        "action": "set_property",
+        "target": name,
+        "componentType": "Light",
+        "property": "type",
+        "value": light_type,
+    }, config)
+
+    if not type_result.get("success"):
+        click.echo(format_output(type_result, config.format))
+        return
+
+    # Step 4: Set color if provided
+    if color:
+        color_result = run_command("manage_components", {
+            "action": "set_property",
             "target": name,
             "componentType": "Light",
+            "property": "color",
+            "value": {"r": color[0], "g": color[1], "b": color[2], "a": 1},
         }, config)
 
-        if not add_result.get("success"):
-            click.echo(format_output(add_result, config.format))
+        if not color_result.get("success"):
+            click.echo(format_output(color_result, config.format))
             return
 
-        # Step 3: Set light type using manage_components set_property
-        type_result = run_command("manage_components", {
+    # Step 5: Set intensity if provided
+    if intensity is not None:
+        intensity_result = run_command("manage_components", {
             "action": "set_property",
             "target": name,
             "componentType": "Light",
-            "property": "type",
-            "value": light_type,
+            "property": "intensity",
+            "value": intensity,
         }, config)
 
-        if not type_result.get("success"):
-            click.echo(format_output(type_result, config.format))
+        if not intensity_result.get("success"):
+            click.echo(format_output(intensity_result, config.format))
             return
 
-        # Step 4: Set color if provided
-        if color:
-            color_result = run_command("manage_components", {
-                "action": "set_property",
-                "target": name,
-                "componentType": "Light",
-                "property": "color",
-                "value": {"r": color[0], "g": color[1], "b": color[2], "a": 1},
-            }, config)
-
-            if not color_result.get("success"):
-                click.echo(format_output(color_result, config.format))
-                return
-
-        # Step 5: Set intensity if provided
-        if intensity is not None:
-            intensity_result = run_command("manage_components", {
-                "action": "set_property",
-                "target": name,
-                "componentType": "Light",
-                "property": "intensity",
-                "value": intensity,
-            }, config)
-
-            if not intensity_result.get("success"):
-                click.echo(format_output(intensity_result, config.format))
-                return
-
-        # Output the result
-        click.echo(format_output(create_result, config.format))
-        print_success(f"Created {light_type} light: {name}")
-
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    # Output the result
+    click.echo(format_output(create_result, config.format))
+    print_success(f"Created {light_type} light: {name}")