node-red-contrib-knx-ultimate 6.2.3-beta.4 → 6.3.0

package/CHANGELOG.md

@@ -6,6 +6,17 @@
 
 # CHANGELOG
 
+**Version 6.3.0** - August 2026<br/>
+
+- **HUE Controller**: unified device-first workflow for all supported Hue API v2 resources, with automatic type detection and legacy-node migration.<br/>
+- **Matter**: clearer commissioning progress and refined Controller/Bridge workflows and documentation.<br/>
+- **Editor pickers**: Hue, Matter and KNX Group Address lists now open reliably and show every available entry before filtering.<br/>
+
+**Version 6.2.3-beta.5** - August 2026<br/>
+
+- **HUE Controller**: device-first selection with automatic type detection and all supported Hue API v2 resources.<br/>
+- **Device pickers**: Hue, Matter and KNX Group Address lists now stay open on click and show all entries before filtering.<br/>
+
 **Version 6.2.3-beta.4** - August 2026<br/>
 
 - **Matter Controller — live commissioning progress**: replaced the pairing overlay spinner with a milestone-based progress bar driven by the actual matter.js commissioning flow. The blocking panel now describes the active discovery, PASE, device-information, fail-safe, regulatory, time-sync, attestation, credential, access-control, CASE reconnect and completion phase in English; when exposed by the commissionee, its product name, Vendor ID and Product ID appear below the current operation. Progress polling is local to the Node-RED editor, stops with the pairing request and is isolated by operation ID across editor tabs.<br/>

package/nodes/hue-config.js

@@ -5,6 +5,10 @@
 /* eslint-disable no-inner-declarations */
 /* eslint-disable max-len */
 const cloneDeep = require('lodash/cloneDeep')
+const {
+  HUE_CONTROLLER_RESOURCE_TYPES,
+  buildHueControllerResourceCatalog
+} = require('./utils/hueControllerResourceCatalog')
 // const classHUE = require("./utils/hueEngine").classHUE;
 const hueColorConverter = require('./utils/colorManipulators/hueColorConverter')
 
@@ -355,6 +359,15 @@ module.exports = (RED) => {
           }
         }
         if (node.hueAllResources === undefined) return
+        if (_rtype === 'hue_controller') {
+          const resourceResults = await Promise.all(HUE_CONTROLLER_RESOURCE_TYPES.map(async (resourceType) => {
+            const result = await node.getResources(resourceType)
+            return [resourceType, Array.isArray(result?.devices) ? result.devices : []]
+          }))
+          return {
+            devices: buildHueControllerResourceCatalog(Object.fromEntries(resourceResults))
+          }
+        }
         // Returns capitalized string
         function capStr (s) {
           if (typeof s !== 'string') return ''

package/nodes/knxUltimate.html

@@ -1,24 +1,25 @@
 <!-- <script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/jquery.searchableSelect.js"></script> -->
 
 <style>
-/* Monaco editor - first area (input to bus): light green */
-#sendMsgToKNXCode-editor .monaco-editor,
-#sendMsgToKNXCode-editor .monaco-editor-background,
-#sendMsgToKNXCode-editor .monaco-editor .margin,
-#sendMsgToKNXCode-editor .monaco-editor .overflow-guard,
-#sendMsgToKNXCode-editor .monaco-editor .lines-content,
-#sendMsgToKNXCode-editor .monaco-editor .editor-scrollable {
-    background-color: #e8f5e9 !important;
-}
-/* Monaco editor - second area (bus to output): light yellow */
-#receiveMsgFromKNXCode-editor .monaco-editor,
-#receiveMsgFromKNXCode-editor .monaco-editor-background,
-#receiveMsgFromKNXCode-editor .monaco-editor .margin,
-#receiveMsgFromKNXCode-editor .monaco-editor .overflow-guard,
-#receiveMsgFromKNXCode-editor .monaco-editor .lines-content,
-#receiveMsgFromKNXCode-editor .monaco-editor .editor-scrollable {
-    background-color: #fffde7 !important;
-}
+    /* Monaco editor - first area (input to bus): light green */
+    #sendMsgToKNXCode-editor .monaco-editor,
+    #sendMsgToKNXCode-editor .monaco-editor-background,
+    #sendMsgToKNXCode-editor .monaco-editor .margin,
+    #sendMsgToKNXCode-editor .monaco-editor .overflow-guard,
+    #sendMsgToKNXCode-editor .monaco-editor .lines-content,
+    #sendMsgToKNXCode-editor .monaco-editor .editor-scrollable {
+        background-color: #e8f5e9 !important;
+    }
+
+    /* Monaco editor - second area (bus to output): light yellow */
+    #receiveMsgFromKNXCode-editor .monaco-editor,
+    #receiveMsgFromKNXCode-editor .monaco-editor-background,
+    #receiveMsgFromKNXCode-editor .monaco-editor .margin,
+    #receiveMsgFromKNXCode-editor .monaco-editor .overflow-guard,
+    #receiveMsgFromKNXCode-editor .monaco-editor .lines-content,
+    #receiveMsgFromKNXCode-editor .monaco-editor .editor-scrollable {
+        background-color: #fffde7 !important;
+    }
 </style>
 
 <script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/htmlUtils.js"></script>
@@ -76,19 +77,19 @@
             return ((this.outputRBE === "true" || this.outputRBE === true) ? "|rbe| " : "") + functionSendMsgToKNXCode + (this.name || this.topic || "KNX Device") + (this.setTopicType === 'str' || this.setTopicType === undefined ? '' : ' [' + (this.setTopicType === 'listenAllGA' ? 'Universal' : this.setTopicType) + ']') + functionreceiveMsgFromKNXCode + ((this.inputRBE === "true" || this.inputRBE === true) ? " |rbe|" : "")
         },
         paletteLabel: "KNX DEVICE",
