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

cli/commands/script.py

@@ -7,7 +7,9 @@ from typing import Optional, Any
 
 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
+from cli.utils.parsers import parse_json_list_or_exit
+from cli.utils.confirmation import confirm_destructive_action
 
 
 @click.group()
@@ -41,6 +43,7 @@ def script():
     default=None,
     help="Full script contents (overrides template)."
 )
+@handle_unity_errors
 def create(name: str, path: str, script_type: str, namespace: Optional[str], contents: Optional[str]):
     """Create a new C# script.
 
@@ -65,14 +68,10 @@ def create(name: str, path: str, script_type: str, namespace: Optional[str], con
     if contents:
         params["contents"] = contents
 
-    try:
-        result = run_command("manage_script", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Created script: {name}.cs")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_script", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Created script: {name}.cs")
 
 
 @script.command("read")
@@ -89,6 +88,7 @@ def create(name: str, path: str, script_type: str, namespace: Optional[str], con
     type=int,
     help="Number of lines to read."
 )
+@handle_unity_errors
 def read(path: str, start_line: Optional[int], line_count: Optional[int]):
     """Read a C# script file.
 
@@ -115,20 +115,16 @@ def read(path: str, start_line: Optional[int], line_count: Optional[int]):
     if line_count:
         params["lineCount"] = line_count
 
-    try:
-        result = run_command("manage_script", params, config)
-        # For read, just output the content directly
-        if result.get("success") and result.get("data"):
-            data = result.get("data", {})
-            if isinstance(data, dict) and "contents" in data:
-                click.echo(data["contents"])
-            else:
-                click.echo(format_output(result, config.format))
+    result = run_command("manage_script", params, config)
+    # For read, just output the content directly
+    if result.get("success") and result.get("data"):
+        data = result.get("data", {})
+        if isinstance(data, dict) and "contents" in data:
+            click.echo(data["contents"])
         else:
             click.echo(format_output(result, config.format))
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    else:
+        click.echo(format_output(result, config.format))
 
 
 @script.command("delete")
@@ -138,6 +134,7 @@ def read(path: str, start_line: Optional[int], line_count: Optional[int]):
     is_flag=True,
     help="Skip confirmation prompt."
 )
+@handle_unity_errors
 def delete(path: str, force: bool):
     """Delete a C# script.
 
@@ -147,8 +144,7 @@ def delete(path: str, force: bool):
     """
     config = get_config()
 
-    if not force:
-        click.confirm(f"Delete script '{path}'?", abort=True)
+    confirm_destructive_action("Delete", "script", path, force)
 
     parts = path.rsplit("/", 1)
     filename = parts[-1]
@@ -161,14 +157,10 @@ def delete(path: str, force: bool):
         "path": directory,
     }
 
-    try:
-        result = run_command("manage_script", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Deleted: {path}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_script", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Deleted: {path}")
 
 
 @script.command("edit")
@@ -178,6 +170,7 @@ def delete(path: str, force: bool):
     required=True,
     help='Edits as JSON array of {startLine, startCol, endLine, endCol, newText}.'
 )
+@handle_unity_errors
 def edit(path: str, edits: str):
     """Apply text edits to a script.
 
@@ -187,25 +180,17 @@ def edit(path: str, edits: str):
     """
     config = get_config()
 
-    try:
-        edits_list = json.loads(edits)
-    except json.JSONDecodeError as e:
-        print_error(f"Invalid JSON for edits: {e}")
-        sys.exit(1)
+    edits_list = parse_json_list_or_exit(edits, "edits")
 
     params: dict[str, Any] = {
         "uri": path,
         "edits": edits_list,
     }
 
