@ifc-lite/viewer 1.17.4 → 1.18.0

package/src/components/viewer/EntityContextMenu.tsx

@@ -18,8 +18,11 @@ import {
   Maximize2,
   Building2,
   Save,
+  Trash2,
+  CopyPlus,
 } from 'lucide-react';
 import { useViewerStore, resolveEntityRef } from '@/store';
+import type { DuplicateDirection } from '@/store/slices/mutationSlice';
 import { resetVisibilityForHomeFromStore } from '@/store/homeView';
 import {
   executeBasketSet,
@@ -28,6 +31,7 @@ import {
   executeBasketSaveView,
 } from '@/store/basket/basketCommands';
 import { useIfc } from '@/hooks/useIfc';
+import { toast } from '@/components/ui/toast';
 
 export function EntityContextMenu() {
   const contextMenu = useViewerStore((s) => s.contextMenu);
@@ -36,6 +40,10 @@ export function EntityContextMenu() {
   const setSelectedEntityId = useViewerStore((s) => s.setSelectedEntityId);
   const setSelectedEntityIds = useViewerStore((s) => s.setSelectedEntityIds);
   const cameraCallbacks = useViewerStore((s) => s.cameraCallbacks);
+  // Store-level mutations
+  const removeEntity = useViewerStore((s) => s.removeEntity);
+  const duplicateEntity = useViewerStore((s) => s.duplicateEntity);
+  const getMutationView = useViewerStore((s) => s.getMutationView);
   // Basket actions
   const menuRef = useRef<HTMLDivElement>(null);
   const { ifcDataStore, models } = useIfc();
@@ -206,6 +214,63 @@ export function EntityContextMenu() {
     closeContextMenu();
   }, [resolvedExpressId, activeDataStore, closeContextMenu]);
 
+  // Right-clicked entity's type — used in the toast message.
+  const contextEntityType = useMemo(() => {
+    if (!resolvedExpressId || !activeDataStore) return '';
+    return activeDataStore.entities.getTypeName(resolvedExpressId) || '';
+  }, [resolvedExpressId, activeDataStore]);
+
+  // Mutation view is required to drive bim.store.* — native-metadata-only
+  // models don't have one, so the Delete option stays hidden there.
+  const canEdit = useMemo(() => {
+    if (!contextEntityRef) return false;
+    return getMutationView(contextEntityRef.modelId) !== null;
+  }, [contextEntityRef, getMutationView]);
+
+  const handleDuplicate = useCallback(
+    (direction: DuplicateDirection = '+X') => {
+      if (!contextEntityRef || !canEdit) {
+        closeContextMenu();
+        return;
+      }
+      const result = duplicateEntity(contextEntityRef.modelId, contextEntityRef.expressId, direction);
+      if ('error' in result) {
+        toast.error(`Couldn't duplicate: ${result.error}`);
+      } else {
+        // Move selection onto the new entity so the property panel
+        // refreshes and the user can keep iterating (Cmd+D again
+        // duplicates the duplicate, like a stamp tool).
+        setSelectedEntityId(result.globalId);
+        toast.success(`Duplicated as #${result.expressId} (${direction}) — undo to remove`);
+      }
+      closeContextMenu();
+    },
+    [contextEntityRef, canEdit, duplicateEntity, setSelectedEntityId, closeContextMenu],
+  );
+
+  const handleDeleteEntity = useCallback(() => {
+    if (!contextEntityRef || !canEdit || !contextMenu.entityId) {
+      closeContextMenu();
+      return;
+    }
+    const ok = removeEntity(contextEntityRef.modelId, contextEntityRef.expressId);
+    if (ok) {
+      // Tombstoning only affects export — the rendered mesh is still
+      // in the GPU buffers. Hide it via the existing visibility system
+      // so the entity disappears from the scene and stops being
+      // pickable. `Show all` from the empty-space menu restores it
+      // (along with re-running undo to bring back the overlay).
+      hideEntity(contextMenu.entityId);
+      // Drop the selection so the right panel doesn't cling to a
+      // tombstoned id.
+      setSelectedEntityId(null);
+      toast.success(`${contextEntityType || 'Entity'} #${contextEntityRef.expressId} deleted — undo to restore`);
+    } else {
+      toast.error('Delete failed — entity not found in store overlay');
+    }
+    closeContextMenu();
+  }, [contextEntityRef, canEdit, contextEntityType, contextMenu.entityId, removeEntity, hideEntity, setSelectedEntityId, closeContextMenu]);
+
   if (!contextMenu.isOpen) {
     return null;
   }
@@ -257,6 +322,22 @@ export function EntityContextMenu() {
           <div className="h-px bg-border my-1" />
 
           <MenuItem icon={Copy} label="Copy GlobalId" onClick={handleCopyId} />
+
+          {/* Store-level mutations (bim.store.*). Only surfaced when there's
+              a live mutation view on the model — otherwise these would
+              silently no-op and confuse users. */}
+          {canEdit && (
+            <>
+              <div className="h-px bg-border my-1" />
+              <DuplicateRow onDuplicate={handleDuplicate} />
+              <MenuItem
+                icon={Trash2}
+                label="Delete entity"
+                tone="destructive"
+                onClick={handleDeleteEntity}
+              />
+            </>
+          )}
         </>
       )}
 
@@ -269,22 +350,105 @@ export function EntityContextMenu() {
   );
 }
 
