mcpforunityserver 8.7.1__tar.gz → 9.0.0__tar.gz

{mcpforunityserver-8.7.1 → mcpforunityserver-9.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpforunityserver
-Version: 8.7.1
+Version: 9.0.0
 Summary: MCP for Unity Server: A Unity package for Unity Editor integration via the Model Context Protocol (MCP).
 Author-email: Marcus Sanatan <msanatan@gmail.com>, David Sarno <david.sarno@gmail.com>, Wu Shutong <martinwfire@gmail.com>
 License-Expression: MIT
@@ -108,7 +108,7 @@ Use this to run the latest released version from the repository. Change the vers
       "command": "uvx",
       "args": [
         "--from",
-        "git+https://github.com/CoplayDev/unity-mcp@v8.7.1#subdirectory=Server",
+        "git+https://github.com/CoplayDev/unity-mcp@v9.0.0#subdirectory=Server",
         "mcp-for-unity",
         "--transport",
         "stdio"

{mcpforunityserver-8.7.1 → mcpforunityserver-9.0.0}/README.md

@@ -69,7 +69,7 @@ Use this to run the latest released version from the repository. Change the vers
       "command": "uvx",
       "args": [
         "--from",
-        "git+https://github.com/CoplayDev/unity-mcp@v8.7.1#subdirectory=Server",
+        "git+https://github.com/CoplayDev/unity-mcp@v9.0.0#subdirectory=Server",
         "mcp-for-unity",
         "--transport",
         "stdio"

{mcpforunityserver-8.7.1 → mcpforunityserver-9.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcpforunityserver"
-version = "8.7.1"
+version = "9.0.0"
 description = "MCP for Unity Server: A Unity package for Unity Editor integration via the Model Context Protocol (MCP)."
 readme = "README.md"
 license = "MIT"

{mcpforunityserver-8.7.1 → mcpforunityserver-9.0.0}/src/main.py

@@ -30,7 +30,8 @@ try:  # pragma: no cover - startup safety guard
     )
     for _name in _typing_names:
         if not hasattr(builtins, _name) and hasattr(_typing, _name):
-            setattr(builtins, _name, getattr(_typing, _name))  # type: ignore[attr-defined]
+            # type: ignore[attr-defined]
+            setattr(builtins, _name, getattr(_typing, _name))
 except Exception:
     pass
 
@@ -234,10 +235,10 @@ mcp = FastMCP(
     instructions="""
 This server provides tools to interact with the Unity Game Engine Editor.
 
-I have a dynamic tool system. Always check the unity://custom-tools resource first to see what special capabilities are available for the current project.
+I have a dynamic tool system. Always check the mcpforunity://custom-tools resource first to see what special capabilities are available for the current project.
 
 Targeting Unity instances:
-- Use the resource unity://instances to list active Unity sessions (Name@hash).
+- Use the resource mcpforunity://instances to list active Unity sessions (Name@hash).
 - When multiple instances are connected, call set_active_instance with the exact Name@hash before using tools/resources. The server will error if multiple are connected and no active instance is set.
 
 Important Workflows:

{mcpforunityserver-8.7.1 → mcpforunityserver-9.0.0}/src/mcpforunityserver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpforunityserver
-Version: 8.7.1
+Version: 9.0.0
 Summary: MCP for Unity Server: A Unity package for Unity Editor integration via the Model Context Protocol (MCP).
 Author-email: Marcus Sanatan <msanatan@gmail.com>, David Sarno <david.sarno@gmail.com>, Wu Shutong <martinwfire@gmail.com>
 License-Expression: MIT
@@ -108,7 +108,7 @@ Use this to run the latest released version from the repository. Change the vers
       "command": "uvx",
       "args": [
         "--from",
-        "git+https://github.com/CoplayDev/unity-mcp@v8.7.1#subdirectory=Server",
+        "git+https://github.com/CoplayDev/unity-mcp@v9.0.0#subdirectory=Server",
         "mcp-for-unity",
         "--transport",
         "stdio"

{mcpforunityserver-8.7.1 → mcpforunityserver-9.0.0}/src/mcpforunityserver.egg-info/SOURCES.txt

@@ -17,7 +17,6 @@ src/mcpforunityserver.egg-info/top_level.txt
 src/models/__init__.py
 src/models/models.py
 src/models/unity_response.py
-src/routes/__init__.py
 src/services/__init__.py
 src/services/custom_tool_service.py
 src/services/registry/__init__.py
@@ -27,7 +26,7 @@ src/services/resources/__init__.py
 src/services/resources/active_tool.py
 src/services/resources/custom_tools.py
 src/services/resources/editor_state.py
-src/services/resources/editor_state_v2.py
+src/services/resources/gameobject.py
 src/services/resources/layers.py
 src/services/resources/menu_items.py
 src/services/resources/prefab_stage.py
@@ -43,8 +42,10 @@ src/services/tools/batch_execute.py
 src/services/tools/debug_request_context.py
 src/services/tools/execute_custom_tool.py
 src/services/tools/execute_menu_item.py
+src/services/tools/find_gameobjects.py
 src/services/tools/find_in_file.py
 src/services/tools/manage_asset.py
+src/services/tools/manage_components.py
 src/services/tools/manage_editor.py
 src/services/tools/manage_gameobject.py
 src/services/tools/manage_material.py
@@ -53,13 +54,13 @@ src/services/tools/manage_scene.py
 src/services/tools/manage_script.py
 src/services/tools/manage_scriptable_object.py
 src/services/tools/manage_shader.py
+src/services/tools/manage_vfx.py
 src/services/tools/preflight.py
 src/services/tools/read_console.py
 src/services/tools/refresh_unity.py
 src/services/tools/run_tests.py
 src/services/tools/script_apply_edits.py
 src/services/tools/set_active_instance.py
-src/services/tools/test_jobs.py
 src/services/tools/utils.py
 src/transport/__init__.py
 src/transport/models.py

{mcpforunityserver-8.7.1 → mcpforunityserver-9.0.0}/src/mcpforunityserver.egg-info/top_level.txt

@@ -2,7 +2,6 @@ __init__
 core
 main
 models
-routes
 services
 transport
 utils

{mcpforunityserver-8.7.1 → mcpforunityserver-9.0.0}/src/services/custom_tool_service.py

@@ -266,15 +266,14 @@ class CustomToolService:
             return None
         return {"message": str(response)}
 
-    def _safe_response(self, response):
-        if isinstance(response, dict):
-            return response
-        if response is None:
-            return None
-        return {"message": str(response)}
-
 
 def compute_project_id(project_name: str, project_path: str) -> str:
+    """
+    DEPRECATED: Computes a SHA256-based project ID.
+    This function is no longer used as of the multi-session fix.
+    Unity instances now use their native project_hash (SHA1-based) for consistency
+    across stdio and WebSocket transports.
+    """
     combined = f"{project_name}:{project_path}"
     return sha256(combined.encode("utf-8")).hexdigest().upper()[:16]
 
@@ -307,7 +306,13 @@ def resolve_project_id_for_unity_instance(unity_instance: str | None) -> str | N
             )
 
         if target:
-            return compute_project_id(target.name, target.path)
+            # Return the project_hash from Unity (not a computed SHA256 hash).
+            # This matches the hash Unity uses when registering tools via WebSocket.
+            if target.hash:
+                return target.hash
+            logger.warning(
+                f"Unity instance {target.id} has empty hash; cannot resolve project ID")
+            return None
     except Exception:
         logger.debug(
             f"Failed to resolve project id via connection pool for {unity_instance}")

{mcpforunityserver-8.7.1 → mcpforunityserver-9.0.0}/src/services/resources/active_tool.py

@@ -31,7 +31,7 @@ class ActiveToolResponse(MCPResponse):
 
 
 @mcp_for_unity_resource(
-    uri="unity://editor/active-tool",
+    uri="mcpforunity://editor/active-tool",
     name="editor_active_tool",
     description="Currently active editor tool (Move, Rotate, Scale, etc.) and transform handle settings."
 )

{mcpforunityserver-8.7.1 → mcpforunityserver-9.0.0}/src/services/resources/custom_tools.py

@@ -22,7 +22,7 @@ class CustomToolsResourceResponse(MCPResponse):
 
 
 @mcp_for_unity_resource(
-    uri="unity://custom-tools",
+    uri="mcpforunity://custom-tools",
     name="custom_tools",
     description="Lists custom tools available for the active Unity project.",
 )
@@ -31,7 +31,7 @@ async def get_custom_tools(ctx: Context) -> CustomToolsResourceResponse | MCPRes
     if not unity_instance:
         return MCPResponse(
             success=False,
-            message="No active Unity instance. Call set_active_instance with Name@hash from unity://instances.",
+            message="No active Unity instance. Call set_active_instance with Name@hash from mcpforunity://instances.",
         )
 
     project_id = resolve_project_id_for_unity_instance(unity_instance)

mcpforunityserver-8.7.1/src/services/resources/editor_state_v2.py → mcpforunityserver-9.0.0/src/services/resources/editor_state.py

@@ -1,15 +1,119 @@
-import time
 import os
+import time
 from typing import Any
 
 from fastmcp import Context
+from pydantic import BaseModel
 
 from models import MCPResponse
 from services.registry import mcp_for_unity_resource
 from services.tools import get_unity_instance_from_context
+from services.state.external_changes_scanner import external_changes_scanner
 import transport.unity_transport as unity_transport
 from transport.legacy.unity_connection import async_send_command_with_retry
-from services.state.external_changes_scanner import external_changes_scanner
+
+
+class EditorStateUnity(BaseModel):
+    instance_id: str | None = None
+    unity_version: str | None = None
+    project_id: str | None = None
+    platform: str | None = None
+    is_batch_mode: bool | None = None
+
+
+class EditorStatePlayMode(BaseModel):
+    is_playing: bool | None = None
+    is_paused: bool | None = None
+    is_changing: bool | None = None
+
+
+class EditorStateActiveScene(BaseModel):
+    path: str | None = None
+    guid: str | None = None
+    name: str | None = None
+
+
+class EditorStateEditor(BaseModel):
+    is_focused: bool | None = None
+    play_mode: EditorStatePlayMode | None = None
+    active_scene: EditorStateActiveScene | None = None
+
+
+class EditorStateActivity(BaseModel):
+    phase: str | None = None
+    since_unix_ms: int | None = None
+    reasons: list[str] | None = None
+
+
+class EditorStateCompilation(BaseModel):
+    is_compiling: bool | None = None
+    is_domain_reload_pending: bool | None = None
+    last_compile_started_unix_ms: int | None = None
+    last_compile_finished_unix_ms: int | None = None
+    last_domain_reload_before_unix_ms: int | None = None
+    last_domain_reload_after_unix_ms: int | None = None
+
+
+class EditorStateRefresh(BaseModel):
+    is_refresh_in_progress: bool | None = None
+    last_refresh_requested_unix_ms: int | None = None
+    last_refresh_finished_unix_ms: int | None = None
+
+
+class EditorStateAssets(BaseModel):
+    is_updating: bool | None = None
+    external_changes_dirty: bool | None = None
+    external_changes_last_seen_unix_ms: int | None = None
+    external_changes_dirty_since_unix_ms: int | None = None
+    external_changes_last_cleared_unix_ms: int | None = None
+    refresh: EditorStateRefresh | None = None
+
+
+class EditorStateLastRun(BaseModel):
+    finished_unix_ms: int | None = None
+    result: str | None = None
+    counts: Any | None = None
+
+
+class EditorStateTests(BaseModel):
+    is_running: bool | None = None
+    mode: str | None = None
+    current_job_id: str | None = None
+    started_unix_ms: int | None = None
+    started_by: str | None = None
+    last_run: EditorStateLastRun | None = None
+
+
+class EditorStateTransport(BaseModel):
+    unity_bridge_connected: bool | None = None
+    last_message_unix_ms: int | None = None
+
+
+class EditorStateAdvice(BaseModel):
+    ready_for_tools: bool | None = None
+    blocking_reasons: list[str] | None = None
+    recommended_retry_after_ms: int | None = None
+    recommended_next_action: str | None = None
+
+
+class EditorStateStaleness(BaseModel):
+    age_ms: int | None = None
+    is_stale: bool | None = None
+
+
+class EditorStateData(BaseModel):
+    schema_version: str
+    observed_at_unix_ms: int
+    sequence: int
+    unity: EditorStateUnity | None = None
+    editor: EditorStateEditor | None = None
+    activity: EditorStateActivity | None = None
+    compilation: EditorStateCompilation | None = None
+    assets: EditorStateAssets | None = None
+    tests: EditorStateTests | None = None
+    transport: EditorStateTransport | None = None
+    advice: EditorStateAdvice | None = None
+    staleness: EditorStateStaleness | None = None
 
 
 def _now_unix_ms() -> int:
@@ -21,13 +125,12 @@ def _in_pytest() -> bool:
     return bool(os.environ.get("PYTEST_CURRENT_TEST"))
 
 
-async def _infer_single_instance_id(ctx: Context) -> str | None:
+async def infer_single_instance_id(ctx: Context) -> str | None:
     """
     Best-effort: if exactly one Unity instance is connected, return its Name@hash id.
     This makes editor_state outputs self-describing even when no explicit active instance is set.
     """
-    if _in_pytest():
-        return None
+    await ctx.info("If exactly one Unity instance is connected, return its Name@hash id.")
 
     try:
         transport = unity_transport._current_transport()
@@ -40,7 +143,8 @@ async def _infer_single_instance_id(ctx: Context) -> str | None:
             from transport.plugin_hub import PluginHub
 
             sessions_data = await PluginHub.get_sessions()
-            sessions = sessions_data.sessions if hasattr(sessions_data, "sessions") else {}
+            sessions = sessions_data.sessions if hasattr(
+                sessions_data, "sessions") else {}
             if isinstance(sessions, dict) and len(sessions) == 1:
                 session = next(iter(sessions.values()))
                 project = getattr(session, "project", None)
@@ -66,78 +170,6 @@ async def _infer_single_instance_id(ctx: Context) -> str | None:
     return None
 
 
-def _build_v2_from_legacy(legacy: dict[str, Any]) -> dict[str, Any]:
-    """
-    Best-effort mapping from legacy get_editor_state payload into the v2 contract.
-    Legacy shape (Unity): {isPlaying,isPaused,isCompiling,isUpdating,timeSinceStartup,...}
-    """
-    now_ms = _now_unix_ms()
-    # legacy may arrive already wrapped as MCPResponse-like {success,data:{...}}
-    state = legacy.get("data") if isinstance(legacy.get("data"), dict) else {}
-
-    return {
-        "schema_version": "unity-mcp/editor_state@2",
-        "observed_at_unix_ms": now_ms,
-        "sequence": 0,
-        "unity": {
-            "instance_id": None,
-            "unity_version": None,
-            "project_id": None,
-            "platform": None,
-            "is_batch_mode": None,
-        },
-        "editor": {
-            "is_focused": None,
-            "play_mode": {
-                "is_playing": bool(state.get("isPlaying", False)),
-                "is_paused": bool(state.get("isPaused", False)),
-                "is_changing": None,
-            },
-            "active_scene": {
-                "path": None,
-                "guid": None,
-                "name": state.get("activeSceneName", "") or "",
-            },
-            "selection": {
-                "count": int(state.get("selectionCount", 0) or 0),
-                "active_object_name": state.get("activeObjectName", None),
-            },
-        },
-        "activity": {
-            "phase": "unknown",
-            "since_unix_ms": now_ms,
-            "reasons": ["legacy_fallback"],
-        },
-        "compilation": {
-            "is_compiling": bool(state.get("isCompiling", False)),
-            "is_domain_reload_pending": None,
-            "last_compile_started_unix_ms": None,
-            "last_compile_finished_unix_ms": None,
-        },
-        "assets": {
-            "is_updating": bool(state.get("isUpdating", False)),
-            "external_changes_dirty": False,
-            "external_changes_last_seen_unix_ms": None,
-            "refresh": {
-                "is_refresh_in_progress": False,
-                "last_refresh_requested_unix_ms": None,
-                "last_refresh_finished_unix_ms": None,
-            },
-        },
-        "tests": {
-            "is_running": False,
-            "mode": None,
-            "started_unix_ms": None,
-            "started_by": "unknown",
-            "last_run": None,
-        },
-        "transport": {
-            "unity_bridge_connected": None,
-            "last_message_unix_ms": None,
-        },
-    }
-
-
 def _enrich_advice_and_staleness(state_v2: dict[str, Any]) -> dict[str, Any]:
     now_ms = _now_unix_ms()
     observed = state_v2.get("observed_at_unix_ms")
@@ -180,18 +212,17 @@ def _enrich_advice_and_staleness(state_v2: dict[str, Any]) -> dict[str, Any]:
 
 
 @mcp_for_unity_resource(
-    uri="unity://editor_state",
-    name="editor_state_v2",
-    description="Canonical editor readiness snapshot (v2). Includes advice and server-computed staleness.",
+    uri="mcpforunity://editor/state",
+    name="editor_state",
+    description="Canonical editor readiness snapshot. Includes advice and server-computed staleness.",
 )
-async def get_editor_state_v2(ctx: Context) -> MCPResponse:
+async def get_editor_state(ctx: Context) -> MCPResponse:
     unity_instance = get_unity_instance_from_context(ctx)
 
-    # Try v2 snapshot first (Unity-side cache will make this fast once implemented).
     response = await unity_transport.send_with_unity_instance(
         async_send_command_with_retry,
         unity_instance,
-        "get_editor_state_v2",
+        "get_editor_state",
         {},
     )
 
@@ -199,26 +230,13 @@ async def get_editor_state_v2(ctx: Context) -> MCPResponse:
     if isinstance(response, dict) and not response.get("success", True):
         return MCPResponse(**response)
 
-    # If v2 is unavailable (older plugin), fall back to legacy get_editor_state and map.
-    if not (isinstance(response, dict) and isinstance(response.get("data"), dict) and response["data"].get("schema_version")):
-        legacy = await unity_transport.send_with_unity_instance(
-            async_send_command_with_retry,
-            unity_instance,
-            "get_editor_state",
-            {},
-        )
-        if isinstance(legacy, dict) and not legacy.get("success", True):
-            return MCPResponse(**legacy)
-        state_v2 = _build_v2_from_legacy(legacy if isinstance(legacy, dict) else {})
-    else:
-        state_v2 = response.get("data") if isinstance(response.get("data"), dict) else {}
-        # Ensure required v2 marker exists even if Unity returns partial.
-        state_v2.setdefault("schema_version", "unity-mcp/editor_state@2")
-        state_v2.setdefault("observed_at_unix_ms", _now_unix_ms())
-        state_v2.setdefault("sequence", 0)
+    state_v2 = response.get("data") if isinstance(
+        response, dict) and isinstance(response.get("data"), dict) else {}
+    state_v2.setdefault("schema_version", "unity-mcp/editor_state@2")
+    state_v2.setdefault("observed_at_unix_ms", _now_unix_ms())
+    state_v2.setdefault("sequence", 0)
 
     # Ensure the returned snapshot is clearly associated with the targeted instance.
-    # (This matters when multiple Unity instances are connected and the client is polling readiness.)
     unity_section = state_v2.get("unity")
     if not isinstance(unity_section, dict):
         unity_section = {}
@@ -228,24 +246,25 @@ async def get_editor_state_v2(ctx: Context) -> MCPResponse:
         if unity_instance:
             unity_section["instance_id"] = unity_instance
         else:
-            inferred = await _infer_single_instance_id(ctx)
+            inferred = await infer_single_instance_id(ctx)
             if inferred:
                 unity_section["instance_id"] = inferred
 
     # External change detection (server-side): compute per instance based on project root path.
-    # This helps detect stale assets when external tools edit the filesystem.
     try:
         instance_id = unity_section.get("instance_id")
         if isinstance(instance_id, str) and instance_id.strip():
             from services.resources.project_info import get_project_info
 
-            # Cache the project root for this instance (best-effort).
             proj_resp = await get_project_info(ctx)
-            proj = proj_resp.model_dump() if hasattr(proj_resp, "model_dump") else proj_resp
+            proj = proj_resp.model_dump() if hasattr(
+                proj_resp, "model_dump") else proj_resp
             proj_data = proj.get("data") if isinstance(proj, dict) else None
-            project_root = proj_data.get("projectRoot") if isinstance(proj_data, dict) else None
+            project_root = proj_data.get("projectRoot") if isinstance(
+                proj_data, dict) else None
             if isinstance(project_root, str) and project_root.strip():
-                external_changes_scanner.set_project_root(instance_id, project_root)
+                external_changes_scanner.set_project_root(
+                    instance_id, project_root)
 
             ext = external_changes_scanner.update_and_get(instance_id)
 
@@ -253,18 +272,33 @@ async def get_editor_state_v2(ctx: Context) -> MCPResponse:
             if not isinstance(assets, dict):
                 assets = {}
                 state_v2["assets"] = assets
-            # IMPORTANT: Unity's cached snapshot may include placeholder defaults; the server scanner is authoritative
-            # for external changes (filesystem edits outside Unity). Always overwrite these fields from the scanner.
-            assets["external_changes_dirty"] = bool(ext.get("external_changes_dirty", False))
-            assets["external_changes_last_seen_unix_ms"] = ext.get("external_changes_last_seen_unix_ms")
-            # Extra bookkeeping fields (server-only) are safe to add under assets.
-            assets["external_changes_dirty_since_unix_ms"] = ext.get("dirty_since_unix_ms")
-            assets["external_changes_last_cleared_unix_ms"] = ext.get("last_cleared_unix_ms")
+            assets["external_changes_dirty"] = bool(
+                ext.get("external_changes_dirty", False))
+            assets["external_changes_last_seen_unix_ms"] = ext.get(
+                "external_changes_last_seen_unix_ms")
+            assets["external_changes_dirty_since_unix_ms"] = ext.get(
+                "dirty_since_unix_ms")
+            assets["external_changes_last_cleared_unix_ms"] = ext.get(
+                "last_cleared_unix_ms")
     except Exception:
-        # Best-effort; do not fail readiness resource if filesystem scan can't run.
         pass
 
     state_v2 = _enrich_advice_and_staleness(state_v2)
-    return MCPResponse(success=True, message="Retrieved editor state (v2).", data=state_v2)
 
+    try:
+        if hasattr(EditorStateData, "model_validate"):
+            validated = EditorStateData.model_validate(state_v2)
+        else:
+            validated = EditorStateData.parse_obj(
+                state_v2)  # type: ignore[attr-defined]
+        data = validated.model_dump() if hasattr(
+            validated, "model_dump") else validated.dict()
+    except Exception as e:
+        return MCPResponse(
+            success=False,
+            error="invalid_editor_state",
+            message=f"Editor state payload failed validation: {e}",
+            data={"raw": state_v2},
+        )
 
+    return MCPResponse(success=True, message="Retrieved editor state.", data=data)