-    try:
-        result = run_command("apply_text_edits", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Applied edits to: {path}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("apply_text_edits", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Applied edits to: {path}")
 
 
 @script.command("validate")
@@ -216,6 +201,7 @@ def edit(path: str, edits: str):
     default="basic",
     help="Validation level."
 )
+@handle_unity_errors
 def validate(path: str, level: str):
     """Validate a C# script for errors.
 
@@ -232,9 +218,5 @@ def validate(path: str, level: str):
         "include_diagnostics": True,
     }
 
-    try:
-        result = run_command("validate_script", params, config)
-        click.echo(format_output(result, config.format))
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("validate_script", params, config)
+    click.echo(format_output(result, config.format))

cli/commands/shader.py

@@ -6,7 +6,8 @@ from typing import Optional
 
 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
+from cli.utils.confirmation import confirm_destructive_action
 
 
 @click.group()
@@ -17,6 +18,7 @@ def shader():
 
 @shader.command("read")
 @click.argument("path")
+@handle_unity_errors
 def read_shader(path: str):
     """Read a shader file.
 
@@ -31,21 +33,17 @@ def read_shader(path: str):
     name = os.path.splitext(os.path.basename(path))[0]
     directory = os.path.dirname(path)
 
-    try:
-        result = run_command("manage_shader", {
-            "action": "read",
-            "name": name,
-            "path": directory or "Assets/",
-        }, config)
+    result = run_command("manage_shader", {
+        "action": "read",
+        "name": name,
+        "path": directory or "Assets/",
+    }, config)
 
-        # If successful, display the contents nicely
-        if result.get("success") and result.get("data", {}).get("contents"):
-            click.echo(result["data"]["contents"])
-        else:
-            click.echo(format_output(result, config.format))
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    # If successful, display the contents nicely
+    if result.get("success") and result.get("data", {}).get("contents"):
+        click.echo(result["data"]["contents"])
+    else:
+        click.echo(format_output(result, config.format))
 
 
 @shader.command("create")
@@ -67,6 +65,7 @@ def read_shader(path: str):
     type=click.Path(exists=True),
     help="Read shader code from file."
 )
+@handle_unity_errors
 def create_shader(name: str, path: str, contents: Optional[str], file_path: Optional[str]):
     """Create a new shader.
 
@@ -127,19 +126,15 @@ def create_shader(name: str, path: str, contents: Optional[str], file_path: Opti
 }}
 '''
 
-    try:
-        result = run_command("manage_shader", {
-            "action": "create",
-            "name": name,
-            "path": path,
-            "contents": shader_contents,
-        }, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Created shader: {path}/{name}.shader")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_shader", {
+        "action": "create",
+        "name": name,
+        "path": path,
+        "contents": shader_contents,
+    }, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Created shader: {path}/{name}.shader")
 
 
 @shader.command("update")
@@ -156,6 +151,7 @@ def create_shader(name: str, path: str, contents: Optional[str], file_path: Opti
     type=click.Path(exists=True),
     help="Read shader code from file."
 )
+@handle_unity_errors
 def update_shader(path: str, contents: Optional[str], file_path: Optional[str]):
     """Update an existing shader.
 
@@ -185,19 +181,15 @@ def update_shader(path: str, contents: Optional[str], file_path: Optional[str]):
                 "No shader contents provided. Use --contents, --file, or pipe via stdin.")
             sys.exit(1)
 
-    try:
-        result = run_command("manage_shader", {
-            "action": "update",
-            "name": name,
-            "path": directory or "Assets/",
-            "contents": shader_contents,
-        }, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Updated shader: {path}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_shader", {
+        "action": "update",
+        "name": name,
+        "path": directory or "Assets/",
+        "contents": shader_contents,
+    }, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Updated shader: {path}")
 
 
 @shader.command("delete")
@@ -207,6 +199,7 @@ def update_shader(path: str, contents: Optional[str], file_path: Optional[str]):
     is_flag=True,
     help="Skip confirmation prompt."
 )
+@handle_unity_errors
 def delete_shader(path: str, force: bool):
     """Delete a shader.
 
@@ -217,22 +210,17 @@ def delete_shader(path: str, force: bool):
     """
     config = get_config()
 
