gloomberb 0.5.1 → 0.6.0

package/src/sources/provider-router.ts

@@ -1,5 +1,6 @@
 import type { CachedResourceRecord, ResourceStore } from "../data/resource-store";
 import type { PluginRegistry } from "../plugins/registry";
+import type { AssetDataCapability, NewsCapability } from "../capabilities";
 import type { BrokerAdapter } from "../types/broker";
 import type { AppConfig } from "../types/config";
 import { createDefaultConfig } from "../types/config";
@@ -7,12 +8,14 @@ import type {
   CachedFinancialsTarget,
   DataProvider,
   MarketDataRequestContext,
-  NewsItem,
   QuoteSubscriptionTarget,
   SearchRequestContext,
   SecFilingItem,
 } from "../types/data-provider";
-import type { OptionsChain, PricePoint, Quote, TickerFinancials } from "../types/financials";
+import type { CapabilityRouteSource } from "../types/capability-route-source";
+import { routeSourcePriority } from "../types/capability-route-source";
+import type { AnalystResearchData, CorporateActionsData, HolderData, OptionsChain, PricePoint, Quote, TickerFinancials } from "../types/financials";
+import type { NewsArticle, NewsQuery } from "../news/types";
 import type { BrokerContractRef, InstrumentSearchResult } from "../types/instrument";
 import type { CachePolicy, CachePolicyMap } from "../types/persistence";
 import type { TimeRange } from "../components/chart/chart-types";
@@ -24,6 +27,7 @@ import {
 } from "../components/chart/chart-resolution";
 import { hasLikelyQuoteUnitMismatch } from "../utils/currency-units";
 import { debugLog } from "../utils/debug-log";
