gloomberb 0.9.6 → 0.9.8

package/src/components/ui/checkbox.tsx

@@ -0,0 +1,76 @@
+import { type ComponentType } from "react";
+import { Box, Text, TextAttributes, useUiHost, type HostCheckboxProps } from "../../ui";
+import { colors, hoverBg } from "../../theme/colors";
+import { useRemoteUiNode } from "../../remote/semantic-tree";
+
+export type CheckboxProps = HostCheckboxProps;
+
+export function Checkbox({
+  label,
+  displayLabel,
+  checked,
+  onChange,
+  disabled = false,
+  active = false,
+  description,
+  width,
+  variant = "default",
+}: CheckboxProps) {
+  useRemoteUiNode({
+    role: "checkbox",
+    label,
+    disabled,
+    actions: {
+      toggle: () => {
+        if (!disabled) onChange?.(!checked);
+      },
+      press: () => {
+        if (!disabled) onChange?.(!checked);
+      },
+    },
+    metadata: { checked, active, variant },
+  });
+
+  const HostCheckbox = useUiHost().Checkbox as ComponentType<CheckboxProps> | undefined;
+  if (HostCheckbox) {
+    return (
+      <HostCheckbox
+        label={label}
+        displayLabel={displayLabel}
+        checked={checked}
+        onChange={onChange}
+        disabled={disabled}
+        active={active}
+        description={description}
+        width={width}
+        variant={variant}
+      />
+    );
+  }
+
+  const marker = checked ? "\u2713" : " ";
+  const visibleLabel = displayLabel ?? label;
+  const fg = disabled ? colors.textMuted : active ? colors.textBright : colors.text;
+  const descriptionWidth = typeof width === "number" ? Math.max(20, width - 2) : 28;
+  return (
+    <Box
+      flexDirection="column"
+      width={width}
+      backgroundColor={active && !disabled ? hoverBg() : undefined}
+      onMouseDown={(event?: { preventDefault?: () => void; stopPropagation?: () => void }) => {
+        event?.preventDefault?.();
+        event?.stopPropagation?.();
+        if (!disabled) onChange?.(!checked);
+      }}
+    >
+      <Text fg={fg} attributes={active ? TextAttributes.BOLD : 0}>
+        {`${active ? "> " : "  "}[${marker}] ${visibleLabel}`}
+      </Text>
+      {description ? (
+        <Text fg={colors.textMuted} wrapText width={descriptionWidth}>
+          {description}
+        </Text>
+      ) : null}
+    </Box>
+  );
+}

package/src/components/ui/choice-dialog.tsx

@@ -37,6 +37,15 @@ function getInitialChoiceIndex(choices: ChoiceDialogChoice[], selectedChoiceId:
   return selectedIndex >= 0 ? selectedIndex : 0;
 }
 
+function choiceDialogWidth(title: string, choices: ChoiceDialogChoice[]): number {
+  const contentWidth = Math.max(
+    title.length,
+    ...choices.map((choice) => choice.label.length + (choice.detail ? choice.detail.length + 4 : 0)),
+    ...choices.map((choice) => getChoiceDescription(choice).length),
+  );
+  return Math.max(34, Math.min(76, contentWidth + 4));
+}
+
 export function ChoiceDialog({
   resolve,
   title,
@@ -57,6 +66,7 @@ export function ChoiceDialog({
     detail: choice.detail,
     disabled: choice.disabled,
   })), [choices]);