+type MenuItemTone = 'default' | 'destructive';
+
 interface MenuItemProps {
   icon: React.ComponentType<{ className?: string }>;
   label: string;
   onClick: () => void;
   disabled?: boolean;
+  /** Right-aligned keyboard hint (e.g. `'⌘D'`). */
+  shortcut?: string;
+  /**
+   * Visual tone:
+   * - `default`     muted icon, neutral hover
+   * - `destructive` red-toned icon and red-tinted hover (Delete entity)
+   */
+  tone?: MenuItemTone;
 }
 
-function MenuItem({ icon: Icon, label, onClick, disabled }: MenuItemProps) {
+/**
+ * Inline directional duplicate row — primary label on the left
+ * (clickable, fires the default +X duplicate), six axis chips on
+ * the right for explicit direction control. Mirrors the column
+ * placement axes the user already sees on the Raw STEP tab.
+ *
+ * Why six chips and not a sub-menu: a flyout for six options is
+ * wasted real estate, and the chip arrows let the user "see and
+ * pick" in one motion.
+ */
+function DuplicateRow({ onDuplicate }: { onDuplicate: (dir: DuplicateDirection) => void }) {
+  return (
+    <div className="px-3 py-1.5 flex items-center gap-2 hover:bg-muted/40">
+      <button
+        type="button"
+        onClick={() => onDuplicate('+X')}
+        className="flex items-center gap-2 text-sm text-left flex-1 min-w-0 hover:text-foreground"
+        title="Duplicate one bbox-width along +X (default)"
+      >
+        <CopyPlus className="h-4 w-4 text-muted-foreground" />
+        <span>Duplicate</span>
+        <span className="ml-auto text-[10px] font-mono text-muted-foreground/70">⌘D</span>
+      </button>
+      <div className="flex items-center gap-0.5 shrink-0 border-l border-border/60 pl-2">
+        <DirectionChip dir="+X" label="→" tooltip="Duplicate +X (east)" onClick={() => onDuplicate('+X')} />
+        <DirectionChip dir="-X" label="←" tooltip="Duplicate −X (west)" onClick={() => onDuplicate('-X')} />
+        <DirectionChip dir="+Y" label="↗" tooltip="Duplicate +Y (north)" onClick={() => onDuplicate('+Y')} />
+        <DirectionChip dir="-Y" label="↙" tooltip="Duplicate −Y (south)" onClick={() => onDuplicate('-Y')} />
+        <DirectionChip dir="+Z" label="↑" tooltip="Duplicate +Z (up)" onClick={() => onDuplicate('+Z')} />
+        <DirectionChip dir="-Z" label="↓" tooltip="Duplicate −Z (down)" onClick={() => onDuplicate('-Z')} />
+      </div>
+    </div>
+  );
+}
+
+function DirectionChip({
+  dir,
+  label,
+  tooltip,
+  onClick,
+}: {
+  dir: DuplicateDirection;
+  label: string;
+  tooltip: string;
+  onClick: () => void;
+}) {
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      title={tooltip}
+      aria-label={tooltip}
+      className="h-5 w-5 flex items-center justify-center rounded text-[11px] font-mono leading-none text-muted-foreground hover:bg-zinc-100 dark:hover:bg-zinc-800 hover:text-foreground transition-colors"
+      data-direction={dir}
+    >
+      {label}
+    </button>
+  );
+}
+
+function MenuItem({ icon: Icon, label, onClick, disabled, shortcut, tone = 'default' }: MenuItemProps) {
+  const iconClass =
+    tone === 'destructive'
+      ? 'h-4 w-4 text-red-500 dark:text-red-400'
+      : 'h-4 w-4 text-muted-foreground';
+  const hoverClass =
+    tone === 'destructive'
+      ? 'hover:bg-red-50 dark:hover:bg-red-950/40 hover:text-red-700 dark:hover:text-red-300'
+      : 'hover:bg-muted';
   return (
     <button
-      className="w-full px-3 py-1.5 text-sm text-left flex items-center gap-2 hover:bg-muted disabled:opacity-50 disabled:cursor-not-allowed"
+      className={`w-full px-3 py-1.5 text-sm text-left flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed ${hoverClass}`}
       onClick={onClick}
       disabled={disabled}
     >
-      <Icon className="h-4 w-4 text-muted-foreground" />
-      <span>{label}</span>
+      <Icon className={iconClass} />
+      <span className="flex-1 min-w-0">{label}</span>
+      {shortcut && (
+        <span className="text-[10px] font-mono text-muted-foreground/70 shrink-0">
+          {shortcut}
+        </span>
+      )}
     </button>
   );
 }