+import { canonicalExchange } from "../utils/exchanges";
 import { normalizePriceHistory, normalizeTickerFinancialsPriceHistory } from "../utils/price-history";
 import { isQuoteStaleForCurrentSession } from "../utils/quote-freshness";
 import {
@@ -34,7 +38,7 @@ import {
 } from "../utils/quote-resolution";
 import { isProviderMiss } from "./provider-errors";
 
-const providerLog = debugLog.createLogger("provider-router");
+const providerLog = debugLog.createLogger("asset-data-router");
 
 const BROKER_ATTEMPT_TIMEOUT = 10_000;
 const EXPECTED_PROVIDER_MISS = /No data found|symbol may be delisted|"code":"Not Found"|No history for /i;
@@ -47,6 +51,9 @@ const DEFAULT_CACHE_POLICIES: Record<string, CachePolicy> = {
   priceHistoryIntraday: { staleMs: 5 * 60_000, expireMs: 2 * 24 * 60 * 60_000 },
   priceHistoryDaily: { staleMs: 24 * 60 * 60_000, expireMs: 30 * 24 * 60 * 60_000 },
   news: { staleMs: 15 * 60_000, expireMs: 2 * 24 * 60 * 60_000 },
+  holders: { staleMs: 24 * 60 * 60_000, expireMs: 7 * 24 * 60 * 60_000 },
+  analystResearch: { staleMs: 24 * 60 * 60_000, expireMs: 7 * 24 * 60 * 60_000 },
+  corporateActions: { staleMs: 24 * 60 * 60_000, expireMs: 14 * 24 * 60 * 60_000 },
   secFilings: { staleMs: 15 * 60_000, expireMs: 2 * 24 * 60 * 60_000 },
   secFilingContent: { staleMs: 30 * 24 * 60 * 60_000, expireMs: 365 * 24 * 60 * 60_000 },
   articleSummary: { staleMs: 30 * 24 * 60 * 60_000, expireMs: 90 * 24 * 60 * 60_000 },
@@ -74,10 +81,6 @@ function normalizeTicker(ticker: string): string {
   return ticker.trim().toUpperCase();
 }
 
-function normalizeExchange(exchange?: string): string {
-  return (exchange ?? "").trim().toUpperCase();
-}
-
 function sanitizeCachedFinancials(financials: TickerFinancials): TickerFinancials {
   if (!isQuoteStaleForCurrentSession(financials.quote)) return financials;
   return {
@@ -143,6 +146,20 @@ function hasMeaningfulProfile(data: TickerFinancials | null | undefined): boolea
   );
 }
 
+function hasAnalystResearchValue(data: AnalystResearchData): boolean {
+  return !!data.priceTarget
+    || data.recommendations.length > 0
+    || data.ratings.length > 0
+    || data.earningsEstimates.length > 0
+    || data.revenueEstimates.length > 0;
+}
+
+function hasCorporateActionsValue(data: CorporateActionsData): boolean {
+  return data.dividends.length > 0
+    || data.splits.length > 0
+    || data.earnings.length > 0;
+}
+
 function hasLikelyPriceUnitMismatch(primary: TickerFinancials, fallback: TickerFinancials): boolean {
   return hasLikelyQuoteUnitMismatch(primary.quote, fallback.quote);
 }
@@ -229,20 +246,63 @@ interface SourceResult<T> {
   value: T;
 }
 
-export class ProviderRouter implements DataProvider {
-  readonly id = "provider-router";
-  readonly name = "Provider Router";
+type RouteSourceCapability = AssetDataCapability | NewsCapability;
+
+function routeSourceFromMarketProvider(provider: DataProvider): CapabilityRouteSource {
+  return {
+    id: provider.id,
+    name: provider.name,
+    priority: provider.priority,
+    cachePolicy: provider.cachePolicy,
+    market: provider,
+  };
+}
+
+function normalizeRouteSource(source: CapabilityRouteSource | DataProvider): CapabilityRouteSource {
+  return "market" in source || "news" in source
+    ? source as CapabilityRouteSource
+    : routeSourceFromMarketProvider(source as DataProvider);
+}
+
+function capabilityRouteSourceId(capability: RouteSourceCapability): string {
+  return capability.sourceId ?? capability.id;
+}
+
+function mergeCapabilityRouteSource(current: CapabilityRouteSource | undefined, capability: RouteSourceCapability): CapabilityRouteSource {
+  const priority = Math.min(
+    current?.priority ?? Number.MAX_SAFE_INTEGER,
+    capability.priority ?? 1000,
+  );
+  return {
+    id: capabilityRouteSourceId(capability),
+    name: current?.name ?? capability.name,
+    priority,
+    cachePolicy: capability.cachePolicy ?? current?.cachePolicy,
+    isEnabled: capability.isEnabled ?? current?.isEnabled,
+    market: capability.kind === "asset-data" ? capability.provider : current?.market,
+    news: capability.kind === "news" ? capability.provider : current?.news,
+  };
+}
+
+export class AssetDataRouter implements DataProvider {
+  readonly id = "asset-data-router";
+  readonly name = "Asset Data Router";
   readonly priority = Number.MAX_SAFE_INTEGER;
 
   private registry: PluginRegistry | null = null;
   private readonly revalidationInFlight = new Map<string, Promise<unknown>>();
   private getConfigFn: () => AppConfig = () => createDefaultConfig("");
+  private readonly fallbackSource: CapabilityRouteSource | null;
+  private readonly extraSources: CapabilityRouteSource[];
 
   constructor(
-    private readonly fallbackProvider: DataProvider | null = null,
-    private readonly extraProviders: DataProvider[] = [],
+    fallbackSource: CapabilityRouteSource | DataProvider | null = null,
+    extraSources: Array<CapabilityRouteSource | DataProvider> = [],
     private readonly resources?: ResourceStore,
-  ) {}
+  ) {
+    this.fallbackSource = fallbackSource ? normalizeRouteSource(fallbackSource) : null;
+    this.extraSources = extraSources.map(normalizeRouteSource);
+  }
 
   attachRegistry(registry: PluginRegistry): void {
     this.registry = registry;
@@ -417,36 +477,88 @@ export class ProviderRouter implements DataProvider {
     return results;
   }
 
-  async getNews(ticker: string, count = 15, exchange?: string, context?: MarketDataRequestContext): Promise<NewsItem[]> {
+  async getNews(query: NewsQuery): Promise<NewsArticle[]> {
+    const sources = this.newsSourcesInPriorityOrder()
+      .filter((source) => source.news?.supports?.(query) ?? true);
+    const feed = query.feed ?? (query.scope === "ticker" ? "ticker" : "latest");
+    if (feed === "ticker") {
+      let firstEmpty: NewsArticle[] | null = null;
+      for (const source of sources) {
+        try {
+          const articles = await source.news!.fetchNews(query);
+          if (articles.length > 0) return articles;
+          firstEmpty ??= articles;
+        } catch (error) {
+          if (shouldLogProviderError(error)) {
+            providerLog.error(`${source.id} failed: ${error}`);
+          }
+        }
+      }
+      return firstEmpty ?? [];
+    }
+
+    const settled = await Promise.allSettled(sources.map((source) => source.news!.fetchNews(query)));
+    return settled.flatMap((result) => result.status === "fulfilled" ? result.value : []);
+  }
+
+  async getHolders(ticker: string, exchange?: string, context?: MarketDataRequestContext): Promise<HolderData> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
-    const variantKeys = [
-      buildVariantKey([["exchange", normalizeExchange(exchange)], ["count", count]]),
-      buildVariantKey([["count", count]]),
-      "",
-    ];
-    const cached = this.selectCachedResource<NewsItem[]>("news", entityKey, variantKeys, this.getProviderSourceKeys(), false);
-    if (cached) {
-      this.scheduleRevalidation(this.makeRevalidationKey("news", ticker, exchange, context, count), async () => {
-        await this.revalidateNews(ticker, count, exchange, context);
+    const variantKeys = this.getTickerVariantCandidates(exchange);
+    const cached = this.selectCachedResource<HolderData>("holders", entityKey, variantKeys, this.getProviderSourceKeys(), false);
+    const forceRefresh = context?.cacheMode === "refresh";
+    if (cached && !forceRefresh) {
+      this.scheduleRevalidation(this.makeRevalidationKey("holders", ticker, exchange, context), async () => {
+        await this.revalidateHolders(ticker, exchange, context);
       });
       return cached.value;
     }
 
-    const result = await this.firstProvider((provider) => provider.getNews(ticker, count, exchange, context));
-    if (!result) {
-      throw new Error(`No news provider available for ${ticker}`);
+    const result = await this.fetchProviderHolders(ticker, exchange, context);
+    if (result) return result.value;
+    if (cached) return cached.value;
+    throw new Error(`No holder data provider available for ${ticker}`);
+  }
+
+  async getAnalystResearch(ticker: string, exchange?: string, context?: MarketDataRequestContext): Promise<AnalystResearchData> {
+    const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
+    const variantKeys = this.getTickerVariantCandidates(exchange);
+    const cached = this.selectCachedResource<AnalystResearchData>("analystResearch", entityKey, variantKeys, this.getProviderSourceKeys(), false);
+    const forceRefresh = context?.cacheMode === "refresh";
+    if (cached && !forceRefresh) {
+      this.scheduleRevalidation(this.makeRevalidationKey("analystResearch", ticker, exchange, context), async () => {
+        await this.revalidateAnalystResearch(ticker, exchange, context);
+      });
+      return cached.value;
     }
-    const provider = this.resolveProviderBySourceKey(result.sourceKey);
-    if (provider) {
-      this.cacheResource("news", entityKey, variantKeys[0] ?? "", result.sourceKey, result.value, this.resolveProviderPolicy("news", provider));
+
+    const result = await this.fetchProviderAnalystResearch(ticker, exchange, context);
+    if (result) return result.value;
+    if (cached) return cached.value;
+    throw new Error(`No analyst research provider available for ${ticker}`);
+  }
+
+  async getCorporateActions(ticker: string, exchange?: string, context?: MarketDataRequestContext): Promise<CorporateActionsData> {
+    const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
+    const variantKeys = this.getTickerVariantCandidates(exchange);
+    const cached = this.selectCachedResource<CorporateActionsData>("corporateActions", entityKey, variantKeys, this.getProviderSourceKeys(), false);
+    const forceRefresh = context?.cacheMode === "refresh";
+    if (cached && !forceRefresh) {
+      this.scheduleRevalidation(this.makeRevalidationKey("corporateActions", ticker, exchange, context), async () => {
+        await this.revalidateCorporateActions(ticker, exchange, context);
+      });
+      return cached.value;
     }
-    return result.value;
+
+    const result = await this.fetchProviderCorporateActions(ticker, exchange, context);
+    if (result) return result.value;
+    if (cached) return cached.value;
+    throw new Error(`No corporate actions provider available for ${ticker}`);
   }
 
   async getSecFilings(ticker: string, count = 15, exchange?: string, context?: MarketDataRequestContext): Promise<SecFilingItem[]> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
     const variantKeys = [
-      buildVariantKey([["exchange", normalizeExchange(exchange)], ["count", count]]),
+      buildVariantKey([["exchange", canonicalExchange(exchange)], ["count", count]]),
       buildVariantKey([["count", count]]),
       "",
     ];
@@ -506,7 +618,7 @@ export class ProviderRouter implements DataProvider {
   async getPriceHistory(ticker: string, exchange: string, range: TimeRange, context?: MarketDataRequestContext): Promise<PricePoint[]> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
     const variantKeys = [
-      buildVariantKey([["exchange", normalizeExchange(exchange)], ["range", range]]),
+      buildVariantKey([["exchange", canonicalExchange(exchange)], ["range", range]]),
       buildVariantKey([["range", range]]),
     ];
     const sourceKeys = [
@@ -543,7 +655,7 @@ export class ProviderRouter implements DataProvider {
   ): Promise<PricePoint[]> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
     const variantKeys = [
-      buildVariantKey([["exchange", normalizeExchange(exchange)], ["range", bufferRange], ["resolution", resolution]]),
+      buildVariantKey([["exchange", canonicalExchange(exchange)], ["range", bufferRange], ["resolution", resolution]]),
       buildVariantKey([["range", bufferRange], ["resolution", resolution]]),
     ];
     const sourceKeys = [
@@ -603,7 +715,7 @@ export class ProviderRouter implements DataProvider {
   ): Promise<PricePoint[]> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
     const variantKeys = [
-      buildVariantKey([["exchange", normalizeExchange(exchange)], ["start", compactDate(startDate)], ["end", compactDate(endDate)], ["bar", barSize]]),
+      buildVariantKey([["exchange", canonicalExchange(exchange)], ["start", compactDate(startDate)], ["end", compactDate(endDate)], ["bar", barSize]]),
       buildVariantKey([["start", compactDate(startDate)], ["end", compactDate(endDate)], ["bar", barSize]]),
     ];
     const sourceKeys = [
@@ -630,7 +742,7 @@ export class ProviderRouter implements DataProvider {
   async getOptionsChain(ticker: string, exchange?: string, expirationDate?: number, context?: MarketDataRequestContext): Promise<OptionsChain> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
     const variantKeys = [
-      buildVariantKey([["exchange", normalizeExchange(exchange)], ["expiration", expirationDate ?? "default"]]),
+      buildVariantKey([["exchange", canonicalExchange(exchange)], ["expiration", expirationDate ?? "default"]]),
       buildVariantKey([["expiration", expirationDate ?? "default"]]),
       "",
     ];
@@ -682,7 +794,7 @@ export class ProviderRouter implements DataProvider {
   }
 
   private getTickerVariantCandidates(exchange?: string): string[] {
-    const normalizedExchange = normalizeExchange(exchange);
+    const normalizedExchange = canonicalExchange(exchange);
     return [
       buildVariantKey([["exchange", normalizedExchange]]),
       "",
@@ -701,10 +813,6 @@ export class ProviderRouter implements DataProvider {
     return this.providersInPriorityOrder().map((provider) => this.providerSourceKey(provider));
   }
 
-  private firstAvailableProvider(): DataProvider | null {
-    return this.providersInPriorityOrder()[0] ?? null;
-  }
-
   private resolvePolicy(overrides: CachePolicyMap | undefined, key: keyof typeof DEFAULT_CACHE_POLICIES): CachePolicy {
     return overrides?.[key] ?? DEFAULT_CACHE_POLICIES[key]!;
   }
@@ -928,27 +1036,48 @@ export class ProviderRouter implements DataProvider {
     }));
   }
 
-  private sortedProviders(): DataProvider[] {
-    const providers = [...this.extraProviders];
+  private sortedSources(): CapabilityRouteSource[] {
+    const sources = [...this.extraSources];
     if (this.registry) {
-      const registryProviders = typeof this.registry.getEnabledDataProviders === "function"
-        ? this.registry.getEnabledDataProviders()
-        : [...this.registry.dataProviders.values()];
-      providers.push(...registryProviders);
+      const capabilitySources = new Map<string, CapabilityRouteSource>();
+      for (const capability of this.registry.getEnabledCapabilities("asset-data") as AssetDataCapability[]) {
+        const sourceId = capabilityRouteSourceId(capability);
+        capabilitySources.set(sourceId, mergeCapabilityRouteSource(capabilitySources.get(sourceId), capability));
+      }
+      for (const capability of this.registry.getEnabledCapabilities("news") as NewsCapability[]) {
+        const sourceId = capabilityRouteSourceId(capability);
+        capabilitySources.set(sourceId, mergeCapabilityRouteSource(capabilitySources.get(sourceId), capability));
+      }
+      sources.push(...capabilitySources.values());
     }
-    return providers
-      .filter((provider) => provider.id !== this.id && provider.id !== this.fallbackProvider?.id)
-      .sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0));
+    return sources
+      .filter((source) => source.id !== this.id && source.id !== this.fallbackSource?.id)
+      .sort((a, b) => routeSourcePriority(a) - routeSourcePriority(b));
+  }
+
+  private sortedProviders(): DataProvider[] {
+    return this.sortedSources()
+      .map((source) => source.market)
+      .filter((provider): provider is DataProvider => !!provider);
   }
 
   private providersInPriorityOrder(): DataProvider[] {
     const providers = [...this.sortedProviders()];
-    if (this.fallbackProvider && !providers.some((provider) => provider.id === this.fallbackProvider?.id)) {
-      providers.push(this.fallbackProvider);
+    const fallbackProvider = this.fallbackSource?.market ?? null;
+    if (fallbackProvider && !providers.some((provider) => provider.id === fallbackProvider.id)) {
+      providers.push(fallbackProvider);
     }
     return providers;
   }
 
+  private newsSourcesInPriorityOrder(): CapabilityRouteSource[] {
+    const sources = this.sortedSources().filter((source) => !!source.news);
+    if (this.fallbackSource?.news && !sources.some((source) => source.id === this.fallbackSource?.id)) {
+      sources.push(this.fallbackSource);
+    }
+    return sources;
+  }
+
   private async firstProvider<T>(fn: (provider: DataProvider) => Promise<T | null | undefined>): Promise<SourceResult<T> | null> {
     for (const provider of this.providersInPriorityOrder()) {
       try {
@@ -1090,7 +1219,7 @@ export class ProviderRouter implements DataProvider {
     context?: MarketDataRequestContext,
   ): Promise<SourceResult<PricePoint[]> | null> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
-    const variantKey = buildVariantKey([["exchange", normalizeExchange(exchange)], ["range", range]]);
+    const variantKey = buildVariantKey([["exchange", canonicalExchange(exchange)], ["range", range]]);
     for (const candidate of this.getBrokerCandidatesForContext(context, false)) {
       if (!candidate.broker.getPriceHistory) continue;
       try {
@@ -1125,7 +1254,7 @@ export class ProviderRouter implements DataProvider {
     context?: MarketDataRequestContext,
   ): Promise<SourceResult<PricePoint[]> | null> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
-    const variantKey = buildVariantKey([["exchange", normalizeExchange(exchange)], ["range", bufferRange], ["resolution", resolution]]);
+    const variantKey = buildVariantKey([["exchange", canonicalExchange(exchange)], ["range", bufferRange], ["resolution", resolution]]);
     for (const candidate of this.getBrokerCandidatesForContext(context, false)) {
       if (!candidate.broker.getPriceHistoryForResolution) continue;
       try {
@@ -1160,7 +1289,7 @@ export class ProviderRouter implements DataProvider {
     context?: MarketDataRequestContext,
   ): Promise<SourceResult<PricePoint[]> | null> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
-    const variantKey = buildVariantKey([["exchange", normalizeExchange(exchange)], ["range", range]]);
+    const variantKey = buildVariantKey([["exchange", canonicalExchange(exchange)], ["range", range]]);
     let firstEmptyResult: SourceResult<PricePoint[]> | null = null;
 
     for (const provider of this.providersInPriorityOrder()) {
@@ -1197,7 +1326,7 @@ export class ProviderRouter implements DataProvider {
     context?: MarketDataRequestContext,
   ): Promise<SourceResult<PricePoint[]> | null> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
-    const variantKey = buildVariantKey([["exchange", normalizeExchange(exchange)], ["range", bufferRange], ["resolution", resolution]]);
+    const variantKey = buildVariantKey([["exchange", canonicalExchange(exchange)], ["range", bufferRange], ["resolution", resolution]]);
     let firstEmptyResult: SourceResult<PricePoint[]> | null = null;
 
     for (const provider of this.providersInPriorityOrder()) {
@@ -1293,7 +1422,7 @@ export class ProviderRouter implements DataProvider {
     context?: MarketDataRequestContext,
   ): Promise<SourceResult<PricePoint[]> | null> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
-    const variantKey = buildVariantKey([["exchange", normalizeExchange(exchange)], ["start", compactDate(startDate)], ["end", compactDate(endDate)], ["bar", barSize]]);
+    const variantKey = buildVariantKey([["exchange", canonicalExchange(exchange)], ["start", compactDate(startDate)], ["end", compactDate(endDate)], ["bar", barSize]]);
     for (const candidate of this.getBrokerCandidatesForContext(context, false)) {
       if (!candidate.broker.getDetailedPriceHistory) continue;
       try {
@@ -1331,7 +1460,7 @@ export class ProviderRouter implements DataProvider {
     context?: MarketDataRequestContext,
   ): Promise<SourceResult<PricePoint[]> | null> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
-    const variantKey = buildVariantKey([["exchange", normalizeExchange(exchange)], ["start", compactDate(startDate)], ["end", compactDate(endDate)], ["bar", barSize]]);
+    const variantKey = buildVariantKey([["exchange", canonicalExchange(exchange)], ["start", compactDate(startDate)], ["end", compactDate(endDate)], ["bar", barSize]]);
     let firstEmptyResult: SourceResult<PricePoint[]> | null = null;
 
     for (const provider of this.providersInPriorityOrder()) {
@@ -1368,7 +1497,7 @@ export class ProviderRouter implements DataProvider {
     context?: MarketDataRequestContext,
   ): Promise<SourceResult<OptionsChain> | null> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
-    const variantKey = buildVariantKey([["exchange", normalizeExchange(exchange)], ["expiration", expirationDate ?? "default"]]);
+    const variantKey = buildVariantKey([["exchange", canonicalExchange(exchange)], ["expiration", expirationDate ?? "default"]]);
     for (const candidate of this.getBrokerCandidatesForContext(context, false)) {
       if (!candidate.broker.getOptionsChain) continue;
       try {
@@ -1402,7 +1531,7 @@ export class ProviderRouter implements DataProvider {
     context?: MarketDataRequestContext,
   ): Promise<SourceResult<OptionsChain> | null> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
-    const variantKey = buildVariantKey([["exchange", normalizeExchange(exchange)], ["expiration", expirationDate ?? "default"]]);
+    const variantKey = buildVariantKey([["exchange", canonicalExchange(exchange)], ["expiration", expirationDate ?? "default"]]);
     const result = await this.firstProvider(async (provider) => {
       if (!provider.getOptionsChain) return null;
       return provider.getOptionsChain(ticker, exchange, expirationDate, context);
@@ -1415,6 +1544,99 @@ export class ProviderRouter implements DataProvider {
     return result;
   }
 
+  private async fetchProviderHolders(
+    ticker: string,
+    exchange?: string,
+    context?: MarketDataRequestContext,
+  ): Promise<SourceResult<HolderData> | null> {
+    const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
+    const variantKey = this.getTickerVariantCandidates(exchange)[0] ?? "";
+    let firstEmptyResult: SourceResult<HolderData> | null = null;
+    let lastError: unknown = null;
+
+    for (const provider of this.providersInPriorityOrder()) {
+      if (!provider.getHolders) continue;
+      try {
+        const value = await provider.getHolders(ticker, exchange, context);
+        const sourceKey = this.providerSourceKey(provider);
+        this.cacheResource("holders", entityKey, variantKey, sourceKey, value, this.resolveProviderPolicy("holders", provider));
+        if (value.holders.length > 0) return { sourceKey, value };
+        firstEmptyResult ??= { sourceKey, value };
+      } catch (error) {
+        lastError = error;
+        if (shouldLogProviderError(error)) {
+          providerLog.error(`${provider.id} failed: ${error}`);
+        }
+      }
+    }
+
+    if (firstEmptyResult) return firstEmptyResult;
+    if (lastError) throw lastError;
+    return null;
+  }
+
+  private async fetchProviderAnalystResearch(
+    ticker: string,
+    exchange?: string,
+    context?: MarketDataRequestContext,
+  ): Promise<SourceResult<AnalystResearchData> | null> {
+    const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
+    const variantKey = this.getTickerVariantCandidates(exchange)[0] ?? "";
+    let firstEmptyResult: SourceResult<AnalystResearchData> | null = null;
+    let lastError: unknown = null;
+
+    for (const provider of this.providersInPriorityOrder()) {
+      if (!provider.getAnalystResearch) continue;
+      try {
+        const value = await provider.getAnalystResearch(ticker, exchange, context);
+        const sourceKey = this.providerSourceKey(provider);
+        this.cacheResource("analystResearch", entityKey, variantKey, sourceKey, value, this.resolveProviderPolicy("analystResearch", provider));
+        if (hasAnalystResearchValue(value)) return { sourceKey, value };
+        firstEmptyResult ??= { sourceKey, value };
+      } catch (error) {
+        lastError = error;
+        if (shouldLogProviderError(error)) {
+          providerLog.error(`${provider.id} failed: ${error}`);
+        }
+      }
+    }
+
+    if (firstEmptyResult) return firstEmptyResult;
+    if (lastError) throw lastError;
+    return null;
+  }
+
+  private async fetchProviderCorporateActions(
+    ticker: string,
+    exchange?: string,
+    context?: MarketDataRequestContext,
+  ): Promise<SourceResult<CorporateActionsData> | null> {
+    const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
+    const variantKey = this.getTickerVariantCandidates(exchange)[0] ?? "";
+    let firstEmptyResult: SourceResult<CorporateActionsData> | null = null;
+    let lastError: unknown = null;
+
+    for (const provider of this.providersInPriorityOrder()) {
+      if (!provider.getCorporateActions) continue;
+      try {
+        const value = await provider.getCorporateActions(ticker, exchange, context);
+        const sourceKey = this.providerSourceKey(provider);
+        this.cacheResource("corporateActions", entityKey, variantKey, sourceKey, value, this.resolveProviderPolicy("corporateActions", provider));
+        if (hasCorporateActionsValue(value)) return { sourceKey, value };
+        firstEmptyResult ??= { sourceKey, value };
+      } catch (error) {
+        lastError = error;
+        if (shouldLogProviderError(error)) {
+          providerLog.error(`${provider.id} failed: ${error}`);
+        }
+      }
+    }
+
+    if (firstEmptyResult) return firstEmptyResult;
+    if (lastError) throw lastError;
+    return null;
+  }
+
   private async fetchProviderSecFilings(
     ticker: string,
     count = 15,
@@ -1422,7 +1644,7 @@ export class ProviderRouter implements DataProvider {
     context?: MarketDataRequestContext,
   ): Promise<SourceResult<SecFilingItem[]> | null> {
     const entityKey = this.getEntityKey(ticker, exchange, context?.instrument);
-    const variantKey = buildVariantKey([["exchange", normalizeExchange(exchange)], ["count", count]]);
+    const variantKey = buildVariantKey([["exchange", canonicalExchange(exchange)], ["count", count]]);
     let lastError: unknown = null;
 
     for (const provider of this.providersInPriorityOrder()) {
@@ -1474,21 +1696,6 @@ export class ProviderRouter implements DataProvider {
     return null;
   }
 
-  private async revalidateFinancials(ticker: string, exchange?: string, context?: MarketDataRequestContext): Promise<void> {
-    const brokerResult = await withBrokerTimeout(this.fetchBrokerFinancials(ticker, exchange, context));
-    const needsProvider = !brokerResult || !hasMeaningfulFundamentals(brokerResult.value) || !hasMeaningfulProfile(brokerResult.value);
-    if (needsProvider) {
-      await this.fetchProviderFinancials(ticker, exchange, context);
-    }
-  }
-
-  private async revalidateQuote(ticker: string, exchange?: string, context?: MarketDataRequestContext): Promise<void> {
-    const brokerQuote = await withBrokerTimeout(this.fetchBrokerQuote(ticker, exchange, context));
-    if (!brokerQuote) {
-      await this.fetchProviderQuote(ticker, exchange, context);
-    }
-  }
-
   private async revalidateExchangeRate(fromCurrency: string): Promise<void> {
     const result = await this.firstProvider(async (provider) => {
       const rate = await provider.getExchangeRate(fromCurrency);
@@ -1498,25 +1705,22 @@ export class ProviderRouter implements DataProvider {
     this.cacheExchangeRate(fromCurrency, result.value.rate, result.value.provider);
   }
 
-  private async revalidateNews(ticker: string, count = 15, exchange?: string, context?: MarketDataRequestContext): Promise<void> {
-    const result = await this.firstProvider((provider) => provider.getNews(ticker, count, exchange, context));
-    if (!result) return;
-    const provider = this.resolveProviderBySourceKey(result.sourceKey);
-    if (!provider) return;
-    this.cacheResource(
-      "news",
-      this.getEntityKey(ticker, exchange, context?.instrument),
-      buildVariantKey([["exchange", normalizeExchange(exchange)], ["count", count]]),
-      result.sourceKey,
-      result.value,
-      this.resolveProviderPolicy("news", provider),
-    );
-  }
-
   private async revalidateSecFilings(ticker: string, count = 15, exchange?: string, context?: MarketDataRequestContext): Promise<void> {
     await this.fetchProviderSecFilings(ticker, count, exchange, context);
   }
 
+  private async revalidateHolders(ticker: string, exchange?: string, context?: MarketDataRequestContext): Promise<void> {
+    await this.fetchProviderHolders(ticker, exchange, context);
+  }
+
+  private async revalidateAnalystResearch(ticker: string, exchange?: string, context?: MarketDataRequestContext): Promise<void> {
+    await this.fetchProviderAnalystResearch(ticker, exchange, context);
+  }
+
+  private async revalidateCorporateActions(ticker: string, exchange?: string, context?: MarketDataRequestContext): Promise<void> {
+    await this.fetchProviderCorporateActions(ticker, exchange, context);
+  }
+
   private async revalidateSecFilingContent(filing: SecFilingItem): Promise<void> {
     await this.fetchProviderSecFilingContent(filing);
   }
@@ -1530,27 +1734,6 @@ export class ProviderRouter implements DataProvider {
     }
   }
 
-  private async revalidatePriceHistory(ticker: string, exchange: string, range: TimeRange, context?: MarketDataRequestContext): Promise<void> {
-    const brokerHistory = await withBrokerTimeout(this.fetchBrokerPriceHistory(ticker, exchange, range, context));
-    if (!brokerHistory || brokerHistory.value.length === 0) {
-      await this.fetchProviderPriceHistory(ticker, exchange, range, context);
-    }
-  }
-
-  private async revalidateDetailedPriceHistory(
-    ticker: string,
-    exchange: string,
-    startDate: Date,
-    endDate: Date,
-    barSize: string,
-    context?: MarketDataRequestContext,
-  ): Promise<void> {
-    const brokerHistory = await withBrokerTimeout(this.fetchBrokerDetailedPriceHistory(ticker, exchange, startDate, endDate, barSize, context));
-    if (!brokerHistory || brokerHistory.value.length === 0) {
-      await this.fetchProviderDetailedPriceHistory(ticker, exchange, startDate, endDate, barSize, context);
-    }
-  }
-
   private async revalidateOptionsChain(
     ticker: string,
     exchange?: string,