gloomberb 0.17.1 → 0.17.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gloomberb",
-  "version": "0.17.1",
+  "version": "0.17.3",
   "packageManager": "bun@1.3.11",
   "description": "Market research and portfolio tracker for the terminal",
   "module": "src/public/index.ts",

package/src/{plugins/builtin/cloud → account}/auth-dialog.tsx

@@ -6,13 +6,13 @@
  * hosted terminal's sign-in gate reuses.
  */
 import { useEffect, useRef, useState } from "react";
-import type { AuthUser } from "../../../api-client";
-import { DialogFrame } from "../../../components/ui/frame";
-import { useAppLanguage } from "../../../i18n/react";
-import { useDialog, type PromptContext } from "../../../ui/dialog";
-import { AuthForm, authFormTitle } from "../../../account/auth-form";
-import type { AccountMode } from "../../../account/auth-model";
-import { CloudVerificationPanel } from "../../../account/verification-panel";
+import type { AuthUser } from "../api-client";
+import { DialogFrame } from "../components/ui/frame";
+import { useAppLanguage } from "../i18n/react";
+import { useDialog, type PromptContext } from "../ui/dialog";
+import { AuthForm, authFormTitle } from "./auth-form";
+import type { AccountMode } from "./auth-model";
+import { CloudVerificationPanel } from "./verification-panel";
 
 function AuthDialog({
   initialMode,

package/src/api-client/earnings.ts

@@ -38,7 +38,9 @@ export interface EarningsReport {
   reportedAt: string | null;
   /** Fiscal quarter end month, YYYY-MM. */
   fiscalPeriod: string | null;
+  /** The company's cap as RV reads it: its latest snapshot at the regular session's price. */
   marketCap: number | null;
+  /** For an upcoming report, the consensus every earnings view shows, with `epsAnalysts` behind it. */
   epsEstimate: number | null;
   epsActual: number | null;
   epsAnalysts: number | null;
@@ -48,6 +50,8 @@ export interface EarningsReport {
   realized: EarningsRealizedMove | null;
   /** Whether the date is out, announced or projected; absent from older servers. */
   dateStatus?: EarningsDateStatus;
+  /** The reported figure's basis, null when it cannot be determined; absent from older servers. */
+  epsBasis?: EarningsEpsBasis | null;
 }
 
 export interface EarningsCalendarReport extends EarningsReport {
@@ -65,8 +69,6 @@ export interface EarningsCalendarPayload {
 
 interface EarningsHistoryReport extends EarningsReport {
   revenueActual: number | null;
-  /** Null when the basis cannot be determined; absent from older servers. */
-  epsBasis?: EarningsEpsBasis | null;
 }
 
 export interface EarningsHistoryPayload {

package/src/api-client/futures-curve.ts

@@ -30,6 +30,22 @@ export interface FuturesContractTermsPayload {
   inDelivery: boolean
   /** The newest exchange settlement confirmed for the contract, with its session. */
   settlement: { price: number; date: string } | null
+  /**
+   * For a continuous symbol (CL=F) or a front generic: the nearest contract
+   * still trading when the symbol has rolled past it to the most active one,
+   * with its last trade; null when it prices the nearest itself. Absent from
+   * servers that do not send it.
+   */
+  nearest?: FuturesNearestContract | null
+}
+
+/** The nearest contract still trading, which a continuous symbol has rolled past (CLX26 under CL=F on Dec). */
+interface FuturesNearestContract {
+  contract: string
+  contractSymbol: string
+  /** YYYY-MM */
+  deliveryMonth: string
+  lastTrade: string | null
 }
 
 /** Gloom Cloud futures prices retain provider denomination and explicit quote units. */

package/src/api-client/index.ts

@@ -12,7 +12,7 @@ import {
   parseCloudLayoutEntry,
   parseCloudLayoutList,
 } from "../layout-marketplace/cloud";
-import type { SyncSnapshot } from "../sync/types";
+import { SyncRevisionConflictError, type SyncSnapshot } from "../sync/types";
 import { withDeadline } from "../utils/async-deadline";
 import { CloudASKGApi } from "./askg";
 import { CloudAuthApi } from "./auth";
@@ -450,14 +450,24 @@ class GloomApiClient {
     return this.request<CloudSyncSnapshotResponse>("/sync/snapshot", { method: "GET" });
   }
 
+  /**
+   * `baseRevision` goes out as If-Match: the server ignores the body field and
+   * would replace a snapshot another device wrote since this one pulled. With
+   * the header it refuses that write (409), raised as SyncRevisionConflictError
+   * so the controller pulls again instead.
+   */
   async putSyncSnapshot(snapshot: SyncSnapshot, options?: { baseRevision?: number | null }): Promise<CloudSyncPushResponse> {
-    return this.request<CloudSyncPushResponse>("/sync/snapshot", {
-      method: "PUT",
-      body: JSON.stringify({
-        snapshot,
-        baseRevision: options?.baseRevision ?? null,
-      }),
-    });
+    const baseRevision = options?.baseRevision ?? null;
+    try {
+      return await this.request<CloudSyncPushResponse>("/sync/snapshot", {
+        method: "PUT",
+        ...(baseRevision !== null ? { headers: { "If-Match": String(baseRevision) } } : {}),
+        body: JSON.stringify({ snapshot, baseRevision }),
+      });
+    } catch (error) {
+      if (error instanceof ApiRequestError && error.status === 409) throw new SyncRevisionConflictError(error.message);
+      throw error;
+    }
   }
 
   async getMarketplaceLayout(

package/src/api-client/types.ts

@@ -459,10 +459,12 @@ export interface CloudPricePointPayload {
   low?: number;
   close: number;
   volume?: number;
-  /** A coin's daily bar for the UTC day still forming when served; it has no volume yet. */
+  /** A daily bar still forming when served: a coin's UTC day, or the trade date a future is trading. */
   partial?: boolean;
   /** A coin's daily bar whose prices were rebuilt from hourly bars; a day the source left empty has no volume. */
   filled?: boolean;
+  /** A future's closed session whose settlement is not confirmed yet: it closes on the last trade. */
+  unsettled?: boolean;
 }
 
 type CloudEconImpact = "high" | "medium" | "low";

package/src/app/global-shortcuts.ts

@@ -212,6 +212,16 @@ export function useAppGlobalShortcuts({
       return;
     }
 
+    // Text fields keep Cmd+Z. Everywhere else it restores the previous layout.
+    // A detached window has no layout history of its own.
+    if (action === "layout-undo" || action === "layout-redo") {
+      if (isDetachedWindow || dialogOpen || state.commandBarOpen || state.inputCaptured || event.targetEditable === true) return;
+      event.preventDefault();
+      event.stopPropagation();
+      dispatch({ type: action === "layout-undo" ? "UNDO_LAYOUT" : "REDO_LAYOUT" });
+      return;
+    }
+
     if (dialogOpen) return;
 
     if (!isDetachedWindow && action === "command-bar") {

package/src/app/keybindings/actions.ts

@@ -30,6 +30,8 @@ export type CoreKeybindingActionId =
   | "pane-share"
   | "pane-ask"
   | "layout-gallery"
+  | "layout-undo"
+  | "layout-redo"
   | "tidy-windows"
   | "window-move-mode"
   | "window-resize-mode";
@@ -62,6 +64,8 @@ export const PANE_ACTION_IDS = new Set<CoreKeybindingActionId>([
   "pane-share",
   "pane-ask",
   "layout-gallery",
+  "layout-undo",
+  "layout-redo",
   "tidy-windows",
   "window-move-mode",
   "window-resize-mode",
@@ -245,6 +249,18 @@ export const KEYBINDING_ACTIONS: readonly KeybindingActionDef[] = [
     description: "Open layout actions.",
     defaults: ["CmdOrCtrl+Shift+L"],
   },
+  {
+    id: "layout-undo",
+    category: "Pane Management",
+    description: "Undo the last layout change.",
+    defaults: ["CmdOrCtrl+Z"],
+  },
+  {
+    id: "layout-redo",
+    category: "Pane Management",
+    description: "Redo the last undone layout change.",
+    defaults: ["CmdOrCtrl+Shift+Z"],
+  },
   {
     id: "tidy-windows",
     category: "Pane Management",

package/src/app/runtime/desktop-deeplink.ts

@@ -11,7 +11,7 @@ import {
 import type { DesktopDeepLinkBridge } from "../../types/desktop-deeplink";
 import type { DesktopWindowBridge } from "../../types/desktop-window";
 import { requestAccountManagementTab } from "../../plugins/builtin/account-management/navigation";
-import { openTeamPane } from "../../plugins/builtin/cloud/team/pane-request";
+import { openTeamPane } from "../../team/pane-request";
 import { chatController } from "../../plugins/builtin/chat/controller";
 import { getShare, type ShareRecord } from "../../shares/api";
 import { openShareLink, registerShareOpener } from "../../shares/open";

package/src/app.tsx

@@ -14,7 +14,7 @@ import { Header } from "./components/layout/header";
 import { StatusBar } from "./components/layout/status-bar";
 import { useAppChromeShown } from "./components/layout/presentation";
 import { useLinkedLayoutSync } from "./layout-marketplace/linked-sync";
-import { useTeamCollectionsSync } from "./plugins/builtin/cloud/team/collections-sync";
+import { useTeamCollectionsSync } from "./team/collections-sync";
 import { Shell } from "./components/layout/shell";
 import { DetachedPaneShell } from "./components/layout/detached-pane-shell";
 import { TransientLayoutProvider } from "./components/layout/transient-layout";

package/src/architecture/core-builtin-allowlist.json

@@ -4,11 +4,11 @@
   "src/app/global-shortcuts.ts": ["help"],
   "src/app/pane-runtime/plugin-bindings.ts": ["broker-manager","layout-manager"],
   "src/app/runtime/broker-import.ts": ["portfolio-list"],
-  "src/app/runtime/desktop-deeplink.ts": ["account-management","chat","cloud"],
+  "src/app/runtime/desktop-deeplink.ts": ["account-management","chat"],
   "src/app/runtime/startup.ts": ["chat"],
   "src/cli/commands/market.ts": ["holders","insider","research","sec"],
   "src/cli/commands/options-chain.ts": ["options","options-calculator"],
-  "src/cli/commands/options-leaps.ts": ["options","vol-surface"],
+  "src/cli/commands/options-leaps.ts": ["iv-history","options","vol-surface"],
   "src/cli/commands/overview.ts": ["correlation","econ","market-movers","sectors","world-indices"],
   "src/cli/commands/ticker.ts": ["notes"],
   "src/cli/desktop-pane-shot.ts": ["market-valuation","time-sales"],
@@ -24,21 +24,16 @@
   "src/components/command-bar/routes/root/command-items.ts": ["portfolio-list"],
   "src/components/command-bar/routes/root/help-items.ts": ["help"],
   "src/components/command-bar/routes/root/shortcut-items.ts": ["portfolio-list"],
-  "src/components/command-bar/workflow/builtin.ts": ["cloud","portfolio-list"],
-  "src/components/command-bar/workflow/collection-actions.ts": ["cloud","portfolio-list"],
+  "src/components/command-bar/workflow/builtin.ts": ["portfolio-list"],
+  "src/components/command-bar/workflow/collection-actions.ts": ["portfolio-list"],
   "src/components/command-bar/workflow/ops.ts": ["correlation","portfolio-list","ticker-detail"],
   "src/components/command-bar/workflow/tickers.ts": ["portfolio-list"],
-  "src/components/feedback-dialog.tsx": ["cloud"],
   "src/components/form-modal/routes.ts": ["portfolio-list"],
   "src/components/index.ts": ["portfolio-list"],
   "src/components/layout/shell/index.tsx": ["cloud"],
-  "src/components/layout/status-bar-groups.ts": ["cloud"],
-  "src/components/layout/status-bar.tsx": ["cloud"],
   "src/components/onboarding/use-onboarding-upgrade.ts": ["chat"],
   "src/components/onboarding/wizard-model.ts": ["portfolio-list"],
   "src/components/onboarding/wizard-positions.ts": ["portfolio-list"],
-  "src/layout-marketplace/gallery.tsx": ["cloud"],
-  "src/layout-marketplace/linked-sync.ts": ["cloud"],
   "src/layout/desks.ts": ["chart-composer"],
   "src/plugins/catalog-browser.ts": ["alerts","analytics","attention","awards","backtest","bond-calculator","catalysts","cds","central-bank-rates","changelog","chart-composer","clinical-trials","cloud","comment-letters","commodities-energy","commodity-balances","company-attention","company-kpis","connections","correlation","cot","cpi","credit-boards","credit-conditions","credit-documents","crypto-board","debt-maturities","dividend-yield","docs","doe","earnings-calls","earnings-ripple","econ","econ-statistics","equity-screener","estimate-revisions","executives","exposure","fear-greed","filing-events","fixed-income","futures","futures-curve","fx-matrix","gpu","help","insider","ipo-calendar","iv-history","jobs","jodi","kelly-sizer","layout-manager","macro-day","market-halts","market-heatmap","market-valuation","members","mna","money-markets","news","openfda","options","options-calculator","options-positioning","options-scenario","pe-band","perps","portfolio-list","power","primary-dealers","rate-path","realized-vol","relative-rotation","research","research-search","revenue-breakdown","reverse-dcf","risk-factors","scanner","seasonality","sec","sectors","short-interest","short-volume","social-mentions","supply-chain","ticker-detail","time-sales","trace-bonds","treasury-auctions","treasury-daily","vol-surface","volatility","world-indices","world-venue-map","yield-curve"],
   "src/plugins/catalog-ui.ts": ["alerts","clinical-trials","cloud","comment-letters","custom-view","fear-greed","ipo-calendar","market-halts","market-heatmap","members","news","notes","openfda","research-search"],

package/src/cli/commands/market.ts

@@ -24,6 +24,7 @@ import { withCliServices, withMarketData } from "../context";
 import { isoDate, parsePositiveInt, requireOneArg, takeFlag, takeOption } from "./command-utils";
 import type { BuiltinCliCommandDef } from "../command-options";
 import { CLI_COMMAND_GROUPS, TABLE_SECTION_OPTION } from "../help";
+import { CLI_EXIT_CODES } from "../exit-codes";
 import {
   formatChangePercentCell,
   formatCountCell,
@@ -44,7 +45,9 @@ import {
 import { getPublishedUsEquityCalendarYears, getPublishedUsEquitySession } from "../../market-data/published-us-sessions";
 import { isQuoteStaleForCurrentSession } from "../../market-data/quotes/freshness";
 import { isOptionsUnavailableError, listedOptionsAlternative, optionsUnavailableTitle } from "../../market-data/options-alternatives";
-import { cliFuturesContract, futuresContractMetrics, fundamentalsReportTables, renderFundamentalsReport } from "./ticker";
+import {
+  cliFuturesContract, futuresContractMetrics, fundamentalsReportTables, loadForwardYieldDeclarations, renderFundamentalsReport,
+} from "./ticker";
 import type { FuturesContractTermsPayload } from "../../api-client/futures-curve";
 import { futuresSettleText, isFuturesInstrument } from "../../market-data/futures-contract";
 import {
@@ -55,18 +58,20 @@ import {
   formatOptionDeltaCell,
   formatOptionIvCell,
   formatOptionQuoteCell,
-  missingExpiryMessage,
   OPTION_MODEL_RATE,
   OPTIONS_USAGE,
   optionRows,
   optionsBasisFields,
   optionsBasisFootnote,
   parseOptionExpiration,
-  requestListedOpenInterest,
   valueChainAtModelSpot,
   type OptionsChainBasis,
 } from "./options-chain";
-import { DEFAULT_LEAPS_CRITERIA, LEAPS_USAGE, parseLeapsCriteria, runLeapsScreen, takeLeapsOptions } from "./options-leaps";
+import { missingExpiryMessage } from "../../utils/option-expiry";
+import { declaredDividends } from "../../utils/declared-dividends";
+import {
+  DEFAULT_LEAPS_CRITERIA, LEAPS_EXTRA_COLUMNS, LEAPS_USAGE, parseLeapsCriteria, runLeapsScreen, takeLeapsOptions,
+} from "./options-leaps";
 import type { CliResultColumn } from "../result";
 import type { PriceHistoryResult } from "../../types/price-history";
 import {
@@ -142,14 +147,14 @@ import { earningsCalendarFailure, earningsChoiceNote, earningsDateLabel, isListi
 import { formatBasisPoints, toBasisPoints } from "../../utils/basis-points";
 import { notATickerSymbol, providerMissReason } from "../../sources/provider-errors";
 import { isNotATickerMessage, withListingSuggestion } from "../not-a-ticker";
-import { describeSuggestion, suggestListing } from "../listing-suggestion";
-import { splitSymbolArgs } from "../symbol-args";
+import { describeSuggestion, suggestListing, suggestUsTicker, type ListingSuggestion } from "../listing-suggestion";
+import { splitSymbolArgs, uniqueSecuritySymbols } from "../symbol-args";
 import { cliPerpetualContract, perpetualContractStats, type PerpetualContractPayload } from "../perpetual-contract";
 import { subMinuteDataMessage } from "../known-gaps";
 import { secRegistrantMismatchMessage, SecRegistrantMismatchError, areDifferentCompanies } from "../../sources/sec-registrant";
 import { isCryptoPairSymbol } from "../../utils/crypto-pair";
 import { looksLikeCurrencyPair } from "../../utils/currency-pair";
-import { isUsListingExchange } from "../../utils/exchanges";
+import { canonicalExchange, isUsListingExchange } from "../../utils/exchanges";
 import { describeTickerChange, startTickerChangeLookup, tickerChangeLine, type TickerChange } from "../../tickers/ticker-changes";
 import { noSecReportsNotice, nonUsSecListingVenue } from "../../utils/sec";
 import type { MarketContext } from "../types";
@@ -207,6 +212,8 @@ type QuoteCliRecord = Omit<QuoteBatchResult, "error"> & {
   perpetualContract?: PerpetualContractPayload;
   /** The symbol changed: its issuer moved to another symbol, or its holder had another before. */
   tickerChange?: TickerChange;
+  /** A bare symbol read on a listing abroad that is one slip from a US ticker: the US ticker it was most likely typed for. */
+  usSuggestion?: ListingSuggestion;
 };
 type FinancialsCliData = TickerFinancials & {
   symbol: string;
@@ -224,9 +231,13 @@ function parseNewsFeed(value: string | undefined): NewsQuery["feed"] | undefined
   return value && VALID_NEWS_FEEDS.has(value as NewsFeed) ? value as NewsQuery["feed"] : undefined;
 }
 
-/** The symbols of a command's arguments, one each however they were separated: spaces, commas or pasted lines. */
+/**
+ * The symbols of a command's arguments, one each however they were separated
+ * (spaces, commas or pasted lines), and each security once however its case or
+ * share class was written: `AAPL aapl BRK.B BRK-B` is AAPL and BRK.B.
+ */
 function normalizeSymbols(args: string[]): string[] {
-  return splitSymbolArgs(args).map((symbol) => symbol.toUpperCase());
+  return uniqueSecuritySymbols(splitSymbolArgs(args).map((symbol) => symbol.toUpperCase()));
 }
 
 /** What JSON metadata says about the listing a command resolved. */
@@ -499,6 +510,13 @@ function corporateActionRows(data: CorporateActionsData) {
       date: event.exDate,
       detail: currency ? formatDistributionAmount(event.amount, currency) : cleanDecimal(event.amount),
     })),
+    // Declared and unpaid, at its ex-date beside the paid rows, never one of them.
+    ...declaredDividends(data).map((event) => ({
+      type: "dividend",
+      date: event.exDate,
+      detail: `declared ${currency ? formatDistributionAmount(event.amount, currency) : cleanDecimal(event.amount)}`
+        + (event.payDate ? `, payable ${event.payDate}` : ""),
+    })),
     ...data.splits.map((event) => ({
       type: "split",
       date: event.date,
@@ -563,7 +581,9 @@ async function runQuote(rawArgs: string[], ctx: Parameters<CliCommandDef["execut
     // So is whether a symbol changed (FB is now META), for the same lists.
     const changes = new Map(listings.length > MAX_CHOICE_LOOKUPS ? []
       : listings.map((listing) => [listing, startTickerChangeLookup(market.dataProvider, listing.symbol, listing.exchange)] as const));
-    const results = await market.dataProvider.getQuotesBatch(targets, { forceRefresh: ctx.cliOptions.refresh });
+    // The service's quote of the moment, not each form's local copy from whenever it was last asked for:
+    // BRK.B saved on NYSE, BRK-B and BRK.B:NYSE print one quote (GLO-735). A local copy answers only offline.
+    const results = await market.dataProvider.getQuotesBatch(targets, { forceRefresh: ctx.cliOptions.refresh, revalidate: true });
     const listingOf = (result: QuoteBatchResult, index: number) => listings[targets.indexOf(result.target)] ?? listings[index]!;
     const asked = results.map(listingOf);
     const request = { command: commandName, noun: "quote" };
@@ -590,6 +610,11 @@ async function runQuote(rawArgs: string[], ctx: Parameters<CliCommandDef["execut
     const perpetualContracts = await Promise.all(answers.map(({ result }) => commandName === "quote" && result.quote
       ? cliPerpetualContract(result.quote)
       : null));
+    // A bare symbol quoted on a listing abroad (APPL, Aptus Pharma on BSE) that is one slip from a US ticker (AAPL) says so.
+    const usSuggestions = await Promise.all(answers.map(({ result, listing, notes }) => {
+      const venue = result.quote && !listing.saved ? bareListingNote(listing, result.quote) : null;
+      return venue && notes.includes(venue) ? suggestUsTicker(listing.symbol, market) : null;
+    }));
     // Each row names its listing by key (SAN:EPA) and company, so the table needs no line above it.
     const data = answers.map(({ result, listing, failure }, index) => ({
       target: result.target,
@@ -599,6 +624,7 @@ async function runQuote(rawArgs: string[], ctx: Parameters<CliCommandDef["execut
       quote: result.quote,
       ...contracts[index] ? { futuresContract: contracts[index] } : {},
       ...perpetualContracts[index] ? { perpetualContract: perpetualContracts[index] } : {},
+      ...usSuggestions[index] ? { usSuggestion: usSuggestions[index] } : {},
       error: failure?.oneLine ?? errorMessage(result.error),
       ...yieldIndexFields(result),
       ...tickerChanges[index] ? { tickerChange: tickerChanges[index] } : {},
@@ -625,15 +651,38 @@ async function runQuote(rawArgs: string[], ctx: Parameters<CliCommandDef["execut
       freshness: quotesFreshness(data.map((row) => row.quote)),
     }, {
       rows: quoteRows,
-      details: quoteFuturesContractText,
+      details: quoteDetailsText,
       columns,
       ...(yieldsOnly ? { textColumns: columns.map((column) => column.key === "changePercent" ? { ...column, header: "Chg" } : column) } : {}),
     });
+    // The table names each symbol it found nothing for; with none found, the exit status says so too.
+    if (data.every((row) => !row.quote)) process.exitCode = CLI_EXIT_CODES.error;
   });
 }
 
 /**
- * Under the table, each futures row's Settle line and Contract block, worded
+ * Under the table: each futures row's Settle line and Contract block, then the
+ * line for a symbol that is not a US ticker though it is one slip from one.
+ */
+function quoteDetailsText(data: QuoteCliRecord[]): string {
+  return [quoteFuturesContractText(data), ...data.flatMap((row) => notUsTickerLine(row) ?? [])].filter(Boolean).join("\n\n");
+}
+
+/**
+ * "APPL is not a US ticker: it is Aptus Pharma Limited on BSE (INR). Did you
+ * mean AAPL (Apple Inc.)?", for a symbol read on a listing abroad that is one
+ * slip from a US ticker, worded as the not-a-ticker answers word it.
+ */
+function notUsTickerLine({ target, quote, listing, usSuggestion }: QuoteCliRecord): string | null {
+  if (!quote || !usSuggestion) return null;
+  const venue = canonicalExchange(quote.listingExchangeName || quote.exchangeName);
+  const name = quote.name || listing?.name;
+  const what = `${name ? `${name} on ` : ""}${venue}${quote.currency ? ` (${quote.currency})` : ""}`;
+  return cliStyles.warning(`${target.symbol} is not a US ticker: it is ${what}. Did you mean ${describeSuggestion(usSuggestion)}?`);
+}
+
+/**
+ * Each futures row's Settle line and Contract block, worded
  * as `ticker` words them. Several symbols name theirs in the block's title.
  */
 function quoteFuturesContractText(data: QuoteCliRecord[]): string {
@@ -837,16 +886,18 @@ async function runHistory(rawArgs: string[], ctx: Parameters<CliCommandDef["exec
     const flagColumn: CliResultColumn = {
       key: "flag", header: "Flag", format: (value) => typeof value === "string" ? cliStyles.warning(value) : "",
     };
-    // Text also marks a bar still forming or rebuilt from hourly bars there; exports keep them as their own fields.
+    // Text also marks a bar still forming, rebuilt from hourly bars or closing before its settlement; exports keep them as fields.
     const flagTextColumn: CliResultColumn = {
       ...flagColumn,
       format: (value, row) => [
         typeof value === "string" ? cliStyles.warning(value) : "",
         row.partial ? cliStyles.muted("partial") : "",
         row.filled ? cliStyles.muted("filled") : "",
+        row.unsettled ? cliStyles.muted("unsettled") : "",
       ].filter(Boolean).join(" "),
     };
     const marked = data.some((row) => row.partial || row.filled);
+    const unsettled = data.some((row) => row.unsettled);
     ctx.printResult({
       data,
       metadata: {
@@ -875,6 +926,7 @@ async function runHistory(rawArgs: string[], ctx: Parameters<CliCommandDef["exec
         ...priceColumns,
         flagColumn,
         ...marked ? [{ key: "partial", header: "Partial" }, { key: "filled", header: "Filled" }] : [],
+        ...unsettled ? [{ key: "unsettled", header: "Unsettled" }] : [],
         ...volume ? [{ key: "volumeUnit", header: "Volume unit" }, { key: "volumeNote", header: "Volume note" }] : [],
       ],
       // Every exported row says what it is a bar of, the currency a price is in and its bar size, so it survives head and concatenation.
@@ -932,6 +984,10 @@ async function runFinancials(rawArgs: string[], ctx: Parameters<CliCommandDef["e
       // Market cap, the multiples and the yield at the regular session price, as the text gives them; the quote stays as sent.
       const priced = atRegularSessionPrice(financials);
       const capitalization = selectMarketCapitalization(priced.quote, priced.fundamentals);
+      // A forward yield dated ahead names the declared distribution it annualizes, in the text and tables.
+      const report = ctx.cliOptions.format === "json" ? data : {
+        ...data, declaredDividends: await loadForwardYieldDeclarations(market.dataProvider, listing.request, financials.fundamentals),
+      };
       ctx.printResult({
         // JSON reads a multiple over a loss as null with its reason, never as a number.
         data: {
@@ -946,8 +1002,8 @@ async function runFinancials(rawArgs: string[], ctx: Parameters<CliCommandDef["e
         freshness,
         ...(choice.length > 0 ? { warnings: choice } : {}),
       }, {
-        text: () => renderFundamentalsReport(data, view),
-        ...(tabular ? { tables: selectTables(fundamentalsReportTables(data, view, freshness)) } : {}),
+        text: () => renderFundamentalsReport(report, view),
+        ...(tabular ? { tables: selectTables(fundamentalsReportTables(report, view, freshness)) } : {}),
         exportIdentity: { symbolOrSeries: listing.key },
       });
       return;
@@ -1472,10 +1528,9 @@ async function runOptions(rawArgs: string[], ctx: Parameters<CliCommandDef["exec
   const expiration = takeOption(args, "--expiration");
   const exchangeOption = takeOption(args, "--exchange");
   if (leapsOptions.leaps) {
-    if (expiration != null || rawArgs.includes("--expiration")) {
-      ctx.fail("--leaps reads every expiry more than a year out; drop --expiration.", `Usage: gloomberb ${LEAPS_USAGE}`);
-    }
-    const criteria = parseLeapsCriteria(leapsOptions.raw);
+    // With --leaps, --expiration is a window of one expiry.
+    const expirationGiven = expiration != null || rawArgs.some((arg) => arg === "--expiration" || arg.startsWith("--expiration="));
+    const criteria = parseLeapsCriteria({ ...leapsOptions.raw, ...expirationGiven ? { "--expiration": expiration ?? "" } : {} });
     if ("error" in criteria) ctx.fail(criteria.error, `Usage: gloomberb ${LEAPS_USAGE}`);
     const symbols = normalizeSymbols(args);
     if (symbols.length === 0) ctx.fail("--leaps needs at least one symbol.", `Usage: gloomberb ${LEAPS_USAGE}`);
@@ -1505,8 +1560,6 @@ async function runOptions(rawArgs: string[], ctx: Parameters<CliCommandDef["exec
     const quotePromise = loadListingQuote(market.dataProvider, listing);
     const fate = listingFateLoader(listing, market, quotePromise);
     const inputsPromise = loadOptionModelInputs(market.dataProvider, listing, quotePromise, refresh);
-    // OPX's listing dates the chain's open interest; asked for alongside the chain when the expiry is known.
-    const listedOpenInterest = expirationDate != null ? requestListedOpenInterest(symbol, expirationDate) : null;
     const { result, chain: loaded } = await loadForListing(listing, market, ctx, async () => {
       const cached = await market.dataProvider.getCachedQuery?.("getOptionsChain", [symbol, exchange, expirationDate, undefined])
         .load({ force: refresh });
@@ -1539,7 +1592,7 @@ async function runOptions(rawArgs: string[], ctx: Parameters<CliCommandDef["exec
     // IV and delta are valued at one spot and instant, named under the table and on every exported row.
     const { chain, spot: modelSpot } = valueChainAtModelSpot(loaded, inputs, Date.now(), identity.exchange);
     const basis: OptionsChainBasis = { spot: modelSpot, dividendYield: inputs.dividendYield ?? null,
-      openInterest: await loadOptionsChainOpenInterest(symbol, chain, listedOpenInterest) };
+      openInterest: await loadOptionsChainOpenInterest(symbol, chain) };
     const basisFields = optionsBasisFields(basis);
     const currency = [...chain.calls, ...chain.puts].find((contract) => contract.currency?.trim())?.currency.trim().toUpperCase()
       ?? quote?.currency ?? null;
@@ -1815,10 +1868,10 @@ export const marketDataCliCommands: BuiltinCliCommandDef[] = [
       options: [
         {
           flags: "--expiration <YYYY-MM-DD|unix>",
-          description: "Expiration as a date (2028-01-21) or Unix seconds; defaults to the nearest one, and lists the others",
+          description: "Expiration as a date (2028-01-21) or Unix seconds; defaults to the nearest one, and lists the others. With --leaps: rank that expiry alone",
         },
         EXCHANGE_OPTION,
-        { flags: "--leaps", description: "Rank contracts more than a year out across the symbols given, as a stock replacement" },
+        { flags: "--leaps", description: "Rank long-dated contracts across the symbols given, as a stock replacement; more than a year out unless a window says otherwise" },
         { flags: "--side <calls|puts>", description: `With --leaps: the side to rank (default ${DEFAULT_LEAPS_CRITERIA.side}s)` },
         {
           flags: "--delta <low-high>",
@@ -1829,6 +1882,17 @@ export const marketDataCliCommands: BuiltinCliCommandDef[] = [
           description: `With --leaps: widest bid/ask spread, in percent of the midpoint (default ${DEFAULT_LEAPS_CRITERIA.maxSpreadPercent})`,
         },
         { flags: "--min-oi <contracts>", description: `With --leaps: least open interest (default ${DEFAULT_LEAPS_CRITERIA.minOpenInterest})` },
+        {
+          flags: "--min-days <days>",
+          description: `With --leaps: fewest calendar days to expiry (default ${DEFAULT_LEAPS_CRITERIA.minDays}); 180 reaches six months out`,
+        },
+        { flags: "--max-days <days>", description: "With --leaps: most calendar days to expiry; --min-days 365 --max-days 730 is 12 to 24 months" },
+        { flags: "--expiry-from <YYYY-MM-DD>", description: "With --leaps: first expiry date kept; replaces the one-year floor" },
+        { flags: "--expiry-to <YYYY-MM-DD>", description: "With --leaps: last expiry date kept" },
+        {
+          flags: "--columns <list>",
+          description: `With --leaps: add figures, comma-separated: ${LEAPS_EXTRA_COLUMNS.join(", ")}`,
+        },
         {
           flags: "--sort <order>",
           description: "With --leaps: carry (extrinsic per year, lowest first; the default), spread, oi, delta, expiry or symbol",
@@ -1837,7 +1901,10 @@ export const marketDataCliCommands: BuiltinCliCommandDef[] = [
       sections: [{
         title: "LEAPS",
         lines: [
-          "--leaps reads every expiry more than a year out for each symbol and keeps the liquid contracts in the delta band, ranked by extrinsic per year: time value (midpoint less intrinsic) as a percent of spot, per year to expiry.",
+          "--leaps reads each symbol's expiries in the window and keeps the liquid contracts in the delta band, ranked by extrinsic per year: time value (midpoint less intrinsic) as a percent of spot, per year to expiry.",
+          "--min-days, --max-days, --expiry-from and --expiry-to set the window together; without a lower bound it starts a year out. Each symbol reads at most 8 expiries, the ones nearest the window's start, and a warning names any it left.",
+          "--columns adds iv (the contract's implied vol), ivr (the underlying's IV rank), cost (midpoint x 100 per contract), breakeven (at the midpoint, and its distance from spot), next-earnings, ex-dividend and carry-net "
+            + `(extrinsic per year net of the ${Number((OPTION_MODEL_RATE * 100).toFixed(2))}% rate on the strike and the dividend yield). A figure a symbol lacks is blank, with a warning.`,
           "A symbol without LEAPS, a quote or a chain is named in a warning and the others still rank. docs/research-data.md defines each figure.",
         ],
       }],
@@ -1847,6 +1914,8 @@ export const marketDataCliCommands: BuiltinCliCommandDef[] = [
         "options AAPL:NASDAQ --json",
         "options AAPL MSFT NVDA GOOGL AMZN META --leaps",
         "options SPY QQQ --leaps --side puts --delta 0.20-0.40 --csv",
+        "options MSFT --leaps --min-days 365 --max-days 730",
+        "options AAPL MSFT NVDA --leaps --min-days 180 --columns iv,ivr,cost,breakeven,carry-net",
       ],
     },
     execute: runOptions,