+  const width = useMemo(() => choiceDialogWidth(title, choices), [choices, title]);
 
   useEffect(() => {
     setIndex((current) => clampChoiceIndex(current, choices.length));
@@ -81,19 +91,21 @@ export function ChoiceDialog({
   });
 
   return (
-    <DialogFrame title={title} footer={footer}>
-      <Box flexDirection="column">
+    <DialogFrame title={title} footer={footer} showTitleDivider={false}>
+      <Box flexDirection="column" width={width}>
         <ListView
           items={items}
           selectedIndex={selectedIndex}
           bgColor={bgColor}
           emptyMessage="No choices."
+          rowGap={0}
+          surface="framed"
           selectOnHover
           onSelect={setIndex}
           onActivate={(_, nextIndex) => activateChoice(choices[nextIndex])}
         />
         <Box height={1} />
-        <Text fg={colors.textDim}>{getChoiceDescription(selectedChoice)}</Text>
+        <Text fg={colors.textDim} wrapText width={width}>{getChoiceDescription(selectedChoice)}</Text>
       </Box>
     </DialogFrame>
   );

package/src/components/ui/frame.tsx

@@ -11,7 +11,7 @@ export interface DialogFrameProps {
   showTitleDivider?: boolean;
 }
 
-export function DialogFrame({ title, children, footer, showTitleDivider = true }: DialogFrameProps) {
+export function DialogFrame({ title, children, footer, showTitleDivider = false }: DialogFrameProps) {
   useThemeColors();
   const HostDialogFrame = useUiHost().DialogFrame as ComponentType<DialogFrameProps> | undefined;
   if (HostDialogFrame) {

package/src/components/ui/index.ts

@@ -6,6 +6,8 @@ export { DataTable } from "./data-table";
 export type { DataTableCell, DataTableColumn, DataTableProps } from "./data-table";
 
 export { Button } from "./button";
+export { Checkbox } from "./checkbox";
+export type { CheckboxProps } from "./checkbox";
 export { ShortcutHint } from "./shortcut-hint";
 
 export { MultiSelectDialogButton, MultiSelectDialogContent } from "./multi-select/dialog";

package/src/components/ui/message-composer.tsx

@@ -17,6 +17,7 @@ export interface MessageComposerProps {
   terminalBottomInset?: number;
   onFocusRequest?: () => void;
   onInput?: (value: string) => void;
+  onCursorChange?: () => void;
   onSubmit?: () => void;
   keyBindings?: Array<Record<string, unknown>>;
   wrapText?: boolean;
@@ -52,6 +53,7 @@ export function MessageComposer({
   terminalBottomInset = 0,
   onFocusRequest,
   onInput,
+  onCursorChange,
   onSubmit,
   keyBindings,
   wrapText = false,
@@ -91,6 +93,7 @@ export function MessageComposer({
         terminalBottomInset={terminalBottomInset}
         onFocusRequest={onFocusRequest}
         onInput={onInput}
+        onCursorChange={onCursorChange}
         onSubmit={onSubmit}
         keyBindings={keyBindings}
         wrapText={wrapText}
@@ -149,6 +152,7 @@ export function MessageComposer({
             focusedBackgroundColor={colors.bg}
             cursorColor={colors.textBright}
             onInput={handleInput}
+            onCursorChange={onCursorChange}
             keyBindings={keyBindings}
             onSubmit={onSubmit}
             wrapText={wrapText}

package/src/components/ui/native-select.tsx

@@ -17,6 +17,7 @@ export interface NativeSelectProps {
   value: string;
   options: NativeSelectOption[];
   width?: number | string;
+  height?: number;
   includeUnsetOption?: boolean;
   selectRef?: (element: NativeSelectElement | null) => void;
   onFocus?: () => void;
@@ -41,6 +42,7 @@ export function NativeSelect({
   value,
   options,
   width = 184,
+  height = 28,
   includeUnsetOption = false,
   selectRef,
   onFocus,
@@ -49,7 +51,7 @@ export function NativeSelect({
   const hasCurrentValue = options.some((option) => option.value === value);
   const style: CSSProperties = {
     width,
-    height: 28,
+    height,
     color: colors.text,
     backgroundColor: blendHex(colors.panel, colors.textBright, 0.06),
     border: `1px solid ${colors.border}`,
@@ -66,7 +68,7 @@ export function NativeSelect({
 
   return (
     <Box
-      height="28px"
+      height={`${height}px`}
       flexDirection="row"
       alignItems="center"
       onMouseDown={(event: any) => {

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

@@ -0,0 +1,49 @@
+import { describe, expect, test } from "bun:test";
+import { MarketDataCoordinatorEvents } from "./events";
+
+const waitMicrotask = () => Promise.resolve();
+const waitTimer = () => new Promise((resolve) => setTimeout(resolve, 0));
+
+describe("MarketDataCoordinatorEvents", () => {
+  test("coalesces version bumps before notifying external-store listeners", async () => {
+    const events = new MarketDataCoordinatorEvents();
+    const calls: number[] = [];
+    events.subscribeKeys(["quote:AMD"], () => {
+      calls.push(events.getKeysVersion(["quote:AMD"]));
+    });
+
+    events.bump("quote:AMD");
+    events.bump("quote:AMD");
+
+    expect(events.getKeysVersion(["quote:AMD"])).toBe(0);
+    expect(calls).toEqual([]);
+
+    await waitMicrotask();
+    expect(events.getKeysVersion(["quote:AMD"])).toBe(1);
+    expect(calls).toEqual([]);
+
+    await waitTimer();
+    expect(calls).toEqual([1]);
+  });
+
+  test("delivers bumps scheduled during notification in a later notification pass", async () => {
+    const events = new MarketDataCoordinatorEvents();
+    const order: string[] = [];
+    events.subscribeKeys(["quote:AMD"], () => {
+      order.push("AMD");
+      events.bump("quote:NVDA");
+    });
+    events.subscribeKeys(["quote:NVDA"], () => {
+      order.push("NVDA");
+    });
+
+    events.bump("quote:AMD");
+    await waitMicrotask();
+    await waitTimer();
+    expect(order).toEqual(["AMD"]);
+
+    await waitMicrotask();
+    await waitTimer();
+    expect(order).toEqual(["AMD", "NVDA"]);
+  });
+});

package/src/market-data/coordinator/events.ts

@@ -4,6 +4,8 @@ export class MarketDataCoordinatorEvents {
   private version = 0;
   private pendingVersionBump = false;
   private pendingChangedKeys = new Set<string>();
+  private pendingNotify = false;
+  private pendingListeners = new Set<() => void>();
   private readonly listeners = new Set<() => void>();
   private readonly keyListeners = new Map<string, Set<() => void>>();
   private readonly keyVersions = new Map<string, number>();
@@ -60,15 +62,34 @@ export class MarketDataCoordinatorEvents {
       for (const key of changedKeys) {
         this.keyVersions.set(key, (this.keyVersions.get(key) ?? 0) + 1);
       }
-      const keyListeners = new Set<() => void>();
+      for (const listener of this.listeners) {
+        this.pendingListeners.add(listener);
+      }
       for (const key of changedKeys) {
         for (const listener of this.keyListeners.get(key) ?? []) {
-          keyListeners.add(listener);
+          this.pendingListeners.add(listener);
         }
       }
 
-      for (const listener of this.listeners) listener();
-      for (const listener of keyListeners) listener();
+      this.scheduleNotify();
     }, { changedKeyCount: changedKeys.size });
   }
+
+  private scheduleNotify(): void {
+    if (this.pendingNotify) return;
+    this.pendingNotify = true;
+    setTimeout(() => this.flushNotify(), 0);
+  }
+
+  private flushNotify(): void {
+    this.pendingNotify = false;
+    const listeners = [...this.pendingListeners];
+    this.pendingListeners.clear();
+    for (const listener of listeners) {
+      listener();
+    }
+    if (this.pendingListeners.size > 0) {
+      this.scheduleNotify();
+    }
+  }
 }

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

@@ -347,6 +347,229 @@ describe("MarketDataCoordinator", () => {
     expect(coordinator.getQuoteEntry(instrument).data?.price).toBe(412.5);
   });
 
+  it("reconciles stream quotes with cached provider day references before a snapshot loads", () => {
+    let streamed: ((target: QuoteSubscriptionTarget, quote: Quote) => void) | null = null;
+    const provider = createProvider({
+      getCachedFinancialsForTargets: () => new Map([[
+        "VICR",
+        {
+          quote: {
+            symbol: "VICR",
+            providerId: "gloomberb-cloud",
+            price: 292.83,
+            currency: "USD",
+            previousClose: 282.95,
+            change: 9.88,
+            changePercent: 3.49,
+            lastUpdated: Date.parse("2026-07-06T16:54:30Z"),
+            marketState: "REGULAR",
+            dataSource: "live",
+          },
+          quoteContributions: {
+            "gloomberb-cloud": {
+              symbol: "VICR",
+              providerId: "gloomberb-cloud",
+              price: 292.83,
+              currency: "USD",
+              previousClose: 380.07,
+              change: -87.24,
+              changePercent: -22.95,
+              lastUpdated: Date.parse("2026-07-06T16:54:30Z"),
+              marketState: "REGULAR",
+              dataSource: "live",
+            },
+            yahoo: {
+              symbol: "VICR",
+              providerId: "yahoo",
+              price: 294.39,
+              currency: "USD",
+              previousClose: 282.95,
+              change: 11.44,
+              changePercent: 4.04,
+              lastUpdated: Date.parse("2026-07-06T16:45:37Z"),
+              marketState: "REGULAR",
+              dataSource: "delayed",
+            },
+          },
+          annualStatements: [],
+          quarterlyStatements: [],
+          priceHistory: [],
+        },
+      ]]),
+      subscribeQuotes: (_targets, onQuote) => {
+        streamed = onQuote as typeof streamed;
+        return () => {};
+      },
+    });
+    const coordinator = new MarketDataCoordinator(provider);
+    const instrument = {
+      symbol: "VICR",
+      exchange: "NASDAQ",
+      brokerId: "ibkr",
+      brokerInstanceId: "ibkr-work",
+      instrument: {
+        brokerId: "ibkr",
+        brokerInstanceId: "ibkr-work",
+        conId: 275759,
+        symbol: "VICR",
+      },
+    };
+
+    coordinator.subscribeQuotes([{ instrument }]);
+    const onStreamed = streamed as ((target: QuoteSubscriptionTarget, quote: Quote) => void) | null;
+    if (!onStreamed) throw new Error("expected streaming callback");
+    onStreamed(
+      {
+        symbol: "VICR",
+        exchange: "NASDAQ",
+        context: {
+          brokerId: "ibkr",
+          brokerInstanceId: "ibkr-work",
+          instrument: instrument.instrument,
+        },
+      },
+      {
+        symbol: "VICR",
+        providerId: "gloomberb-cloud",
+        price: 293.07,
+        currency: "USD",
+        previousClose: 380.07,
+        change: -87,
+        changePercent: -22.89,
+        lastUpdated: Date.parse("2026-07-06T17:17:00Z"),
+        marketState: "REGULAR",
+        dataSource: "live",
+      },
+    );
+
+    const quote = coordinator.getQuoteEntry(instrument).data;
+    expect(quote?.price).toBe(293.07);
+    expect(quote?.previousClose).toBe(282.95);
+    expect(quote?.changePercent).toBeCloseTo(((293.07 - 282.95) / 282.95) * 100, 10);
+    expect(quote?.provenance?.fields?.previousClose?.providerId).toBe("yahoo");
+  });
+
+  it("reconciles batch quote loads with cached provider day references before a snapshot loads", async () => {
+    const provider = createProvider({
+      getCachedFinancialsForTargets: () => new Map([[
+        "VICR",
+        {
+          quote: {
+            symbol: "VICR",
+            providerId: "gloomberb-cloud",
+            price: 292.83,
+            currency: "USD",
+            previousClose: 282.95,
+            change: 9.88,
+            changePercent: 3.49,
+            lastUpdated: Date.parse("2026-07-06T16:54:30Z"),
+            marketState: "REGULAR",
+            dataSource: "live",
+          },
+          quoteContributions: {
+            "gloomberb-cloud": {
+              symbol: "VICR",
+              providerId: "gloomberb-cloud",
+              price: 292.83,
+              currency: "USD",
+              previousClose: 380.07,
+              change: -87.24,
+              changePercent: -22.95,
+              lastUpdated: Date.parse("2026-07-06T16:54:30Z"),
+              marketState: "REGULAR",
+              dataSource: "live",
+            },
+            yahoo: {
+              symbol: "VICR",
+              providerId: "yahoo",
+              price: 294.39,
+              currency: "USD",
+              previousClose: 282.95,
+              change: 11.44,
+              changePercent: 4.04,
+              lastUpdated: Date.parse("2026-07-06T16:45:37Z"),
+              marketState: "REGULAR",
+              dataSource: "delayed",
+            },
+          },
+          annualStatements: [],
+          quarterlyStatements: [],
+          priceHistory: [],
+        },
+      ]]),
+      getQuotesBatch: async (targets) => targets.map((target) => ({
+        target,
+        quote: {
+          symbol: target.symbol,
+          providerId: "gloomberb-cloud",
+          price: 293.07,
+          currency: "USD",
+          previousClose: 380.07,
+          change: -87,
+          changePercent: -22.89,
+          lastUpdated: Date.parse("2026-07-06T17:17:00Z"),
+          marketState: "REGULAR",
+          dataSource: "live",
+        },
+      })),
+    });
+    const coordinator = new MarketDataCoordinator(provider);
+    const instrument = {
+      symbol: "VICR",
+      exchange: "NASDAQ",
+      brokerId: "ibkr",
+      brokerInstanceId: "ibkr-work",
+      instrument: {
+        brokerId: "ibkr",
+        brokerInstanceId: "ibkr-work",
+        conId: 275759,
+        symbol: "VICR",
+      },
+    };
+
+    await coordinator.loadQuotesBatch([instrument], { forceRefresh: true });
+
+    const quote = coordinator.getQuoteEntry(instrument).data;
+    expect(quote?.price).toBe(293.07);
+    expect(quote?.previousClose).toBe(282.95);
+    expect(quote?.changePercent).toBeCloseTo(((293.07 - 282.95) / 282.95) * 100, 10);
+    expect(quote?.provenance?.fields?.previousClose?.providerId).toBe("yahoo");
+  });
+
+  it("preserves requested quote stream routes", () => {
+    let subscribedTargets: QuoteSubscriptionTarget[] = [];
+    const provider = createProvider({
+      subscribeQuotes: (targets) => {
+        subscribedTargets = targets;
+        return () => {};
+      },
+    });
+    const coordinator = new MarketDataCoordinator(provider);
+
+    coordinator.subscribeQuotes([{
+      instrument: {
+        symbol: "AAPL",
+        exchange: "NASDAQ",
+        brokerId: "ibkr",
+        brokerInstanceId: "ibkr-work",
+      },
+      priority: { route: "provider", surface: "portfolio", visible: true },
+    }]);
+
+    expect(subscribedTargets).toEqual([{
+      symbol: "AAPL",
+      exchange: "NASDAQ",
+      route: "provider",
+      context: {
+        brokerId: "ibkr",
+        brokerInstanceId: "ibkr-work",
+        instrument: null,
+      },
+      surface: "portfolio",
+      visible: true,
+    }]);
+  });
+
   it("routes manual-resolution chart requests through the resolution-aware provider path", async () => {
     let requested: { range: string; resolution: string } | null = null;
     const provider = createProvider({

package/src/market-data/coordinator/index.ts

@@ -19,6 +19,8 @@ import {
   resolveEntryData,
   toMarketDataContext,
 } from "../selectors";
+import { resolveTickerFinancialsQuoteState } from "../quotes/resolution";
+import { hasLikelyQuoteUnitMismatch } from "../../utils/currency-units";
 import { normalizePriceHistory } from "../../utils/price-history";
 import {
   createBaselineChartRequest,
@@ -218,6 +220,7 @@ export class MarketDataCoordinator {
       options,
       quoteStore: this.quoteStore,
       runSingleFlight: (key, task) => this.runSingleFlight(key, task),
+      resolveQuote: (targetInstrument, quote) => this.resolveIncomingQuote(targetInstrument, quote),
     });
   }
 
@@ -231,6 +234,7 @@ export class MarketDataCoordinator {
       options,
       quoteStore: this.quoteStore,
       runSingleFlight: (key, task) => this.runSingleFlight(key, task),
+      resolveQuote: (targetInstrument, quote) => this.resolveIncomingQuote(targetInstrument, quote),
     });
   }
 
@@ -377,10 +381,43 @@ export class MarketDataCoordinator {
   private applyStreamQuote(instrument: InstrumentRef, quote: Quote): void {
     const key = buildQuoteKey(instrument);
     const current = this.quoteStore.get(key);
-    if (areStreamQuotesEquivalent(current.data ?? current.lastGoodData, quote)) return;
+    const resolvedQuote = this.resolveIncomingQuote(instrument, quote);
+    if (areStreamQuotesEquivalent(current.data ?? current.lastGoodData, resolvedQuote)) return;
     const receivedAt = Date.now();
-    const attempts = [createAttempt(quote.providerId ?? this.dataProvider.id, receivedAt, "success")];
-    this.quoteStore.set(key, readyQuoteEntry(current, { ...quote, receivedAt }, quote.providerId ?? this.dataProvider.id, attempts));
+    const attempts = [createAttempt(resolvedQuote.providerId ?? this.dataProvider.id, receivedAt, "success")];
+    this.quoteStore.set(key, readyQuoteEntry(current, { ...resolvedQuote, receivedAt }, resolvedQuote.providerId ?? this.dataProvider.id, attempts));
+  }
+
+  private resolveIncomingQuote(instrument: InstrumentRef, quote: Quote): Quote {
+    const snapshot = resolveEntryData(this.snapshotStore.get(buildSnapshotKey(instrument)));
+    if (snapshot?.quote) {
+      if (hasLikelyQuoteUnitMismatch(snapshot.quote, quote)) return quote;
+      if (
+        typeof snapshot.quote.lastUpdated === "number"
+        && typeof quote.lastUpdated === "number"
+        && quote.lastUpdated < snapshot.quote.lastUpdated
+      ) {
+        return quote;
+      }
+    }
+    const cachedFinancials = snapshot ?? this.readCachedFinancialsForInstrument(instrument);
+    return resolveTickerFinancialsQuoteState(cachedFinancials, quote)?.quote ?? quote;
+  }
+
+  private readCachedFinancialsForInstrument(instrument: InstrumentRef): TickerFinancials | null {
+    if (!this.dataProvider.getCachedFinancialsForTargets) return null;
+    const result = this.dataProvider.getCachedFinancialsForTargets([{
+      symbol: instrument.symbol,
+      exchange: instrument.exchange,
+      brokerId: instrument.brokerId,
+      brokerInstanceId: instrument.brokerInstanceId,
+      instrument: instrument.instrument ?? null,
+    }], {
+      allowExpired: true,
+      includeStaleQuotes: true,
+    });
+    if (result instanceof Promise) return null;
+    return result.get(instrument.symbol.trim().toUpperCase()) ?? null;
   }
 }
 

package/src/market-data/coordinator/quotes.ts

@@ -15,7 +15,7 @@ import {
   readyQuoteEntry,
 } from "./entries";
 
-export type QuoteSubscriptionPriority = Pick<QuoteSubscriptionTarget, "surface" | "visible" | "selected" | "weight">;
+export type QuoteSubscriptionPriority = Pick<QuoteSubscriptionTarget, "route" | "surface" | "visible" | "selected" | "weight">;
 
 export interface QuoteSubscriptionEntry {
   target: QuoteSubscriptionTarget;
@@ -123,6 +123,7 @@ interface LoadQuoteEntryOptions {
   options?: CoordinatorLoadOptions;
   quoteStore: QueryStore<Quote>;
   runSingleFlight: CoordinatorSingleFlight;
+  resolveQuote?: (instrument: InstrumentRef, quote: Quote) => Quote;
 }
 
 export async function loadQuoteEntry({
@@ -131,6 +132,7 @@ export async function loadQuoteEntry({
   options = {},
   quoteStore,
   runSingleFlight,
+  resolveQuote,
 }: LoadQuoteEntryOptions): Promise<QueryEntry<Quote>> {
   const key = buildQuoteKey(instrument);
   const flightKey = options.forceRefresh ? `${key}|refresh` : key;
@@ -146,9 +148,10 @@ export async function loadQuoteEntry({
           cacheMode: options.forceRefresh ? "refresh" : "default",
         },
       );
-      const source = quote.providerId ?? dataProvider.id;
+      const resolvedQuote = resolveQuote?.(instrument, quote) ?? quote;
+      const source = resolvedQuote.providerId ?? dataProvider.id;
       const attempts = [createAttempt(source, startedAt, "success")];
-      return quoteStore.update(key, (current) => readyQuoteEntry(current, quote, source, attempts));
+      return quoteStore.update(key, (current) => readyQuoteEntry(current, resolvedQuote, source, attempts));
     } catch (error) {
       const classified = classifyError(error);
       const attempt = createAttempt(dataProvider.id, startedAt, EXPECTED_EMPTY.test(classified.message) ? "empty" : "fatal_error", classified.reasonCode, classified.message);
@@ -163,6 +166,7 @@ interface LoadQuoteBatchEntriesOptions {
   options?: CoordinatorLoadOptions;
   quoteStore: QueryStore<Quote>;
   runSingleFlight: CoordinatorSingleFlight;
+  resolveQuote?: (instrument: InstrumentRef, quote: Quote) => Quote;
 }
 
 export async function loadQuoteBatchEntries({
@@ -171,6 +175,7 @@ export async function loadQuoteBatchEntries({
   options = {},
   quoteStore,
   runSingleFlight,
+  resolveQuote,
 }: LoadQuoteBatchEntriesOptions): Promise<QueryEntry<Quote>[]> {
   const uniqueInstruments = [...new Map(instruments.map((instrument) => [buildQuoteKey(instrument), instrument] as const)).values()];
   const results = new Map<string, QueryEntry<Quote>>();
@@ -195,9 +200,10 @@ export async function loadQuoteBatchEntries({
       const instrument = misses[index];
       if (!instrument || !item.quote) return;
       const key = buildQuoteKey(instrument);
-      const source = item.quote.providerId ?? dataProvider.id;
+      const quote = resolveQuote?.(instrument, item.quote) ?? item.quote;
+      const source = quote.providerId ?? dataProvider.id;
       const attempts = [createAttempt(source, Date.now(), "success")];
-      results.set(key, quoteStore.update(key, (current) => readyQuoteEntry(current, item.quote!, source, attempts)));
+      results.set(key, quoteStore.update(key, (current) => readyQuoteEntry(current, quote, source, attempts)));
     });
   }
 
@@ -210,6 +216,7 @@ export async function loadQuoteBatchEntries({
       options,
       quoteStore,
       runSingleFlight,
+      resolveQuote,
     }));
   }));
 
@@ -292,6 +299,7 @@ export class QuoteSubscriptionManager {
       .sort(([left], [right]) => left.localeCompare(right));
     const nextSignature = activeEntries.map(([key, entry]) => [
       key,
+      entry.target.route ?? "",
       entry.target.surface ?? "",
       entry.target.visible ? "visible" : "",
       entry.target.selected ? "selected" : "",