gloomberb 0.16.3 → 0.16.5

package/src/plugins/builtin/market-heatmap/portfolio.ts

@@ -3,7 +3,12 @@ import type { MarketHeatmapAsset, MarketHeatmapUniverseId } from "../../../api-c
 import { useAppSelector, usePaneStateValue } from "../../../state/app/context";
 import type { ColumnConfig } from "../../../types/config";
 import type { TickerFinancials } from "../../../types/financials";
-import { getSessionMoveDisplay, type ExtendedSession } from "../../../market-data/market/status";
+import {
+  getRegularSessionMoveDisplay,
+  getTradedSessionMoveDisplay,
+  type ActiveQuoteDisplay,
+  type ExtendedSession,
+} from "../../../market-data/market/status";
 import type { TickerRecord } from "../../../types/ticker";
 import { getSortValue, type ColumnContext } from "../portfolio-list/metrics";
 
@@ -195,6 +200,7 @@ export function buildPortfolioHeatmapAssets({
   currency,
   exchangeRates,
   sizeBy = "sqrt-market-cap",
+  regularSession = false,
 }: {
   tickers: readonly TickerRecord[];
   financials: ReadonlyMap<string, TickerFinancials>;
@@ -204,6 +210,8 @@ export function buildPortfolioHeatmapAssets({
   currency: string;
   exchangeRates: Map<string, number>;
   sizeBy?: HeatmapSizeBy;
+  /** Color by the regular session alone, never an extended print (`getRegularSessionMoveDisplay`). */
+  regularSession?: boolean;
 }): { assets: HeatmapBoardAsset[]; omitted: number } {
   const context: ColumnContext = {
     activeTab: kind === "portfolio" ? collectionId : undefined,
@@ -217,7 +225,9 @@ export function buildPortfolioHeatmapAssets({
     const snapshot = financials.get(symbol);
     const quote = snapshot?.quote;
     // Colored like the market boards: an open extended session's move, else the regular session's.
-    const display = getSessionMoveDisplay(quote);
+    const display: (ActiveQuoteDisplay & { session?: ExtendedSession }) | null = regularSession
+      ? getRegularSessionMoveDisplay(quote)
+      : getTradedSessionMoveDisplay(quote);
     const price = display != null && Number.isFinite(display.price) ? display.price : null;
     const size = positiveNumber(getSortValue(sizeColumn, ticker, snapshot, context));
     const hasChange = display?.changePercent != null && Number.isFinite(display.changePercent);

package/src/plugins/builtin/market-movers/client.ts

@@ -5,18 +5,19 @@ import type {
   CloudSessionMoversSide,
 } from "../../../api-client/market-movers";
 import type { DataProvider } from "../../../types/data-provider";
-import { CATEGORY_MAP, screenerQuoteFromQuote, type ScreenerTabId } from "./model";
+import { CATEGORY_MAP, moverRegularSession, screenerQuoteFromQuote, type MoverQuote, type ScreenerTabId } from "./model";
 import {
   fetchPreferredMarketMovers,
   fetchTrending,
   type MarketMoversResult,
   type PreferredMoversOptions,
-  type ScreenerQuote,
   type TrendingSymbol,
 } from "./screener";
 
 export interface MarketMoverTabResult extends MarketMoversResult {
   tab: ScreenerTabId;
+  /** In the list's order; Last and Chg% the regular session, as `ticker` reads them. */
+  quotes: MoverQuote[];
 }
 
 export interface MarketMoverTabDependencies {
@@ -36,9 +37,9 @@ const defaultDependencies: MarketMoverTabDependencies = {
 async function hydrateTrending(
   trending: readonly TrendingSymbol[],
   provider: DataProvider | null,
-): Promise<ScreenerQuote[]> {
+): Promise<MoverQuote[]> {
   const symbols = trending.slice(0, 25).map(({ symbol }) => symbol);
-  const bySymbol = new Map<string, ScreenerQuote>();
+  const bySymbol = new Map<string, MoverQuote>();
   if (!provider) return [];
   if (provider.getQuotesBatch) {
     const results = await provider.getQuotesBatch(
@@ -79,7 +80,8 @@ export async function loadMarketMoverTab(
     };
   }
   const result = await dependencies.fetchPreferred(CATEGORY_MAP[tab], 25, options);
-  return { ...result, tab };
+  // Ranked by the live print first, so reading each row's regular session keeps its place.
+  return { ...result, quotes: result.quotes.map(moverRegularSession), tab };
 }
 
 /** The server refused the list for the account's plan. */

package/src/plugins/builtin/market-movers/headless.ts

@@ -10,14 +10,18 @@ import type {
   CloudSessionMoversSide,
 } from "../../../api-client/market-movers";
 import { loadMarketMoverTab, loadSessionMovers, type MarketMoverTabResult } from "./client";
-import { createRows, fiftyTwoWeekPositionPercent, formatMoverPrice, moverReferencePrice, type MarketMoverRow, type ScreenerTabId, type TabId } from "./model";
+import { createRows, fiftyTwoWeekPositionPercent, formatMoverPrice, moverExtendedSessions, moverReferencePrice, type MarketMoverRow, type ScreenerTabId, type TabId } from "./model";
+import { EXTENDED_SESSION_LABELS, type ExtendedSession } from "../../../market-data/market/status";
+import type { HeadlessPaneColumn } from "../../../types/headless";
 import { isSessionTab, resolveSide } from "./session";
 
-const COLUMNS = [
+const rowPrice = (value: unknown, row: Record<string, unknown>) => formatMoverPrice(typeof value === "number" ? value : null, typeof row.currency === "string" ? row.currency : "", moverReferencePrice(row as unknown as MarketMoverRow));
+
+const COLUMNS: HeadlessPaneColumn[] = [
   { key: "rank", header: "Rank", align: "right" as const },
   { key: "symbol", header: "Symbol" },
   { key: "name", header: "Name" },
-  { key: "price", header: "Last", align: "right" as const, format: (value: unknown, row: Record<string, unknown>) => formatMoverPrice(typeof value === "number" ? value : null, typeof row.currency === "string" ? row.currency : "", moverReferencePrice(row as unknown as MarketMoverRow)) },
+  { key: "price", header: "Last", align: "right" as const, format: rowPrice },
   { key: "changePercent", header: "Change %", align: "right" as const, format: (value: unknown) => value == null ? "—" : formatPercentRaw(Number(value)) },
   { key: "volume", header: "Volume", align: "right" as const, format: (value: unknown) => value == null ? "—" : formatCompact(Number(value), { fixedDecimals: true }) },
   { key: "volumeRatio", header: "Vol / Avg", align: "right" as const, format: (value: unknown) => value == null ? "—" : formatNumber(Number(value), 1) },
@@ -30,6 +34,19 @@ const percent = (value: unknown) => value == null ? "—" : formatPercentRaw(Num
 const ratio = (value: unknown) => value == null ? "—" : `${formatNumber(Number(value), 1)}x`;
 const compact = (value: unknown) => value == null ? "—" : formatCompact(Number(value), { fixedDecimals: true });
 const CATALYST_LABEL: Record<string, string> = { halt: "Halt", filing: "8-K", news: "News" };
+
+/** The pre-market or after-hours print and its move from the regular close, for the rows that have one. */
+function extendedColumn(session: ExtendedSession): HeadlessPaneColumn {
+  return {
+    key: "extendedPrice",
+    header: EXTENDED_SESSION_LABELS[session],
+    align: "right",
+    format: (value, row) => row.extendedSession === session && typeof value === "number"
+      ? `${rowPrice(value, row)} ${percent(row.extendedChangePercent)}`
+      : "—",
+  };
+}
+
 const SESSION_VOLUME: Record<CloudSessionMoversCategory, string> = {
   premarket: "Pre-market volume",
   afterhours: "After-hours volume",
@@ -131,8 +148,15 @@ export function createMarketMoversHeadless(
         };
       }
       const result = await dependencies.load(args, tab, ctx.marketData);
-      const rows = createRows(result.quotes).map((row) => ({
+      const ranked = createRows(result.quotes);
+      // Last and Change % are the regular session; an extended print is a column of its own.
+      const extendedSessions = moverExtendedSessions(ranked);
+      const rows = ranked.map(({ extended, ...row }) => ({
         ...row,
+        extendedSession: extended?.session ?? null,
+        extendedPrice: extended?.price ?? null,
+        extendedChange: extended?.change ?? null,
+        extendedChangePercent: extended?.changePercent ?? null,
         rangePositionPercent: fiftyTwoWeekPositionPercent(
           row.price,
           row.fiftyTwoWeekLow,
@@ -140,6 +164,9 @@ export function createMarketMoversHeadless(
         ),
       }));
       return {
+        ...(extendedSessions.length > 0
+          ? { columns: [...COLUMNS.slice(0, 5), ...extendedSessions.map(extendedColumn), ...COLUMNS.slice(5)] }
+          : {}),
         rows,
         metadata: { list: tab, source: result.source, stale: result.stale },
       };

package/src/plugins/builtin/market-movers/index.tsx

@@ -25,6 +25,7 @@ import {
   INDEX_SHORT,
   TABS,
   createRows,
+  moverExtendedSessions,
   overlayMarketMoverQuotes,
   resolveSummarySymbols,
   resolveTabs,
@@ -33,6 +34,7 @@ import {
   type MarketMoverColumn,
   type MarketMoverRow,
   type MarketMoverSortPreference,
+  type MoverQuote,
   type ScreenerTabId,
   type TabId,
 } from "./model";
@@ -42,6 +44,7 @@ import { isSessionTab, resolveActiveTab, usSessionAt, type UsSession } from "./s
 import { SessionMoversBody } from "./session-body";
 import { marketMoversHeadless } from "./headless";
 import { buildMarketMoverColumns, renderMarketMoverCell } from "./table";
+import type { ExtendedSession } from "../../../market-data/market/status";
 import {
   LIVE_STREAMING_QUICK_SETTING,
   useLiveStreamingSetting,
@@ -56,7 +59,7 @@ import {
 /** Stable identity: a fresh literal here would reload the board every render. */
 const NO_SAVED_SELECTION: string[] = [];
 const SESSION_CHECK_MS = 30_000;
-const NO_QUOTES: ScreenerQuote[] = [];
+const NO_QUOTES: MoverQuote[] = [];
 const moverKey = (row: Pick<ScreenerQuote, "symbol" | "exchange">) => publicTickerKey(row.symbol, row.exchange);
 
 /** What is trading in New York, re-read every half minute so the pane follows 04:00, 09:30 and 16:00. */
@@ -152,7 +155,7 @@ function ScreenerMoversBody({ activeTab, focused, width, summaryQuotes, liveStre
 }) {
   const dataProvider = useAssetData();
   const { pinTicker } = usePluginTickerActions();
-  const [quotes, setQuotes] = useState<ScreenerQuote[]>([]);
+  const [quotes, setQuotes] = useState<MoverQuote[]>([]);
   const [loadedTab, setLoadedTab] = useState<TabId | null>(null);
   const visibleQuotes = loadedTab === activeTab ? quotes : NO_QUOTES;
   // The first load starts before the effect runs; an empty board is not "no data".
@@ -188,8 +191,13 @@ function ScreenerMoversBody({ activeTab, focused, width, summaryQuotes, liveStre
     }),
     [freshnessNow, liveQuoteEntries, quoteTargets, subscriptionStartedAt],
   );
-  const columns = useMemo(() => buildMarketMoverColumns(width), [width]);
   const rankedRows = useMemo(() => createRows(resolvedQuotes), [resolvedQuotes]);
+  // A pre-market or after-hours column only while a row has such a print.
+  const extendedSessionsKey = moverExtendedSessions(rankedRows).join(",");
+  const columns = useMemo(
+    () => buildMarketMoverColumns(width, extendedSessionsKey ? extendedSessionsKey.split(",") as ExtendedSession[] : []),
+    [extendedSessionsKey, width],
+  );
   const rows = useMemo(() => sortRows(rankedRows, sortPreference), [rankedRows, sortPreference]);
   const selectedIdx = selectedSymbol
     ? rows.findIndex((row) => moverKey(row) === selectedSymbol)

package/src/plugins/builtin/market-movers/model.ts

@@ -1,5 +1,13 @@
 import { resolveCurrencyUnit } from "../../../utils/currency-units";
 import { overlayScreenerQuoteEntries } from "../../../market-data/quotes/screener-live-quotes";
+import {
+  getExtendedSessionDisplay,
+  getRegularSessionDisplay,
+  type ExtendedSession,
+  type ExtendedSessionDisplay,
+} from "../../../market-data/market/status";
+import { buildQuoteKey, resolveEntryData } from "../../../market-data/selectors";
+import { isFiniteNumber } from "../../../utils/guards";
 import type { Quote } from "../../../types/financials";
 import type { CloudSessionMoversCategory } from "../../../api-client/market-movers";
 import type { QueryEntry } from "../../../market-data/result-types";
@@ -37,12 +45,20 @@ type MarketMoverColumnId =
   | "name"
   | "price"
   | "changePercent"
+  | "preMarket"
+  | "afterHours"
   | "volume"
   | "volumeRatio"
   | "range"
   | "marketCap";
 export type MarketMoverColumn = DataTableColumn & { id: MarketMoverColumnId };
-export type MarketMoverRow = ScreenerQuote & { rank: number };
+/**
+ * A list row. Price and change are the regular session's, as `ticker` reads
+ * them; a row whose quote has a pre-market or after-hours print carries it in
+ * `extended`, measured from that session's close.
+ */
+export type MoverQuote = ScreenerQuote & { extended?: ExtendedSessionDisplay | null };
+export type MarketMoverRow = MoverQuote & { rank: number };
 
 export interface MarketMoverSortPreference {
   columnId: MarketMoverColumnId | null;
@@ -96,6 +112,9 @@ function getSortValue(
       return row.price;
     case "changePercent":
       return row.changePercent;
+    case "preMarket":
+    case "afterHours":
+      return moverExtendedMove(row, columnId === "preMarket" ? "PRE" : "POST");
     case "volume":
       return row.volume;
     case "volumeRatio":
@@ -123,7 +142,17 @@ export function sortRows(
 /** A row is rebuilt only when its quote or rank moved, so unchanged rows skip the render. */
 const moverRows = new WeakMap<ScreenerQuote, MarketMoverRow>();
 
-export function createRows(quotes: ScreenerQuote[]): MarketMoverRow[] {
+/** The extended print's move from the close, when the row has one for `session`. */
+export function moverExtendedMove(row: MoverQuote, session: ExtendedSession): number | null {
+  return row.extended?.session === session && isFiniteNumber(row.extended.changePercent) ? row.extended.changePercent : null;
+}
+
+/** The extended sessions some row has a print for, in the order their columns go. */
+export function moverExtendedSessions(rows: readonly MoverQuote[]): ExtendedSession[] {
+  return (["PRE", "POST"] as const).filter((session) => rows.some((row) => row.extended?.session === session));
+}
+
+export function createRows(quotes: readonly MoverQuote[]): MarketMoverRow[] {
   return quotes.map((quote, index) => {
     const cached = moverRows.get(quote);
     if (cached?.rank === index + 1) return cached;
@@ -137,26 +166,66 @@ export function createRows(quotes: ScreenerQuote[]): MarketMoverRow[] {
   });
 }
 
-export function summaryQuoteFromQuote(
-  symbol: string,
-  quote: { name?: string; price: number; change: number; changePercent: number },
-): MarketSummaryQuote {
+/** An index in the summary strip, at its regular session's level and move. */
+export function summaryQuoteFromQuote(symbol: string, quote: Quote): MarketSummaryQuote {
+  const headline = getRegularSessionDisplay(quote)!;
   return {
     symbol,
     name: quote.name ?? symbol,
-    price: quote.price,
-    change: quote.change,
-    changePercent: quote.changePercent,
+    price: headline.price,
+    change: headline.change ?? Number.NaN,
+    changePercent: headline.changePercent ?? Number.NaN,
+  };
+}
+
+/** The extended print beside a quote's regular session, or null; a non-finite price is none. */
+function moverExtended(quote: Quote): ExtendedSessionDisplay | null {
+  const extended = getExtendedSessionDisplay(quote);
+  return extended && isFiniteNumber(extended.price) ? extended : null;
+}
+
+/**
+ * A listed row as `ticker` reads its quote: Last and Chg% are the regular
+ * session's close and move, and a pre-market or after-hours print is its
+ * `extended`, measured from that close. The list ranked it by its live print
+ * first, so its place stays. A row without its quote's sessions (an older
+ * server) reads as it came.
+ */
+export function moverRegularSession({ sessions, ...row }: ScreenerQuote): MoverQuote {
+  if (!sessions || row.price == null) return row;
+  const quote: Quote = {
+    symbol: row.symbol,
+    price: row.price,
+    change: row.change ?? Number.NaN,
+    changePercent: row.changePercent ?? Number.NaN,
+    previousClose: row.previousClose,
+    currency: row.currency,
+    lastUpdated: row.lastUpdated ?? Number.NaN,
+    listingExchangeName: row.exchange || undefined,
+    ...sessions,
+  };
+  const headline = getRegularSessionDisplay(quote)!;
+  return {
+    ...row,
+    price: screenerNumber(headline.price),
+    change: screenerNumber(headline.change),
+    changePercent: screenerNumber(headline.changePercent),
+    extended: moverExtended(quote),
   };
 }
 
-export function screenerQuoteFromQuote(symbol: string, quote: { name?: string; price?: number; change?: number; changePercent?: number; volume?: number; currency?: string; exchangeName?: string; listingExchangeName?: string; lastUpdated?: number; previousClose?: number }): ScreenerQuote {
+/**
+ * A trending row from its quote: Last and Chg% are the regular session, as
+ * `ticker` reads it, and a pre-market or after-hours print rides beside them.
+ */
+export function screenerQuoteFromQuote(symbol: string, quote: Quote): MoverQuote {
+  const headline = getRegularSessionDisplay(quote)!;
   return {
     symbol,
     name: quote.name ?? symbol,
-    price: screenerNumber(quote.price),
-    change: screenerNumber(quote.change),
-    changePercent: screenerNumber(quote.changePercent),
+    price: screenerNumber(headline.price),
+    change: screenerNumber(headline.change),
+    changePercent: screenerNumber(headline.changePercent),
     volume: screenerVolume(quote.volume),
     avgVolume: null,
     volumeRatio: null,
@@ -169,6 +238,7 @@ export function screenerQuoteFromQuote(symbol: string, quote: { name?: string; p
     exchange: quote.listingExchangeName ?? quote.exchangeName ?? "",
     lastUpdated: quote.lastUpdated,
     previousClose: screenerNumber(quote.previousClose) ?? undefined,
+    extended: moverExtended(quote),
   };
 }
 
@@ -198,21 +268,35 @@ export function formatMoverPrice(price: number | null, currency: string, referen
 }
 
 /** Keyed by the overlaid row, which the shared overlay keeps while its quote holds. */
-const convertedOverlays = new WeakMap<ScreenerQuote, ScreenerQuote>();
+const convertedOverlays = new WeakMap<ScreenerQuote, MoverQuote>();
 
-/** Range endpoints and the previous close belong to the original screener price denomination. */
+/**
+ * Live quotes on the list's rows, which keep the list's order. Price and
+ * change are the regular session's, as `ticker` reads them, so after the
+ * close they hold at it and a pre-market or after-hours print is the row's
+ * `extended`. Range endpoints and the previous close belong to the original
+ * screener price denomination.
+ */
 export function overlayMarketMoverQuotes(
-  rows: readonly ScreenerQuote[],
+  rows: readonly MoverQuote[],
   entries: ReadonlyMap<string, QueryEntry<Quote>>,
-): ScreenerQuote[] {
+): MoverQuote[] {
   return overlayScreenerQuoteEntries(rows, entries).map((row, index) => {
     const original = rows[index]!;
     if (row === original) return row;
     const cached = convertedOverlays.get(row);
     if (cached) return cached;
     const convert = (value: number | undefined) => convertScreenerPriceUnit(value, original.currency, row.currency);
+    const quote = resolveEntryData(entries.get(buildQuoteKey({ symbol: row.symbol, exchange: row.exchange })));
+    const headline = quote ? getRegularSessionDisplay(quote) : null;
     const converted = {
       ...row,
+      ...(quote && headline ? {
+        price: headline.price,
+        change: isFiniteNumber(headline.change) ? headline.change : null,
+        changePercent: isFiniteNumber(headline.changePercent) ? headline.changePercent : null,
+        extended: moverExtended(quote),
+      } : {}),
       fiftyTwoWeekLow: convert(original.fiftyTwoWeekLow),
       fiftyTwoWeekHigh: convert(original.fiftyTwoWeekHigh),
       dayLow: convert(original.dayLow),

package/src/plugins/builtin/market-movers/screener.ts

@@ -8,7 +8,9 @@ import type {
   CloudMarketScreenerCategory,
   CloudMarketScreenerItem,
   CloudMarketScreenerPayload,
+  CloudMoverSessionFields,
 } from "../../../api-client/types";
+import type { MarketState } from "../../../types/financials";
 import { hasProAccess } from "../../../api-client/plan-access";
 
 const CACHE_KIND = "market-screener";
@@ -184,6 +186,32 @@ export function convertScreenerPriceUnit(value: number | undefined, from: string
     ? value / source.divisor * target.divisor : undefined;
 }
 
+const MARKET_STATES = new Set<string>(["PRE", "REGULAR", "POST", "PREPRE", "POSTPOST", "CLOSED"] satisfies MarketState[]);
+const SESSION_NUMBERS = [
+  "regularClose", "regularChange", "regularChangePercent",
+  "preMarketPrice", "preMarketChange", "preMarketChangePercent",
+  "postMarketPrice", "postMarketChange", "postMarketChangePercent",
+] as const;
+const isSessionDate = (value: unknown): value is string => typeof value === "string" && /^\d{4}-\d{2}-\d{2}$/.test(value);
+
+/**
+ * A row's quote sessions as the server sends them beside its live print, or
+ * undefined when it sends none (an older server), so the row reads as it came.
+ */
+function parseScreenerSessions(row: Record<string, unknown>): CloudMoverSessionFields | undefined {
+  if (typeof row.marketState !== "string" || !MARKET_STATES.has(row.marketState)) return undefined;
+  const sessions: CloudMoverSessionFields = { marketState: row.marketState as MarketState };
+  if (isSessionDate(row.changeSessionDate)) sessions.changeSessionDate = row.changeSessionDate;
+  for (const key of SESSION_NUMBERS) {
+    const value = screenerNumber(row[key]);
+    if (value != null) sessions[key] = value;
+  }
+  if (sessions.regularClose != null && isSessionDate(row.regularCloseSessionDate)) {
+    sessions.regularCloseSessionDate = row.regularCloseSessionDate;
+  }
+  return sessions;
+}
+
 /** Validate numeric fields at the API boundary so absent values stay unavailable. */
 export function parseScreenerResponse(data: unknown): ScreenerQuote[] {
   if (!data || typeof data !== "object" || !("quotes" in data) || !Array.isArray(data.quotes)) {
@@ -202,6 +230,7 @@ export function parseScreenerResponse(data: unknown): ScreenerQuote[] {
       dayHigh: screenerNumber(q.dayHigh) ?? undefined, dayLow: screenerNumber(q.dayLow) ?? undefined,
       previousClose: screenerNumber(q.previousClose) ?? undefined, exchange: typeof q.exchange === "string" ? q.exchange : "",
       lastUpdated: typeof q.lastUpdated === "number" && Number.isFinite(q.lastUpdated) && q.lastUpdated > 0 ? q.lastUpdated : undefined,
+      sessions: parseScreenerSessions(q),
     }];
   });
 }
@@ -274,6 +303,8 @@ function mergeCloudScreenerItem(
     dayLow: screenerNumber(item.dayLow) ?? metadataPrice(metadata?.dayLow),
     exchange: item.exchange || metadata?.exchange || "",
     lastUpdated: item.lastUpdated,
+    previousClose: screenerNumber(item.previousClose) ?? undefined,
+    sessions: parseScreenerSessions(item as unknown as Record<string, unknown>),
   };
 }
 

package/src/plugins/builtin/market-movers/table.ts

@@ -1,9 +1,11 @@
 import type { DataTableCell } from "../../../components";
+import { getTableWidth } from "../../../components/ui/table-layout";
 import { TextAttributes } from "../../../ui";
 import { colors, priceColor } from "../../../theme/colors";
 import { formatCompact, formatPercentRaw } from "../../../utils/format";
+import { marketStateLabel, type ExtendedSession } from "../../../market-data/market/status";
 import type { MarketMoverColumn, MarketMoverRow } from "./model";
-import { fiftyTwoWeekPositionPercent, formatMoverPrice, moverReferencePrice } from "./model";
+import { fiftyTwoWeekPositionPercent, formatMoverPrice, moverExtendedMove, moverReferencePrice } from "./model";
 
 export function formatVolRatio(ratio: number | null): string {
   if (ratio == null || !Number.isFinite(ratio) || ratio < 0) return "—";
@@ -22,30 +24,45 @@ function fiftyTwoWeekPosition(price: number | null, low: number | undefined, hig
   return pct == null ? "—" : `${Math.round(pct)}%`;
 }
 
-export function buildMarketMoverColumns(width: number): MarketMoverColumn[] {
-  const rankWidth = 3;
-  const tickerWidth = 8;
-  const priceWidth = 11;
-  const chgWidth = 9;
-  const volWidth = 8;
-  const volRatioWidth = 6;
-  const rangeWidth = 6;
-  const mcapWidth = 8;
-  const columnCount = 9;
-  const fixedWidth = rankWidth + tickerWidth + priceWidth + chgWidth + volWidth + volRatioWidth + rangeWidth + mcapWidth;
-  const nameWidth = Math.max(6, width - 2 - columnCount - fixedWidth);
+const EXTENDED_COLUMN_WIDTH = 9;
+/** With an extended column, a narrow pane drops MCAP, then 52W%, before the name gets narrower than this. */
+const EXTENDED_MIN_NAME_WIDTH = 12;
 
-  return [
-    { id: "rank", label: "#", width: rankWidth, align: "left" },
-    { id: "symbol", label: "TICKER", width: tickerWidth, align: "left" },
-    { id: "name", label: "NAME", width: nameWidth, align: "left" },
-    { id: "price", label: "LAST", width: priceWidth, align: "right" },
-    { id: "changePercent", label: "CHG%", width: chgWidth, align: "right" },
-    { id: "volume", label: "VOL", width: volWidth, align: "right" },
-    { id: "volumeRatio", label: "V/AVG", width: volRatioWidth, align: "right" },
-    { id: "range", label: "52W%", width: rangeWidth, align: "right" },
-    { id: "marketCap", label: "MCAP", width: mcapWidth, align: "right" },
+/**
+ * The list's columns at `width`. A pre-market or after-hours column follows
+ * CHG% for each session in `extendedSessions`; to make room for it a narrow
+ * pane gives up MCAP, then 52W%, before it cuts the names short.
+ */
+export function buildMarketMoverColumns(width: number, extendedSessions: readonly ExtendedSession[] = []): MarketMoverColumn[] {
+  const lead: MarketMoverColumn[] = [
+    { id: "rank", label: "#", width: 3, align: "left" },
+    { id: "symbol", label: "TICKER", width: 8, align: "left" },
   ];
+  const quote: MarketMoverColumn[] = [
+    { id: "price", label: "LAST", width: 11, align: "right" },
+    { id: "changePercent", label: "CHG%", width: 9, align: "right" },
+    ...extendedSessions.map((session): MarketMoverColumn => ({
+      id: session === "PRE" ? "preMarket" : "afterHours",
+      // Named for the session it trades in, as the header labels it.
+      label: marketStateLabel(session),
+      width: EXTENDED_COLUMN_WIDTH,
+      align: "right",
+    })),
+  ];
+  const trailing: MarketMoverColumn[] = [
+    { id: "volume", label: "VOL", width: 8, align: "right" },
+    { id: "volumeRatio", label: "V/AVG", width: 6, align: "right" },
+    { id: "range", label: "52W%", width: 6, align: "right" },
+    { id: "marketCap", label: "MCAP", width: 8, align: "right" },
+  ];
+  // Measured the way the table draws them (a header and its sort mark widen a
+  // column, gaps between them); the name adds its own width and a gap.
+  const nameRoom = () => width - getTableWidth([...lead, ...quote, ...trailing]) - 1;
+  for (const id of ["marketCap", "range"] as const) {
+    if (extendedSessions.length === 0 || nameRoom() >= EXTENDED_MIN_NAME_WIDTH) break;
+    trailing.splice(trailing.findIndex((column) => column.id === id), 1);
+  }
+  return [...lead, { id: "name", label: "NAME", width: Math.max(6, nameRoom()), align: "left" }, ...quote, ...trailing];
 }
 
 export function renderMarketMoverCell(
@@ -71,6 +88,16 @@ export function renderMarketMoverCell(
         value: row.changePercent,
         color: priceColor(row.changePercent ?? 0),
       };
+    case "preMarket":
+    case "afterHours": {
+      // The extended print's move from the close in LAST.
+      const move = moverExtendedMove(row, column.id === "preMarket" ? "PRE" : "POST");
+      return {
+        text: formatPercentRaw(move ?? undefined),
+        value: move,
+        color: move == null ? colors.textDim : priceColor(move),
+      };
+    }
     case "volume":
       return { text: formatCompact(row.volume ?? undefined, { fixedDecimals: true }), value: row.volume, color: colors.textDim };
     case "volumeRatio":