gloomberb 0.13.2 → 0.14.0

package/src/plugins/builtin/earnings/index.tsx

@@ -1,14 +1,19 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { DataTableView, usePaneFooter, type DataTableKeyEvent } from "../../../components";
+import { DataTableStackView, usePaneFooter, type DataTableKeyEvent } from "../../../components";
 import type { PaneProps } from "../../../types/plugin";
 import type { PluginModule } from "../plugin-module";
 import type { EarningsEvent } from "../../../types/data-provider";
-import { useAppSelector, usePaneInstance } from "../../../state/app/context";
+import { useAppSelector, usePaneInstance, usePaneSettingValue } from "../../../state/app/context";
 import { parseTickerListInput, formatTickerListInput } from "../../../tickers/list";
-import { useAssetData, usePluginPaneState, usePluginTickerActions } from "../../runtime";
+import { useAssetData, usePluginAppActions, usePluginPaneState, usePluginTickerActions } from "../../runtime";
+import { useUiCapabilities } from "../../../ui";
+import { EarningsDetailView } from "./detail-view";
 import { useAutoRefresh } from "../shared/auto-refresh";
-import type { PaneSettingsContext, PaneSettingsDef } from "../../../types/plugin";
-import { formatTickerListInput as formatTickers } from "../../../tickers/list";
+import type {
+  PaneSettingsContext,
+  PaneSettingsDef,
+  PaneTemplateCreateOptions,
+} from "../../../types/plugin";
 import {
   attachEarningsCalendarPersistence,
   loadEarningsCalendar,
@@ -34,6 +39,14 @@ import {
 function EarningsCalendarPane({ focused, width, height }: PaneProps) {
   const dataProvider = useAssetData();
   const { navigateTicker } = usePluginTickerActions();
+  const { createPaneFromTemplate } = usePluginAppActions();
+  const { nativePaneChrome } = useUiCapabilities();
+  // The open detail is remembered by symbol and date so a reload keeps it.
+  const [openKey, setOpenKey] = usePluginPaneState<string | null>("openEvent", null);
+  // A layout or `gloomberb shot ERN NVDA,AMD --open NVDA` lands on that
+  // company's next report instead of the list.
+  const [openSymbol] = usePaneSettingValue<string>("open", "");
+  const openedSymbol = useRef<string | null>(null);
   const pane = usePaneInstance();
   const [events, setEvents] = useState<EarningsEvent[]>([]);
   // Starts loading so the first frame never claims there are no earnings.
@@ -120,18 +133,41 @@ function EarningsCalendarPane({ focused, width, height }: PaneProps) {
     }
   }, [eventCount, selectedIdx, setSelectedIdx]);
 
-  const openEvent = useCallback((event: EarningsEvent) => {
-    navigateTicker(event.symbol);
-  }, [navigateTicker]);
+  const selectedEvent = eventRows[activeEventIdx]?.event ?? null;
 
-  const handleTableKeyDown = useCallback((event: DataTableKeyEvent) => {
+  useEffect(() => {
+    const symbol = openSymbol.trim().toUpperCase();
+    if (!symbol || openedSymbol.current === symbol || events.length === 0) return;
+    const match = eventRows.find((row) => row.event.symbol === symbol)?.event;
+    if (!match) return;
+    openedSymbol.current = symbol;
+    setOpenKey(eventKey(match));
+  }, [eventRows, events.length, openSymbol, setOpenKey]);
+  const openEvent = useMemo(
+    () => (openKey ? events.find((event) => eventKey(event) === openKey) ?? null : null),
+    [events, openKey],
+  );
+
+  const openTicker = useCallback((symbol: string) => navigateTicker(symbol), [navigateTicker]);
+  const openEstimates = useCallback((symbol: string) => createPaneFromTemplate("earnings-estimates-pane", { symbol }), [createPaneFromTemplate]);
+  const openCalls = useCallback((symbol: string) => createPaneFromTemplate("earnings-calls-pane", { symbol }), [createPaneFromTemplate]);
+  const openAnalysts = useCallback((symbol: string) => createPaneFromTemplate("analyst-research-pane", { symbol }), [createPaneFromTemplate]);
+
+  const handleKeyDown = useCallback((event: DataTableKeyEvent) => {
+    const symbol = openEvent?.symbol ?? selectedEvent?.symbol ?? null;
     if (event.name === "r") {
       event.preventDefault?.();
       reload(true);
       return true;
     }
-    return false;
-  }, [reload]);
+    if (!symbol) return false;
+    const actions: Record<string, (symbol: string) => void> = { t: openTicker, e: openEstimates, c: openCalls, a: openAnalysts };
+    const action = event.name ? actions[event.name] : undefined;
+    if (!action) return false;
+    event.preventDefault?.();
+    action(symbol);
+    return true;
+  }, [openAnalysts, openCalls, openEstimates, openEvent, openTicker, reload, selectedEvent]);
 
   const renderCell = useCallback((
     row: EarningsDisplayRow,
@@ -142,17 +178,45 @@ function EarningsCalendarPane({ focused, width, height }: PaneProps) {
     return renderEarningsCell(row, column, rowState.selected);
   }, []);
 
-  usePaneFooter("earnings-calendar", () => ({
-    info: [
-      ...(stale ? [{ id: "stale", parts: [{ text: "STALE", tone: "warning" as const }] }] : []),
-      ...(loading ? [{ id: "loading", parts: [{ text: "loading", tone: "muted" as const }] }] : []),
-      ...(error ? [{ id: "error", parts: [{ text: error, tone: "warning" as const }] }] : []),
-    ],
-  }), [error, loading, stale]);
+  usePaneFooter("earnings-calendar", () => {
+    const symbol = openEvent?.symbol ?? selectedEvent?.symbol ?? null;
+    return {
+      info: [
+        ...(stale ? [{ id: "stale", parts: [{ text: "STALE", tone: "warning" as const }] }] : []),
+        ...(loading ? [{ id: "loading", parts: [{ text: "loading", tone: "muted" as const }] }] : []),
+        ...(error ? [{ id: "error", parts: [{ text: error, tone: "warning" as const }] }] : []),
+      ],
+      hints: symbol
+        ? [
+            { id: "ticker", key: "t", label: "icker", onPress: () => openTicker(symbol) },
+            { id: "estimates", key: "e", label: "stimates", onPress: () => openEstimates(symbol) },
+            { id: "calls", key: "c", label: "alls", onPress: () => openCalls(symbol) },
+            { id: "analysts", key: "a", label: "nalysts", onPress: () => openAnalysts(symbol) },
+          ]
+        : [],
+    };
+  }, [error, loading, stale, openEvent, selectedEvent, openTicker, openEstimates, openCalls, openAnalysts]);
+
+  const detailContent = openEvent ? (
+    <EarningsDetailView
+      event={openEvent}
+      width={width}
+      height={Math.max(4, height - 1)}
+      onOpenTicker={openTicker}
+      onOpenEstimates={openEstimates}
+      onOpenCalls={openCalls}
+      onOpenAnalysts={openAnalysts}
+    />
+  ) : null;
 
   return (
-    <DataTableView<EarningsDisplayRow, EarningsColumn>
+    <DataTableStackView<EarningsDisplayRow, EarningsColumn>
       focused={focused}
+      detailOpen={!!openEvent}
+      onBack={() => setOpenKey(null)}
+      detailTitle={openEvent ? `${openEvent.symbol} · ${openEvent.name}` : undefined}
+      detailContent={detailContent}
+      onDetailKeyDown={handleKeyDown}
       selection={{
         kind: "index",
         selectedIndex: selectedRowIndex,
@@ -162,11 +226,11 @@ function EarningsCalendarPane({ focused, width, height }: PaneProps) {
       }}
       isNavigable={(row) => row.kind === "event"}
       onActivate={(row) => {
-        if (row.kind === "event") openEvent(row.event);
+        if (row.kind === "event") setOpenKey(eventKey(row.event));
       }}
-      onRootKeyDown={handleTableKeyDown}
+      onRootKeyDown={handleKeyDown}
       rootWidth={width}
-      rootHeight={height}
+      rootHeight={Math.max(3, height - (nativePaneChrome ? 1 : 0))}
       columns={columns}
       items={rows}
       sortColumnId={null}
@@ -188,6 +252,22 @@ function EarningsCalendarPane({ focused, width, height }: PaneProps) {
   );
 }
 
+function eventKey(event: EarningsEvent): string {
+  return `${event.symbol}:${event.earningsDate.toISOString().slice(0, 10)}`;
+}
+
+/** Tickers named on the command bar or the CLI win over the active collection. */
+function earningsScopeSymbols(options: PaneTemplateCreateOptions | undefined): string[] {
+  if (options?.symbols && options.symbols.length > 0) return options.symbols;
+  const raw = options?.arg?.trim() ?? "";
+  if (!raw) return [];
+  try {
+    return parseTickerListInput(raw);
+  } catch {
+    return [];
+  }
+}
+
 /** The monitor's scope lives in pane settings, so it has to be editable there too. */
 function earningsSettings(context: PaneSettingsContext): PaneSettingsDef {
   const collections = [
@@ -197,7 +277,7 @@ function earningsSettings(context: PaneSettingsContext): PaneSettingsDef {
   const symbols = scopedSymbolsFromSettings(context.settings);
   return {
     title: "Earnings Scope",
-    values: { symbolsText: symbols.length > 0 ? formatTickers(symbols) : "" },
+    values: { symbolsText: symbols.length > 0 ? formatTickerListInput(symbols) : "" },
     fields: [
       {
         key: "symbolsText",
@@ -221,24 +301,6 @@ function earningsSettings(context: PaneSettingsContext): PaneSettingsDef {
 export const earningsModule: PluginModule = {
   setup(ctx) {
     attachEarningsCalendarPersistence(ctx.persistence);
-    ctx.registerCommand({
-      id: "earnings-monitor-shortcut",
-      label: "Earnings Monitor",
-      keywords: ["earnings", "monitor", "calendar", "em", "eps"],
-      shortcut: "EM",
-      shortcutArg: {
-        placeholder: "tickers",
-        kind: "text",
-        parse: (arg) => ({ tickers: arg.trim() }),
-      },
-      category: "data",
-      description: "Open upcoming earnings, optionally scoped to tickers.",
-      execute: (values) => {
-        ctx.createPaneFromTemplate("earnings-monitor-pane", {
-          arg: values?.tickers ?? "",
-        });
-      },
-    });
   },
 
   dispose() {
@@ -264,34 +326,23 @@ export const earningsModule: PluginModule = {
       id: "earnings-calendar-pane",
       paneId: "earnings-calendar",
       label: "Earnings Calendar",
-      description: "Upcoming earnings dates and estimates for your tickers.",
-      keywords: ["earn", "earnings", "calendar", "eps", "revenue", "quarterly"],
-      shortcut: { prefix: "ERN" },
+      description: "Upcoming earnings dates and estimates: alone, for your portfolio and watchlists; with tickers, for those.",
+      keywords: ["earn", "earnings", "calendar", "monitor", "em", "eps", "revenue", "quarterly"],
+      // Tickers are optional on purpose: ERN alone follows the active
+      // collection and must not silently narrow to the active ticker.
+      shortcut: { prefix: "ERN", argPlaceholder: "tickers", argKind: "ticker-list", argOptional: true },
       headless: earningsCalendarHeadless,
-      createInstance: (context) => ({
-        settings: context.activeCollectionId
-          ? { collectionId: context.activeCollectionId }
-          : undefined,
-      }),
-    },
-    {
-      id: "earnings-monitor-pane",
-      paneId: "earnings-calendar",
-      label: "Earnings Monitor",
-      description: "Upcoming earnings dates and estimates, optionally scoped to tickers.",
-      keywords: ["earn", "earnings", "monitor", "em", "eps", "revenue"],
       canCreate: () => true,
+      // Tickers named on the command bar win over the collection. Ignoring
+      // them left `ERN NKE` scoped to the active collection, which rendered
+      // "No tickers in scope" while the report listed NKE's earnings.
       createInstance: (context, options) => {
-        const raw = options?.arg?.trim() ?? "";
-        const symbols = raw ? parseTickerListInput(raw) : [];
+        const symbols = earningsScopeSymbols(options);
         return {
-          title: symbols.length > 0 ? `EM ${formatTickerListInput(symbols)}` : "Earnings Monitor",
+          title: symbols.length > 0 ? `ERN ${formatTickerListInput(symbols)}` : "Earnings Calendar",
           placement: "floating",
           settings: symbols.length > 0
-            ? {
-              symbols,
-              symbolsText: formatTickerListInput(symbols),
-            }
+            ? { symbols, symbolsText: formatTickerListInput(symbols) }
             : context.activeCollectionId
               ? { collectionId: context.activeCollectionId }
               : undefined,

package/src/plugins/builtin/earnings/model.test.ts

@@ -1,6 +1,13 @@
 import { describe, expect, test } from "bun:test";
 import type { TickerRecord } from "../../../types/ticker";
-import { groupEarningsByRelativeDate, resolveEarningsCollectionId, trackedEarningsSymbols } from "./model";
+import type { PaneTemplateContext } from "../../../types/plugin";
+import { earningsModule } from "./index";
+import {
+  groupEarningsByRelativeDate,
+  resolveEarningsCollectionId,
+  scopedSymbolsFromSettings,
+  trackedEarningsSymbols,
+} from "./model";
 
 function ticker(
   symbol: string,
@@ -22,6 +29,27 @@ function ticker(
   };
 }
 
+describe("ERN pane scope", () => {
+  /**
+   * The shortcut takes tickers, but the template used to drop them and follow
+   * the active collection instead, so `ERN NKE` opened a pane that reported no
+   * tickers in scope while the same argument produced a report.
+   */
+  test("scopes the pane to the tickers the shortcut was given", async () => {
+    const template = earningsModule.paneTemplates?.find(
+      (candidate) => candidate.id === "earnings-calendar-pane",
+    );
+    const context = { activeCollectionId: "main" } as unknown as PaneTemplateContext;
+
+    const scoped = await template?.createInstance?.(context, { arg: "nke, msft" });
+    expect(scopedSymbolsFromSettings(scoped?.settings)).toEqual(["NKE", "MSFT"]);
+
+    const unscoped = await template?.createInstance?.(context, undefined);
+    expect(scopedSymbolsFromSettings(unscoped?.settings)).toEqual([]);
+    expect(unscoped?.settings?.collectionId).toBe("main");
+  });
+});
+
 describe("trackedEarningsSymbols", () => {
   test("gives settings-less legacy panes one stable collection scope", () => {
     expect(resolveEarningsCollectionId(undefined, "main")).toBe("main");

package/src/plugins/builtin/earnings/table.test.ts

@@ -0,0 +1,60 @@
+import { describe, expect, test } from "bun:test";
+import { colors } from "../../../theme/colors";
+import type { EarningsEvent } from "../../../types/data-provider";
+import { EARNINGS_ESTIMATE_FIELDS } from "./estimate-basis";
+import { buildEarningsColumns, renderEarningsCell, type EarningsColumn } from "./table";
+
+function event(values: Partial<EarningsEvent> = {}): EarningsEvent {
+  const result: EarningsEvent = {
+    symbol: "TEST", name: "Controlled estimate", earningsDate: new Date("2026-09-12T00:00:00Z"),
+    epsEstimate: 4, epsActual: null, revenueEstimate: null, revenueActual: null,
+    surprise: null, timing: "", ...values,
+  };
+  result.estimateBasis ??= Object.fromEntries(EARNINGS_ESTIMATE_FIELDS
+    .filter(field => typeof result[field] === "number")
+    .map(field => [field, {
+      source: "earningsTrend", sourceValue: result[field], period: "0q", periodEndDate: "2026-09-30",
+      ...(["epsEstimate", "epsTrend7dAgo", "epsTrend30dAgo"].includes(field) ? { currency: "USD" } : {}),
+    }]));
+  return result;
+}
+
+function cell(id: EarningsColumn["id"], values: Partial<EarningsEvent>) {
+  return renderEarningsCell({ kind: "event", key: "test", eventIdx: 0, event: event(values) },
+    buildEarningsColumns(180).find((column) => column.id === id)!, false);
+}
+
+describe("earnings estimate comparison basis", () => {
+  test("30-day changes do not substitute 7-day observations", () => {
+    expect(cell("epsTrend", { epsTrend7dAgo: 3, epsTrend30dAgo: null }).text).toBe("—");
+    expect(cell("epsTrend", { epsTrend7dAgo: 3, epsTrend30dAgo: 2 }).text).toBe("USD 2.00");
+    expect(cell("epsTrend", { epsEstimate: 0, epsTrend30dAgo: 2 }).text).toBe("USD -2.00");
+    expect(cell("epsTrend", { epsEstimate: null, epsTrend30dAgo: 2 }).text).toBe("—");
+  });
+
+  test("revision counts preserve one horizon and distinguish unknown from zero", () => {
+    const partial = cell("epsRevisions", {
+      epsRevisionUp30d: 3, epsRevisionDown30d: null, epsRevisionDown7d: 2,
+    });
+    expect(partial.text).toBe("3/—");
+    expect(partial.color).toBe(colors.textDim);
+    expect(cell("epsRevisions", { epsRevisionUp7d: 3, epsRevisionDown7d: 2 }).text).toBe("—");
+    expect(cell("epsRevisions", { epsRevisionUp30d: null, epsRevisionDown30d: 0 }).text).toBe("—/0");
+    expect(cell("epsRevisions", { epsRevisionUp30d: 0, epsRevisionDown30d: 0 }).text).toBe("0/0");
+    expect(cell("epsRevisions", { epsRevisionUp30d: 3, epsRevisionDown30d: 0 }).color).toBe(colors.positive);
+    expect(cell("epsRevisions", { epsRevisionUp30d: 0, epsRevisionDown30d: 3 }).color).toBe(colors.negative);
+  });
+
+  test("calendar dates agree with UTC grouping across time zones and year boundaries", () => {
+    const modulePath = new URL("./table.ts", import.meta.url).pathname;
+    const script = `import { buildEarningsColumns, renderEarningsCell } from ${JSON.stringify(modulePath)};
+      const column = buildEarningsColumns(180).find(c => c.id === 'date');
+      const dates = ['2026-09-12T00:00:00Z', '2026-12-31T23:00:00Z'];
+      console.log(JSON.stringify(dates.map(date => renderEarningsCell({kind:'event', event:{earningsDate:new Date(date)}},column,false).text)));`;
+    for (const timezone of ["UTC", "America/Los_Angeles", "Pacific/Kiritimati"]) {
+      const result = Bun.spawnSync([process.execPath, "-e", script], { env: { ...process.env, TZ: timezone } });
+      expect(result.exitCode).toBe(0);
+      expect(JSON.parse(result.stdout.toString())).toEqual(["Sep 12", "Dec 31"]);
+    }
+  });
+});

package/src/plugins/builtin/earnings/table.ts

@@ -1,9 +1,10 @@
 import { TextAttributes } from "../../../ui";
 import type { DataTableCell, DataTableColumn } from "../../../components";
-import type { EarningsEvent } from "../../../types/data-provider";
+import type { EarningsEstimateField, EarningsEvent } from "../../../types/data-provider";
 import { colors } from "../../../theme/colors";
 import { formatCompact, formatNumber, formatPercent } from "../../../utils/format";
 import type { EarningsDisplayRow } from "./model";
+import { coherentEarningsValue, earningsEpsChange30d, earningsForecastPeriod } from "./estimate-basis";
 
 type EarningsColumnId =
   | "date"
@@ -11,6 +12,7 @@ type EarningsColumnId =
   | "status"
   | "symbol"
   | "name"
+  | "forecastEnd"
   | "epsEstimate"
   | "epsRange"
   | "epsGrowth"
@@ -26,7 +28,7 @@ export type EarningsColumn = DataTableColumn & { id: EarningsColumnId };
 const MONTH_NAMES = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] as const;
 
 function formatDate(date: Date): string {
-  return `${MONTH_NAMES[date.getMonth()]} ${date.getDate()}`;
+  return `${MONTH_NAMES[date.getUTCMonth()]} ${date.getUTCDate()}`;
 }
 
 function formatTime(date: Date | null | undefined): string {
@@ -34,29 +36,34 @@ function formatTime(date: Date | null | undefined): string {
   return date.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
 }
 
-function formatMaybeNumber(value: number | null | undefined, decimals = 2): string {
-  return value == null ? "—" : formatNumber(value, decimals);
+function formatEstimate(event: EarningsEvent, field: EarningsEstimateField, formatter: (value: number) => string): string {
+  const value = coherentEarningsValue(event, field);
+  return value == null ? "—" : `${event.estimateBasis?.[field]?.currency ?? "?"} ${formatter(value)}`;
 }
 
-function formatRange(
-  low: number | null | undefined,
-  high: number | null | undefined,
+function formatEstimateRange(
+  event: EarningsEvent, lowField: EarningsEstimateField, highField: EarningsEstimateField,
   formatter: (value: number) => string,
 ): string {
+  const low = coherentEarningsValue(event, lowField);
+  const high = coherentEarningsValue(event, highField);
   if (low == null && high == null) return "—";
-  return `${low == null ? "—" : formatter(low)}-${high == null ? "—" : formatter(high)}`;
+  const lowCurrency = event.estimateBasis?.[lowField]?.currency ?? "?";
+  const highCurrency = event.estimateBasis?.[highField]?.currency ?? "?";
+  if (lowCurrency === highCurrency) return `${lowCurrency} ${low == null ? "—" : formatter(low)}-${high == null ? "—" : formatter(high)}`;
+  return `${formatEstimate(event, lowField, formatter)}-${formatEstimate(event, highField, formatter)}`;
 }
 
 function formatRevisionSummary(event: EarningsEvent): string {
-  const up = event.epsRevisionUp30d ?? event.epsRevisionUp7d;
-  const down = event.epsRevisionDown30d ?? event.epsRevisionDown7d;
+  const up = coherentEarningsValue(event, "epsRevisionUp30d");
+  const down = coherentEarningsValue(event, "epsRevisionDown30d");
   if (up == null && down == null) return "—";
-  return `${up ?? 0}/${down ?? 0}`;
+  return `${up ?? "—"}/${down ?? "—"}`;
 }
 
 function formatAnalystSummary(event: EarningsEvent): string {
-  const eps = event.epsAnalysts;
-  const revenue = event.revenueAnalysts;
+  const eps = coherentEarningsValue(event, "epsAnalysts");
+  const revenue = coherentEarningsValue(event, "revenueAnalysts");
   if (eps == null && revenue == null) return "—";
   if (eps === revenue || revenue == null) return String(eps);
   if (eps == null) return String(revenue);
@@ -74,16 +81,17 @@ export function buildEarningsColumns(width: number): EarningsColumn[] {
   const whenWidth = 8;
   const statusWidth = 4;
   const symbolWidth = 8;
-  const epsWidth = 8;
-  const epsRangeWidth = 11;
+  const epsWidth = 11;
+  const forecastEndWidth = 10;
+  const epsRangeWidth = 20;
   const growthWidth = 8;
-  const trendWidth = 8;
+  const trendWidth = 11;
   const revisionsWidth = 7;
-  const revenueWidth = 9;
-  const revenueRangeWidth = 13;
+  const revenueWidth = 12;
+  const revenueRangeWidth = 23;
   const analystsWidth = 7;
-  const columnCount = 14;
-  const fixedWidth = dateWidth + whenWidth + statusWidth + symbolWidth + epsWidth
+  const columnCount = 15;
+  const fixedWidth = dateWidth + whenWidth + statusWidth + symbolWidth + epsWidth + forecastEndWidth
     + epsRangeWidth + growthWidth + trendWidth + revisionsWidth + revenueWidth
     + revenueRangeWidth + growthWidth + analystsWidth;
   const nameWidth = Math.max(14, width - 2 - columnCount - fixedWidth);
@@ -94,11 +102,12 @@ export function buildEarningsColumns(width: number): EarningsColumn[] {
     { id: "status", label: "ST", width: statusWidth, align: "left" },
     { id: "symbol", label: "TICKER", width: symbolWidth, align: "left" },
     { id: "name", label: "NAME", width: nameWidth, align: "left" },
+    { id: "forecastEnd", label: "EST END", width: forecastEndWidth, align: "left" },
     { id: "epsEstimate", label: "EPS", width: epsWidth, align: "right" },
     { id: "epsRange", label: "EPS RNG", width: epsRangeWidth, align: "right" },
     { id: "epsGrowth", label: "EPS YOY", width: growthWidth, align: "right" },
     { id: "epsTrend", label: "EPS 30D", width: trendWidth, align: "right" },
-    { id: "epsRevisions", label: "REV", width: revisionsWidth, align: "right" },
+    { id: "epsRevisions", label: "REV 30D", width: revisionsWidth, align: "right" },
     { id: "revenueEstimate", label: "SALES", width: revenueWidth, align: "right" },
     { id: "revenueRange", label: "SALES RNG", width: revenueRangeWidth, align: "right" },
     { id: "revenueGrowth", label: "SALES YOY", width: growthWidth, align: "right" },
@@ -150,52 +159,53 @@ export function renderEarningsCell(
       };
     case "name":
       return { text: row.event.name, color: selectedColor ?? colors.text };
+    case "forecastEnd":
+      return { text: earningsForecastPeriod(row.event)?.periodEndDate ?? "—", color: selectedColor ?? colors.textDim };
     case "epsEstimate":
       return {
-        text: formatMaybeNumber(row.event.epsEstimate),
+        text: formatEstimate(row.event, "epsEstimate", value => formatNumber(value, 2)),
         color: selectedColor ?? colors.textDim,
       };
     case "epsRange":
       return {
-        text: formatRange(row.event.epsLow, row.event.epsHigh, (value) => formatNumber(value, 2)),
+        text: formatEstimateRange(row.event, "epsLow", "epsHigh", value => formatNumber(value, 2)),
         color: selectedColor ?? colors.textDim,
       };
     case "epsGrowth":
       return {
-        text: row.event.epsGrowth != null ? formatPercent(row.event.epsGrowth) : "—",
-        color: estimateColor(row.event.epsGrowth, selectedColor),
+        text: coherentEarningsValue(row.event, "epsGrowth") != null ? formatPercent(coherentEarningsValue(row.event, "epsGrowth")!) : "—",
+        color: estimateColor(coherentEarningsValue(row.event, "epsGrowth"), selectedColor),
       };
     case "epsTrend": {
-      const current = row.event.epsEstimate;
-      const prior = row.event.epsTrend30dAgo ?? row.event.epsTrend7dAgo;
-      const change = current != null && prior != null ? current - prior : null;
+      const change = earningsEpsChange30d(row.event);
       return {
-        text: change != null ? formatNumber(change, 2) : "—",
+        text: change != null ? `${row.event.estimateBasis?.epsEstimate?.currency} ${formatNumber(change, 2)}` : "—",
         color: estimateColor(change, selectedColor),
       };
     }
     case "epsRevisions": {
-      const net = (row.event.epsRevisionUp30d ?? row.event.epsRevisionUp7d ?? 0)
-        - (row.event.epsRevisionDown30d ?? row.event.epsRevisionDown7d ?? 0);
+      const up = coherentEarningsValue(row.event, "epsRevisionUp30d");
+      const down = coherentEarningsValue(row.event, "epsRevisionDown30d");
+      const net = up != null && down != null ? up - down : null;
       return {
         text: formatRevisionSummary(row.event),
-        color: selectedColor ?? (net > 0 ? colors.positive : net < 0 ? colors.negative : colors.textDim),
+        color: selectedColor ?? (net != null && net > 0 ? colors.positive : net != null && net < 0 ? colors.negative : colors.textDim),
       };
     }
     case "revenueEstimate":
       return {
-        text: row.event.revenueEstimate != null ? formatCompact(row.event.revenueEstimate) : "—",
+        text: formatEstimate(row.event, "revenueEstimate", formatCompact),
         color: selectedColor ?? colors.textDim,
       };
     case "revenueRange":
       return {
-        text: formatRange(row.event.revenueLow, row.event.revenueHigh, formatCompact),
+        text: formatEstimateRange(row.event, "revenueLow", "revenueHigh", formatCompact),
         color: selectedColor ?? colors.textDim,
       };
     case "revenueGrowth":
       return {
-        text: row.event.revenueGrowth != null ? formatPercent(row.event.revenueGrowth) : "—",
-        color: estimateColor(row.event.revenueGrowth, selectedColor),
+        text: coherentEarningsValue(row.event, "revenueGrowth") != null ? formatPercent(coherentEarningsValue(row.event, "revenueGrowth")!) : "—",
+        color: estimateColor(coherentEarningsValue(row.event, "revenueGrowth"), selectedColor),
       };
     case "analysts":
       return {