package/src/components/viewer/ExportChangesButton.tsx

@@ -12,13 +12,14 @@ import { Download, Loader2, Check, AlertCircle } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Badge } from '@/components/ui/badge';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
-import { useViewerStore } from '@/store';
+import { useViewerStore, countGeneratedTasks } from '@/store';
 import { configureMutationView } from '@/utils/configureMutationView';
 import { StepExporter } from '@ifc-lite/export';
 import { MutablePropertyView } from '@ifc-lite/mutations';
 import type { IfcDataStore } from '@ifc-lite/parser';
 import { toast } from '@/components/ui/toast';
 import { ensureModelExportReady } from '@/services/desktop-export';
+import { spliceScheduleIntoExport } from '@/sdk/adapters/export-schedule-splice';
 
 interface ExportChangesButtonProps {
   /** Optional custom class name */
@@ -71,16 +72,25 @@ export function ExportChangesButton({ className }: ExportChangesButtonProps) {
     return null;
   }, [models, legacyIfcDataStore, legacyGeometryResult]);
 
-  // Count mutations (includes georef mutations)
+  // Count mutations (includes georef mutations + pending generated schedule tasks)
   const mutationCount = useMemo(() => {
     if (!modelInfo) return 0;
     const mutationView = getMutationView(modelInfo.id);
     let count = mutationView?.getMutations().length || 0;
-    const gm = useViewerStore.getState().georefMutations?.get(modelInfo.id);
+    const state = useViewerStore.getState();
+    const gm = state.georefMutations?.get(modelInfo.id);
     if (gm) {
       if (gm.projectedCRS) count += Object.keys(gm.projectedCRS).length;
       if (gm.mapConversion) count += Object.keys(gm.mapConversion).length;
     }
+    // Generated schedule tasks are first-class pending edits — they get
+    // spliced into the STEP on export (see injectScheduleIntoStep), so
+    // they belong in the same badge that tells users "you have unsaved
+    // work." Attribution: only count when this is the schedule's source
+    // model, so the badge doesn't inflate on every federated model.
+    if (state.scheduleSourceModelId === modelInfo.id) {
+      count += countGeneratedTasks(state.scheduleData);
+    }
     return count;
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [modelInfo, getMutationView, mutationVersion]);
@@ -137,7 +147,8 @@ export function ExportChangesButton({ className }: ExportChangesButtonProps) {
                    : 'IFC4';
 
       const exporter = new StepExporter(exportDataStore, mutationView || undefined);
-      const georefMutations = useViewerStore.getState().georefMutations?.get(modelInfo.id) ?? undefined;
+      const state = useViewerStore.getState();
+      const georefMutations = state.georefMutations?.get(modelInfo.id) ?? undefined;
       const result = exporter.export({
         schema: schema as 'IFC2X3' | 'IFC4' | 'IFC4X3',
         includeGeometry: true,
@@ -148,8 +159,17 @@ export function ExportChangesButton({ className }: ExportChangesButtonProps) {
         application: 'ifc-lite',
       });
 
+      // Splice any pending schedule into the STEP via the shared
+      // helper. Same contract every export surface uses so bugs can't
+      // differ between the quick button, the dialog, and the SDK.
+      const spliced = spliceScheduleIntoExport(result, modelInfo.id, exportDataStore, {
+        scheduleData: state.scheduleData ?? null,
+        scheduleIsEdited: state.scheduleIsEdited === true,
+        scheduleSourceModelId: state.scheduleSourceModelId ?? null,
+      });
+
       // Download the file
-      const blob = new Blob([toBlobPart(result.content)], { type: 'text/plain' });
+      const blob = new Blob([toBlobPart(spliced.content)], { type: 'text/plain' });
       const url = URL.createObjectURL(blob);
       const a = document.createElement('a');
       a.href = url;

package/src/components/viewer/ExportDialog.tsx

@@ -56,6 +56,7 @@ import { ensureModelExportReady } from '@/services/desktop-export';
 import { StepExporter, MergedExporter, Ifc5Exporter, IFC5_KNOWN_PROP_NAMES, type MergeModelInput, type ExportProgress, type StepExportProgress } from '@ifc-lite/export';
 import { MutablePropertyView } from '@ifc-lite/mutations';
 import type { IfcDataStore } from '@ifc-lite/parser';
+import { spliceScheduleIntoExport } from '@/sdk/adapters/export-schedule-splice';
 
 type ExportScope = 'single' | 'merged';
 type SchemaVersion = 'IFC2X3' | 'IFC4' | 'IFC4X3' | 'IFC5';
@@ -387,6 +388,12 @@ export function ExportDialog({ trigger }: ExportDialogProps) {
       }
 
       if (!selectedModel) return;
+      // IFC5 export needs a parsed data store + geometry. Native-metadata
+      // models don't carry these, so bail with a descriptive error rather
+      // than passing nulls through.
+      if (!selectedModel.ifcDataStore) {
+        throw new Error('Selected model has no parsed IFC data store available for export');
+      }
       const mutationView = getMutationView(selectedModelId);
       const baseName = selectedModel.name.replace(/\.[^.]+$/, '');
 
@@ -515,7 +522,18 @@ export function ExportDialog({ trigger }: ExportDialogProps) {
 
         setExportProgress(null);
 
-        const blob = new Blob([toBlobPart(result.content)], { type: 'text/plain' });
+        // Splice pending schedule tasks into the STEP via the shared
+        // helper. Same contract every export surface uses so bugs
+        // can't differ between the dialog, the quick button, and the
+        // SDK adapter.
+        const state = useViewerStore.getState();
+        const spliced = spliceScheduleIntoExport(result, selectedModelId, selectedModel.ifcDataStore as IfcDataStore, {
+          scheduleData: state.scheduleData ?? null,
+          scheduleIsEdited: state.scheduleIsEdited === true,
+          scheduleSourceModelId: state.scheduleSourceModelId ?? null,
+        });
+
+        const blob = new Blob([toBlobPart(spliced.content)], { type: 'text/plain' });
         const url = URL.createObjectURL(blob);
         const a = document.createElement('a');
         a.href = url;

package/src/components/viewer/MainToolbar.tsx

@@ -10,6 +10,7 @@ import {
   PersonStanding,
   Ruler,
   Scissors,
+  MapPin,
   Eye,
   EyeOff,
   Equal,
@@ -37,6 +38,7 @@ import {
   Layout,
   LayoutTemplate,
   FileCode2,
+  CalendarClock,
   Globe2,
   Settings,
 } from 'lucide-react';
@@ -66,6 +68,7 @@ import { ExportDialog } from './ExportDialog';
 import { BulkPropertyEditor } from './BulkPropertyEditor';
 import { DataConnector } from './DataConnector';
 import { ExportChangesButton } from './ExportChangesButton';
+import { SearchInline } from './SearchInline';
 // CesiumSettingsDialog removed — settings now shown as overlay on Cesium viewer
 import { useFloorplanView } from '@/hooks/useFloorplanView';
 import { buildDesktopUpgradeUrl, hasDesktopFeatureAccess, type DesktopFeature } from '@/lib/desktop-product';
@@ -84,7 +87,7 @@ import {
   subscribeAnalysisExtensions,
 } from '@/services/analysis-extensions';
 
-type Tool = 'select' | 'walk' | 'measure' | 'section';
+type Tool = 'select' | 'walk' | 'measure' | 'section' | 'annotate';
 type WorkspacePanel = 'script' | 'list' | 'bcf' | 'ids' | 'lens' | string;
 
 function isNativeFileHandle(file: File | NativeFileHandle): file is NativeFileHandle {
@@ -100,21 +103,39 @@ interface ToolButtonProps {
   shortcut?: string;
   activeTool: string;
   onToolChange: (tool: Tool) => void;
+  /**
+   * Tailwind classes applied when this tool is active. Defaults to the
+   * shared `bg-primary text-primary-foreground` shape; pass a per-tool
+   * accent (e.g. amber for Annotate) to set tools apart visually
+   * without breaking the toolbar's tool-button rhythm.
+   */
+  activeAccentClass?: string;
 }
 
-function ToolButton({ tool, icon: Icon, label, shortcut, activeTool, onToolChange }: ToolButtonProps) {
+function ToolButton({
+  tool,
+  icon: Icon,
+  label,
+  shortcut,
+  activeTool,
+  onToolChange,
+  activeAccentClass,
+}: ToolButtonProps) {
+  const isActive = activeTool === tool;
   return (
     <Tooltip>
       <TooltipTrigger asChild>
         <Button
-          variant={activeTool === tool ? 'default' : 'ghost'}
+          variant={isActive ? 'default' : 'ghost'}
           size="icon-sm"
           onClick={(e) => {
             // Blur button to close tooltip after click
             (e.currentTarget as HTMLButtonElement).blur();
             onToolChange(tool);
           }}
-          className={cn(activeTool === tool && 'bg-primary text-primary-foreground')}
+          className={cn(
+            isActive && (activeAccentClass ?? 'bg-primary text-primary-foreground'),
+          )}
         >
           <Icon className="h-4 w-4" />
         </Button>
@@ -305,7 +326,10 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
   const setLensPanelVisible = useViewerStore((state) => state.setLensPanelVisible);
   const scriptPanelVisible = useViewerStore((state) => state.scriptPanelVisible);
   const setScriptPanelVisible = useViewerStore((state) => state.setScriptPanelVisible);
+  const ganttPanelVisible = useViewerStore((state) => state.ganttPanelVisible);
+  const setGanttPanelVisible = useViewerStore((state) => state.setGanttPanelVisible);
   // Cesium 3D overlay state
+  const cesiumAvailable = useViewerStore((state) => state.cesiumAvailable);
   const cesiumEnabled = useViewerStore((state) => state.cesiumEnabled);
   const toggleCesium = useViewerStore((state) => state.toggleCesium);
   const storeModels = useViewerStore((state) => state.models);
@@ -507,21 +531,31 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     return false;
   }, [desktopEntitlement, promptDesktopUpgrade]);
 
-  const handleToggleBottomPanel = useCallback((panel: 'script' | 'list') => {
+  const handleToggleBottomPanel = useCallback((panel: 'script' | 'list' | 'gantt') => {
     if (activeAnalysisExtension?.placement === 'bottom') {
       closeActiveAnalysisExtension();
     }
-    const isScriptPanel = panel === 'script';
-    const nextScriptVisible = isScriptPanel ? !scriptPanelVisible : false;
-    const nextListVisible = isScriptPanel ? false : !listPanelVisible;
+    const nextScriptVisible = panel === 'script' ? !scriptPanelVisible : false;
+    const nextListVisible = panel === 'list' ? !listPanelVisible : false;
+    const nextGanttVisible = panel === 'gantt' ? !ganttPanelVisible : false;
 
     setScriptPanelVisible(nextScriptVisible);
     setListPanelVisible(nextListVisible);
+    setGanttPanelVisible(nextGanttVisible);
 
-    if (nextScriptVisible || nextListVisible) {
+    if (nextScriptVisible || nextListVisible || nextGanttVisible) {
       setRightPanelCollapsed(false);
     }
-  }, [activeAnalysisExtension?.placement, listPanelVisible, scriptPanelVisible, setListPanelVisible, setRightPanelCollapsed, setScriptPanelVisible]);
+  }, [
+    activeAnalysisExtension?.placement,
+    ganttPanelVisible,
+    listPanelVisible,
+    scriptPanelVisible,
+    setGanttPanelVisible,
+    setListPanelVisible,
+    setRightPanelCollapsed,
+    setScriptPanelVisible,
+  ]);
 
   const handleToggleRightPanel = useCallback((panel: 'bcf' | 'ids' | 'lens') => {
     if (activeAnalysisExtension?.placement !== 'bottom') {
@@ -576,6 +610,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     if ((extension.placement ?? 'right') === 'bottom') {
       setScriptPanelVisible(false);
       setListPanelVisible(false);
+      setGanttPanelVisible(false);
       setRightPanelCollapsed(false);
       return;
     }
@@ -588,6 +623,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     analysisExtensionState.activeId,
     analysisExtensionState.extensions,
     setBcfPanelVisible,
+    setGanttPanelVisible,
     setIdsPanelVisible,
     setLensPanelVisible,
     setListPanelVisible,
@@ -599,6 +635,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     const panels = new Set<WorkspacePanel>();
     if (scriptPanelVisible) panels.add('script');
     if (listPanelVisible) panels.add('list');
+    if (ganttPanelVisible) panels.add('gantt');
     if (bcfPanelVisible) panels.add('bcf');
     if (idsPanelVisible) panels.add('ids');
     if (lensPanelVisible) panels.add('lens');
@@ -607,6 +644,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
   }, [
     analysisExtensionState.activeId,
     bcfPanelVisible,
+    ganttPanelVisible,
     idsPanelVisible,
     lensPanelVisible,
     listPanelVisible,
@@ -618,6 +656,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
     if (activeWorkspacePanels.size > 1) return 'Multiple Panels';
     if (activeWorkspacePanels.has('script')) return 'Script Editor';
     if (activeWorkspacePanels.has('list')) return 'Lists';
+    if (activeWorkspacePanels.has('gantt')) return 'Schedule';
     if (activeWorkspacePanels.has('bcf')) return 'BCF Issues';
     if (activeWorkspacePanels.has('ids')) return 'IDS Validation';
     if (activeWorkspacePanels.has('lens')) return 'Lens Rules';
@@ -947,6 +986,13 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
             <FileSpreadsheet className="h-4 w-4 mr-2" />
             Lists
           </DropdownMenuCheckboxItem>
+          <DropdownMenuCheckboxItem
+            checked={activeWorkspacePanels.has('gantt')}
+            onCheckedChange={() => handleToggleBottomPanel('gantt')}
+          >
+            <CalendarClock className="h-4 w-4 mr-2" />
+            Schedule (Gantt)
+          </DropdownMenuCheckboxItem>
           <DropdownMenuSeparator />
           <DropdownMenuCheckboxItem
             checked={activeWorkspacePanels.has('bcf')}
@@ -1010,6 +1056,11 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
 
       <Separator orientation="vertical" className="h-6 mx-1" />
 
+      {/* ── Search (Tier-0 inline; ⌘F or / to focus) ── */}
+      <SearchInline />
+
+      <Separator orientation="vertical" className="h-6 mx-1" />
+
       {/* ── Navigation Tools ── */}
       <ToolButton tool="select" icon={MousePointer2} label="Select" shortcut="V" activeTool={activeTool} onToolChange={setActiveTool} />
       <ToolButton tool="walk" icon={PersonStanding} label="Walk Mode" shortcut="C" activeTool={activeTool} onToolChange={setActiveTool} />
@@ -1019,6 +1070,15 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
       {/* ── Measurement & Section ── */}
       <ToolButton tool="measure" icon={Ruler} label="Measure" shortcut="M" activeTool={activeTool} onToolChange={setActiveTool} />
       <ToolButton tool="section" icon={Scissors} label="Section" shortcut="X" activeTool={activeTool} onToolChange={setActiveTool} />
+      <ToolButton
+        tool="annotate"
+        icon={MapPin}
+        label="Annotate"
+        shortcut="P"
+        activeTool={activeTool}
+        onToolChange={setActiveTool}
+        activeAccentClass="bg-amber-500 text-white hover:bg-amber-500/90"
+      />
 
       {/* Floorplan dropdown */}
       {availableStoreys.length > 0 && (
@@ -1157,8 +1217,8 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
         </TooltipContent>
       </Tooltip>
 
-      {/* Cesium 3D Context toggle + settings */}
-      {hasModelsLoaded && (
+      {/* Cesium 3D Context toggle + settings — web only, only when model has georeferencing */}
+      {cesiumAvailable && !desktopShell && (
         <div className="flex items-center">
           <Tooltip>
             <TooltipTrigger asChild>
@@ -1293,7 +1353,7 @@ export function MainToolbar({ onShowShortcuts }: MainToolbarProps = {} as MainTo
               <ThemeSwitch />
             </div>
           </TooltipTrigger>
-          <TooltipContent>Toggle theme</TooltipContent>
+          <TooltipContent>Toggle theme (Shift+click for secret mode)</TooltipContent>
         </Tooltip>
 
         <Tooltip>