@ifc-lite/viewer 1.25.2 → 1.27.0

package/src/components/viewer/MainToolbar.tsx

@@ -52,6 +52,7 @@ import {
   Redo2,
 } from 'lucide-react';
 import { Button } from '@/components/ui/button';
+import { Switch } from '@/components/ui/switch';
 import { Separator } from '@/components/ui/separator';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import {
@@ -158,6 +159,39 @@ function ToolButton({
   );
 }
 
+interface ClassVisibilityRowProps {
+  /** Colored class glyph (caller sets the tint). */
+  icon: React.ReactNode;
+  label: string;
+  /** One-line plain-language hint about what the IFC class covers. */
+  description: string;
+  checked: boolean;
+  onChange: (next: boolean) => void;
+}
+
+/**
+ * One row of the Visibility panel: colored class icon + label/description
+ * on the left, a Switch on the right. The whole row is a <label>, so a
+ * click anywhere toggles the switch and — because it isn't a menu item —
+ * the dropdown stays open for flipping several classes in a row. The left
+ * cluster dims when off so on/off reads from saturation as well as the
+ * switch position.
+ */
+function ClassVisibilityRow({ icon, label, description, checked, onChange }: ClassVisibilityRowProps) {
+  return (
+    <label className="group flex items-center justify-between gap-3 rounded-md px-2 py-1.5 cursor-pointer hover:bg-muted/50 transition-colors">
+      <span className={cn('flex items-center gap-2.5 min-w-0 transition-opacity', !checked && 'opacity-50')}>
+        {icon}
+        <span className="grid gap-0.5 min-w-0">
+          <span className="text-sm leading-tight truncate">{label}</span>
+          <span className="text-[10px] leading-tight text-muted-foreground truncate">{description}</span>
+        </span>
+      </span>
+      <Switch checked={checked} onCheckedChange={onChange} />
+    </label>
+  );
+}
+
 /**
  * Stacked / Exploded / Solo level display dropdown. Pinned next
  * to the Quick Floorplan dropdown so storey-related controls
@@ -505,6 +539,16 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
   const toggleHoverTooltips = useViewerStore((state) => state.toggleHoverTooltips);
   const typeVisibility = useViewerStore((state) => state.typeVisibility);
   const toggleTypeVisibility = useViewerStore((state) => state.toggleTypeVisibility);
+  const resetTypeVisibility = useViewerStore((state) => state.resetTypeVisibility);
+  // How many of the five class toggles are on — surfaced in the menu
+  // header so the user sees scene state at a glance.
+  const visibleClassCount = [
+    typeVisibility.spaces,
+    typeVisibility.openings,
+    typeVisibility.site,
+    typeVisibility.ifcAnnotations,
+    typeVisibility.ifcGrid,
+  ].filter(Boolean).length;
   // Issue #540: load-time toggle that asks the WASM bridge to merge
   // Revit-style multilayer walls. We surface this in the Class
   // Visibility dropdown so users discover it next to the other
@@ -516,6 +560,8 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
   const setBcfPanelVisible = useViewerStore((state) => state.setBcfPanelVisible);
   const idsPanelVisible = useViewerStore((state) => state.idsPanelVisible);
   const setIdsPanelVisible = useViewerStore((state) => state.setIdsPanelVisible);
+  const clashPanelVisible = useViewerStore((state) => state.clashPanelVisible);
+  const setClashPanelVisible = useViewerStore((state) => state.setClashPanelVisible);
   const listPanelVisible = useViewerStore((state) => state.listPanelVisible);
   const setListPanelVisible = useViewerStore((state) => state.setListPanelVisible);
   const setRightPanelCollapsed = useViewerStore((state) => state.setRightPanelCollapsed);
@@ -562,107 +608,11 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
   );
   const desktopShell = isTauri();
 
-  // Check which type geometries exist across ALL loaded models (federation-aware).
-  // PERF: Use meshes.length as dep proxy instead of full geometryResult, and
-  // scan incrementally — once a type is found it stays found, so we only scan
-  // NEW meshes since the last check. Per-model cursors ensure federated models
-  // each track their own scan position independently.
-  const typeGeomScanRef = useRef({
-    spaces: false, openings: false, site: false,
-    legacyLastLen: 0,
-    modelLastLen: new Map<string | number, number>(),
-  });
-  const meshLen = geometryResult?.meshes.length ?? 0;
-  const typeGeometryExists = useMemo(() => {
-    const scan = typeGeomScanRef.current;
-
-    // Reset if legacy meshes array shrunk (new file loaded)
-    if (meshLen < scan.legacyLastLen) {
-      scan.spaces = false;
-      scan.openings = false;
-      scan.site = false;
-      scan.legacyLastLen = 0;
-      scan.modelLastLen.clear();
-    }
-
-    // Already found all types — nothing to do
-    if (scan.spaces && scan.openings && scan.site) {
-      return { spaces: scan.spaces, openings: scan.openings, site: scan.site };
-    }
-
-    // Check federated models (scan only new meshes per model)
-    if (models.size > 0) {
-      for (const [modelId, model] of models) {
-        const meshes = model.geometryResult?.meshes;
-        if (!meshes) continue;
-        const modelStart = scan.modelLastLen.get(modelId) ?? 0;
-        // Reset cursor if model was reloaded (mesh array shrunk)
-        const start = meshes.length < modelStart ? 0 : modelStart;
-        for (let i = start; i < meshes.length; i++) {
-          const t = meshes[i].ifcType;
-          if (t === 'IfcSpace') scan.spaces = true;
-          else if (t === 'IfcOpeningElement') scan.openings = true;
-          else if (t === 'IfcSite') scan.site = true;
-          if (scan.spaces && scan.openings && scan.site) break;
-        }
-        scan.modelLastLen.set(modelId, meshes.length);
-        if (scan.spaces && scan.openings && scan.site) break;
-      }
-    }
-
-    // Legacy single-model path (scan only new meshes)
-    if (geometryResult?.meshes) {
-      const meshes = geometryResult.meshes;
-      for (let i = scan.legacyLastLen; i < meshes.length; i++) {
-        const t = meshes[i].ifcType;
-        if (t === 'IfcSpace') scan.spaces = true;
-        else if (t === 'IfcOpeningElement') scan.openings = true;
-        else if (t === 'IfcSite') scan.site = true;
-        if (scan.spaces && scan.openings && scan.site) break;
-      }
-    }
-
-    scan.legacyLastLen = meshLen;
-    return { spaces: scan.spaces, openings: scan.openings, site: scan.site };
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- meshLen is a stable proxy for geometryResult
-  }, [models, meshLen]);
-
-  // IfcAnnotation / IfcGrid have no body mesh, so they can't be detected via
-  // the mesh scan. Look up the entity table directly. byType keys are
-  // uppercase STEP names but cache loads sometimes preserve PascalCase.
-  //
-  // Issue #862 split these into separate visibility toggles — files that
-  // ship only one of the two need only that menu entry. Some files ship
-  // only grids (Snowdon Towers Structural — no IfcAnnotation) so probing
-  // each independently is required.
-  const hasIfcEntities = useMemo(() => {
-    const probe = (store: typeof ifcDataStore | undefined) => {
-      const byType = store?.entityIndex?.byType;
-      if (!byType) return { annotations: false, grid: false };
-      return {
-        annotations: (byType.get('IFCANNOTATION')?.length ?? 0) > 0
-          || (byType.get('IfcAnnotation')?.length ?? 0) > 0,
-        grid: (byType.get('IFCGRID')?.length ?? 0) > 0
-          || (byType.get('IfcGrid')?.length ?? 0) > 0,
-      };
-    };
-    let annotations = false;
-    let grid = false;
-    if (models.size > 0) {
-      for (const [, m] of models) {
-        const p = probe(m.ifcDataStore);
-        annotations ||= p.annotations;
-        grid ||= p.grid;
-      }
-    } else {
-      const p = probe(ifcDataStore);
-      annotations = p.annotations;
-      grid = p.grid;
-    }
-    return { annotations, grid };
-  }, [models, ifcDataStore]);
-  const hasIfcAnnotations = hasIfcEntities.annotations;
-  const hasIfcGrid = hasIfcEntities.grid;
+  // NOTE: The Class Visibility dropdown used to gate each toggle on whether
+  // the loaded model actually contained that class (scanning meshes for
+  // Spaces/Openings/Site and probing the entity table for Annotations/Grids).
+  // That gating was removed: the toggles are persisted user preferences, so
+  // they now render unconditionally and stay sticky across models and reloads.
 
   const handleFileSelect = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
     const files = e.target.files;
@@ -811,7 +761,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     setScriptPanelVisible,
   ]);
 
-  const handleToggleRightPanel = useCallback((panel: 'bcf' | 'ids' | 'lens' | 'addElement' | 'extensions') => {
+  const handleToggleRightPanel = useCallback((panel: 'bcf' | 'ids' | 'lens' | 'clash' | 'addElement' | 'extensions') => {
     if (activeAnalysisExtension?.placement !== 'bottom') {
       closeActiveAnalysisExtension();
     }
@@ -828,6 +778,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     const nextBcfVisible = panel === 'bcf' ? !bcfPanelVisible : false;
     const nextIdsVisible = panel === 'ids' ? !idsPanelVisible : false;
     const nextLensVisible = panel === 'lens' ? !lensPanelVisible : false;
+    const nextClashVisible = panel === 'clash' ? !clashPanelVisible : false;
     const nextExtensionsVisible = panel === 'extensions' ? !extensionsPanelVisible : false;
     const isAddElementActive = activeTool === 'addElement';
     const nextAddElementActive = panel === 'addElement' ? !isAddElementActive : false;
@@ -835,6 +786,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     setBcfPanelVisible(nextBcfVisible);
     setIdsPanelVisible(nextIdsVisible);
     setLensPanelVisible(nextLensVisible);
+    setClashPanelVisible(nextClashVisible);
     setExtensionsPanelVisible(nextExtensionsVisible);
 
     if (panel === 'addElement') {
@@ -843,19 +795,21 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
       setActiveTool('select');
     }
 
-    if (nextBcfVisible || nextIdsVisible || nextLensVisible || nextExtensionsVisible || nextAddElementActive) {
+    if (nextBcfVisible || nextIdsVisible || nextLensVisible || nextClashVisible || nextExtensionsVisible || nextAddElementActive) {
       setRightPanelCollapsed(false);
     }
   }, [
     activeAnalysisExtension?.placement,
     activeTool,
     bcfPanelVisible,
+    clashPanelVisible,
     extensionsPanelVisible,
     idsPanelVisible,
     lensPanelVisible,
     requireDesktopFeature,
     setActiveTool,
     setBcfPanelVisible,
+    setClashPanelVisible,
     setExtensionsPanelVisible,
     setIdsPanelVisible,
     setLensPanelVisible,
@@ -889,6 +843,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     setBcfPanelVisible(false);
     setIdsPanelVisible(false);
     setLensPanelVisible(false);
+    setClashPanelVisible(false);
     setExtensionsPanelVisible(false);
     // The right slot is single-tenant: when an analysis extension takes
     // it over, the AddElement tool must release it too, otherwise its 3D
@@ -903,6 +858,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     analysisExtensionState.extensions,
     setActiveTool,
     setBcfPanelVisible,
+    setClashPanelVisible,
     setExtensionsPanelVisible,
     setGanttPanelVisible,
     setIdsPanelVisible,
@@ -920,6 +876,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     if (bcfPanelVisible) panels.add('bcf');
     if (idsPanelVisible) panels.add('ids');
     if (lensPanelVisible) panels.add('lens');
+    if (clashPanelVisible) panels.add('clash');
     if (extensionsPanelVisible) panels.add('extensions');
     if (activeTool === 'addElement') panels.add('addElement');
     if (analysisExtensionState.activeId) panels.add(analysisExtensionState.activeId);
@@ -928,6 +885,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     activeTool,
     analysisExtensionState.activeId,
     bcfPanelVisible,
+    clashPanelVisible,
     extensionsPanelVisible,
     ganttPanelVisible,
     idsPanelVisible,
@@ -945,6 +903,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     if (activeWorkspacePanels.has('bcf')) return 'BCF Issues';
     if (activeWorkspacePanels.has('ids')) return 'IDS Validation';
     if (activeWorkspacePanels.has('lens')) return 'Lens Rules';
+    if (activeWorkspacePanels.has('clash')) return 'Clash Detection';
     if (activeWorkspacePanels.has('extensions')) return 'Extensions';
     if (activeWorkspacePanels.has('addElement')) return 'Add Element';
     return activeAnalysisExtension?.label ?? 'Analysis';
@@ -1299,6 +1258,13 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
             <Palette className="h-4 w-4 mr-2" />
             Lens Rules
           </DropdownMenuCheckboxItem>
+          <DropdownMenuCheckboxItem
+            checked={activeWorkspacePanels.has('clash')}
+            onCheckedChange={() => handleToggleRightPanel('clash')}
+          >
+            <Crosshair className="h-4 w-4 mr-2" />
+            Clash Detection
+          </DropdownMenuCheckboxItem>
           <DropdownMenuSeparator />
           <DropdownMenuLabel className="text-[10px] uppercase tracking-wide text-muted-foreground">
             Author
@@ -1534,9 +1500,9 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
                 // Stay enabled even with no model loaded — the dropdown
                 // also exposes load-time settings (Merge Multilayer
                 // Walls) that the user should be able to set BEFORE
-                // opening a file. Runtime items inside self-gate via
-                // typeGeometryExists.
-                aria-label={mergeLayers ? 'Class Visibility (Merge Multilayer Walls is on)' : 'Class Visibility'}
+                // opening a file. The class toggles are persisted
+                // preferences, so they always render too.
+                aria-label={mergeLayers ? 'Visibility (Merge Multilayer Walls is on)' : 'Visibility'}
                 className="relative"
               >
                 <Filter className="h-4 w-4" />
@@ -1553,79 +1519,93 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
             </DropdownMenuTrigger>
           </TooltipTrigger>
           <TooltipContent>
-            {mergeLayers ? 'Class Visibility · Merge Multilayer Walls is on' : 'Class Visibility'}
+            {mergeLayers ? 'Visibility · Merge Multilayer Walls is on' : 'Visibility'}
           </TooltipContent>
         </Tooltip>
-        <DropdownMenuContent className="w-72">
-          {typeGeometryExists.spaces && (
-            <DropdownMenuCheckboxItem
-              checked={typeVisibility.spaces}
-              onCheckedChange={() => toggleTypeVisibility('spaces')}
-            >
-              <Box className="h-4 w-4 mr-2" style={{ color: '#33d9ff' }} />
-              Show Spaces
-            </DropdownMenuCheckboxItem>
-          )}
-          {typeGeometryExists.openings && (
-            <DropdownMenuCheckboxItem
-              checked={typeVisibility.openings}
-              onCheckedChange={() => toggleTypeVisibility('openings')}
-            >
-              <SquareX className="h-4 w-4 mr-2" style={{ color: '#ff6b4a' }} />
-              Show Openings
-            </DropdownMenuCheckboxItem>
-          )}
-          {typeGeometryExists.site && (
-            <DropdownMenuCheckboxItem
-              checked={typeVisibility.site}
-              onCheckedChange={() => toggleTypeVisibility('site')}
-            >
-              <Building2 className="h-4 w-4 mr-2" style={{ color: '#66cc4d' }} />
-              Show Site
-            </DropdownMenuCheckboxItem>
-          )}
-          {hasIfcAnnotations && (
-            <DropdownMenuCheckboxItem
-              checked={typeVisibility.ifcAnnotations}
-              onCheckedChange={() => toggleTypeVisibility('ifcAnnotations')}
-            >
-              <Pencil className="h-4 w-4 mr-2" style={{ color: '#e4b400' }} />
-              Show Annotations
-            </DropdownMenuCheckboxItem>
-          )}
-          {hasIfcGrid && (
-            <DropdownMenuCheckboxItem
-              checked={typeVisibility.ifcGrid}
-              onCheckedChange={() => toggleTypeVisibility('ifcGrid')}
-            >
-              <Pencil className="h-4 w-4 mr-2" style={{ color: '#e4b400' }} />
-              Show Grids
-            </DropdownMenuCheckboxItem>
-          )}
-
-          {/* Load-time toggles live below the runtime visibility
-              switches — they apply on next model open rather than
-              affecting the current scene. The subheader makes that
-              boundary visible at a glance. */}
-          <DropdownMenuSeparator />
-          <DropdownMenuLabel className="px-2 pt-1 pb-0.5 text-[10px] font-semibold uppercase tracking-wider text-muted-foreground">
-            Load Settings
-          </DropdownMenuLabel>
-          <DropdownMenuCheckboxItem
-            checked={mergeLayers}
-            onCheckedChange={(next) => setMergeLayers(next === true)}
-            // Use items-start so the checkmark and icon line up with
-            // the primary label while the description wraps below.
-            className="items-start gap-2 py-2"
-          >
-            <Layers2 className="h-4 w-4 mr-2 mt-0.5 shrink-0 text-primary" />
-            <div className="flex flex-col gap-0.5 min-w-0">
-              <span className="text-sm font-medium leading-tight">Merge Multilayer Walls</span>
-              <span className="text-[11px] leading-tight text-muted-foreground">
-                Render walls as 1 solid · Applies on reload
+        {/*
+          Settings-style panel (not a list of menu-items): each row is a
+          plain <label> wrapping a right-aligned Switch, so toggling does
+          NOT close the menu — users routinely flip several classes in one
+          pass. State reads two ways: the switch position and the row
+          dimming when off. All five render unconditionally (persisted
+          preferences, sticky across models/reloads); toggling a class the
+          model lacks is a no-op.
+        */}
+        <DropdownMenuContent align="start" className="w-[300px] p-1.5">
+          <div className="flex items-center justify-between gap-2 px-1.5 pb-1 pt-0.5">
+            <span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">
+              Visibility
+            </span>
+            <div className="flex items-center gap-1">
+              <span className="text-[11px] tabular-nums text-muted-foreground/80">
+                {visibleClassCount}/5
               </span>
