gloomberb 0.7.3 → 0.7.5

package/src/components/command-bar/command-bar.tsx

@@ -73,8 +73,10 @@ import {
   movePaneRelative,
   removePane,
   swapPanes,
+  type LayoutBounds,
 } from "../../plugins/pane-manager";
 import { notifyGridlockComplete } from "../../plugins/gridlock-notification";
+import { resolveAppHeaderHeightCells } from "../layout/shell";
 import { CHART_RENDERER_PREFERENCES } from "../chart/chart-types";
 import {
   getEmptyState,
@@ -168,6 +170,7 @@ interface CommandBarProps {
   pluginRegistry: PluginRegistry;
   quitApp: () => void;
   onCheckForUpdates?: () => void | Promise<void>;
+  onNativeOccluderChange?: (rect: LayoutBounds | null) => void;
 }
 
 type WorkflowStringValues = Record<string, string>;
@@ -645,6 +648,7 @@ export function CommandBar({
   pluginRegistry,
   quitApp,
   onCheckForUpdates,
+  onNativeOccluderChange,
 }: CommandBarProps) {
   const dispatch = useAppDispatch();
   const themeColors = useThemeColors();
@@ -709,7 +713,7 @@ export function CommandBar({
   }, []);
   const { symbol: activeTickerSymbol, ticker: activeTickerData, financials: activeFinancials } = useFocusedTicker();
   const { width: termWidth, height: termHeight } = useViewport();
-  const { nativePaneChrome, cellWidthPx = 8, cellHeightPx = 18 } = useUiCapabilities();
+  const { nativePaneChrome, cellWidthPx = 8, cellHeightPx = 18, titleBarOverlay } = useUiCapabilities();
   const availableCommands = useMemo(
     () => nativePaneChrome
       ? commands.filter((command) => command.id !== "cycle-chart-renderer")
@@ -4000,7 +4004,11 @@ export function CommandBar({
     rootResultModel.items,
     rootTickerSearchArg,
   ]);
-  const orderedRootResults = useMemo(() => orderListResults(rootResults), [rootResults]);
+  const rootSectionOrder = rootPlainTickerSearchArg ? "app-first" : "default";
+  const orderedRootResults = useMemo(
+    () => orderListResults(rootResults, { sectionOrder: rootSectionOrder }),
+    [rootResults, rootSectionOrder],
+  );
   const activeRootProviderResultsKey = useMemo(() => {
     if (!rootTickerSearchArg || rootProviderResultsQuery !== rootTickerSearchArg || !rootProviderResults) return null;
     return [
@@ -4316,6 +4324,7 @@ export function CommandBar({
         emptyDetail: emptyState.detail,
         footerLeft: getScreenFooterLeft(null),
         footerRight: getScreenFooterRight(null),
+        sectionOrder: rootSectionOrder,
       };
     }
 
@@ -4463,6 +4472,7 @@ export function CommandBar({
     rootModeInfo.kind,
     rootQuery,
     orderedRootResults,
+    rootSectionOrder,
     rootSearching,
     rootSelectedIdx,
     rootShortcutIntent,
@@ -5384,6 +5394,13 @@ export function CommandBar({
     : bodyHeight + 7;
   const barLeft = Math.max(4, Math.floor((termWidth - barWidth) / 2));
   const barTop = Math.max(1, Math.floor((termHeight - barHeight) / 2));
+  const appHeaderHeight = resolveAppHeaderHeightCells({ titleBarOverlay, cellHeightPx });
+  const nativeOccluderRect = useMemo<LayoutBounds>(() => ({
+    x: barLeft,
+    y: barTop - appHeaderHeight,
+    width: barWidth,
+    height: barHeight,
+  }), [appHeaderHeight, barHeight, barLeft, barTop, barWidth]);
   const resultsInnerWidth = Math.max(12, barWidth - nativePanelPaddingColumns - contentPadding * 2);
   const trailingWidth = Math.max(8, Math.min(12, Math.floor(resultsInnerWidth * 0.18)));
   const labelWidth = Math.max(10, resultsInnerWidth - trailingWidth);
@@ -5413,6 +5430,13 @@ export function CommandBar({
     }
   }, [listBodyHeight, selectedScrollRowIndex, visibleListState?.kind, visibleListState?.query]);
 
+  useLayoutEffect(() => {
+    onNativeOccluderChange?.(nativeOccluderRect);
+    return () => {
+      onNativeOccluderChange?.(null);
+    };
+  }, [nativeOccluderRect, onNativeOccluderChange]);
+
   useEffect(() => {
     if (!nativePaneChrome || currentRoute?.kind !== "workflow") return;
     const scrollBox = workflowScrollRef.current;

package/src/components/command-bar/list-model.ts

@@ -1,4 +1,4 @@
-import { buildSections } from "./view-model";
+import { buildSections, type CommandBarSectionOrder } from "./view-model";
 
 export interface ResultItem {
   id: string;
@@ -31,6 +31,7 @@ export interface ListScreenState {
   emptyDetail: string;
   footerLeft: string;
   footerRight: string;
+  sectionOrder?: CommandBarSectionOrder;
 }
 
 export type CommandBarListRow =
@@ -41,13 +42,16 @@ export type CommandBarListRow =
   | { kind: "spinner"; id: string; label: string }
   | { kind: "filler"; id: string };
 
-export function orderListResults(results: ResultItem[]): ResultItem[] {
-  return buildSections(results).flatMap((section) => section.items);
+export function orderListResults(
+  results: ResultItem[],
+  options?: { sectionOrder?: CommandBarSectionOrder },
+): ResultItem[] {
+  return buildSections(results, options).flatMap((section) => section.items);
 }
 
 export function buildListRows(listState: ListScreenState): CommandBarListRow[] {
   const rows: CommandBarListRow[] = [];
-  const sections = buildSections(listState.results);
+  const sections = buildSections(listState.results, { sectionOrder: listState.sectionOrder });
   let globalIdx = 0;
   sections.forEach((section, sectionIndex) => {
     if (sectionIndex > 0) {

package/src/components/command-bar/view-model.test.ts

@@ -47,6 +47,26 @@ describe("command bar view model helpers", () => {
     expect(sections.map((section) => section.category)).toEqual(["Tickers", "Config", "Danger", "Debug"]);
   });
 
+  test("keeps provider ticker suggestions behind app sections in app-first order", () => {
+    const sections = buildSections([
+      { id: "pane", category: "Panes" },
+      { id: "primary", category: "Primary Listing" },
+      { id: "other", category: "Other Listings" },
+      { id: "fund", category: "Funds & Derivatives" },
+      { id: "saved", category: "Saved" },
+      { id: "exact", category: "Exact Match" },
+    ], { sectionOrder: "app-first" });
+
+    expect(sections.map((section) => section.category)).toEqual([
+      "Exact Match",
+      "Saved",
+      "Panes",
+      "Primary Listing",
+      "Other Listings",
+      "Funds & Derivatives",
+    ]);
+  });
+
   test("derives row presentation for toggles and current rows", () => {
     expect(getRowPresentation({
       id: "plugin:news",

package/src/components/command-bar/view-model.ts

@@ -15,6 +15,8 @@ export interface CommandBarSection<T> {
   items: T[];
 }
 
+export type CommandBarSectionOrder = "default" | "app-first";
+
 export interface CommandBarItemView {
   id: string;
   label: string;
@@ -59,7 +61,10 @@ export function resolveCommandBarMode(query: string, commandList?: Command[]): C
   }
 }
 
-export function buildSections<T extends { category: string }>(items: T[]): Array<CommandBarSection<T>> {
+export function buildSections<T extends { category: string }>(
+  items: T[],
+  options?: { sectionOrder?: CommandBarSectionOrder },
+): Array<CommandBarSection<T>> {
   const sections: Array<CommandBarSection<T>> = [];
   for (const item of items) {
     let section = sections.find((candidate) => candidate.category === item.category);
@@ -72,7 +77,9 @@ export function buildSections<T extends { category: string }>(items: T[]): Array
   return sections
     .map((section, index) => ({ section, index }))
     .sort((a, b) => {
-      const priorityDiff = getCategoryPriority(a.section.category) - getCategoryPriority(b.section.category);
+      const leftPriority = getCategoryPriority(a.section.category, options?.sectionOrder);
+      const rightPriority = getCategoryPriority(b.section.category, options?.sectionOrder);
+      const priorityDiff = leftPriority - rightPriority;
       return priorityDiff !== 0 ? priorityDiff : a.index - b.index;
     })
     .map(({ section }) => section);
@@ -126,10 +133,15 @@ export function truncateText(text: string, width: number): string {
   return `${text.slice(0, width - 3)}...`;
 }
 
-function getCategoryPriority(category: string): number {
+function getCategoryPriority(category: string, sectionOrder: CommandBarSectionOrder = "default"): number {
   const normalized = category.trim().toLowerCase();
   if (normalized === "exact match") return -50;
   if (normalized === "saved") return -40;
+  if (sectionOrder === "app-first") {
+    if (normalized === "primary listing") return 100;
+    if (normalized === "other listings") return 110;
+    if (normalized === "funds & derivatives") return 120;
+  }
   if (normalized === "primary listing") return -30;
   if (normalized === "other listings") return -20;
   if (normalized === "funds & derivatives") return -10;

package/src/components/layout/shell.test.tsx

@@ -560,6 +560,32 @@ describe("Shell", () => {
     ]);
   });
 
+  test("keeps command bar native occlusion scoped to the panel", () => {
+    const state = buildNativeWindowState(
+      ["portfolio-list:main"],
+      [],
+      null,
+      { open: false, width: 120, contentHeight: 40 },
+      [
+        {
+          id: "command-bar:panel",
+          rect: { x: 24, y: 8, width: 72, height: 14 },
+          zIndex: Number.MAX_SAFE_INTEGER,
+        },
+      ],
+    );
+
+    expect(state.occluders).toEqual([
+      {
+        id: "command-bar:panel",
+        paneId: null,
+        rect: { x: 24, y: 9, width: 72, height: 14 },
+        zIndex: Number.MAX_SAFE_INTEGER,
+      },
+    ]);
+    expect(state.occluders.some((occluder) => occluder.id === "overlay:global")).toBe(false);
+  });
+
   test("adds dock dividers as global native occluders", () => {
     const state = buildNativeWindowState(
       ["left:main", "right:main"],

package/src/components/layout/shell.tsx

@@ -76,6 +76,7 @@ interface ShellProps {
   pluginRegistry: PluginRegistry;
   desktopWindowBridge?: DesktopWindowBridge;
   desktopDockPreview?: DesktopDockPreviewState | null;
+  commandBarNativeOccluder?: LayoutBounds | null;
 }
 
 interface HoverOverlay {
@@ -192,6 +193,7 @@ const DEFAULT_HEADER_HEIGHT = 1;
 const MENU_MIN_WIDTH = 18;
 const MENU_MAX_WIDTH = 44;
 const MENU_Z_INDEX = 10_000;
+const DOCK_DIVIDER_SIZE = 1;
 const PANE_DRAG_THRESHOLD = 2;
 const PRECISE_PANE_DRAG_THRESHOLD = 0.15;
 const PANE_MANAGEMENT_ACCELERATORS = {
@@ -498,6 +500,39 @@ export function resolveNativeDockDividers(
   ));
 }
 
+function resolveDividerPreviewRect(
+  axis: "horizontal" | "vertical",
+  bounds: LayoutBounds,
+  ratio: number,
+  nativePaneChrome: boolean,
+): LayoutBounds {
+  if (axis === "horizontal") {
+    const offset = nativePaneChrome
+      ? bounds.width * ratio
+      : bounds.width > DOCK_DIVIDER_SIZE
+        ? Math.round((bounds.width - DOCK_DIVIDER_SIZE) * ratio)
+        : Math.max(0, Math.round(bounds.width * ratio) - DOCK_DIVIDER_SIZE);
+    return {
+      x: nativePaneChrome ? bounds.x + offset - (DOCK_DIVIDER_SIZE / 2) : bounds.x + offset,
+      y: bounds.y,
+      width: DOCK_DIVIDER_SIZE,
+      height: bounds.height,
+    };
+  }
+
+  const offset = nativePaneChrome
+    ? bounds.height * ratio
+    : bounds.height > DOCK_DIVIDER_SIZE
+      ? Math.round((bounds.height - DOCK_DIVIDER_SIZE) * ratio)
+      : Math.max(0, Math.round(bounds.height * ratio) - DOCK_DIVIDER_SIZE);
+  return {
+    x: bounds.x,
+    y: nativePaneChrome ? bounds.y + offset - (DOCK_DIVIDER_SIZE / 2) : bounds.y + offset,
+    width: bounds.width,
+    height: DOCK_DIVIDER_SIZE,
+  };
+}
+
 export function finalizePaneDragRelease(
   layout: LayoutConfig,
   paneId: string,
@@ -789,7 +824,12 @@ function resolveExternalDockPreview(
   }
 }
 
-export function Shell({ pluginRegistry, desktopWindowBridge, desktopDockPreview }: ShellProps) {
+export function Shell({
+  pluginRegistry,
+  desktopWindowBridge,
+  desktopDockPreview,
+  commandBarNativeOccluder = null,
+}: ShellProps) {
   useThemeColors();
   const dispatch = useAppDispatch();
   const config = useAppSelector((state) => state.config);
@@ -1047,7 +1087,9 @@ export function Shell({ pluginRegistry, desktopWindowBridge, desktopDockPreview
     event.stopPropagation();
   });
 
-  const dockGeometryOptions = useMemo(() => (nativePaneChrome ? { precise: true } : undefined), [nativePaneChrome]);
+  const dockGeometryOptions = useMemo(() => (
+    nativePaneChrome ? { precise: true } : { reserveDividerGutters: true }
+  ), [nativePaneChrome]);
   const dockLeafLayouts = useMemo(() => getDockLeafLayouts(visibleLayout, bounds, dockGeometryOptions), [bounds, dockGeometryOptions, visibleLayout]);
   const dockDividerLayouts = useMemo(() => getDockDividerLayouts(visibleLayout, bounds, dockGeometryOptions), [bounds, dockGeometryOptions, visibleLayout]);
   const snapGuides = useMemo(() => makeSnapGuides(width, contentHeight), [contentHeight, width]);
@@ -1092,8 +1134,29 @@ export function Shell({ pluginRegistry, desktopWindowBridge, desktopDockPreview
       });
     }
 
+    if (menuState) {
+      occluders.push({
+        id: `pane-menu:${menuState.paneId}`,
+        rect: {
+          x: menuState.x,
+          y: menuState.y,
+          width: menuState.width,
+          height: menuState.items.length + 2,
+        },
+        zIndex: MENU_Z_INDEX,
+      });
+    }
+
+    if (commandBarNativeOccluder) {
+      occluders.push({
+        id: "command-bar:panel",
+        rect: commandBarNativeOccluder,
+        zIndex: Number.MAX_SAFE_INTEGER,
+      });
+    }
+
     return occluders;
-  }, [activeHoverOverlay, activePaneDrag, dragFloatingRect, effectiveDockPreview]);
+  }, [activeHoverOverlay, activePaneDrag, commandBarNativeOccluder, dragFloatingRect, effectiveDockPreview, menuState]);
   const nativeDockDividers = useMemo(
     () => resolveNativeDockDividers(dockDividerLayouts, dividerPreview),
     [dividerPreview, dockDividerLayouts],
@@ -1107,12 +1170,12 @@ export function Shell({ pluginRegistry, desktopWindowBridge, desktopDockPreview
         zIndex: pane.floating?.zIndex ?? 50,
       })),
       dragFloatingRect,
-      { open: overlayOpen, width, contentHeight },
+      { open: dialogOpen, width, contentHeight },
       nativeTransientOccluders,
       nativeDockDividers,
       appHeaderHeight,
     ),
-    [appHeaderHeight, contentHeight, dockedPanes, dragFloatingRect, nativeDockDividers, nativeTransientOccluders, overlayOpen, visibleFloatingPanes, width],
+    [appHeaderHeight, contentHeight, dialogOpen, dockedPanes, dragFloatingRect, nativeDockDividers, nativeTransientOccluders, visibleFloatingPanes, width],
   );
 
   useEffect(() => {
@@ -1194,22 +1257,7 @@ export function Shell({ pluginRegistry, desktopWindowBridge, desktopDockPreview
         const total = drag.axis === "horizontal" ? drag.bounds.width : drag.bounds.height;
         const delta = drag.axis === "horizontal" ? preciseX - drag.startX : preciseShellY - drag.startY;
         const nextRatio = Math.max(0.1, Math.min(0.9, drag.startRatio + (delta / Math.max(1, total))));
-        const offset = drag.axis === "horizontal"
-          ? drag.bounds.width * nextRatio
-          : drag.bounds.height * nextRatio;
-        const nextRect = drag.axis === "horizontal"
-          ? {
-            x: nativePaneChrome ? drag.bounds.x + offset - 0.5 : drag.bounds.x + Math.round(offset) - 1,
-            y: drag.bounds.y,
-            width: 1,
-            height: drag.bounds.height,
-          }
-          : {
-            x: drag.bounds.x,
-            y: nativePaneChrome ? drag.bounds.y + offset - 0.5 : drag.bounds.y + Math.round(offset) - 1,
-            width: drag.bounds.width,
-            height: 1,
-          };
+        const nextRect = resolveDividerPreviewRect(drag.axis, drag.bounds, nextRatio, nativePaneChrome);
         updateDividerPreview({ pathKey: drag.path.join("."), rect: nextRect, ratio: nextRatio });
       } else if (drag.type === "pane-drag") {
         if (!isMeaningfulPaneDrag(drag.startX, drag.startY, preciseX, preciseShellY, dragThreshold)) {

package/src/components/ticker-list-table.tsx

@@ -56,17 +56,6 @@ const FLASHABLE_QUOTE_COLUMN_IDS = new Set([
   "pnl_pct",
 ]);
 
-function resolveQuoteFlashColor(direction: QuoteFlashDirection, fallbackColor: string): string {
-  switch (direction) {
-    case "up":
-      return colors.positive;
-    case "down":
-      return colors.negative;
-    default:
-      return fallbackColor === colors.textDim ? colors.text : colors.textBright;
-  }
-}
-
 export interface TickerListTableProps {
   columns: ColumnConfig[];
   tickers: TickerRecord[];
@@ -239,13 +228,13 @@ const TickerListRow = memo(function TickerListRow({
         const { text, color } = resolveCell(column, ticker, financials);
         const baseFg = color || (isSelected ? colors.selectedText : colors.text);
         const shouldFlash = flashDirection != null && FLASHABLE_QUOTE_COLUMN_IDS.has(column.id);
-        const cellFg = shouldFlash
-          ? resolveQuoteFlashColor(flashDirection, baseFg)
-          : baseFg;
 
         return (
           <Box key={column.id} width={column.width + 1}>
-            <Text fg={cellFg}>
+            <Text
+              fg={baseFg}
+              attributes={shouldFlash ? TextAttributes.DIM : TextAttributes.NONE}
+            >
               {padTo(text, column.width, column.align)}
             </Text>
           </Box>

package/src/core/state/session-persistence.ts

@@ -73,6 +73,23 @@ function targetFromTicker(ticker: TickerRecord): HydrationTarget {
   });
 }
 
+function resolvePortfolioPaneCollectionId(
+  config: AppConfig,
+  paneState: Record<string, unknown> | undefined,
+  instance: AppConfig["layout"]["instances"][number],
+): string | null {
+  const stateCollectionId = typeof paneState?.collectionId === "string" ? paneState.collectionId : null;
+  if (stateCollectionId) return stateCollectionId;
+  if (typeof instance.params?.collectionId === "string") return instance.params.collectionId;
+  return config.portfolios[0]?.id ?? config.watchlists[0]?.id ?? null;
+}
+
+function tickerInCollection(ticker: TickerRecord, collectionId: string | null): boolean {
+  if (!collectionId) return false;
+  return ticker.metadata.portfolios.includes(collectionId)
+    || ticker.metadata.watchlists.includes(collectionId);
+}
+
 export function buildAppSessionSnapshot(state: SessionStateInput): AppSessionSnapshot {
   const seen = new Set<string>();
   const hydrationTargets: HydrationTarget[] = [];
@@ -104,6 +121,14 @@ export function buildAppSessionSnapshot(state: SessionStateInput): AppSessionSna
     if (instance.binding?.kind === "fixed") {
       pushTarget(state.tickers.get(instance.binding.symbol));
     }
+    if (instance.paneId === "portfolio-list") {
+      const collectionId = resolvePortfolioPaneCollectionId(state.config, paneState, instance);
+      for (const ticker of state.tickers.values()) {
+        if (tickerInCollection(ticker, collectionId)) {
+          pushTarget(ticker);
+        }
+      }
+    }
   }
 
   return {

package/src/market-data/coordinator-subscriptions.test.ts

@@ -43,6 +43,79 @@ async function flushCoordinator(): Promise<void> {
 }
 
 describe("MarketDataCoordinator key subscriptions", () => {
+  test("subscribes active quote targets as one provider batch", () => {
+    const subscriptions: QuoteSubscriptionTarget[][] = [];
+    const provider = createTestDataProvider({
+      id: "test-provider",
+      subscribeQuotes: (targets) => {
+        subscriptions.push(targets);
+        return () => {};
+      },
+    });
+    const coordinator = new MarketDataCoordinator(provider);
+
+    coordinator.subscribeQuotes([
+      {
+        instrument: { symbol: "AAPL", exchange: "NASDAQ" },
+        priority: { surface: "portfolio", visible: true, selected: true, weight: 100 },
+      },
+      { instrument: { symbol: "MSFT", exchange: "NASDAQ" } },
+    ]);
+
+    expect(subscriptions).toHaveLength(1);
+    expect(subscriptions[0]?.map((target) => target.symbol).sort()).toEqual(["AAPL", "MSFT"]);
+    expect(subscriptions[0]?.find((target) => target.symbol === "AAPL")).toMatchObject({
+      surface: "portfolio",
+      visible: true,
+      selected: true,
+      weight: 100,
+    });
+  });
+
+  test("keeps the highest-priority target when duplicate surfaces subscribe", () => {
+    const subscriptions: QuoteSubscriptionTarget[][] = [];
+    let disposals = 0;
+    const provider = createTestDataProvider({
+      id: "test-provider",
+      subscribeQuotes: (targets) => {
+        subscriptions.push(targets);
+        return () => {
+          disposals += 1;
+        };
+      },
+    });
+    const coordinator = new MarketDataCoordinator(provider);
+    const instrument = { symbol: "AAPL", exchange: "NASDAQ" };
+
+    const unsubscribeDetail = coordinator.subscribeQuotes([{
+      instrument,
+      priority: { surface: "detail", visible: true, selected: true, weight: 100 },
+    }]);
+    coordinator.subscribeQuotes([{
+      instrument,
+      priority: { surface: "portfolio", visible: false, selected: false, weight: 10 },
+    }]);
+
+    expect(subscriptions).toHaveLength(1);
+    expect(subscriptions[0]?.[0]).toMatchObject({
+      surface: "detail",
+      visible: true,
+      selected: true,
+      weight: 100,
+    });
+
+    unsubscribeDetail();
+
+    expect(subscriptions).toHaveLength(2);
+    expect(disposals).toBe(1);
+    expect(subscriptions[1]?.[0]).toMatchObject({
+      surface: "portfolio",
+      visible: false,
+      selected: false,
+      weight: 10,
+    });
+  });
+
   test("notifies listeners for changed keys only", async () => {
     const { provider, emitQuote } = createProvider();
     const coordinator = new MarketDataCoordinator(provider);
@@ -97,29 +170,40 @@ describe("MarketDataCoordinator key subscriptions", () => {
     expect(coordinator.getVersion()).toBe(1);
   });
 
-  test("ignores repeated stream quotes that only refresh timestamp noise", async () => {
+  test("applies repeated stream quotes that refresh quote freshness", async () => {
+    const realDateNow = Date.now;
     const { provider, emitQuote } = createProvider();
     const coordinator = new MarketDataCoordinator(provider);
     const aapl = { symbol: "AAPL", exchange: "NASDAQ" };
     let calls = 0;
 
-    coordinator.subscribeKeys([buildQuoteKey(aapl)], () => { calls += 1; });
-    coordinator.subscribeQuotes([{ instrument: aapl }]);
-
     const firstTimestamp = 1_700_000_000_000;
-    emitQuote({ symbol: "AAPL", exchange: "NASDAQ" }, quote("AAPL", 100, { lastUpdated: firstTimestamp }));
-    await flushCoordinator();
-
-    emitQuote({ symbol: "AAPL", exchange: "NASDAQ" }, quote("AAPL", 100, { lastUpdated: firstTimestamp + 10_000 }));
-    await flushCoordinator();
-
-    expect(calls).toBe(1);
-    expect(coordinator.getQuoteEntry(aapl).data?.lastUpdated).toBe(firstTimestamp);
-
-    emitQuote({ symbol: "AAPL", exchange: "NASDAQ" }, quote("AAPL", 101, { lastUpdated: firstTimestamp + 20_000 }));
-    await flushCoordinator();
-
-    expect(calls).toBe(2);
-    expect(coordinator.getQuoteEntry(aapl).data?.price).toBe(101);
+    try {
+      coordinator.subscribeKeys([buildQuoteKey(aapl)], () => { calls += 1; });
+      coordinator.subscribeQuotes([{ instrument: aapl }]);
+
+      Date.now = () => firstTimestamp;
+      emitQuote({ symbol: "AAPL", exchange: "NASDAQ" }, quote("AAPL", 100, { lastUpdated: firstTimestamp }));
+      await flushCoordinator();
+
+      Date.now = () => firstTimestamp + 10_000;
+      emitQuote({ symbol: "AAPL", exchange: "NASDAQ" }, quote("AAPL", 100, { lastUpdated: firstTimestamp + 10_000 }));
+      await flushCoordinator();
+
+      expect(calls).toBe(2);
+      expect(coordinator.getQuoteEntry(aapl).data?.lastUpdated).toBe(firstTimestamp + 10_000);
+      expect(coordinator.getQuoteEntry(aapl).data?.receivedAt).toBe(firstTimestamp + 10_000);
+
+      Date.now = () => firstTimestamp + 20_000;
+      emitQuote({ symbol: "AAPL", exchange: "NASDAQ" }, quote("AAPL", 101, { lastUpdated: firstTimestamp + 10_000 }));
+      await flushCoordinator();
+
+      expect(calls).toBe(3);
+      expect(coordinator.getQuoteEntry(aapl).data?.price).toBe(101);
+      expect(coordinator.getQuoteEntry(aapl).data?.lastUpdated).toBe(firstTimestamp + 10_000);
+      expect(coordinator.getQuoteEntry(aapl).data?.receivedAt).toBe(firstTimestamp + 20_000);
+    } finally {
+      Date.now = realDateNow;
+    }
   });
 });