-	        button: {
-	            enabled: function () {
-	                return !this.changed;
-	            },
-	            visible: function () {
-	                const isUniversal = this.setTopicType === 'listenAllGA' || this.listenallga === true || this.listenallga === 'true';
-	                if (isUniversal) return false;
-	                return this.buttonEnabled === true || this.buttonEnabled === "true";
-	            },
-	            onclick: function () {
-	                const node = this;
-	                const mode = node.buttonMode || 'toggle';
-	                const request = { id: node.id, mode };
+        button: {
+            enabled: function () {
+                return !this.changed;
+            },
+            visible: function () {
+                const isUniversal = this.setTopicType === 'listenAllGA' || this.listenallga === true || this.listenallga === 'true';
+                if (isUniversal) return false;
+                return this.buttonEnabled === true || this.buttonEnabled === "true";
+            },
+            onclick: function () {
+                const node = this;
+                const mode = node.buttonMode || 'toggle';
+                const request = { id: node.id, mode };
                 if (mode === 'value') {
                     request.value = node.buttonStaticValue;
                 }
@@ -148,6 +149,7 @@
 
 
             var node = this;
+            let topicPickerMouseDown = false;
             if ($("#node-input-server").val() === "_ADD_") {
                 // Node-Red 4.0.x has a bug not selecting the default server node
                 try {
@@ -964,8 +966,20 @@ return msg;`
                                         }
                                     } catch (e) { }
                                 }
-                            }).focus(function () {
-                                $(this).autocomplete('search', $(this).val() + 'exactmatch');
+                            }).on('mousedown.knxUltimateTopicPicker', function () {
+                                topicPickerMouseDown = true;
+                            }).on('focus.knxUltimateTopicPicker', function () {
+                                if (!topicPickerMouseDown) {
+                                    $(this).autocomplete('search', '');
+                                }
+                            }).on('click.knxUltimateTopicPicker', function () {
+                                topicPickerMouseDown = false;
+                                const input = this;
+                                setTimeout(function () {
+                                    $(input).autocomplete('search', '');
+                                }, 0);
+                            }).on('blur.knxUltimateTopicPicker', function () {
+                                topicPickerMouseDown = false;
                             }).autocomplete("instance")._renderItem = function (ul, item) {
                                 const isSecure = !!item.isSecure;
                                 const colorStyle = isSecure ? 'color: green;' : '';
@@ -1185,10 +1199,6 @@ return msg;`
 <input id="node-input-gaSecure" name="node-input-gaSecure" type="hidden" value="false" />
 
 <div class="form-row">
-    <b>KNX Device node</b>
-    <br />
-    <br />
-
     <label for="node-input-server">
         <i class="fa fa-circle-o"></i> <span data-i18n="knxUltimate.properties.node-input-server"></span>
     </label>
@@ -1209,13 +1219,14 @@ return msg;`
             <option value="global" data-i18n="knxUltimate.selectlists.SetTopic_global"></option>
             <option value="env" data-i18n="knxUltimate.selectlists.SetTopic_env"></option>
         </select>
-        <input type="text" id="node-input-topic" data-i18n="[placeholder]knxUltimate.placeholder.search"
+         <input type="text" id="node-input-topic" data-i18n="[placeholder]knxUltimate.placeholder.search"
             style="width:180px" />
         <span id="gaSecureShield" title="Data Secure" style="display:none;color:green;margin-left:6px;"><i
                 class="fa fa-shield"></i></span>
+        <input style="flex:1 1 240px; min-width:240px; max-width:240px;" type="text" id="node-input-name"
+            data-i18n="[placeholder]knxUltimate.properties.node-input-name" />
     </div>
 
-
     <div class="form-row" id="divDatapointSelection">
         <label for="node-input-dpt">
             <img
@@ -1229,19 +1240,10 @@ return msg;`
     </div>
     <div class="form-row">
         <span id="dptDetailsContainer" style="display:none;width:100%;">
-            <div id="sampleCodeEditor" class="dpt-details-helplink" style="color:red;margin-bottom:4px;"></div>
-            <div class="node-text-editor" id="example-editor" style="height:200px;min-height:150px;padding:0px;"></div>
+            <!-- <div id="sampleCodeEditor" class="dpt-details-helplink" style="color:red;margin-bottom:4px;"></div> -->
+            <div class="node-text-editor" id="example-editor" style="height:110px;padding:0px;"></div>
         </span>
     </div>
-    <!-- <div class="form-row">
-        <input type="checkbox" id="node-input-listenallga"
-            style="display:inline-block; width:auto; vertical-align:top;" />
-        <label style="width:auto" for="node-input-listenallga">
-            <img
-                src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAACXBIWXMAAB7CAAAewgFu0HU+AAAFGmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDggNzkuMTY0MDM2LCAyMDE5LzA4LzEzLTAxOjA2OjU3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgMjEuMSAoTWFjaW50b3NoKSIgeG1wOkNyZWF0ZURhdGU9IjIwMjAtMDMtMjNUMTY6MjM6MjMrMDE6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDIwLTAzLTIzVDE2OjI1OjM0KzAxOjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDIwLTAzLTIzVDE2OjI1OjM0KzAxOjAwIiBkYzpmb3JtYXQ9ImltYWdlL3BuZyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgcGhvdG9zaG9wOklDQ1Byb2ZpbGU9InNSR0IgSUVDNjE5NjYtMi4xIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOmJmNGM3NWVjLTIwNGYtNGY1YS05YTMxLTQ5NTU5YWJmZDE4NSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpiZjRjNzVlYy0yMDRmLTRmNWEtOWEzMS00OTU1OWFiZmQxODUiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpiZjRjNzVlYy0yMDRmLTRmNWEtOWEzMS00OTU1OWFiZmQxODUiPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjcmVhdGVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmJmNGM3NWVjLTIwNGYtNGY1YS05YTMxLTQ5NTU5YWJmZDE4NSIgc3RFdnQ6d2hlbj0iMjAyMC0wMy0yM1QxNjoyMzoyMyswMTowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIxLjEgKE1hY2ludG9zaCkiLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+nhtLUgAAAE9JREFUKJG1UMsOACAIgub//7IdqvVQtjrExU1EEQLuiGCvgTNgl5D74MmVZPu4wIxQAgm+/sDec2VhgQPgf0sq1unjMlYJE/3MZrvy+kMFZQkZEWfC7ikAAAAASUVORK5CYII="></img>
-            <span data-i18n="knxUltimate.properties.node-input-listenallga"></span>
-        </label>
-    </div> -->
     <div id="tabs">
         <ul>
             <li><a href="#tabs-1"><i class="fa fa-braille"></i> Advanced options</a></li>
@@ -1254,14 +1256,6 @@ return msg;`
                         <i class="fa fa-desktop"></i> General properties
                     </dt>
                 </div>
-                <div class="form-row">
-                    <label style="width:180px" for="node-input-name">
-                        <i class="fa fa-tag"></i>
-                        <span data-i18n="knxUltimate.properties.node-input-name"></span>
-                    </label>
-                    <input style="flex:1 1 240px; min-width:240px; max-width:240px;" type="text" id="node-input-name"
-                        data-i18n="[placeholder]knxUltimate.properties.node-input-name" />
-                </div>
                 <div class="form-row" id="divTopic">
                     <label style="width:180px" for="node-input-outputtopic">
                         <i class="fa fa-tasks"></i>

package/nodes/knxUltimateHueController.html

@@ -36,6 +36,7 @@
     // Node-RED 4.x uses `_ADD_` both for the visible "none" option (when
     // gateways exist) and for "Add new..." (when none exist).
     const KNX_EMPTY_SERVER_VALUES = new Set(['', 'none', '_add_', '__none__']);
+    const HUE_EMPTY_SERVER_VALUES = new Set(['', 'none', '_add_', '__none__']);
     const TUTORIALS_URL = 'https://www.youtube.com/playlist?list=PL9Yh1bjbLAYrU8PsVhW4xzEug2WtVFv3E';
     const profileBundle = window.KNXUltimateHueControllerProfiles;
 
@@ -294,6 +295,11 @@
         let legacyContext;
         let closeMigrationDialog = () => { };
         const profileDrafts = {};
+        let cachedHueResources = [];
+        let selectedHueResource;
+        let activeHueServerId;
+        let hueDevicePickerMouseDown = false;
+        const defaultHueDevicePlaceholder = $('#node-input-name').attr('placeholder') || '';
 
         const hasLegacyHueNodes = editorContainsLegacyHueNodes();
         const $migrationButton = $('#hue-controller-migrate-legacy-flow');
@@ -357,6 +363,168 @@
           });
         };
 
+        const controllerText = (key, fallback) => {
+          try {
+            const translated = controllerNode._(`knxUltimateHueController.${key}`);
+            if (translated && translated !== `knxUltimateHueController.${key}`) return translated;
+          } catch (error) { /* empty */ }
+          return fallback;
+        };
+
+        const resolveHueServerId = ({ allowStored = false } = {}) => {
+          const domValue = $('#node-input-serverHue').val();
+          if (domValue !== undefined && domValue !== null) {
+            const normalized = String(domValue).trim();
+            if (normalized !== '' && !HUE_EMPTY_SERVER_VALUES.has(normalized.toLowerCase())) return normalized;
+          }
+          if (allowStored && controllerNode.serverHue !== undefined && controllerNode.serverHue !== null) {
+            const stored = String(controllerNode.serverHue).trim();
+            if (stored !== '' && !HUE_EMPTY_SERVER_VALUES.has(stored.toLowerCase())) return stored;
+          }
+          return '';
+        };
+
+        const getHueDeviceValue = () => {
+          const domValue = $('#node-input-hueDevice').val();
+          if (domValue !== undefined && domValue !== null && String(domValue).trim() !== '') return String(domValue).trim();
+          return controllerNode.hueDevice === undefined || controllerNode.hueDevice === null
+            ? ''
+            : String(controllerNode.hueDevice).trim();
+        };
+
+        const getRawHueResourceId = (value) => String(value || '').split('#')[0];
+
+        const updateSelectedDevicePresentation = (controllerType = controllerNode.hueControllerType) => {
+          const hasDevice = getHueDeviceValue() !== '';
+          const profile = PROFILE_TYPES[controllerType] || PROFILE_TYPES.light;
+          const typeLabel = controllerText(`types.${controllerType}`, profile.label);
+          $('#hue-controller-selected-device-type-value').text(typeLabel);
+          $('#hue-controller-selected-device-type').toggle(hasDevice);
+          $('#hue-controller-locate-device').toggle(hasDevice && controllerType === 'light');
+          $('#hue-controller-profile-editor').toggle(hasDevice);
+          $('#node-input-hueControllerType').val(controllerType);
+        };
+
+        const filterHueResources = (term) => {
+          const search = String(term || '').replace(/exactmatch/gi, '').trim().toLowerCase();
+          return cachedHueResources.filter((item) => {
+            if (search === '') return true;
+            return String(item.name || item.id || '').toLowerCase().includes(search);
+          }).map((item) => ({
+            ...item,
+            value: item.name || item.id,
+            label: item.name || item.id
+          }));
+        };
+
+        const reconcileSavedHueResource = () => {
+          const savedDevice = getHueDeviceValue();
+          if (savedDevice === '') return;
+          const rawId = getRawHueResourceId(savedDevice);
+          const match = cachedHueResources.find((item) => item.hueDevice === savedDevice)
+            || cachedHueResources.find((item) => item.id === rawId && item.controllerType === controllerNode.hueControllerType)
+            || cachedHueResources.find((item) => item.id === rawId);
+          if (!match) {
+            updateSelectedDevicePresentation();
+            return;
+          }
+          selectedHueResource = match;
+          if (!$('#node-input-name').val()) $('#node-input-name').val(match.name || match.id);
+          if (match.controllerType !== controllerNode.hueControllerType) {
+            applyHueResourceSelection(match);
+            return;
+          }
+          updateSelectedDevicePresentation(match.controllerType);
+        };
+
+        const fetchHueResources = (term, response, { forceRefresh = false } = {}) => {
+          const reply = typeof response === 'function' ? response : () => { };
+          const hueServerId = resolveHueServerId({ allowStored: true });
+          if (hueServerId === '') {
+            reply([]);
+            return;
+          }
+          if (!forceRefresh && cachedHueResources.length > 0) {
+            reply(filterHueResources(term));
+            return;
+          }
+          $('#hue-controller-devices-loading').show();
+          const refreshQuery = forceRefresh ? '&forceRefresh=1' : '';
+          $.getJSON(`KNXUltimateGetResourcesHUE?rtype=hue_controller&serverId=${encodeURIComponent(hueServerId)}${refreshQuery}&_=${Date.now()}`, (data) => {
+            const devices = Array.isArray(data) ? data : (Array.isArray(data?.devices) ? data.devices : []);
+            cachedHueResources = devices.filter((item) => item && PROFILE_TYPES[item.controllerType] && item.id && item.hueDevice);
+            $('#node-input-name').attr('placeholder', cachedHueResources.length > 0
+              ? defaultHueDevicePlaceholder
+              : controllerText('no_devices', 'No Hue resources found. Check the Hue Bridge and press refresh.'));
+            reconcileSavedHueResource();
+            reply(filterHueResources(term));
+          }).fail(() => {
+            cachedHueResources = [];
+            $('#node-input-name').attr('placeholder', controllerText('no_devices', 'No Hue resources found. Check the Hue Bridge and press refresh.'));
+            reply([]);
+          }).always(() => {
+            $('#hue-controller-devices-loading').hide();
+          });
+        };
+
+        const configureUnifiedDeviceControl = () => {
+          const $deviceName = $('#node-input-name');
+          if (!$deviceName.length) return;
+          $deviceName.autocomplete({
+            minLength: 0,
+            source(request, response) {
+              fetchHueResources(request.term, response);
+            },
+            select(event, ui) {
+              applyHueResourceSelection(ui.item);
+              return false;
+            },
+            change(event, ui) {
+              if (ui.item || selectedHueResource?.name === $deviceName.val()) return;
+              selectedHueResource = undefined;
+              controllerNode.hueDevice = '';
+              $('#node-input-hueDevice').val('');
+              updateSelectedDevicePresentation();
+            }
+          });
+          $deviceName.off('.knxUltimateHueControllerDevice')
+            .on('mousedown.knxUltimateHueControllerDevice', () => {
+              hueDevicePickerMouseDown = true;
+            })
+            .on('focus.knxUltimateHueControllerDevice', function () {
+              if (!hueDevicePickerMouseDown) $(this).autocomplete('search', '');
+            })
+            .on('click.knxUltimateHueControllerDevice', function () {
+              hueDevicePickerMouseDown = false;
+              const input = this;
+              setTimeout(() => $(input).autocomplete('search', ''), 0);
+            })
+            .on('blur.knxUltimateHueControllerDevice', () => {
+              hueDevicePickerMouseDown = false;
+            });
+        };
+
+        const applyHueResourceSelection = (item) => {
+          if (!item || !PROFILE_TYPES[item.controllerType] || !item.hueDevice) return;
+          const nextType = item.controllerType;
+          const typeChanged = nextType !== controllerNode.hueControllerType;
+          collectCurrentEditor();
+          if (typeChanged) prepareProfileValues(nextType, getProfileDefinition(nextType));
+          selectedHueResource = item;
+          controllerNode.hueControllerType = nextType;
+          controllerNode.name = item.name || item.id;
+          controllerNode.hueDevice = item.hueDevice;
+          if (item.deviceObject) controllerNode.hueDeviceObject = cloneEditorValue(item.deviceObject);
+          const nextDefinition = getProfileDefinition(nextType);
+          controllerNode.inputs = Number(nextDefinition?.inputs || 0);
+          controllerNode.outputs = Number(nextDefinition?.outputs || 0);
+          $('#node-input-name').val(controllerNode.name);
+          $('#node-input-hueDevice').val(controllerNode.hueDevice);
+          $('#node-input-hueControllerType').val(nextType);
+          renderProfileEditor(nextType, true);
+          updateSelectedDevicePresentation(nextType);
+        };
+
         const renderProfileEditor = (controllerType, skipCollect) => {
           // Controlled lifecycle transition:
           // collect old -> dispose old -> mount private HTML -> translate ->
@@ -403,6 +571,13 @@
           $profileContent.find('#node-input-server, #node-input-serverHue').each(function () {
             $(this).closest('.form-row').remove();
           });
+          // Device selection belongs to the unified wrapper. Remove the private
+          // profile's duplicate row/hidden value while keeping the static fields
+          // available to its mature lifecycle callbacks.
+          $profileContent.find('#node-input-name').each(function () {
+            $(this).closest('.form-row').remove();
+          });
+          $profileContent.find('#node-input-hueDevice').remove();
           $container.empty().append($profileContent.contents());
           // Node-RED translates the static dialog before oneditprepare. This
           // fragment belongs to another node type, so qualify every key with the
@@ -428,9 +603,14 @@
           // Light deliberately receives the real Hue config-node selection.
           // Its private editor owns the bounded readiness poll and displays the
           // hourglass until the bridge resources are available or it times out.
+          // The Light editor completes asynchronously and installs its historic
+          // light-only autocomplete inside Go(). Give it an explicit callback
+          // that restores the Controller-wide catalog after that late setup.
+          controllerNode.__configureHueControllerDeviceControl = configureUnifiedDeviceControl;
           if (typeof definition.oneditprepare === 'function') {
             definition.oneditprepare.call(legacyContext);
           }
+          configureUnifiedDeviceControl();
           // Profile guidance is already available in the node help. Keeping it
           // out of the embedded editor makes every device profile more compact.
           $container.find('.form-tips').remove();
@@ -449,29 +629,46 @@
           $('#node-input-server')
             .off('.knxUltimateHueControllerKnxVisibility')
             .on('change.knxUltimateHueControllerKnxVisibility', updateControllerKnxVisibility);
+          updateSelectedDevicePresentation(controllerType);
           focusProfileHelp(controllerType);
         };
 
         const selectedType = PROFILE_TYPES[this.hueControllerType] ? this.hueControllerType : 'light';
-        $('#node-input-hueControllerType')
-          .val(selectedType)
-          .off('.knxUltimateHueController')
-          .on('change.knxUltimateHueController', function () {
-            const nextType = PROFILE_TYPES[$(this).val()] ? $(this).val() : 'light';
-            const nextDefinition = getProfileDefinition(nextType);
-            collectCurrentEditor();
-            prepareProfileValues(nextType, nextDefinition);
-            // A deliberate function change adopts that function's normal pin shape.
-            controllerNode.inputs = Number(nextDefinition?.inputs || 0);
-            controllerNode.outputs = Number(nextDefinition?.outputs || 0);
-            renderProfileEditor(nextType, true);
+        $('#node-input-hueControllerType').val(selectedType);
+
+        activeHueServerId = resolveHueServerId({ allowStored: true });
+        $('#hue-controller-refresh-devices')
+          .off('.knxUltimateHueControllerDevice')
+          .on('click.knxUltimateHueControllerDevice', () => {
+            cachedHueResources = [];
+            fetchHueResources('', (items) => {
+              if (items.length) $('#node-input-name').autocomplete('search', '');
+            }, { forceRefresh: true });
+          });
+        $('#node-input-serverHue')
+          .off('.knxUltimateHueControllerDevice')
+          .on('change.knxUltimateHueControllerDevice', () => {
+            const nextServerId = resolveHueServerId();
+            if (nextServerId === activeHueServerId) return;
+            activeHueServerId = nextServerId;
+            cachedHueResources = [];
+            selectedHueResource = undefined;
+            controllerNode.name = '';
+            controllerNode.hueDevice = '';
+            $('#node-input-name, #node-input-hueDevice').val('');
+            updateSelectedDevicePresentation();
           });
 
         this._hueControllerCollectEditor = collectCurrentEditor;
         this._hueControllerGetLegacyContext = () => legacyContext;
         this._hueControllerGetProfile = () => activeProfile;
         this._hueControllerCloseMigration = () => closeMigrationDialog();
+        this._hueControllerCleanupDevice = () => {
+          $('#hue-controller-refresh-devices, #node-input-serverHue, #node-input-name').off('.knxUltimateHueControllerDevice');
+          delete controllerNode.__configureHueControllerDeviceControl;
+        };
         renderProfileEditor(selectedType);
+        fetchHueResources('', () => { });
       },
       oneditsave() {
         // Preserve lifecycle order: close auxiliary UI, collect mounted fields,
@@ -496,10 +693,12 @@
           if (Number.isFinite(Number(legacyContext.inputs))) this.inputs = Number(legacyContext.inputs);
           if (Number.isFinite(Number(legacyContext.outputs))) this.outputs = Number(legacyContext.outputs);
         }
+        if (typeof this._hueControllerCleanupDevice === 'function') this._hueControllerCleanupDevice();
         delete this._hueControllerCollectEditor;
         delete this._hueControllerGetLegacyContext;
         delete this._hueControllerGetProfile;
         delete this._hueControllerCloseMigration;
+        delete this._hueControllerCleanupDevice;
       },
       oneditcancel() {
         // Cancel releases profile-owned editor state but deliberately does not
@@ -515,7 +714,9 @@
         if (definition && typeof definition.oneditcancel === 'function') {
           definition.oneditcancel.call(legacyContext || this);
         }
+        if (typeof this._hueControllerCleanupDevice === 'function') this._hueControllerCleanupDevice();
         delete this._hueControllerCloseMigration;
+        delete this._hueControllerCleanupDevice;
       }
     });
   }());
@@ -551,29 +752,37 @@
     </label>
     <input type="text" id="node-input-serverHue">
   </div>
-  <div class="form-row">
-    <label for="node-input-hueControllerType" style="width:160px;">
-      <i class="fa fa-cubes"></i>
-      <span data-i18n="knxUltimateHueController.device_function"></span>
+  <br />
+  <p>
+    <b><span data-i18n="knxUltimateHueController.hue_section"></span></b>
+  </p>
+  <div class="form-row" id="hue-controller-device-row">
+    <label for="node-input-name">
+      <i class="fa fa-play-circle"></i>
+      <span data-i18n="knxUltimateHueController.hue_device"></span>
     </label>
-    <select id="node-input-hueControllerType" style="width:33.333%;">
-      <option value="light" data-i18n="knxUltimateHueController.types.light"></option>
-      <option value="plug" data-i18n="knxUltimateHueController.types.plug"></option>
-      <option value="button" data-i18n="knxUltimateHueController.types.button"></option>
-      <option value="relative_rotary" data-i18n="knxUltimateHueController.types.relative_rotary"></option>
-      <option value="motion" data-i18n="knxUltimateHueController.types.motion"></option>
-      <option value="area_motion" data-i18n="knxUltimateHueController.types.area_motion"></option>
-      <option value="camera_motion" data-i18n="knxUltimateHueController.types.camera_motion"></option>
-      <option value="contact" data-i18n="knxUltimateHueController.types.contact"></option>
-      <option value="light_level" data-i18n="knxUltimateHueController.types.light_level"></option>
-      <option value="temperature" data-i18n="knxUltimateHueController.types.temperature"></option>
-      <option value="humidity" data-i18n="knxUltimateHueController.types.humidity"></option>
-      <option value="scene" data-i18n="knxUltimateHueController.types.scene"></option>
-      <option value="device_power" data-i18n="knxUltimateHueController.types.device_power"></option>
-      <option value="zigbee_connectivity" data-i18n="knxUltimateHueController.types.zigbee_connectivity"></option>
-      <option value="device_software_update" data-i18n="knxUltimateHueController.types.device_software_update"></option>
-    </select>
+    <input type="text" id="node-input-name" data-i18n="[placeholder]knxUltimateHueController.hue_device_placeholder"
+      style="flex:1 1 240px; min-width:240px; max-width:240px;">
+    <button type="button" id="hue-controller-refresh-devices" class="red-ui-button"
+      style="margin-left:6px; color:#1b7d33; border-color:#1b7d33;" data-i18n="[title]knxUltimateHueController.refresh_devices">
+      <i class="fa fa-sync"></i>
+    </button>
+    <button type="button" id="hue-controller-locate-device" class="red-ui-button hue-locate-device"
+      style="display:none; margin-left:6px; color:#ff9800; border-color:#ff9800;" data-i18n="[title]knxUltimateHueController.locate_device">
+      <i class="fa fa-play"></i>
+    </button>
+    <span id="hue-controller-devices-loading" style="margin-left:6px; display:none; color:#1b7d33;">
+      <i class="fa fa-circle-notch fa-spin"></i>
+    </span>
+    <span id="hue-controller-selected-device-type" style="display:none; margin-left:10px; color:#666; white-space:nowrap;">
+      <i class="fa fa-cubes"></i>
+      <span data-i18n="knxUltimateHueController.device_type"></span>:
+      <span id="hue-controller-selected-device-type-value" style="font-weight:600;"></span>
+    </span>
+    <input type="hidden" id="node-input-hueDevice">
+    <input type="hidden" id="node-input-hueControllerType">
   </div>
+  <br />
   <div id="hue-controller-profile-editor"></div>
   <br/>
    <br/>
@@ -586,7 +795,9 @@
 
 [**KNX-Ultimate video tutorials (YouTube playlist)**](https://www.youtube.com/playlist?list=PL9Yh1bjbLAYrU8PsVhW4xzEug2WtVFv3E)
 
-The unified controller for Hue API v2 resources. Choose the device function and configure the same KNX mapping and behaviour already available in the established dedicated Hue node.
+The unified controller for Hue API v2 resources. Choose a Hue device or resource; its device type is detected automatically and the matching KNX mapping, behaviour and node pins are then displayed.
+
+Clicking or focusing the Hue device field always opens the complete resource list, even when a device is already selected. Typing continues to filter the list.
 
 The controller supports lights and grouped lights, plugs, buttons, Tap dial, motion resources, contacts, light level, temperature, humidity, scenes, battery, Zigbee connectivity, and device software update resources.
 
@@ -610,7 +821,7 @@ For a single light, the **Dim**, **Tunable White**, **RGB/HSV**, and native-effe
 
 While the Hue Bridge is still loading its resources, the Light editor displays a spinning hourglass and polls readiness every 500 ms. The wait is bounded: after about 10 seconds the editor is released, the mapping tabs remain hidden, and a localized error asks you to check the bridge configuration, deploy, and retry. Closing, saving, or changing function always cancels the pending timer.
 
-Changing **Device function** changes the visible editor and the node pin layout. After saving, reopen the node to verify the selected resource and mappings.
+Changing the selected **Hue device** automatically changes the detected **Device type**, visible editor and node pin layout. After saving, reopen the node to verify the selected resource and mappings.
 
 KNX mapping rows keep GA, DPT and Name on one line. DPT selectors use a compact fixed range, while Name fields are shorter and may contract further on a narrow editor tray without changing their stored text. Saved DPT values are retained while selector options load asynchronously.
 

package/nodes/knxUltimateMatterControllerDevice.html

@@ -297,6 +297,7 @@
             $deviceNameInput.val(node.name);
           }
           let selectedMatterDeviceName = ($deviceNameInput.val() || '').trim();
+          let matterDevicePickerMouseDown = false;
           let showingNoHueDevicesPlaceholder = false;
           const HUE_EMPTY_SERVER_VALUES = new Set(['', 'none', '_add_', '__none__', '__null__', 'null', 'undefined']);
           let locateSessionActive = false;
@@ -1506,8 +1507,16 @@
               focus(event, ui) {
                 event.preventDefault();
               }
-            }).focus(function () {
-              $(this).autocomplete('search', `${$(this).val()}exactmatch`);
+            }).on('mousedown.knxUltimateMatterControllerDevicePicker', () => {
+              matterDevicePickerMouseDown = true;
+            }).on('focus.knxUltimateMatterControllerDevicePicker', function () {
+              if (!matterDevicePickerMouseDown) $(this).autocomplete('search', '');
+            }).on('click.knxUltimateMatterControllerDevicePicker', function () {
+              matterDevicePickerMouseDown = false;
+              const input = this;
+              setTimeout(() => $(input).autocomplete('search', ''), 0);
+            }).on('blur.knxUltimateMatterControllerDevicePicker', () => {
+              matterDevicePickerMouseDown = false;
             }).on('input.knxUltimateMatterControllerDevice', function () {
               const typedValue = $(this).val().trim();
               if (typedValue === '' || typedValue !== selectedMatterDeviceName) {
@@ -1529,7 +1538,7 @@
               node._cachedHueLightDevices = cachedHueDevices;
               fetchHueDevices('', () => {
                 if ($deviceNameInput.length) {
-                  $deviceNameInput.autocomplete('search', `${$deviceNameInput.val()}exactmatch`);
+                  $deviceNameInput.autocomplete('search', '');
                 }
               }, { forceRefresh: true });
             });
@@ -2668,6 +2677,9 @@ the device picker. Door Lock, Window Covering, Thermostat, Fan and Switch endpoi
 dedicated profiles. Switch press, long-press and multi-press events are emitted on the
 optional flow output; simpler endpoints continue through the generic mapped fallback.
 
+Clicking or focusing the Matter device field always opens the complete commissioned
+endpoint list, even when a device is already selected. Typing continues to filter it.
+
 **Flow input**
 
 Enable **Node Input/Output PINs** to reveal the **Flow input** section directly below

package/nodes/locales/de/knxUltimate.html

@@ -11,7 +11,7 @@ Dieser Node steuert eine KNX-Gruppenadresse und ist der am häufigsten verwendet
 |--|--|
 | Gateway | Zu verwendendes KNX-Gateway auswählen |
 | GA-Typ (Dropdown) | Typ der Gruppenadresse. **3-Ebenen** ist Standard (Eingabe der 3-stufigen GA oder GA-Bezeichnung, sofern ETS importiert). **Global** liest die GA beim Start aus einer globalen Variablen, **Flow** analog auf Flow-Ebene. **$Env variable** liest die GA aus einer Umgebungsvariable. **Universeller Modus (alle GAs abhören)** reagiert auf ALLE Gruppenadressen. |
-| Gruppenadresse | Zu steuernde Gruppenadresse. Mit importierter ETS kannst du den Gerätenamen tippen. Kann leer bleiben, wenn du sie per `msg.setConfig` setzt. |
+| Gruppenadresse | Zu steuernde Gruppenadresse. Bei importierter ETS öffnet ein Klick oder Fokus auf dieses Feld die vollständige Liste, auch wenn bereits eine GA ausgewählt ist; durch Tippen werden die Einträge gefiltert. Kann leer bleiben, wenn du sie per `msg.setConfig` setzt. |
 | Datenpunkt | Der zum Node gehörende Datapoint. |
 
 <br/>

package/nodes/locales/de/knxUltimateHueController.html

@@ -1,8 +1,9 @@
 <script type="text/markdown" data-help-name="knxUltimateHueController">
 <p><a href="https://www.youtube.com/playlist?list=PL9Yh1bjbLAYrU8PsVhW4xzEug2WtVFv3E" target="_blank" rel="noopener noreferrer"><strong>KNX-Ultimate video tutorials (YouTube playlist)</strong></a> Sehen Sie sich vor dem Start die <a href="https://youtu.be/f0Evf2QFI7c" target="_blank" rel="noopener noreferrer">Videoanleitung auf YouTube</a> an.</p>
 <p><strong>HUE Controller</strong> ist der einheitliche Knoten für Hue-API-v2-Ressourcen.</p>
-<p>Wählen Sie die Gerätefunktion und konfigurieren Sie anschließend dieselbe KNX-Zuordnung und dasselbe Verhalten wie im bewährten dedizierten Hue-Knoten.</p>
-<p>Die Auswahl der Gerätefunktion verwendet ein Drittel der verfügbaren Breite, damit der Editor kompakt bleibt.</p>
+<p>Wählen Sie ein Hue-Gerät oder eine Hue-Ressource. HUE Controller erkennt den Gerätetyp automatisch und öffnet den passenden Editor für KNX-Zuordnungen, Verhalten und Node-Anschlüsse.</p>
+<p>Geräteauswahl, Aktualisierung und erkannter Typ stehen wie beim Matter Controller in derselben kompakten Zeile.</p>
+<p>Ein Klick oder Fokus auf das Gerätefeld öffnet immer die vollständige Hue-Ressourcenliste, auch wenn bereits ein Gerät ausgewählt ist. Beim Tippen wird die Liste weiterhin gefiltert.</p>
 <p>KNX-Zuordnungszeilen halten GA, DPT und Name in einer Zeile. DPT-Auswahl und Namensfeld verwenden kompakte Breiten; das Namensfeld kann sich in schmalen Editoren weiter verkleinern, ohne den gespeicherten Text zu ändern. Gespeicherte DPT-Werte bleiben erhalten, während die Auswahloptionen asynchron geladen werden.</p>
 <p>Unterstützt werden Leuchten und Leuchtengruppen, Steckdosen, Taster, Tap dial, Bewegungs- und Kamerabewegungsressourcen, Kontakte, Lichtstärke, Temperatur, Luftfeuchtigkeit, Szenen, Batterie, Zigbee-Verbindung und Softwareupdate.</p>
 <p>Wenn kein <strong>KNX-Gateway</strong> ausgewählt ist (einschließlich <code>none</code> und <em>Neu hinzufügen...</em>), werden die KNX-Zuordnungsfelder ausgeblendet; die Auswahl der Hue-Ressource und reine Flow-Optionen bleiben verfügbar.</p>

package/nodes/locales/de/knxUltimateHueController.json

@@ -5,6 +5,13 @@
   },
   "knxUltimateHueController": {
     "device_function": "Gerätefunktion",
+    "hue_section": "Philips Hue",
+    "hue_device": "Hue-Gerät",
+    "hue_device_placeholder": "Hue-Gerät oder -Ressource suchen",
+    "device_type": "Gerätetyp",
+    "refresh_devices": "Hue-Geräte aktualisieren",
+    "locate_device": "Ausgewählte Hue-Leuchte lokalisieren",
+    "no_devices": "Keine Hue-Ressourcen gefunden. Prüfen Sie die Hue Bridge und aktualisieren Sie die Liste.",
     "legacy_node_notice": "Dieser Legacy-HUE-Knoten ist veraltet. Verwenden Sie für neue Flows den neuen HUE Controller-Knoten.",
     "migration_button": "Legacy-HUE-Knoten konvertieren",
     "migration_button_title": "Alle Legacy-HUE-Knoten im Editor konvertieren",

package/nodes/locales/de/knxUltimateMatterControllerDevice.html

@@ -3,6 +3,8 @@
 
 Dieser Knoten steuert einen bereits gekoppelten Matter-Endpunkt über KNX. Wähle das Matter-Gerät aus; der Editor erkennt die Fähigkeiten des Endpunkts und zeigt nur die passenden KNX-Zuordnungen.
 
+Ein Klick oder Fokus auf das Matter-Gerätefeld öffnet immer die vollständige Liste der gekoppelten Endpunkte, auch wenn bereits ein Gerät ausgewählt ist. Beim Tippen wird die Liste weiterhin gefiltert.
+
 Er ersetzt die unveröffentlichten getrennten Matter-Controller-Nodes und behält die komplette Licht-UI bei, wenn der gewählte Endpunkt ein Licht ist.
 
 ## Konfiguration

package/nodes/locales/en/knxUltimate.html

@@ -11,7 +11,7 @@
 |--|--|
 | Gateway | Select the KNX gateway to be used |
 | GA Type dropdown list | The group address type. **3-Levels** is the default, where you can type the _3 level group address_ or the _group address name_ (if you've upload the ETS file), or **Global**, for reading the GA at startup from a global variable, or **Flow** that do the same as the _Global_, but at flow level. Select **$Env variable** to read the group address from an environment variable. Select **Universal mode (listen to all Group Addresses)** to react to ALL group addresses.|
-| Group Addr. | The KNX Group Address you want to control. If you've imported the ETS group addresses file, you can just start typing in your device name. You can leave it empty if you wish set it with _msg.setConfig_ input message. |
+| Group Addr. | The KNX Group Address you want to control. If you've imported the ETS group addresses file, clicking or focusing this field opens the complete list, even when a GA is already selected; typing filters the entries. You can leave it empty if you wish set it with _msg.setConfig_ input message. |
 | Datapoint | The datapoint belonging to your node.|
 
 <br/>

package/nodes/locales/en/knxUltimateHueController.html

@@ -1,8 +1,9 @@
 <script type="text/markdown" data-help-name="knxUltimateHueController">
 <p><a href="https://www.youtube.com/playlist?list=PL9Yh1bjbLAYrU8PsVhW4xzEug2WtVFv3E" target="_blank" rel="noopener noreferrer"><strong>KNX-Ultimate video tutorials (YouTube playlist)</strong></a> <a href="https://youtu.be/f0Evf2QFI7c" target="_blank" rel="noopener noreferrer">Watch the explanatory video on YouTube</a> before starting.</p>
 <p><strong>HUE Controller</strong> is the unified node for Hue API v2 resources.</p>
-<p>Select the device function, then configure the same KNX mapping and behaviour provided by the established dedicated Hue node.</p>
-<p>The device function selector uses one third of the available width to keep the editor compact.</p>
+<p>Select a Hue device or resource. HUE Controller detects its device type automatically and opens the matching KNX mapping, behaviour and node-pin editor.</p>
+<p>The device picker, refresh action and detected type share the same compact row, matching the Matter Controller workflow.</p>
+<p>Clicking or focusing the device field always opens the complete Hue resource list, even when a device is already selected. Typing continues to filter the list.</p>
 <p>KNX mapping rows keep GA, DPT and Name on one line. DPT selectors and Name fields use compact widths, and the Name field can contract further on narrow editor trays without changing its stored text. Saved DPT values are retained while the selector options load asynchronously.</p>
 <p>Supported functions: lights and grouped lights, plugs, buttons, Tap dial, motion and camera motion, contacts, light level, temperature, humidity, scenes, battery, Zigbee connectivity, and device software update.</p>
 <p>When no <strong>KNX Gateway</strong> is selected (including <code>none</code> and <em>Add new...</em>), KNX mapping fields are hidden while Hue resource selection and flow-only options remain available.</p>

package/nodes/locales/en/knxUltimateHueController.json

@@ -5,6 +5,13 @@
   },
   "knxUltimateHueController": {
     "device_function": "Device function",
+    "hue_section": "Philips Hue",
+    "hue_device": "Hue device",
+    "hue_device_placeholder": "Search your Hue device or resource",
+    "device_type": "Device type",
+    "refresh_devices": "Refresh Hue devices",
+    "locate_device": "Locate selected Hue light",
+    "no_devices": "No Hue resources found. Check the Hue Bridge and press refresh.",
     "legacy_node_notice": "This legacy HUE node is deprecated. Use the new HUE Controller node for new flows.",
     "migration_button": "Convert legacy HUE nodes",
     "migration_button_title": "Convert all legacy HUE nodes in the editor",

package/nodes/locales/en/knxUltimateMatterControllerDevice.html

@@ -3,6 +3,8 @@
 
 This node controls a commissioned Matter endpoint from KNX. Select the Matter device and the editor detects its capabilities, then shows only the KNX mappings that make sense for that endpoint.
 
+Clicking or focusing the Matter device field always opens the complete commissioned endpoint list, even when a device is already selected. Typing continues to filter it.
+
 It replaces the unpublished per-device Matter controller nodes and keeps the full light UI when the selected endpoint is a light.
 
 ## Configuration

package/nodes/locales/es/knxUltimate.html

@@ -11,7 +11,7 @@
 |-|-|
 | Puerta | Seleccione la puerta de enlace KNX para ser utilizada |
 | Lista desplegable Tipo de GA | El tipo de dirección de grupo. **3 niveles** es el valor predeterminado, donde puede escribir la dirección de grupo de nivel _3 o el _group name_ (si ha cargado el archivo ETS), o **global**, para leer el GA al inicio desde una variable global, o **flujo** que hace lo mismo que el _global_, pero a nivel de flujo. Seleccione **$Env variable** para leer la dirección de grupo de una variable de entorno. Seleccione **Modo universal (escuche todas las direcciones de grupo)** para reaccionar a todas las direcciones de grupo. |
-| ADR DE GRUPO. | La dirección de grupo KNX que desea controlar. Si ha importado el archivo de direcciones del grupo ETS, puede comenzar a escribir el nombre de su dispositivo. Puede dejarlo vacío si lo desea establecerlo con _MSG.SetConfig_ Mensaje de entrada. |
+| ADR DE GRUPO. | La dirección de grupo KNX que desea controlar. Si ha importado el archivo de direcciones de grupo ETS, al hacer clic o enfocar este campo se abre la lista completa, aunque ya haya una GA seleccionada; al escribir se filtran las entradas. Puede dejarlo vacío si desea establecerlo con el mensaje de entrada _msg.setConfig_. |
 | Punto de datos | El punto de datos que pertenece a su nodo. |
 
 <br/>

package/nodes/locales/es/knxUltimateHueController.html

@@ -1,8 +1,9 @@
 <script type="text/markdown" data-help-name="knxUltimateHueController">
 <p><a href="https://www.youtube.com/playlist?list=PL9Yh1bjbLAYrU8PsVhW4xzEug2WtVFv3E" target="_blank" rel="noopener noreferrer"><strong>KNX-Ultimate video tutorials (YouTube playlist)</strong></a> Antes de empezar, <a href="https://youtu.be/f0Evf2QFI7c" target="_blank" rel="noopener noreferrer">mira el vídeo explicativo en YouTube</a>.</p>
 <p><strong>HUE Controller</strong> es el nodo unificado para recursos de Hue API v2.</p>
-<p>Selecciona la función del dispositivo y configura el mismo mapeo KNX y comportamiento del nodo Hue dedicado ya consolidado.</p>
-<p>El selector de función utiliza un tercio del ancho disponible para mantener compacto el editor.</p>
+<p>Selecciona un dispositivo o recurso Hue. HUE Controller detecta automáticamente su tipo y abre el editor correspondiente para mapeos KNX, comportamiento y puertos del nodo.</p>
+<p>El selector de dispositivo, la actualización y el tipo detectado comparten la misma fila compacta, como en Matter Controller.</p>
+<p>Al hacer clic o enfocar el campo del dispositivo siempre se abre la lista completa de recursos Hue, aunque ya haya un dispositivo seleccionado. Al escribir, la lista sigue filtrándose.</p>
 <p>Las filas de mapeo KNX mantienen GA, DPT y Nombre en una sola línea. Los campos DPT y Nombre usan anchos compactos; Nombre puede reducirse aún más en editores estrechos sin modificar el texto guardado. Los valores DPT guardados se conservan mientras las opciones del selector se cargan de forma asíncrona.</p>
 <p>Admite luces y grupos de luces, enchufes, botones, Tap dial, movimiento y movimiento de cámara, contactos, nivel de luz, temperatura, humedad, escenas, batería, conectividad Zigbee y actualización de software.</p>
 <p>Cuando no hay ningún <strong>Gateway KNX</strong> seleccionado (incluidos <code>none</code> y <em>Añadir nuevo...</em>), se ocultan los campos de mapeo KNX; la selección del recurso Hue y las opciones exclusivas del flujo siguen disponibles.</p>

package/nodes/locales/es/knxUltimateHueController.json

@@ -5,6 +5,13 @@
   },
   "knxUltimateHueController": {
     "device_function": "Función del dispositivo",
+    "hue_section": "Philips Hue",
+    "hue_device": "Dispositivo Hue",
+    "hue_device_placeholder": "Buscar dispositivo o recurso Hue",
+    "device_type": "Tipo de dispositivo",
+    "refresh_devices": "Actualizar dispositivos Hue",
+    "locate_device": "Localizar la luz Hue seleccionada",
+    "no_devices": "No se encontraron recursos Hue. Comprueba Hue Bridge y actualiza la lista.",
     "legacy_node_notice": "Este nodo HUE legacy está obsoleto. Usa el nuevo nodo HUE Controller para los flujos nuevos.",
     "migration_button": "Convertir nodos HUE legacy",
     "migration_button_title": "Convertir todos los nodos HUE legacy del editor",

package/nodes/locales/es/knxUltimateMatterControllerDevice.html

@@ -3,6 +3,8 @@
 
 Este nodo controla desde KNX un endpoint Matter ya emparejado. Selecciona el dispositivo Matter y el editor detecta sus capacidades, mostrando solo las asignaciones KNX coherentes con ese endpoint.
 
+Al hacer clic o enfocar el campo del dispositivo Matter siempre se abre la lista completa de endpoints emparejados, aunque ya haya un dispositivo seleccionado. Al escribir, la lista sigue filtrándose.
+
 Sustituye a los nodos Matter separados no publicados y conserva toda la UI de luz cuando el endpoint seleccionado es una luz.
 
 ## Configuración

package/nodes/locales/fr/knxUltimate.html

@@ -11,7 +11,7 @@
 |-|-|
 | Porte | Sélectionnez la passerelle KNX à utiliser |
 | Liste déroulante de type GA | Le type d'adresse de groupe. **3 niveaux** est la valeur par défaut, où vous pouvez saisir l'adresse du groupe de niveau _3 ou le _group name_ (si vous avez téléchargé le fichier ETS), ou **global**, pour lire le GA au démarrage à partir d'une variable globale, ou **flux** qui font la même chose que le _Global_, mais au niveau du flux. Sélectionnez **$Env variable** pour lire l'adresse de groupe à partir d'une variable d'environnement. Sélectionnez **Mode universel (écoutez toutes les adresses de groupe)** pour réagir à toutes les adresses de groupe. |
-| Groupe addr. | L'adresse du groupe KNX que vous souhaitez contrôler. Si vous avez importé le fichier d'adresses du groupe ETS, vous pouvez simplement commencer à saisir le nom de votre appareil. Vous pouvez le laisser vide si vous souhaitez le définir avec le message d'entrée _msg.setConfig_. |
+| Groupe addr. | L'adresse du groupe KNX que vous souhaitez contrôler. Si vous avez importé le fichier d'adresses de groupe ETS, cliquer sur ce champ ou lui donner le focus ouvre la liste complète, même lorsqu'une GA est déjà sélectionnée ; la saisie filtre les entrées. Vous pouvez le laisser vide si vous souhaitez le définir avec le message d'entrée _msg.setConfig_. |
 | Point de données | Le point de données appartenant à votre nœud. |
 
 <br/>

package/nodes/locales/fr/knxUltimateHueController.html

@@ -1,8 +1,9 @@
 <script type="text/markdown" data-help-name="knxUltimateHueController">
 <p><a href="https://www.youtube.com/playlist?list=PL9Yh1bjbLAYrU8PsVhW4xzEug2WtVFv3E" target="_blank" rel="noopener noreferrer"><strong>KNX-Ultimate video tutorials (YouTube playlist)</strong></a> Avant de commencer, <a href="https://youtu.be/f0Evf2QFI7c" target="_blank" rel="noopener noreferrer">regardez la vidéo explicative sur YouTube</a>.</p>
 <p><strong>HUE Controller</strong> est le nœud unifié pour les ressources Hue API v2.</p>
-<p>Sélectionnez la fonction de l'appareil, puis configurez le même mappage KNX et le même comportement que dans le nœud Hue dédié éprouvé.</p>
-<p>Le sélecteur de fonction utilise un tiers de la largeur disponible afin de conserver un éditeur compact.</p>
+<p>Sélectionnez un appareil ou une ressource Hue. HUE Controller détecte automatiquement son type et ouvre l'éditeur correspondant pour le mappage KNX, le comportement et les ports du nœud.</p>
+<p>Le sélecteur d'appareil, l'actualisation et le type détecté partagent la même ligne compacte, comme dans Matter Controller.</p>
+<p>Un clic ou le focus sur le champ de l'appareil ouvre toujours la liste complète des ressources Hue, même si un appareil est déjà sélectionné. La saisie continue de filtrer la liste.</p>
 <p>Les lignes de mappage KNX conservent GA, DPT et Nom sur une seule ligne. Les champs DPT et Nom utilisent des largeurs compactes ; le champ Nom peut encore se réduire dans un éditeur étroit sans modifier le texte enregistré. Les valeurs DPT enregistrées sont conservées pendant le chargement asynchrone des options du sélecteur.</p>
 <p>Fonctions prises en charge : lampes et groupes, prises, boutons, Tap dial, mouvement et mouvement de caméra, contacts, niveau de lumière, température, humidité, scènes, batterie, connectivité Zigbee et mise à jour logicielle.</p>
 <p>Lorsqu'aucune <strong>Passerelle KNX</strong> n'est sélectionnée (y compris <code>none</code> et <em>Ajouter...</em>), les champs de mappage KNX sont masqués ; la sélection de la ressource Hue et les options réservées au flow restent disponibles.</p>

package/nodes/locales/fr/knxUltimateHueController.json

@@ -5,6 +5,13 @@
   },
   "knxUltimateHueController": {
     "device_function": "Fonction de l'appareil",
+    "hue_section": "Philips Hue",
+    "hue_device": "Appareil Hue",
+    "hue_device_placeholder": "Rechercher un appareil ou une ressource Hue",
+    "device_type": "Type d'appareil",
+    "refresh_devices": "Actualiser les appareils Hue",
+    "locate_device": "Localiser la lampe Hue sélectionnée",
+    "no_devices": "Aucune ressource Hue trouvée. Vérifiez le Hue Bridge et actualisez la liste.",
     "legacy_node_notice": "Ce nœud HUE legacy est obsolète. Utilisez le nouveau nœud HUE Controller pour les nouveaux flows.",
     "migration_button": "Convertir les nœuds HUE legacy",
     "migration_button_title": "Convertir tous les nœuds HUE legacy présents dans l'éditeur",

package/nodes/locales/fr/knxUltimateMatterControllerDevice.html

@@ -3,6 +3,8 @@
 
 Ce nœud contrôle depuis KNX un endpoint Matter déjà appairé. Sélectionnez l'appareil Matter et l'éditeur détecte ses capacités, puis affiche uniquement les mappings KNX adaptés à cet endpoint.
 
+Un clic ou le focus sur le champ de l'appareil Matter ouvre toujours la liste complète des endpoints appairés, même si un appareil est déjà sélectionné. La saisie continue de filtrer la liste.
+
 Il remplace les nœuds Matter séparés non publiés et conserve toute l'UI lumière lorsque l'endpoint sélectionné est une lumière.
 
 ## Configuration

package/nodes/locales/it/knxUltimate.html

@@ -11,7 +11,7 @@ Questo nodo controlla un Indirizzo di Gruppo KNX; è il nodo più utilizzato.
 |--|--|
 | Gateway | Seleziona il gateway KNX da utilizzare |
 | Elenco a discesa tipo GA | Tipo di indirizzo di gruppo. **3-Livelli** è il default, dove puoi digitare il GA a 3 livelli o il nome GA (se hai caricato il file ETS); **Global** legge il GA da una variabile globale all'avvio; **Flow** fa lo stesso a livello di flow. Seleziona **$Env variable** per leggere il GA da una variabile d'ambiente. Seleziona **Modalità universale (ascolta tutti gli Indirizzi di Gruppo)** per reagire a TUTTI i GA. |
-| Ind. Gruppo | L'indirizzo di gruppo KNX da controllare. Se hai importato il file ETS, puoi iniziare a digitare il nome del dispositivo. Puoi lasciarlo vuoto se intendi impostarlo tramite messaggio di ingresso `msg.setConfig`. |
+| Ind. Gruppo | L'indirizzo di gruppo KNX da controllare. Se hai importato il file ETS, facendo clic o portando il focus sul campo si apre l'elenco completo, anche quando un GA è già selezionato; digitando puoi filtrare le voci. Puoi lasciarlo vuoto se intendi impostarlo tramite messaggio di ingresso `msg.setConfig`. |
 | Datapoint | Il Datapoint associato al nodo. |
 
 <br/>

package/nodes/locales/it/knxUltimateHueController.html

@@ -1,8 +1,9 @@
 <script type="text/markdown" data-help-name="knxUltimateHueController">
 <p><a href="https://www.youtube.com/playlist?list=PL9Yh1bjbLAYrU8PsVhW4xzEug2WtVFv3E" target="_blank" rel="noopener noreferrer"><strong>KNX-Ultimate video tutorials (YouTube playlist)</strong></a> Prima di iniziare, <a href="https://youtu.be/f0Evf2QFI7c" target="_blank" rel="noopener noreferrer">guarda il video esplicativo su YouTube</a>.</p>
 <p><strong>HUE Controller</strong> è il nodo unificato per le risorse Hue API v2.</p>
-<p>Seleziona la funzione del dispositivo, quindi configura la stessa mappatura KNX e lo stesso comportamento disponibili nel nodo Hue dedicato già consolidato.</p>
-<p>Il selettore della funzione dispositivo usa un terzo della larghezza disponibile, mantenendo l'editor più compatto.</p>
+<p>Seleziona un dispositivo o una risorsa Hue. HUE Controller ne rileva automaticamente il tipo e apre l'editor corretto per mappature KNX, comportamento e pin del nodo.</p>
+<p>Selettore del dispositivo, pulsante di aggiornamento e tipo rilevato condividono la stessa riga compatta, come nel workflow del Matter Controller.</p>
+<p>Un click o il focus sul campo dispositivo apre sempre l'elenco completo delle risorse Hue, anche quando un dispositivo è già selezionato. Digitando, l'elenco continua a essere filtrato.</p>
 <p>Le righe di mappatura KNX mantengono GA, DPT e Nome sulla stessa linea. I campi DPT e Nome usano larghezze compatte e Nome può restringersi ulteriormente negli editor più stretti senza modificare il testo memorizzato. I valori DPT salvati vengono conservati mentre le opzioni del selettore si caricano in modo asincrono.</p>
 <p>Funzioni supportate: luci e gruppi di luci, prese, pulsanti, Tap dial, movimento e movimento telecamera, contatti, livello luce, temperatura, umidità, scene, batteria, connettività Zigbee e aggiornamento software.</p>
 <p>Quando non è selezionato alcun <strong>Gateway KNX</strong> (inclusi <code>none</code> e <em>Aggiungi nuovo...</em>), i campi di mappatura KNX vengono nascosti, mentre la selezione della risorsa Hue e le opzioni per il solo flow restano disponibili.</p>

package/nodes/locales/it/knxUltimateHueController.json

@@ -5,6 +5,13 @@
   },
   "knxUltimateHueController": {
     "device_function": "Funzione dispositivo",
+    "hue_section": "Philips Hue",
+    "hue_device": "Dispositivo Hue",
+    "hue_device_placeholder": "Cerca il dispositivo o la risorsa Hue",
+    "device_type": "Tipo dispositivo",
+    "refresh_devices": "Aggiorna dispositivi Hue",
+    "locate_device": "Localizza la luce Hue selezionata",
+    "no_devices": "Nessuna risorsa Hue trovata. Controlla Hue Bridge e premi aggiorna.",
     "legacy_node_notice": "Questo nodo HUE legacy è deprecato. Per i nuovi flow usa il nuovo nodo HUE Controller.",
     "migration_button": "Converti nodi HUE legacy",
     "migration_button_title": "Converti tutti i nodi HUE legacy presenti nell'editor",

package/nodes/locales/it/knxUltimateMatterControllerDevice.html

@@ -3,6 +3,8 @@
 
 Questo nodo controlla da KNX un endpoint Matter già abbinato. Seleziona il dispositivo Matter e l'editor rileva le sue capability, mostrando solo le mappature KNX coerenti con quell'endpoint.
 
+Un click o il focus sul campo del dispositivo Matter apre sempre l'elenco completo degli endpoint abbinati, anche quando un dispositivo è già selezionato. Digitando, l'elenco continua a essere filtrato.
+
 Sostituisce i nodi Matter separati non pubblicati e mantiene tutta la UI luce quando l'endpoint selezionato è una luce.
 
 ## Configurazione

package/nodes/locales/zh-CN/knxUltimate.html

@@ -11,7 +11,7 @@
 |--|--|
 | Gateway | 选择要使用的 KNX 网关 |
 | GA 类型 | 组地址类型。默认 **3-层级**（可输入三层组地址或名称，若已导入 ETS）；**Global** 启动时从全局变量读取；**Flow** 在流程作用域读取；**$Env variable** 从环境变量读取；**通用模式（监听所有组地址）** 对所有 GA 做出响应。|
-| Group Addr. | 需要控制的组地址。若已导入 ETS，可直接输入设备名进行匹配。也可留空，之后通过输入消息 `msg.setConfig` 设置。|
+| Group Addr. | 需要控制的组地址。若已导入 ETS，单击此字段或使其获得焦点会打开完整列表，即使已选择了 GA；输入文字可筛选条目。也可留空，之后通过输入消息 `msg.setConfig` 设置。|
 | Datapoint | 与节点关联的 Datapoint。|
 
 <br/>

package/nodes/locales/zh-CN/knxUltimateHueController.html

@@ -1,8 +1,9 @@
 <script type="text/markdown" data-help-name="knxUltimateHueController">
 <p><a href="https://www.youtube.com/playlist?list=PL9Yh1bjbLAYrU8PsVhW4xzEug2WtVFv3E" target="_blank" rel="noopener noreferrer"><strong>KNX-Ultimate 视频教程（YouTube 播放列表）</strong></a> 开始前，请<a href="https://youtu.be/f0Evf2QFI7c" target="_blank" rel="noopener noreferrer">在 YouTube 上观看说明视频</a>。</p>
 <p><strong>HUE Controller</strong> 是面向 Hue API v2 资源的统一节点。</p>
-<p>选择设备功能，然后使用原有专用 Hue 节点中已经稳定的 KNX 映射和行为设置。</p>
-<p>设备功能选择器使用可用宽度的三分之一，使编辑器保持紧凑。</p>
+<p>选择 Hue 设备或资源后，HUE Controller 会自动检测设备类型，并打开对应的 KNX 映射、行为和节点端口编辑器。</p>
+<p>设备选择、刷新操作和检测到的类型显示在同一紧凑行中，与 Matter Controller 的工作流程一致。</p>
+<p>单击设备字段或使其获得焦点时，即使已经选择了设备，也会始终打开完整的 Hue 资源列表；输入文字仍可筛选列表。</p>
 <p>KNX 映射行会将 GA、DPT 和名称保持在同一行。DPT 与名称字段采用紧凑宽度；在较窄的编辑器中，名称字段还可继续收缩，而不会更改已保存的文本。选择器选项异步加载时，已保存的 DPT 值会被保留。</p>
 <p>支持灯和灯组、插座、按钮、Tap dial、运动和摄像机运动、接触、光照度、温度、湿度、场景、电池、Zigbee 连接和设备软件更新。</p>
 <p>未选择<strong>KNX 网关</strong>时（包括 <code>none</code> 和“新增...”），KNX 映射字段会隐藏，而 Hue 资源选择和仅用于流程的选项仍然可用。</p>

package/nodes/locales/zh-CN/knxUltimateHueController.json

@@ -5,6 +5,13 @@
   },
   "knxUltimateHueController": {
     "device_function": "设备功能",
+    "hue_section": "Philips Hue",
+    "hue_device": "Hue 设备",
+    "hue_device_placeholder": "搜索 Hue 设备或资源",
+    "device_type": "设备类型",
+    "refresh_devices": "刷新 Hue 设备",
+    "locate_device": "定位所选 Hue 灯",
+    "no_devices": "未找到 Hue 资源。请检查 Hue Bridge 并刷新列表。",
     "legacy_node_notice": "此旧版 HUE 节点已弃用。新流程请使用新的 HUE Controller 节点。",
     "migration_button": "转换旧版 HUE 节点",
     "migration_button_title": "转换编辑器中的所有旧版 HUE 节点",

package/nodes/locales/zh-CN/knxUltimateMatterControllerDevice.html

@@ -3,6 +3,8 @@
 
 此节点用于从 KNX 控制已经配对的 Matter endpoint。选择 Matter 设备后，编辑器会检测它的能力，并只显示与该 endpoint 匹配的 KNX 映射。
 
+单击 Matter 设备字段或使其获得焦点时，即使已经选择了设备，也会始终打开完整的已配对 endpoint 列表；输入文字仍可筛选列表。
+
 它替代未发布的多个专用 Matter 控制节点；当选择的 endpoint 是灯时，仍保留完整的灯光 UI。
 
 ## 配置

package/nodes/utils/hueControllerResourceCatalog.js

@@ -0,0 +1,71 @@
+'use strict'
+
+// Resource queries are intentionally ordered with Plug before Light. Hue plugs
+// often expose an on/off service whose API v2 type is `light`; preferring the
+// plug profile prevents the same resource from appearing twice or being
+// classified as a lamp in the unified Controller picker.
+const HUE_CONTROLLER_RESOURCE_TYPES = Object.freeze([
+  'plug',
+  'light',
+  'button',
+  'relative_rotary',
+  'motion',
+  'area_motion',
+  'camera_motion',
+  'contact',
+  'light_level',
+  'temperature',
+  'humidity',
+  'scene',
+  'device_power',
+  'zigbee_connectivity',
+  'device_software_update'
+])
+
+const normalizeHueDeviceValue = (controllerType, item) => {
+  const id = String(item?.id || item?.rid || '').trim()
+  if (id === '') return ''
+  const resourceType = String(item?.type || item?.deviceObject?.type || '').trim().toLowerCase()
+  if (controllerType === 'light') {
+    return `${id}#${resourceType === 'grouped_light' ? 'grouped_light' : 'light'}`
+  }
+  if (controllerType === 'plug') {
+    return `${id}#${resourceType || 'plug'}`
+  }
+  return id
+}
+
+const buildHueControllerResourceCatalog = (resourcesByType = {}) => {
+  const catalogById = new Map()
+
+  HUE_CONTROLLER_RESOURCE_TYPES.forEach((controllerType) => {
+    const resources = Array.isArray(resourcesByType[controllerType])
+      ? resourcesByType[controllerType]
+      : []
+    resources.forEach((item) => {
+      const id = String(item?.id || item?.rid || '').trim()
+      if (id === '' || id === 'error' || catalogById.has(id)) return
+      const hueDevice = normalizeHueDeviceValue(controllerType, item)
+      if (hueDevice === '') return
+      catalogById.set(id, {
+        ...item,
+        id,
+        hueDevice,
+        controllerType
+      })
+    })
+  })
+
+  return Array.from(catalogById.values()).sort((left, right) => {
+    return String(left.name || left.id).localeCompare(String(right.name || right.id), undefined, {
+      numeric: true,
+      sensitivity: 'base'
+    })
+  })
+}
+
+module.exports = {
+  HUE_CONTROLLER_RESOURCE_TYPES,
+  buildHueControllerResourceCatalog,
+  normalizeHueDeviceValue
+}

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=20.18.1"
   },
-  "version": "6.2.3-beta.4",
+  "version": "6.3.0",
   "description": "KNX Ultimate is the most advanced KNX integration for Node-RED, providing secure KNX/IP communication, routing, ETS project import, Philips Hue, Matter Controller and Matter Bridge (control matter device via KNX and expose KNX GA via Matter), MQTT, diagnostics with AI, virtual devices, and powerful automation nodes. Build professional, reliable, and scalable smart home and building automation projects with minimal effort.",
   "files": [
     "nodes/",

package/resources/hueControllerProfiles.js

@@ -1573,6 +1573,13 @@
                   RED.sidebar.show("help");
                 } catch (error) { }
                 onEditPrepare();
+                // HUE Controller owns a device-first picker covering every supported
+                // Hue API v2 resource. onEditPrepare installs the mature Light-only
+                // autocomplete, so let the wrapper restore its unified source after
+                // this asynchronous readiness callback completes.
+                if (typeof node.__configureHueControllerDeviceControl === 'function') {
+                  node.__configureHueControllerDeviceControl();
+                }
               }