+              <Button
+                variant="ghost"
+                size="sm"
+                className="h-6 px-1.5 text-[11px] font-medium text-muted-foreground hover:text-foreground"
+                onClick={resetTypeVisibility}
+              >
+                Reset
+              </Button>
             </div>
-          </DropdownMenuCheckboxItem>
+          </div>
+
+          <ClassVisibilityRow
+            icon={<Box className="h-4 w-4 shrink-0" style={{ color: '#33d9ff' }} />}
+            label="Spaces"
+            description="Room & zone volumes"
+            checked={typeVisibility.spaces}
+            onChange={() => toggleTypeVisibility('spaces')}
+          />
+          <ClassVisibilityRow
+            icon={<SquareX className="h-4 w-4 shrink-0" style={{ color: '#ff6b4a' }} />}
+            label="Openings"
+            description="Door & window voids"
+            checked={typeVisibility.openings}
+            onChange={() => toggleTypeVisibility('openings')}
+          />
+          <ClassVisibilityRow
+            icon={<Building2 className="h-4 w-4 shrink-0" style={{ color: '#66cc4d' }} />}
+            label="Site"
+            description="Terrain & context"
+            checked={typeVisibility.site}
+            onChange={() => toggleTypeVisibility('site')}
+          />
+          <ClassVisibilityRow
+            icon={<Pencil className="h-4 w-4 shrink-0" style={{ color: '#e4b400' }} />}
+            label="Annotations"
+            description="Text, dimensions, leaders"
+            checked={typeVisibility.ifcAnnotations}
+            onChange={() => toggleTypeVisibility('ifcAnnotations')}
+          />
+          <ClassVisibilityRow
+            icon={<Grid3x3 className="h-4 w-4 shrink-0" style={{ color: '#e4b400' }} />}
+            label="Grids"
+            description="Structural axes"
+            checked={typeVisibility.ifcGrid}
+            onChange={() => toggleTypeVisibility('ifcGrid')}
+          />
+
+          <DropdownMenuSeparator className="my-1" />
+
+          {/* Merge multilayer walls rebuilds geometry, so unlike the live
+              toggles above it only takes effect on the next model load.
+              The "· on reload" suffix carries that nuance inline — keeps
+              the row identical in shape to the others (no header, no chip
+              crowding the long label). */}
+          <label className="group flex items-center justify-between gap-3 rounded-md px-2 py-1.5 cursor-pointer hover:bg-muted/50 transition-colors">
+            <span className={cn('flex items-center gap-2.5 min-w-0 transition-opacity', !mergeLayers && 'opacity-50')}>
+              <Layers2 className="h-4 w-4 shrink-0 text-primary" />
+              <span className="grid gap-0.5 min-w-0">
+                <span className="text-sm leading-tight truncate">Merge multilayer walls</span>
+                <span className="text-[10px] leading-tight text-muted-foreground truncate">
+                  Render walls as one solid · on reload
+                </span>
+              </span>
+            </span>
+            <Switch checked={mergeLayers} onCheckedChange={(next) => setMergeLayers(next === true)} />
+          </label>
         </DropdownMenuContent>
       </DropdownMenu>
 