-    if not force:
-        click.confirm(f"Delete shader '{path}'?", abort=True)
+    confirm_destructive_action("Delete", "shader", path, force)
 
     import os
     name = os.path.splitext(os.path.basename(path))[0]
     directory = os.path.dirname(path)
 
-    try:
-        result = run_command("manage_shader", {
-            "action": "delete",
-            "name": name,
-            "path": directory or "Assets/",
-        }, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Deleted shader: {path}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_shader", {
+        "action": "delete",
+        "name": name,
+        "path": directory or "Assets/",
+    }, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Deleted shader: {path}")

cli/commands/texture.py

@@ -1,28 +1,13 @@
 """Texture CLI commands."""
 
 import sys
-import json
 import click
 from typing import Optional, Any
 
 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
-
-
-def try_parse_json(value: str, context: str) -> Any:
-    """Try to parse JSON, with fallback for single quotes and Python bools."""
-    try:
-        return json.loads(value)
-    except json.JSONDecodeError:
-        # Try to fix common shell quoting issues (single quotes, Python bools)
-        try:
-            fixed = value.replace("'", '"').replace(
-                "True", "true").replace("False", "false")
-            return json.loads(fixed)
-        except json.JSONDecodeError as e:
-            print_error(f"Invalid JSON for {context}: {e}")
-            sys.exit(1)
+from cli.utils.connection import run_command, handle_unity_errors
+from cli.utils.parsers import parse_json_or_exit as try_parse_json
 
 
 _TEXTURE_TYPES = {
@@ -125,6 +110,22 @@ def _normalize_color(value: Any, context: str) -> list[int]:
             return _parse_hex_color(value)
         value = try_parse_json(value, context)
 
+    # Handle dict with r/g/b keys (e.g., {"r": 1, "g": 0, "b": 0} or {"r": 1, "g": 0, "b": 0, "a": 1})
+    if isinstance(value, dict):
+        if all(k in value for k in ("r", "g", "b")):
+            try:
+                color = [value["r"], value["g"], value["b"]]
+                if "a" in value:
+                    color.append(value["a"])
+                else:
+                    color.append(1.0 if _is_normalized_color(color) else 255)
+                if _is_normalized_color(color):
+                    return [int(round(float(c) * 255)) for c in color]
+                return [int(c) for c in color]
+            except (TypeError, ValueError):
+                raise ValueError(f"{context} dict values must be numeric, got {value}")
+        raise ValueError(f"{context} dict must have 'r', 'g', 'b' keys, got {list(value.keys())}")
+
     if isinstance(value, (list, tuple)):
         if len(value) == 3:
             value = list(value) + [1.0 if _is_normalized_color(value) else 255]
@@ -339,6 +340,7 @@ def texture():
 ]), help="Pattern type")
 @click.option("--palette", help="Color palette for pattern (JSON array of colors)")
 @click.option("--import-settings", help="TextureImporter settings (JSON)")
+@handle_unity_errors
 def create(path: str, width: int, height: int, image_path: Optional[str], color: Optional[str],
            pattern: Optional[str], palette: Optional[str], import_settings: Optional[str]):
     """Create a new procedural texture.
@@ -402,14 +404,10 @@ def create(path: str, width: int, height: int, image_path: Optional[str], color:
     if image_path:
         params["imagePath"] = image_path
 
-    try:
-        result = run_command("manage_texture", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Created texture: {path}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_texture", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Created texture: {path}")
 
 
 @texture.command("sprite")
@@ -423,6 +421,7 @@ def create(path: str, width: int, height: int, image_path: Optional[str], color:
 ]), help="Pattern type (defaults to checkerboard if no color specified)")
 @click.option("--ppu", default=100.0, help="Pixels Per Unit")
 @click.option("--pivot", help="Pivot as [x,y] (default: [0.5, 0.5])")
+@handle_unity_errors
 def sprite(path: str, width: int, height: int, image_path: Optional[str], color: Optional[str], pattern: Optional[str], ppu: float, pivot: Optional[str]):
     """Quickly create a sprite texture.
 
