Fix review findings: Windows uvx, error consistency, CI robustness

- find_uvx: check uvx.exe on Windows, remove dead PATH-building code
- Install uv button: use powershell directly on Windows, not via bash
- find_nodes: return EDITOR_NOT_READY error instead of empty success
  when no scene is open (consistent with other handlers)
- node_get_properties: skip properties that return null unexpectedly
  (protects against custom script getter errors)
- ci-godot-tests: fail hard with clear message if no Godot session
  connects after 60 attempts, instead of falling through to run_tests
- Document port-check limitation (HTTP only, not WebSocket)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: dsarno

plugin/addons/godot_ai/client_configurator.gd

@@ -98,29 +98,27 @@ static func get_server_command() -> Array[String]:
 
 
 ## Find the uvx executable, checking platform-specific locations.
+## On GUI-launched Godot, PATH is minimal, so we check well-known
+## install locations explicitly before falling back to which/where.
 static func find_uvx() -> String:
 	var extra_paths := _get_platform_path_prepend()
-	var search_names := ["uvx"]
-
-	for name in search_names:
-		# Check extra platform paths first
-		for dir in extra_paths:
-			var full := dir.path_join(name)
-			if FileAccess.file_exists(full):
-				return full
-
-		# Check via which/where
-		var cmd := "which" if OS.get_name() != "Windows" else "where"
-		var output: Array = []
-		var env_path := OS.get_environment("PATH")
-		if not extra_paths.is_empty():
-			var prepend := ":".join(extra_paths) if OS.get_name() != "Windows" else ";".join(extra_paths)
-			env_path = prepend + (":" if OS.get_name() != "Windows" else ";") + env_path
-		var exit_code := OS.execute(cmd, [name], output, true)
-		if exit_code == 0 and output.size() > 0:
-			var found: String = output[0].strip_edges()
-			if not found.is_empty():
-				return found
+	var is_windows := OS.get_name() == "Windows"
+	var exe_name := "uvx.exe" if is_windows else "uvx"
+
+	# Check well-known platform paths first (works even with minimal PATH)
+	for dir in extra_paths:
+		var full := dir.path_join(exe_name)
+		if FileAccess.file_exists(full):
+			return full
+
+	# Fallback: which/where using inherited PATH
+	var cmd := "where" if is_windows else "which"
+	var output: Array = []
+	var exit_code := OS.execute(cmd, [exe_name], output, true)
+	if exit_code == 0 and output.size() > 0:
+		var found: String = output[0].strip_edges()
+		if not found.is_empty():
+			return found
 
 	return ""
 

plugin/addons/godot_ai/handlers/node_handler.gd

@@ -70,10 +70,13 @@ func get_node_properties(params: Dictionary) -> Dictionary:
 	var properties: Array[Dictionary] = []
 	for prop in node.get_property_list():
 		var usage: int = prop.get("usage", 0)
-		# Only include properties visible in the inspector (PROPERTY_USAGE_EDITOR)
 		if not (usage & PROPERTY_USAGE_EDITOR):
 			continue
+		# Safe read: custom script getters can error; skip bad properties
+		# rather than letting one bad read timeout the entire request.
 		var value = node.get(prop.name)
+		if value == null and prop.type != TYPE_NIL:
+			continue
 		properties.append({
 			"name": prop.name,
 			"type": type_string(prop.type),

plugin/addons/godot_ai/handlers/scene_handler.gd

@@ -39,7 +39,7 @@ func find_nodes(params: Dictionary) -> Dictionary:
 
 	var scene_root := EditorInterface.get_edited_scene_root()
 	if scene_root == null:
-		return {"data": {"nodes": [], "message": "No scene open"}}
+		return McpErrorCodes.make(McpErrorCodes.EDITOR_NOT_READY, "No scene open")
 
 	var results: Array[Dictionary] = []
 	_find_recursive(scene_root, scene_root, name_filter, type_filter, group_filter, results)

plugin/addons/godot_ai/mcp_dock.gd

@@ -256,14 +256,11 @@ func _make_status_row(label_text: String, value_text: String, value_color: Color
 
 
 func _on_install_uv() -> void:
-	var install_cmd: String
 	match OS.get_name():
 		"Windows":
-			install_cmd = "powershell -ExecutionPolicy ByPass -c \"irm https://astral.sh/uv/install.ps1 | iex\""
+			OS.execute("powershell", ["-ExecutionPolicy", "ByPass", "-c", "irm https://astral.sh/uv/install.ps1 | iex"], [], false)
 		_:
-			install_cmd = "curl -LsSf https://astral.sh/uv/install.sh | sh"
-	OS.execute("bash", ["-c", install_cmd], [], false)
-	# Re-check after a moment
+			OS.execute("bash", ["-c", "curl -LsSf https://astral.sh/uv/install.sh | sh"], [], false)
 	_refresh_setup_status.call_deferred()
 
 

plugin/addons/godot_ai/plugin.gd

@@ -67,6 +67,9 @@ func _exit_tree() -> void:
 func _start_server() -> void:
 	## If a server is already listening on our HTTP port, use it.
 	## This covers: CI (external server), another Godot instance, or manual start.
+	## NOTE: We only check port 8000 (HTTP), not 9500 (WebSocket). If a foreign
+	## process holds 8000, we'll assume it's a valid server. The WebSocket
+	## connection will fail and retry if the server isn't actually ours.
 	if _is_port_in_use(McpClientConfigurator.SERVER_HTTP_PORT):
 		print("MCP | server already running on port %d, using existing" % McpClientConfigurator.SERVER_HTTP_PORT)
 		return

script/ci-godot-tests

@@ -56,6 +56,29 @@ if [ -z "${SESSION_ID:-}" ]; then
   exit 1
 fi
 
+# Verify a Godot session is actually connected before running tests
+FINAL_COUNT=$(curl -s "$SERVER_URL" -X POST "${HEADERS[@]}" \
+  -H "Mcp-Session-Id: $SESSION_ID" \
+  -d '{"jsonrpc":"2.0","id":99,"method":"tools/call","params":{"name":"session_list","arguments":{}}}' \
+  | python3 -c "
+import json, sys
+raw = sys.stdin.read()
+for line in raw.split('\n'):
+    if line.startswith('data: '):
+        data = json.loads(line[6:])
+        sc = data.get('result',{}).get('structuredContent',{})
+        if not sc:
+            text = data.get('result',{}).get('content',[{}])[0].get('text','{}')
+            sc = json.loads(text)
+        print(sc.get('count', 0))
+        break
+" 2>/dev/null || echo "0")
+
+if [ "$FINAL_COUNT" -eq 0 ] 2>/dev/null; then
+  echo "ERROR: No Godot session connected after 60 attempts. Plugin may not have loaded."
+  exit 1
+fi
+
 # Call run_tests
 echo "Running handler tests..."
 RESULT=$(curl -s "$SERVER_URL" -X POST "${HEADERS[@]}" \