Fix CodeRabbit feedback: reconnection fallback and annotations safety

Address 3 CodeRabbit review comments:

1. Critical: Guard reconnection fallback to prevent wrong instance routing
   - When instance_id is set but rediscovery fails, now raises ConnectionError
   - Added 'from e' to preserve exception chain for better debugging
   - Prevents silently connecting to different Unity instance
   - Ensures multi-instance routing integrity

2. Minor: Guard __annotations__ access in resource registration
   - Use getattr(func, '__annotations__', {}) instead of direct access
   - Prevents AttributeError for functions without type hints

3. Minor: Remove unused get_type_hints import
   - Clean up unused import in resources/__init__.py

All changes applied to both Server/ and MCPForUnity/ directories.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>

Author: sakurachan

MCPForUnity/UnityMcpServer~/src/resources/__init__.py

@@ -4,7 +4,6 @@
 import logging
 import inspect
 from pathlib import Path
-from typing import get_type_hints
 
 from fastmcp import FastMCP
 from telemetry_decorator import telemetry_resource
@@ -105,13 +104,13 @@ def register_all_resources(mcp: FastMCP):
             if has_other_params:
                 fixed_wrapper.__signature__ = sig.replace(parameters=fixed_params)
                 fixed_wrapper.__annotations__ = {
-                    k: v for k, v in func.__annotations__.items()
+                    k: v for k, v in getattr(func, '__annotations__', {}).items()
                     if k != 'unity_instance'
                 }
             else:
                 fixed_wrapper.__signature__ = inspect.Signature(parameters=[])
                 fixed_wrapper.__annotations__ = {
-                    k: v for k, v in func.__annotations__.items()
+                    k: v for k, v in getattr(func, '__annotations__', {}).items()
                     if k == 'return'
                 }
 

MCPForUnity/UnityMcpServer~/src/unity_connection.py

@@ -346,6 +346,10 @@ def read_status_file() -> dict | None:
 
                     # Fallback to generic port discovery if instance-specific discovery failed
                     if new_port is None:
+                        if self.instance_id:
+                            raise ConnectionError(
+                                f"Unity instance '{self.instance_id}' could not be rediscovered"
+                            ) from e
                         new_port = PortDiscovery.discover_unity_port()
 
                     if new_port != self.port:

Server/resources/__init__.py

@@ -4,7 +4,6 @@
 import logging
 import inspect
 from pathlib import Path
-from typing import get_type_hints
 
 from fastmcp import FastMCP
 from telemetry_decorator import telemetry_resource
@@ -105,13 +104,13 @@ def register_all_resources(mcp: FastMCP):
             if has_other_params:
                 fixed_wrapper.__signature__ = sig.replace(parameters=fixed_params)
                 fixed_wrapper.__annotations__ = {
-                    k: v for k, v in func.__annotations__.items()
+                    k: v for k, v in getattr(func, '__annotations__', {}).items()
                     if k != 'unity_instance'
                 }
             else:
                 fixed_wrapper.__signature__ = inspect.Signature(parameters=[])
                 fixed_wrapper.__annotations__ = {
-                    k: v for k, v in func.__annotations__.items()
+                    k: v for k, v in getattr(func, '__annotations__', {}).items()
                     if k == 'return'
                 }
 

Server/unity_connection.py

@@ -346,6 +346,10 @@ def read_status_file() -> dict | None:
 
                     # Fallback to generic port discovery if instance-specific discovery failed
                     if new_port is None:
+                        if self.instance_id:
+                            raise ConnectionError(
+                                f"Unity instance '{self.instance_id}' could not be rediscovered"
+                            ) from e
                         new_port = PortDiscovery.discover_unity_port()
 
                     if new_port != self.port: