Merge fix: bypass TagRegistry.get for selected-tag resolution

Author: HanSur94

libs/FastSenseCompanion/FastSenseCompanion.m

@@ -408,13 +408,43 @@ function resolveInspectorState_(obj)
         %RESOLVEINSPECTORSTATE_ Compute (state, payload) and fire InspectorStateChanged.
         %   Single notify point for the inspector. Inspector subscribes via the
         %   InspectorStateChanged listener wired in the constructor / setProject.
+        %
+        %   Resolution strategy: prefer tag HANDLES from the catalog snapshot
+        %   (CatalogPane_.getSelectedTags()) over a TagRegistry.get() round
+        %   trip. The catalog already has resolved Tag handles; using them
+        %   directly bypasses any drift between the catalog snapshot and
+        %   the TagRegistry singleton's current state (e.g. cooling.health
+        %   visible in catalog but missing from get() — a real bug seen in
+        %   the industrial plant demo). Keys without a matching handle in
+        %   the catalog snapshot are silently dropped.
             try
-                [state, payload] = inspectorResolveState( ...
-                    obj.LastInteraction_, ...
-                    obj.SelectedTagKeys_, ...
-                    obj.SelectedDashboardIdx_, ...
-                    obj.Engines_, ...
-                    obj.Registry_);
+                state   = '';
+                payload = struct();
+                tags = obj.CatalogPane_.getSelectedTags();
+                nTags = numel(tags);
+
+                if nTags == 1
+                    state   = 'tag';
+                    payload = struct('tag', tags{1}, ...
+                                     'tagKeys', {obj.SelectedTagKeys_});
+                elseif nTags >= 2
+                    state   = 'multitag';
+                    payload = struct('tags', {tags}, ...
+                                     'tagKeys', {obj.SelectedTagKeys_});
+                elseif strcmp(obj.LastInteraction_, 'dashboard') ...
+                        && isnumeric(obj.SelectedDashboardIdx_) ...
+                        && isscalar(obj.SelectedDashboardIdx_) ...
+                        && obj.SelectedDashboardIdx_ > 0 ...
+                        && obj.SelectedDashboardIdx_ <= numel(obj.Engines_)
+                    state   = 'dashboard';
+                    payload = struct('dashboard', ...
+                                     obj.Engines_{obj.SelectedDashboardIdx_});
+                else
+                    state   = 'welcome';
+                    payload = struct('nTags', nTags, ...
+                                     'nDashboards', numel(obj.Engines_));
+                end
+
                 ed = InspectorStateEventData(state, payload);
                 notify(obj, 'InspectorStateChanged', ed);
             catch err
@@ -435,9 +465,27 @@ function onOpenAdHocPlotRequested_(obj, ~, evt)
             try
                 keys = evt.TagKeys;
                 mode = evt.Mode;
-                tags = cell(1, numel(keys));
+                % Prefer the catalog snapshot's already-resolved Tag handles
+                % over a TagRegistry.get() round-trip (catalog/registry can
+                % drift; see resolveInspectorState_).
+                allTags  = obj.CatalogPane_.getSelectedTags();
+                allKeys  = obj.SelectedTagKeys_;
+                tags     = {};
                 for k = 1:numel(keys)
-                    tags{k} = obj.Registry_.get(keys{k});
+                    matched = false;
+                    for j = 1:numel(allTags)
+                        if strcmp(allKeys{j}, keys{k})
+                            tags{end+1} = allTags{j}; %#ok<AGROW>
+                            matched = true;
+                            break;
+                        end
+                    end
+                    if ~matched
+                        % Last-resort registry fallback (still wrapped in
+                        % the outer try/catch so a missing key surfaces as
+                        % uialert instead of crashing the figure callback).
+                        tags{end+1} = obj.Registry_.get(keys{k}); %#ok<AGROW>
+                    end
                 end
                 [~, skipped] = openAdHocPlot(tags, mode, obj.Theme);
                 if ~isempty(skipped)

libs/FastSenseCompanion/TagCatalogPane.m

@@ -210,6 +210,26 @@ function refresh(obj)
             keys = obj.SelectedKeys_;
         end
 
+        function tags = getSelectedTags(obj)
+        %GETSELECTEDTAGS Return the current selection as a cell of Tag handles.
+        %   Resolved against the catalog's own snapshot (AllTags_) — does NOT
+        %   round-trip through TagRegistry.get(), so the inspector is robust
+        %   against registry state changes (clear/re-register/etc.) that can
+        %   happen between catalog snapshot and click. Keys not present in
+        %   AllTags_ are silently skipped (defensive).
+            tags = {};
+            for k = 1:numel(obj.SelectedKeys_)
+                key = obj.SelectedKeys_{k};
+                for j = 1:numel(obj.AllTags_)
+                    t = obj.AllTags_{j};
+                    if strcmp(t.Key, key)
+                        tags{end+1} = t; %#ok<AGROW>
+                        break;
+                    end
+                end
+            end
+        end
+
         function deselectKey(obj, key)
         %DESELECTKEY Remove a single key from the selection set and fire TagSelectionChanged.
         %   key — char tag key (e.g., 'pressure_a')