package/src/components/viewer/PropertiesPanel.tsx

@@ -512,7 +512,7 @@ export function PropertiesPanel() {
     if (!entityNode) return [];
 
     const rawProps = entityNode.properties();
-    let result = rawProps.map(pset => ({
+    let result: DisplayPropertySet[] = rawProps.map(pset => ({
       name: pset.name,
       properties: pset.properties.map(p => ({ name: p.name, value: p.value, isMutated: false })),
       isNewPset: false,
@@ -970,21 +970,28 @@ export function PropertiesPanel() {
     }));
   }, [nativeDetails]);
 
+  // Overlay (authored) entities — split halves, duplicates, scripted
+  // adds — live only in the StoreEditor overlay, NOT the parsed store.
+  // `modelQuery.entity()` always returns a node, and its getters fall
+  // back to the 'Unknown'/'' sentinels for ids absent from the parsed
+  // table (entity-table.ts#getTypeName). Those non-null sentinels would
+  // shadow the overlay record in an `entityNode ?? overlay` chain, so
+  // when an overlay record exists it MUST take precedence.
   const renderedEntityType = isNativeLazySelection
     ? (nativeDetails?.summary.type ?? 'Loading...')
-    : (entityNode?.type ?? overlayEntity?.type ?? 'Unknown');
+    : (overlayEntity?.type ?? entityNode?.type ?? 'Unknown');
   const renderedEntityName = isNativeLazySelection
     ? (nativeDetails?.summary.name ?? `#${selectedEntity?.expressId ?? ''}`)
-    : (entityNode?.name ?? overlayAttr(2) ?? undefined);
+    : (overlayAttr(2) ?? entityNode?.name ?? undefined);
   const renderedEntityGlobalId = isNativeLazySelection
     ? (nativeDetails?.summary.globalId ?? null)
-    : (entityNode?.globalId ?? overlayAttr(0));
+    : (overlayAttr(0) ?? entityNode?.globalId);
   const renderedEntityDescription = isNativeLazySelection
     ? undefined
-    : (entityNode?.description ?? overlayAttr(3) ?? undefined);
+    : (overlayAttr(3) ?? entityNode?.description ?? undefined);
   const renderedEntityObjectType = isNativeLazySelection
     ? undefined
-    : (entityNode?.objectType ?? overlayAttr(4) ?? undefined);
+    : (overlayAttr(4) ?? entityNode?.objectType ?? undefined);
   const renderedSpatialInfo = isNativeLazySelection ? nativeSpatialInfo : spatialInfo;
   const renderedOccurrenceProperties = isNativeLazySelection ? nativeOccurrenceProperties : occurrenceProperties;
   const renderedInheritedTypeProperties = isNativeLazySelection ? [] : inheritedTypeProperties;

package/src/components/viewer/SearchInline.tsx

@@ -25,7 +25,7 @@
  */
 
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Search, Clock, X } from 'lucide-react';
+import { Search, Clock, X, SlidersHorizontal } from 'lucide-react';
 import { useShallow } from 'zustand/react/shallow';
 import { Input } from '@/components/ui/input';
 import { useViewerStore } from '@/store';
@@ -79,6 +79,9 @@ export function SearchInline() {
     exitVimCycle,
     stepVimCycle,
     setSearchModalOpen,
+    setSearchModalTab,
+    activeRuleCount,
+    clearFilterRules,
     models,
     setSelectedEntity,
     setSelectedEntityId,
@@ -99,6 +102,9 @@ export function SearchInline() {
       exitVimCycle: s.exitVimCycle,
       stepVimCycle: s.stepVimCycle,
       setSearchModalOpen: s.setSearchModalOpen,
+      setSearchModalTab: s.setSearchModalTab,
+      activeRuleCount: s.searchFilter.rules.length,
+      clearFilterRules: s.clearFilterRules,
       models: s.models,
       setSelectedEntity: s.setSelectedEntity,
       setSelectedEntityId: s.setSelectedEntityId,
@@ -395,8 +401,10 @@ export function SearchInline() {
         e.preventDefault();
         // ⌘↵ / Ctrl+↵ opens the advanced modal instead of committing — the
         // inline query is preserved so the modal opens already populated.
+        // Text-search entry point, so land on the Search tab.
         if (e.metaKey || e.ctrlKey) {
           setSearchOpen(false);
+          setSearchModalTab('search');
           setSearchModalOpen(true);
           return;
         }
@@ -416,9 +424,19 @@ export function SearchInline() {
         if (target) commitResult(target, idx, e.shiftKey, liveResults, live);
       }
     },
-    [commitResult, results, searchHighlightIndex, searchOpen, setSearchHighlightIndex, setSearchModalOpen, setSearchOpen],
+    [commitResult, results, searchHighlightIndex, searchOpen, setSearchHighlightIndex, setSearchModalOpen, setSearchModalTab, setSearchOpen],
   );
 
+  const hasFilters = activeRuleCount > 0;
+
+  /** Open the advanced modal straight to the Filter builder — the
+   *  always-visible entry point to structured filtering. */
+  const openAdvancedFilter = useCallback(() => {
+    setSearchOpen(false);
+    setSearchModalTab('filter');
+    setSearchModalOpen(true);
+  }, [setSearchOpen, setSearchModalTab, setSearchModalOpen]);
+
   const queryTrimmedLen = searchQuery.trim().length;
   const showPopover = searchOpen && (results.length > 0 || queryTrimmedLen > 0 || recents.length > 0);
   const showRecents = searchOpen && queryTrimmedLen === 0 && recents.length > 0;
@@ -437,11 +455,52 @@ export function SearchInline() {
         }}
         onFocus={() => setSearchOpen(true)}
         onKeyDown={handleInputKeyDown}
+        className={cn(hasFilters ? 'pr-[4.5rem]' : 'pr-9')}
         aria-label="Search entities"
         aria-autocomplete="list"
         aria-expanded={showPopover}
         aria-controls="search-inline-popover"
       />
+      {/* Advanced-filter affordance — always visible so structured
+          filtering is discoverable without the ⌘⇧F shortcut. Shows the
+          active rule count and a quick-clear when a filter is applied. */}
+      <div className="absolute right-1.5 top-1/2 -translate-y-1/2 flex items-center gap-0.5">
+        {hasFilters && (
+          <button
+            type="button"
+            aria-label="Clear filters"
+            title="Clear filters"
+            onMouseDown={(e) => {
+              e.preventDefault();
+              clearFilterRules();
+            }}
+            className="rounded p-1 text-muted-foreground transition-colors hover:bg-zinc-100 hover:text-foreground dark:hover:bg-zinc-800"
+          >
+            <X className="h-3.5 w-3.5" />
+          </button>
+        )}
+        <button
+          type="button"
+          aria-label={hasFilters ? `Advanced filter — ${activeRuleCount} active` : 'Advanced filter'}
+          aria-pressed={hasFilters}
+          title="Advanced filter (⌘⇧F)"
+          onMouseDown={(e) => {
+            e.preventDefault();
+            openAdvancedFilter();
+          }}
+          className={cn(
+            'flex items-center gap-1 rounded px-1.5 py-1 text-xs transition-colors',
+            hasFilters
+              ? 'bg-primary/10 text-primary hover:bg-primary/15'
+              : 'text-muted-foreground hover:bg-zinc-100 hover:text-foreground dark:hover:bg-zinc-800',
+          )}
+        >
+          <SlidersHorizontal className="h-3.5 w-3.5" />
+          {hasFilters && (
+            <span className="font-mono text-[10px] font-semibold leading-none">{activeRuleCount}</span>
+          )}
+        </button>
+      </div>
       {/* Vim cycle hint — shows below the input whenever a cycle is active
           and the popover is closed. Clicking it exits the cycle. */}
       {searchVimCycle && !showPopover && (
@@ -475,6 +534,7 @@ export function SearchInline() {
           onHover={(i) => setSearchHighlightIndex(i)}
           onOpenAdvanced={() => {
             setSearchOpen(false);
+            setSearchModalTab('search');
             setSearchModalOpen(true);
           }}
         />