gloomberb 0.18.3 → 0.18.4

package/src/plugins/builtin/news/wire/news/command-bar-search.ts

@@ -7,6 +7,7 @@ import type {
   CommandBarSearchProvider,
   GloomPluginContext,
 } from "../../../../../types/plugin";
+import { abortable, settleWithin } from "../../../../../utils/async-deadline";
 import { formatFeedTime } from "../../../../../utils/datetime-format";
 import { logFailure } from "../../../../../utils/log-failure";
 import { openNewsStoryPane } from "./pop-out";
@@ -54,10 +55,19 @@ export function matchLoadedStories(
     .slice(0, limit);
 }
 
+/**
+ * How long a lookup waits for the feed to load before it answers with the
+ * stories the app already holds. The feed waits on its slowest source, so one
+ * feed that is down must not keep the command bar searching.
+ */
+const WARM_TIMEOUT_MS = 3_000;
+
 interface StorySearchDeps {
   getService(): NewsService | null;
   isSignedIn(): boolean;
   now(): number;
+  /** How long to wait for the feed to load. Default 3000. */
+  warmTimeoutMs?: number;
 }
 
 const defaultDeps: StorySearchDeps = {
@@ -66,22 +76,28 @@ const defaultDeps: StorySearchDeps = {
   now: Date.now,
 };
 
-let warming: Promise<unknown> | null = null;
+const warming = new WeakMap<NewsService, Promise<unknown>>();
 
 /**
  * Unless News Feed is open, the app may hold few stories or none, so a lookup
  * first loads the latest feed News Feed reads (the same request, delayed when
  * the account has no live news). The service keeps it for a while after, so
- * later lookups reuse it instead of asking again.
+ * later lookups reuse it instead of asking again. The wait ends when the
+ * feed has loaded, the lookup is abandoned, or `timeoutMs` passes; a load
+ * still running then carries on for the next lookup.
  */
-async function warmLatestStories(service: NewsService): Promise<void> {
+async function warmLatestStories(service: NewsService, signal: AbortSignal, timeoutMs: number): Promise<void> {
   if (service.getQueryState(NEWS_QUERY_PRESETS.feed).articles.length > 0) return;
-  warming ??= service.load(NEWS_QUERY_PRESETS.feed)
-    .catch(logFailure("news.command-bar-search", "Load news for command bar search failed", null))
-    .finally(() => {
-      warming = null;
-    });
-  await warming;
+  let loading = warming.get(service);
+  if (!loading) {
+    loading = service.load(NEWS_QUERY_PRESETS.feed)
+      .catch(logFailure("news.command-bar-search", "Load news for command bar search failed", null))
+      .finally(() => {
+        warming.delete(service);
+      });
+    warming.set(service, loading);
+  }
+  await settleWithin(abortable(loading, signal, "News lookup abandoned"), timeoutMs);
 }
 
 /**
@@ -104,7 +120,7 @@ export function createLoadedStorySearchProvider(
       if (deps.isSignedIn()) return [];
       const service = deps.getService();
       if (!service) return [];
-      await warmLatestStories(service);
+      await warmLatestStories(service, signal, deps.warmTimeoutMs ?? WARM_TIMEOUT_MS);
       if (signal.aborted) return [];
       const now = deps.now();
       return matchLoadedStories(service.listArticles(), query).map((article) => ({

package/src/plugins/builtin/news/wire/news/query-presets.ts

@@ -17,8 +17,9 @@ export type SectorNewsSelection = "all" | typeof SECTOR_NEWS_SECTORS[number];
 
 /**
  * NI codes, Bloomberg style: topics the service tags from a story's text and
- * source (`NI MNA`), and the sectors NI always had (`NI TECH`). ENERGY is a
- * topic, so it takes energy news from every sector. `LTR` is the one code that
+ * source (`NI MNA`), and the sectors NI always had (`NI TECH`). ENERGY and
+ * METALS are topics, so they take their market's news from every sector:
+ * METALS is metal prices, futures and bullion, not a miner's releases. `LTR` is the one code that
  * lists no stories: public fund and investor letters, as links.
  */
 export interface NewsIndustryCode {
@@ -34,6 +35,7 @@ export const NEWS_INDUSTRY_CODES: readonly NewsIndustryCode[] = [
   { code: "MNA", label: "M&A", topic: "mna" },
   { code: "CB", label: "Central banks", topic: "cb" },
   { code: "ENERGY", label: "Energy", topic: "energy" },
+  { code: "METALS", label: "Metals", topic: "metals" },
   { code: "REG", label: "Regulation", topic: "reg" },
   { code: "CRYPTO", label: "Crypto", topic: "crypto" },
   { code: "EARN", label: "Earnings", topic: "earn" },
@@ -58,6 +60,8 @@ const INDUSTRY_CODE_ALIASES: Record<string, string> = {
   earnings: "EARN",
   ipos: "IPO",
   regulation: "REG",
+  metal: "METALS",
+  precious_metals: "METALS",
 };
 
 function industryKey(value: string): string {

package/src/plugins/builtin/news/wire/rss/cli.ts

@@ -14,10 +14,10 @@ export const rssCliCommand: CliCommandDef = {
   },
   execute: async (args, ctx) => {
     const action = args[0] ?? "fetch";
-    if (action !== "fetch") ctx.fail("Usage: gloomberb rss fetch <url> [--name <label>]");
+    if (action !== "fetch") ctx.fail("Usage: gloom rss fetch <url> [--name <label>]");
     const rawArgs = args.slice(1);
     const name = takeOption(rawArgs, "--name") ?? "RSS";
-    const url = requireArg(rawArgs[0], "Usage: gloomberb rss fetch <url> [--name <label>]", ctx);
+    const url = requireArg(rawArgs[0], "Usage: gloom rss fetch <url> [--name <label>]", ctx);
     const capability = createRssNewsCapability([{
       id: "cli-feed",
       url,
@@ -37,7 +37,7 @@ export const rssCliCommand: CliCommandDef = {
     })) }, {
       textColumns: [
         { key: "publishedAt", header: "Published" },
-        { key: "source", header: "Source", maxWidth: 20 },
+        { key: "source", header: "Source" },
         { key: "title", header: "Title" },
         { key: "url", header: "URL", optional: true },
         { key: "summary", header: "Summary", optional: true },

package/src/plugins/builtin/notes/cli.ts

@@ -1,12 +1,14 @@
 import { apiClient } from "../../../api-client";
-import { withCliServices, withConfigData } from "../../../cli/scoped-context";
+import { withCliServices, withConfigData, withMarketData } from "../../../cli/scoped-context";
 import type { CliServicesContext } from "../../../cli/types";
 import { CLI_COMMAND_GROUPS } from "../../../cli/help";
 import { dryRunNote } from "../../../cli/helpers";
 import { requireArg, takeOption } from "../../../cli/commands/command-utils";
 import { EXCHANGE_OPTION, listingReadNotes, requireListingArg } from "../../../cli/listing-arg";
+import { isNotATickerMessage } from "../../../cli/not-a-ticker";
+import { requireQuotedListing } from "../../../cli/quote-answer";
 import { createPluginPersistence } from "../../plugin-persistence";
-import type { CliCommandDef } from "../../../types/plugin";
+import type { BuiltinCliCommandDef } from "../../../cli/command-options";
 import { cliStyles } from "../../../utils/cli-output";
 import { errorMessage } from "../../../utils/errors";
 import { logFailure } from "../../../utils/log-failure";
@@ -15,9 +17,11 @@ import { describeExportSkip, exportNotesToDirectory, type NotesExportSource } fr
 import { NotesFiles } from "./files";
 import { CloudNotesStore } from "./store";
 
-export const notesCliCommand: CliCommandDef = {
+export const notesCliCommand: BuiltinCliCommandDef = {
   name: "notes",
   description: "Read, write, or export ticker notes",
+  // A note's text is saved as typed, and an export's folder is a path; the symbol is read as any other.
+  keepsArgAsTyped: ([action], index) => (action === "set" && index >= 2) || (action === "export" && index >= 1),
   help: {
     group: CLI_COMMAND_GROUPS.portfolios,
     usage: ["notes show <symbol>", "notes set <symbol> <text...>", "notes delete <symbol>", "notes quick list", "notes export [dir]"],
@@ -28,13 +32,43 @@ export const notesCliCommand: CliCommandDef = {
     const args = [...rawArgs];
     const exchange = takeOption(args, "--exchange");
     // A note belongs to one listing: SAN:EPA, or SAN with --exchange EPA.
-    // What a typed listing was read as (7203:TSE as 7203:JPX) is said beside the note.
+    // What a typed listing was read as (7203:TSE as 7203:JPX, Apple as AAPL) is said beside the note.
     let read: { warnings?: string[] } = {};
-    const noteSymbol = async (usage: string) => {
-      const listing = await requireListingArg(requireArg(args[1], usage, ctx), exchange, ctx);
-      const notes = listingReadNotes(listing);
-      if (notes.length > 0) read = { warnings: notes };
-      return listing.key;
+    const said = (warnings: string[]) => {
+      if (warnings.length > 0) read = { warnings };
+    };
+    /**
+     * The file a note of the symbol typed is kept in, the same for show, set
+     * and delete. A note already kept under what was typed is the one, so a
+     * note written before names were read (APPLE.md) or for a symbol that
+     * stopped trading stays reachable. Otherwise the symbol is read as
+     * `quote` reads it (`requireQuotedListing`): a company's name is its
+     * listing (`Apple` is AAPL, under the bare symbol as the app keeps a
+     * ticker it was not given a venue for), and a pair its listing
+     * (USDNGN=X). With `refuse`, a definite "Not a ticker" fails the command
+     * with `quote`'s search hint, so no note is written for a symbol that
+     * does not exist. Any other failure (offline, the data service down, a
+     * symbol with no quote) keeps what was typed, as does `lookUp: false`,
+     * which opens no data source.
+     */
+    const noteSymbol = async (usage: string, notes: NotesFiles, options: { refuse?: boolean; lookUp?: boolean } = {}) => {
+      const raw = requireArg(args[1], usage, ctx);
+      const typed = await requireListingArg(raw, exchange, ctx);
+      const asTyped = () => {
+        said(listingReadNotes(typed));
+        return typed.key;
+      };
+      if ((await notes.load(typed.key).catch(logFailure("notes.cli", "Read the note kept under a typed symbol failed", ""))).trim()) return asTyped();
+      if (options.lookUp === false) return asTyped();
+      try {
+        const quoted = await withMarketData(ctx, (market) => requireQuotedListing(raw, exchange, market, ctx, `notes ${args[0] ?? "show"}`));
+        said(quoted.notes);
+        return typed.exchange ? quoted.listing.key : quoted.listing.symbol;
+      } catch (error) {
+        if (!isNotATickerMessage(errorMessage(error))) logFailure("notes.cli", "Read a note's symbol as quote does failed")(error);
+        else if (options.refuse) throw error;
+        return asTyped();
+      }
     };
     await withConfigData(ctx, async (config) => {
       const notes = new NotesFiles(config.dataDir);
@@ -96,20 +130,21 @@ export const notesCliCommand: CliCommandDef = {
       }
       if (action === "quick") {
         const subaction = args[1] ?? "list";
-        if (subaction !== "list") ctx.fail("Usage: gloomberb notes quick list");
+        if (subaction !== "list") ctx.fail("Usage: gloom notes quick list");
         const entries = await notes.loadQuickNotesIndex();
         ctx.printResult({ data: entries }, { empty: "No quick notes." });
         return;
       }
       if (action === "show") {
-        const symbol = await noteSymbol("Usage: gloomberb notes show <symbol>");
+        const symbol = await noteSymbol("Usage: gloom notes show <symbol>", notes);
         ctx.printResult({ data: { symbol, text: await notes.load(symbol) }, ...read }, {
           text: (data) => data.text?.trim() ? data.text.trimEnd() : cliStyles.muted(`No note for ${symbol}.`),
         });
         return;
       }
       if (action === "set") {
-        const symbol = await noteSymbol("Usage: gloomberb notes set <symbol> <text...>");
+        // A dry run looks nothing up: it says the note it would write under the symbol as typed.
+        const symbol = await noteSymbol("Usage: gloom notes set <symbol> <text...>", notes, { refuse: true, lookUp: !ctx.cliOptions.dryRun });
         const text = args.slice(2).join(" ");
         if (!ctx.cliOptions.dryRun) await notes.save(symbol, text);
         ctx.printResult({ data: { changed: !ctx.cliOptions.dryRun, dryRun: ctx.cliOptions.dryRun, symbol, bytes: text.length }, ...read }, {
@@ -118,7 +153,7 @@ export const notesCliCommand: CliCommandDef = {
         return;
       }
       if (action === "delete" || action === "rm") {
-        const symbol = await noteSymbol("Usage: gloomberb notes delete <symbol>");
+        const symbol = await noteSymbol("Usage: gloom notes delete <symbol>", notes);
         const existed = await notes.load(symbol).then((text) => !!text?.trim(), () => {
           // Intentional ignore: an unreadable note is still deleted, so the message says it existed.
           return true;
@@ -131,7 +166,7 @@ export const notesCliCommand: CliCommandDef = {
         });
         return;
       }
-      ctx.fail("Usage: gloomberb notes show|set|delete|quick|export");
+      ctx.fail("Usage: gloom notes show|set|delete|quick|export");
     });
   },
 };

package/src/plugins/builtin/openfda/pane.tsx

@@ -127,7 +127,7 @@ function DrugReportDetail({ record, width }: { record: DrugReport; width: number
       <KeyValueRow labelWidth={LABEL_WIDTH} label="Outcome" value={record.outcomes.length > 0 ? record.outcomes.join(", ") : record.outcome ?? "Not coded"} width={width} />
       {labelerText(record) ? <KeyValueRow labelWidth={LABEL_WIDTH} label="Labeler" value={labelerText(record)!} width={width} /> : null}
       {record.reporter ? <KeyValueRow labelWidth={LABEL_WIDTH} label="Reporter" value={record.reporter} width={width} /> : null}
-      {record.country ? <KeyValueRow labelWidth={LABEL_WIDTH} label="Country" value={record.country} width={width} /> : null}
+      {record.country ? <KeyValueRow labelWidth={LABEL_WIDTH} label="Country" value={record.country} country={record.country} width={width} /> : null}
       <KeyValueRow labelWidth={LABEL_WIDTH} label="Report" value={record.id.slice("drug:".length)} width={width} />
       <Section title="Reactions" width={width}>
         <Prose text={record.reactions.join(", ") || "None coded."} width={width} figures={false} />

package/src/plugins/builtin/options/carry.ts

@@ -4,7 +4,7 @@ import { optionSpread } from "./market-reference";
 
 /**
  * What holding a contract costs in time value, read the same way by the OMON
- * columns and the LEAPS screen (`gloomberb options --leaps`):
+ * columns and the LEAPS screen (`gloom options --leaps`):
  *
  *   intrinsic          = max(0, spot - strike) for a call, max(0, strike - spot) for a put
  *   extrinsic          = midpoint - intrinsic, the midpoint of a two-sided quote
@@ -50,7 +50,7 @@ export function optionCarry(
 
 /**
  * Extrinsic per year net of financing and dividends, a fraction of spot per
- * year (`gloomberb options --leaps --columns carry-net`):
+ * year (`gloom options --leaps --columns carry-net`):
  *
  *   call: (extrinsic - strike x rate x years + spot x dividend yield x years) / spot / years
  *   put:  (extrinsic + strike x rate x years - spot x dividend yield x years) / spot / years

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

@@ -135,7 +135,7 @@ export const optionsModule: PluginModule = {
       paneId: "options",
       label: "Options",
       description: "Options chain for the selected ticker.",
-      // Where a put seller picks the strike; OSA owns the exact put-selling phrases and ranks first on them.
+      // Where a put seller picks the strike; CSP and OSA own the exact put-selling phrases and rank first on them.
       keywords: ["options", "chain", "calls", "puts", "omon", "cash-secured puts", "selling puts", "short-put strikes", "csp strikes", "wheel strikes"],
       shortcut: "OMON",
       settings: (_symbol, _context, options) => {

package/src/plugins/builtin/options/view.tsx

@@ -8,7 +8,7 @@ import { formatMarketPrice, formatSignedMarketPrice, liveQuoteFormatOptions } fr
 import { getRegularSessionDisplay } from "../../../market-data/market/status";
 import { chainOptionContract, formatExpDate, optionContractName, resolveOptionsTarget } from "../../../utils/options";
 import {
-  expiryIsoDate, findListedExpiry, formatDaysToExpiry, daysToExpiry, missingExpiryMessage, missingExpiryText, readOptionExpiration,
+  expiryIsoDate, findListedExpiry, formatDaysToExpiry, daysToExpiry, isLiveOptionExpiry, missingExpiryMessage, missingExpiryText, readOptionExpiration,
 } from "../../../utils/option-expiry";
 import { canonicalTickerKey } from "../../../utils/exchanges";
 import { isOptionsUnavailableError, listedOptionsAlternative, optionsUnavailableTitle } from "../../../market-data/options-alternatives";
@@ -69,7 +69,7 @@ import { signedPositionDirection } from "../../../portfolio/position-metrics";
 import { optionMarketReference } from "./market-reference";
 import { useOptionsEnrichment } from "./enrichment";
 import type { OptionsEnrichmentSnapshot } from "./enrichment-model";
-import { daysToExpiryFrom, optionMid, type OptionSide } from "../shared/volatility";
+import { optionMid, type OptionSide } from "../shared/volatility";
 import type { TickerRecord } from "../../../types/ticker";
 import type { TickerFinancials } from "../../../types/financials";
 import type { IvStats } from "../iv-history/client";
@@ -269,10 +269,10 @@ export function OptionsView({ width, height, focused, nestedInTabs = false, ivRa
   const strikeWindowText = strikeWindowValue(strikeWindow);
   const initialChainEntry = useOptionsQuery(baseRequest);
   const initialChain = useResolvedEntryValue(initialChainEntry);
-  // A listing can still carry a date whose 16:00 ET close has passed. The chain
+  // A listing can still carry a date whose last session has closed. The chain
   // never opens there, nor on a saved date that has since passed: it takes the nearest live one.
   const now = Date.now();
-  const liveExpiration = (expiration: number) => daysToExpiryFrom(expiration, now) > 0;
+  const liveExpiration = (expiration: number) => isLiveOptionExpiry(expiration, now, effectiveExchange);
   const listedExpirations = initialChain?.expirationDates ?? [];
   const openingExpirations = listedExpirations.some(liveExpiration) ? listedExpirations.filter(liveExpiration) : listedExpirations;
   const initialExpiration = openingExpirations.length === 0 ? undefined : openingExpirations.reduce((best, expiration) => (
@@ -321,10 +321,10 @@ export function OptionsView({ width, height, focused, nestedInTabs = false, ivRa
   const expirationDates = useMemo(() => {
     const listed = selectedExpirationMissing
       ? [...availableExpirations, selectedExpiration!].sort((left, right) => left - right) : availableExpirations;
-    // A date that has ended has no contracts left to show; the strip leaves it out, unless every date has.
-    const current = (expiration: number) => daysToExpiry(expiration, Date.now()) >= 0;
+    // A date whose last session has closed has no contracts left to show; the strip leaves it out, unless every date has.
+    const current = (expiration: number) => isLiveOptionExpiry(expiration, Date.now(), effectiveExchange);
     return listed.some(current) ? listed.filter((expiration) => expiration === selectedExpiration || current(expiration)) : listed;
-  }, [availableExpirations, selectedExpiration, selectedExpirationMissing]);
+  }, [availableExpirations, effectiveExchange, selectedExpiration, selectedExpirationMissing]);
   // Keep the date strip stable while a mouse press focuses this pane. A new
   // tab list asks the web host to reveal the active tab and can move the date
   // being clicked before mouse-up, cancelling selection of an offscreen expiry.
@@ -444,7 +444,7 @@ export function OptionsView({ width, height, focused, nestedInTabs = false, ivRa
   const chainAsOfMs = asOfChain?.asOf ? Date.parse(asOfChain.asOf) : Number.NaN;
   const expiryAsOfMs = Number.isFinite(chainAsOfMs) ? chainAsOfMs : Date.now();
   const expiryDate = selectedExpiration == null ? "" : expiryIsoDate(selectedExpiration);
-  const expiryDays = selectedExpiration == null ? "" : formatDaysToExpiry(selectedExpiration, expiryAsOfMs);
+  const expiryDays = selectedExpiration == null ? "" : formatDaysToExpiry(selectedExpiration, expiryAsOfMs, effectiveExchange);
   useRemoteUiNode(expiryDate && chain && !expirationUnavailable ? {
     role: "report-notice",
     label: "Expiry",
@@ -474,7 +474,7 @@ export function OptionsView({ width, height, focused, nestedInTabs = false, ivRa
       ...(chainDelay > 0 ? { delayMinutes: chainDelay } : {}),
     }),
   } : null);
-  // A report of the pane (`gloomberb fn OMON`) says how many strikes it lists of how many the expiry has.
+  // A report of the pane (`gloom fn OMON`) says how many strikes it lists of how many the expiry has.
   useRemoteUiNode(strikeChain ? {
     role: "report-notice",
     label: "Strike window",
@@ -592,7 +592,7 @@ export function OptionsView({ width, height, focused, nestedInTabs = false, ivRa
   const openInterestAsOf = useMemo(() => statedOpenInterest
     ?? (strikeChain && listedOpenInterest.data ? chainOpenInterestAsOf(strikeChain, listedOpenInterest.data) : null),
   [statedOpenInterest, strikeChain, listedOpenInterest.data]);
-  // A report of the pane (`gloomberb fn OMON`) names them too.
+  // A report of the pane (`gloom fn OMON`) names them too.
   useRemoteUiNode(modelSpot ? {
     role: "report-notice",
     label: "Greeks spot",

package/src/plugins/builtin/options-calculator/headless.ts

@@ -9,18 +9,56 @@ import { createCalculatorSurfaceDependencies, loadCalculatorSurfaceVol, type Cal
 const number = (value: number) => Number.isFinite(value) ? value.toFixed(6) : "--";
 const metric = (label: string, value: number, suffix = ""): HeadlessPaneEntry => ({ label, value, formatted: `${number(value)}${suffix}` });
 
+/** What was typed for each input, by option key: the CLI's strings, a pane's settings. */
+type EnteredInputs = Readonly<Record<string, unknown>>;
+const PLAIN_DECIMAL = /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)$/;
+/** A computed number without float noise or padding: 73.15, 30, 60. */
+const plain = (value: number) => Number.isFinite(value) ? String(Number(value.toPrecision(12))) : "--";
+
+/**
+ * An input echoed as it was entered: the typed text when it was a plain
+ * decimal of this value (73.15 stays 73.15, 73.150 stays 73.150), else the
+ * number without padding. Percent inputs (`scale` 100) compare the typed
+ * percent with the decimal the model reads.
+ */
+function enteredText(entered: EnteredInputs, key: string, value: number, scale = 1): string {
+  const raw = entered[key];
+  const text = typeof raw === "string" ? raw.trim() : "";
+  if (PLAIN_DECIMAL.test(text) && Number(plain(Number(text) / scale)) === Number(plain(value))) return text.replace(/^\+/, "");
+  return plain(value * scale);
+}
+
+/** A price or day count, at the precision it was entered. */
+const input = (entered: EnteredInputs, label: string, key: string, value: number): HeadlessPaneEntry => (
+  { label, value, formatted: enteredText(entered, key, value) }
+);
+
+/** A volatility or rate in percent, as the options ask for it: 60%, never 0.600000. */
+const percentInput = (entered: EnteredInputs, label: string, key: string, value: number): HeadlessPaneEntry => {
+  const text = enteredText(entered, key, value, 100);
+  return { label, value: Number(text), unit: "%", formatted: `${text}%` };
+};
+
+/** A volatility read off the surface was not typed, so it reads to the hundredth of a point. */
+const surfacePercent = (label: string, value: number): HeadlessPaneEntry => {
+  const percent = Number((value * 100).toFixed(2));
+  return { label, value: percent, unit: "%", formatted: `${percent}%` };
+};
+
 function report(draft: OptionCalcDraft, valuation: OptionValuation | null,
   implied: { volatility: number | null; note: string | null }, surface: CalculatorSurfaceVol | null,
-  errors: string[], effectiveTreeSteps: number | null = null): HeadlessBundleResult {
+  errors: string[], effectiveTreeSteps: number | null = null, entered: EnteredInputs = {}): HeadlessBundleResult {
   const model = draft.pricingModel ?? "european";
   return {
     sections: [
       { title: "Inputs", entries: [
         ...(draft.symbol ? [{ label: "Underlying", value: draft.symbol }] : []),
         { label: "Model", value: model }, { label: "Side", value: draft.side },
-        metric("Spot", draft.spot), metric("Strike", draft.strike), metric("Days to expiry", draft.daysToExpiry),
-        metric("Volatility", draft.volatility, " decimal"), metric("Annual rate", draft.rate, " decimal"),
-        metric("Annual dividend yield", draft.dividendYield, " decimal"),
+        input(entered, "Spot", "spot", draft.spot), input(entered, "Strike", "strike", draft.strike),
+        input(entered, "Days to expiry", "days", draft.daysToExpiry),
+        surface?.volatility != null ? surfacePercent("Volatility", draft.volatility) : percentInput(entered, "Volatility", "volatility", draft.volatility),
+        percentInput(entered, "Annual rate", "rate", draft.rate),
+        percentInput(entered, "Annual dividend yield", "dividendYield", draft.dividendYield),
         ...(model === "american" ? [{ label: "Requested tree steps", value: draft.steps ?? 400 }] : []),
         ...(effectiveTreeSteps != null && effectiveTreeSteps !== (draft.steps ?? 400)
           ? [{ label: "Effective tree steps", value: effectiveTreeSteps }] : []),
@@ -68,7 +106,8 @@ export const optionsCalculatorHeadless: HeadlessPaneDefinition<"bundle"> = {
     { key: "marketPrice", aliases: ["market-price"], type: "string", description: "Observed premium per unit for implied volatility inversion" },
   ],
   async load(args, ctx) {
-    const draft = draftFromCalculatorInputs({ ...ctx.settings, ...args.options });
+    const entered = { ...ctx.settings, ...args.options };
+    const draft = draftFromCalculatorInputs(entered);
     const dividends = draft.dividends ?? [];
     if (draft.pricingModel !== "american" && dividends.some((dividend) => dividend.amount > 0)) {
       throw new Error("Discrete cash dividends require the American CRR model.");
@@ -83,7 +122,7 @@ export const optionsCalculatorHeadless: HeadlessPaneDefinition<"bundle"> = {
         spot: draft.spot, strike: draft.strike, daysToExpiry: draft.daysToExpiry, signal: ctx.signal,
       }, createCalculatorSurfaceDependencies(ctx.marketData, ctx.apiClient));
       if (surface.volatility == null || surface.error) return report(draft, null,
-        { volatility: null, note: "Surface volatility unavailable" }, surface, [surface.error ?? "Surface volatility unavailable"]);
+        { volatility: null, note: "Surface volatility unavailable" }, surface, [surface.error ?? "Surface volatility unavailable"], null, entered);
       valuedDraft = { ...draft, volatility: surface.volatility };
     }
     ctx.signal.throwIfAborted();
@@ -93,6 +132,6 @@ export const optionsCalculatorHeadless: HeadlessPaneDefinition<"bundle"> = {
     const implied = valuedDraft.marketPrice > 0 ? valuedDraft.pricingModel === "american"
       ? solveBinomialImpliedVolatility(valuedDraft, valuedDraft.marketPrice, tree)
       : solveImpliedVolatility(valuedDraft, valuedDraft.marketPrice) : { volatility: null, note: null };
-    return report(valuedDraft, valuation, implied, surface, [], effectiveTreeSteps);
+    return report(valuedDraft, valuation, implied, surface, [], effectiveTreeSteps, entered);
   },
 };