@@ -476,19 +475,16 @@ def sprite(path: str, width: int, height: int, image_path: Optional[str], color:
     if image_path:
         params["imagePath"] = image_path
 
-    try:
-        result = run_command("manage_texture", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Created sprite: {path}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_texture", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Created sprite: {path}")
 
 
 @texture.command("modify")
 @click.argument("path")
 @click.option("--set-pixels", required=True, help="Modification args as JSON")
+@handle_unity_errors
 def modify(path: str, set_pixels: str):
     """Modify an existing texture.
 
@@ -510,29 +506,35 @@ def modify(path: str, set_pixels: str):
         print_error(str(e))
         sys.exit(1)
 
-    try:
-        result = run_command("manage_texture", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Modified texture: {path}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_texture", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Modified texture: {path}")
 
 
 @texture.command("delete")
 @click.argument("path")
-def delete(path: str):
+@click.option(
+    "--force", "-f",
+    is_flag=True,
+    help="Skip confirmation prompt."
+)
+@handle_unity_errors
+def delete(path: str, force: bool):
     """Delete a texture.
+
+    \\b
+    Examples:
+        unity-mcp texture delete "Assets/Textures/Old.png"
+        unity-mcp texture delete "Assets/Textures/Old.png" --force
     """
+    from cli.utils.confirmation import confirm_destructive_action
     config = get_config()
 
-    try:
-        result = run_command("manage_texture", {
-                             "action": "delete", "path": path}, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Deleted texture: {path}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    confirm_destructive_action("Delete", "texture", path, force)
+
+    result = run_command("manage_texture", {
+                         "action": "delete", "path": path}, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Deleted texture: {path}")

cli/commands/tool.py

@@ -1,40 +1,35 @@
 """Tool CLI commands for listing custom tools."""
 
-import sys
 import click
 
 from cli.utils.config import get_config
 from cli.utils.output import format_output, print_error
-from cli.utils.connection import run_list_custom_tools, UnityConnectionError
+from cli.utils.connection import run_list_custom_tools, handle_unity_errors
 
 
 def _list_custom_tools() -> None:
     config = get_config()
-    try:
-        result = run_list_custom_tools(config)
-        if config.format != "text":
-            click.echo(format_output(result, config.format))
-            return
-
-        if not isinstance(result, dict) or not result.get("success", True):
-            click.echo(format_output(result, config.format))
-            return
-
-        tools = result.get("tools")
-        if tools is None:
-            data = result.get("data", {})
-            tools = data.get("tools") if isinstance(data, dict) else None
-        if not isinstance(tools, list):
-            click.echo(format_output(result, config.format))
-            return
-
-        click.echo(f"Custom tools ({len(tools)}):")
-        for i, tool in enumerate(tools):
-            name = tool.get("name") if isinstance(tool, dict) else str(tool)
-            click.echo(f"  [{i}] {name}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_list_custom_tools(config)
+    if config.format != "text":
+        click.echo(format_output(result, config.format))
+        return
+
+    if not isinstance(result, dict) or not result.get("success", True):
+        click.echo(format_output(result, config.format))
+        return
+
+    tools = result.get("tools")
+    if tools is None:
+        data = result.get("data", {})
+        tools = data.get("tools") if isinstance(data, dict) else None
+    if not isinstance(tools, list):
+        click.echo(format_output(result, config.format))
+        return
+
+    click.echo(f"Custom tools ({len(tools)}):")
+    for i, t in enumerate(tools):
+        name = t.get("name") if isinstance(t, dict) else str(t)
+        click.echo(f"  [{i}] {name}")
 
 
 @click.group("tool")
@@ -44,6 +39,7 @@ def tool():
 
 
 @tool.command("list")
+@handle_unity_errors
 def list_tools():
     """List custom tools registered for the active Unity project."""
     _list_custom_tools()
@@ -56,6 +52,7 @@ def custom_tool():
 
 
 @custom_tool.command("list")
+@handle_unity_errors
 def list_custom_tools():
     """List custom tools registered for the active Unity project."""
     _list_custom_tools()