gloomberb 0.9.7 → 0.9.8

package/src/market-data/request-types.ts

@@ -12,6 +12,10 @@ export interface InstrumentRef {
   instrument?: BrokerContractRef | null;
 }
 
+export interface TickerInstrumentOptions {
+  portfolioId?: string | null;
+}
+
 type ChartGranularity = "range" | "detail" | "resolution";
 
 export interface ChartRequest {
@@ -39,10 +43,44 @@ export interface SecFilingsRequest {
   count?: number;
 }
 
-export function instrumentFromTicker(ticker: TickerRecord | null | undefined, fallbackSymbol?: string | null): InstrumentRef | null {
+function brokerContractForTicker(
+  ticker: TickerRecord | null | undefined,
+  options: TickerInstrumentOptions = {},
+): BrokerContractRef | null {
+  const contracts = ticker?.metadata.broker_contracts ?? [];
+  if (contracts.length === 0) return null;
+
+  const portfolioId = options.portfolioId;
+  if (portfolioId) {
+    const positions = ticker?.metadata.positions.filter((position) => position.portfolio === portfolioId) ?? [];
+    for (const position of positions) {
+      const matchingContract = contracts.find((contract) => (
+        (position.brokerContractId == null || contract.conId === position.brokerContractId)
+        && (!position.brokerInstanceId || contract.brokerInstanceId === position.brokerInstanceId)
+        && (!position.broker || contract.brokerId === position.broker)
+      ));
+      if (matchingContract) return matchingContract;
+    }
+    for (const position of positions) {
+      const matchingContract = contracts.find((contract) => (
+        (!position.brokerInstanceId || contract.brokerInstanceId === position.brokerInstanceId)
+        && (!position.broker || contract.brokerId === position.broker)
+      ));
+      if (matchingContract) return matchingContract;
+    }
+  }
+
+  return contracts[0] ?? null;
+}
+
+export function instrumentFromTicker(
+  ticker: TickerRecord | null | undefined,
+  fallbackSymbol?: string | null,
+  options: TickerInstrumentOptions = {},
+): InstrumentRef | null {
   const symbol = ticker?.metadata.ticker ?? fallbackSymbol ?? null;
   if (!symbol) return null;
-  const instrument = ticker?.metadata.broker_contracts?.[0] ?? null;
+  const instrument = brokerContractForTicker(ticker, options);
   return {
     symbol,
     exchange: ticker?.metadata.exchange ?? "",
@@ -56,8 +94,9 @@ export function quoteSubscriptionTargetFromTicker(
   ticker: TickerRecord | null | undefined,
   fallbackSymbol?: string | null,
   route: QuoteSubscriptionTarget["route"] = "auto",
+  options: TickerInstrumentOptions = {},
 ): QuoteSubscriptionTarget | null {
-  const instrument = instrumentFromTicker(ticker, fallbackSymbol);
+  const instrument = instrumentFromTicker(ticker, fallbackSymbol, options);
   return quoteSubscriptionTargetFromInstrument(instrument, route);
 }
 

package/src/plugins/builtin/account-management/footer.ts

@@ -8,22 +8,19 @@ export function useAccountManagementFooter({
   draft,
   hasSession,
   message,
-  openPasswordDialog,
   profile,
   saveProfile,
 }: {
-  busy: "profile" | "password" | null;
+  busy: "profile" | "password" | "alerts" | "billing" | "delete" | null;
   draft: AccountDraft;
   hasSession: boolean;
   message: { tone: "info" | "success" | "error"; text: string } | null;
-  openPasswordDialog: () => void;
   profile: AccountProfile | null;
   saveProfile: () => Promise<void>;
 }) {
   const footerHints = useMemo<PaneHint[]>(() => [
     { id: "save", key: "Ctrl+S", label: "save", onPress: () => { void saveProfile(); }, disabled: !!busy || !hasSession },
-    { id: "password", key: "p", label: "assword", onPress: openPasswordDialog, disabled: !!busy || !hasSession },
-  ], [busy, hasSession, openPasswordDialog, saveProfile]);
+  ], [busy, hasSession, saveProfile]);
 
   usePaneFooter("account-management", () => ({
     info: [

package/src/plugins/builtin/account-management/form-components.tsx

@@ -1,8 +1,9 @@
-import { useState, type ReactNode } from "react";
-import { TextField } from "../../../components";
-import { Box, Text, TextAttributes } from "../../../ui";
-import { colors, hoverBg } from "../../../theme/colors";
-import type { AccountFieldKey } from "./model";
+import { type ReactNode } from "react";
+import { Button, Checkbox, TextField, type ChoiceDialogChoice } from "../../../components";
+import { Box, Text, TextAttributes, useUiHost } from "../../../ui";
+import { colors } from "../../../theme/colors";
+import { NativeSelect, type NativeSelectElement } from "../../../components/ui/native-select";
+import type { AccountFieldKey, ProfileAnalyticsPreview } from "./model";
 import { truncate } from "./model";
 
 export function AccountTextField({
@@ -31,14 +32,30 @@ export function AccountTextField({
   onSubmit?: () => void;
 }) {
   const active = activeField === fieldKey;
+  const labelWidth = accountFieldLabelWidth(width);
+  const inputWidth = Math.max(8, width - labelWidth - 1);
+  const labelText = `${active ? "> " : "  "}${label}`;
   return (
-    <Box onMouseDown={() => onFocus(fieldKey)}>
+    <Box
+      height={1}
+      width={width}
+      flexDirection="row"
+      alignItems="center"
+      gap={1}
+      onMouseDown={() => onFocus(fieldKey)}
+    >
+      <Text
+        width={labelWidth}
+        fg={active ? colors.textBright : colors.textDim}
+        attributes={active ? TextAttributes.BOLD : 0}
+      >
+        {truncate(labelText, labelWidth)}
+      </Text>
       <TextField
-        label={`${active ? "> " : "  "}${label}`}
         value={value}
         placeholder={placeholder}
         focused={focused && active}
-        width={width}
+        width={inputWidth}
         type={type}
         onChange={onChange}
         onSubmit={onSubmit}
@@ -48,6 +65,11 @@ export function AccountTextField({
   );
 }
 
+export function accountFieldLabelWidth(width: number) {
+  const preferred = width >= 28 ? 16 : Math.max(10, Math.floor(width * 0.42));
+  return Math.max(8, Math.min(preferred, width - 9));
+}
+
 export function FieldRow({
   twoColumns,
   children,
@@ -127,30 +149,244 @@ export function CheckboxRow({
   onFocus: () => void;
   onChange: (checked: boolean) => void;
 }) {
-  const [hovered, setHovered] = useState(false);
-  const marker = checked ? "x" : " ";
-  const fg = active ? colors.textBright : colors.text;
-
+  const labelText = `${active ? "> " : "  "}${label}`;
+  const labelWidth = Math.min(
+    width - 9,
+    Math.max(accountFieldLabelWidth(width), Math.min(labelText.length, 34)),
+  );
+  const controlWidth = Math.max(8, width - labelWidth - 1);
   return (
     <Box
       flexDirection="column"
-      backgroundColor={hovered ? hoverBg() : undefined}
-      onMouseOver={() => {
-        setHovered(true);
-        onFocus();
-      }}
-      onMouseOut={() => setHovered(false)}
-      onMouseDown={() => {
+      width={width}
+      onMouseOver={onFocus}
+      onMouseDown={(event?: { preventDefault?: () => void; stopPropagation?: () => void }) => {
+        event?.preventDefault?.();
+        event?.stopPropagation?.();
         onFocus();
         onChange(!checked);
       }}
     >
-      <Text fg={fg} attributes={active ? TextAttributes.BOLD : 0}>
-        {`${active ? "> " : "  "}[${marker}] ${label}`}
-      </Text>
+      <Box height={1} flexDirection="row" alignItems="center" gap={1}>
+        <Text
+          width={labelWidth}
+          fg={active ? colors.textBright : colors.textDim}
+          attributes={active ? TextAttributes.BOLD : 0}
+        >
+          {truncate(labelText, labelWidth)}
+        </Text>
+        <Checkbox
+          label={label}
+          displayLabel={checked ? "On" : "Off"}
+          checked={checked}
+          active={false}
+          width={controlWidth}
+          variant="desktop"
+          onChange={(nextChecked) => {
+            onFocus();
+            onChange(nextChecked);
+          }}
+        />
+      </Box>
       {description ? (
-        <Text fg={colors.textMuted} wrapText width={Math.max(24, width - 2)}>
-          {description}
+        <Box height={1} flexDirection="row" gap={1}>
+          <Box width={labelWidth} />
+          <Text fg={colors.textMuted} wrapText width={controlWidth}>
+            {description}
+          </Text>
+        </Box>
+      ) : null}
+    </Box>
+  );
+}
+
+function metricColor(tone: ProfileAnalyticsPreview["metrics"][number]["tone"]): string {
+  if (tone === "positive") return colors.positive;
+  if (tone === "negative") return colors.negative;
+  if (tone === "muted") return colors.textMuted;
+  return colors.text;
+}
+
+export function AccountAnalyticsPreview({
+  preview,
+  width,
+  disclaimer,
+  surface = "panel",
+}: {
+  preview: ProfileAnalyticsPreview;
+  width: number;
+  disclaimer?: string | null;
+  surface?: "panel" | "plain";
+}) {
+  const horizontalPadding = surface === "panel" ? 1 : 0;
+  const contentWidth = Math.max(1, width - horizontalPadding * 2);
+  const metricWidth = Math.max(14, Math.min(28, Math.floor((contentWidth - 2) / 2)));
+  const subtitleWidth = Math.max(1, contentWidth - preview.title.length - 2);
+  const showHeader = surface === "panel";
+
+  return (
+    <Box
+      flexDirection="column"
+      width={width}
+      backgroundColor={surface === "panel" ? colors.panel : undefined}
+      paddingX={horizontalPadding}
+    >
+      {showHeader ? (
+        <Box height={1} flexDirection="row">
+          <Text fg={colors.textBright} attributes={TextAttributes.BOLD}>
+            {truncate(preview.title, contentWidth)}
+          </Text>
+          {preview.subtitle ? (
+            <>
+              <Box flexGrow={1} />
+              <Text fg={colors.textMuted}>{truncate(preview.subtitle, subtitleWidth)}</Text>
+            </>
+          ) : null}
+        </Box>
+      ) : null}
+      {preview.metrics.length > 0 ? (
+        <Box flexDirection="row" flexWrap="wrap" gap={2}>
+          {preview.metrics.map((metric) => {
+            const labelWidth = Math.max(1, Math.min(metric.label.length, metricWidth - 2));
+            const valueWidth = Math.max(1, metricWidth - labelWidth - 1);
+            const detailWidth = Math.max(0, metricWidth - labelWidth - metric.value.length - 2);
+            return (
+              <Box key={metric.id} width={metricWidth} height={1} flexDirection="row" gap={1}>
+                <Text fg={colors.textDim}>{truncate(metric.label, labelWidth)}</Text>
+                <Text fg={metricColor(metric.tone)} attributes={TextAttributes.BOLD}>
+                  {truncate(metric.value, valueWidth)}
+                </Text>
+                {metric.detail ? (
+                  <Text fg={colors.textMuted}>
+                    {truncate(metric.detail, detailWidth)}
+                  </Text>
+                ) : null}
+              </Box>
+            );
+          })}
+        </Box>
+      ) : preview.subtitle ? (
+        <Text fg={colors.textMuted} wrapText width={contentWidth}>
+          {preview.subtitle}
+        </Text>
+      ) : null}
+      {disclaimer ? (
+        <Text fg={colors.textMuted} wrapText width={contentWidth}>
+          {disclaimer}
+        </Text>
+      ) : null}
+    </Box>
+  );
+}
+
+export function PublicAnalyticsGroup({
+  preview,
+  choices,
+  value,
+  label,
+  detail,
+  active,
+  width,
+  disclaimer,
+  selectRef,
+  onFocus,
+  onSelect,
+  onOpen,
+}: {
+  preview: ProfileAnalyticsPreview;
+  choices: ChoiceDialogChoice[];
+  value: string;
+  label: string;
+  detail?: string;
+  active: boolean;
+  width: number;
+  disclaimer?: string | null;
+  selectRef?: (element: NativeSelectElement | null) => void;
+  onFocus: () => void;
+  onSelect: (value: string) => void;
+  onOpen: () => void;
+}) {
+  const isDesktop = useUiHost().kind === "desktop-web";
+  const contentWidth = Math.max(1, width - 2);
+  const labelText = active ? "> Public Stats:" : "  Public Stats:";
+  const labelWidth = Math.min(accountFieldLabelWidth(width), Math.max(1, contentWidth));
+  const nativeButtonWidth = Math.max(14, Math.min(24, Math.floor(contentWidth * 0.3)));
+  const terminalMaxButtonWidth = Math.max(8, Math.min(24, contentWidth - labelWidth - 1));
+  const buttonLabel = truncate(label, Math.max(1, terminalMaxButtonWidth - 4));
+  const buttonWidth = buttonLabel.length + 4;
+  const layoutButtonWidth = isDesktop ? nativeButtonWidth : buttonWidth;
+  const nativeSelectWidth = nativeButtonWidth * 8;
+  const normalizedDetail = (detail ?? "").replace(/\.+$/, "");
+  const displayPreview = (
+    preview.metrics.length === 0
+    && normalizedDetail
+    && preview.subtitle.replace(/\.+$/, "") === normalizedDetail
+  ) ? { ...preview, subtitle: "" } : preview;
+  const metrics = displayPreview.metrics.slice(0, 2);
+  const metricAreaWidth = Math.max(0, contentWidth - labelWidth - layoutButtonWidth - 2);
+  const metricWidth = metrics.length > 0 ? Math.max(8, Math.floor((metricAreaWidth - (metrics.length - 1)) / metrics.length)) : 0;
+  const detailWidth = Math.max(0, metricAreaWidth);
+  return (
+    <Box
+      flexDirection="column"
+      width={width}
+      onMouseOver={onFocus}
+    >
+      <Box height={isDesktop ? "24px" : 1} flexDirection="row" gap={1} alignItems="center">
+        <Text fg={active ? colors.textBright : colors.textDim} attributes={active ? TextAttributes.BOLD : 0}>
+          {truncate(labelText, labelWidth)}
+        </Text>
+        {isDesktop ? (
+          <NativeSelect
+            value={value}
+            options={choices.map((choice) => ({
+              value: choice.id,
+              label: choice.label,
+              disabled: choice.disabled,
+            }))}
+            width={nativeSelectWidth}
+            height={22}
+            selectRef={selectRef}
+            onFocus={onFocus}
+            onChange={onSelect}
+          />
+        ) : (
+          <Button
+            label={`${buttonLabel} v`}
+            variant="secondary"
+            width={buttonWidth}
+            active={active}
+            onPress={() => {
+              onFocus();
+              onOpen();
+            }}
+          />
+        )}
+        {metrics.length > 0 ? metrics.map((metric) => {
+          const labelTextWidth = Math.max(1, Math.min(metric.label.length, metricWidth - 2));
+          const valueWidth = Math.max(1, metricWidth - labelTextWidth - 1);
+          return (
+            <Box key={metric.id} width={metricWidth} height={1} flexDirection="row" gap={1}>
+              <Text fg={colors.textDim}>{truncate(metric.label, labelTextWidth)}</Text>
+              <Text fg={metricColor(metric.tone)} attributes={TextAttributes.BOLD}>
+                {truncate(metric.value, valueWidth)}
+              </Text>
+            </Box>
+          );
+        }) : detail ? (
+          <Text fg={colors.textMuted}>
+            {truncate(detail, detailWidth)}
+          </Text>
+        ) : null}
+      </Box>
+      {metrics.length === 0 && displayPreview.subtitle ? (
+        <Text fg={colors.textMuted} wrapText width={contentWidth}>
+          {displayPreview.subtitle}
+        </Text>
+      ) : null}
+      {disclaimer ? (
+        <Text fg={colors.textMuted} wrapText width={contentWidth}>
+          {disclaimer}
         </Text>
       ) : null}
     </Box>

package/src/plugins/builtin/account-management/keyboard.ts

@@ -10,8 +10,11 @@ export function useAccountManagementKeyboard({
   focused,
   openPasswordDialog,
   openPortfolioDialog,
+  openUpgrade,
   saveProfile,
   setDraftValue,
+  deleteAccount,
+  turnOffEmailAlerts,
 }: {
   activeField: AccountFieldKey;
   cycleField: (delta: number) => void;
@@ -20,8 +23,11 @@ export function useAccountManagementKeyboard({
   focused: boolean;
   openPasswordDialog: () => void;
   openPortfolioDialog: () => Promise<void>;
+  openUpgrade: () => void;
   saveProfile: () => Promise<void>;
   setDraftValue: <K extends keyof AccountDraft>(key: K, value: AccountDraft[K]) => void;
+  deleteAccount: () => Promise<void>;
+  turnOffEmailAlerts: () => Promise<void>;
 }) {
   useShortcut((event) => {
     if (!focused) return;
@@ -57,6 +63,18 @@ export function useAccountManagementKeyboard({
       setDraftValue("acceptUnknownDms", !draftRef.current.acceptUnknownDms);
       return;
     }
+    if (!event.targetEditable && activeField === "weeklyRoundupEnabled" && isPlainKey(event, "space", "enter", "return")) {
+      event.preventDefault?.();
+      event.stopPropagation?.();
+      setDraftValue("weeklyRoundupEnabled", !draftRef.current.weeklyRoundupEnabled);
+      return;
+    }
+    if (!event.targetEditable && activeField === "positionAlertsEnabled" && isPlainKey(event, "space", "enter", "return")) {
+      event.preventDefault?.();
+      event.stopPropagation?.();
+      setDraftValue("positionAlertsEnabled", !draftRef.current.positionAlertsEnabled);
+      return;
+    }
     if (!event.targetEditable && activeField === "sharedPortfolioId" && isPlainKey(event, "left", "h", "[")) {
       event.preventDefault?.();
       event.stopPropagation?.();
@@ -81,10 +99,22 @@ export function useAccountManagementKeyboard({
       openPasswordDialog();
       return;
     }
-    if (!event.targetEditable && event.name === "p") {
+    if (!event.targetEditable && activeField === "upgradeAction" && isPlainKey(event, "space", "enter", "return")) {
       event.preventDefault?.();
       event.stopPropagation?.();
-      openPasswordDialog();
+      openUpgrade();
+      return;
+    }
+    if (!event.targetEditable && activeField === "deleteAccountAction" && isPlainKey(event, "space", "enter", "return")) {
+      event.preventDefault?.();
+      event.stopPropagation?.();
+      void deleteAccount();
+      return;
+    }
+    if (!event.targetEditable && activeField === "emailAlertsOffAction" && isPlainKey(event, "space", "enter", "return")) {
+      event.preventDefault?.();
+      event.stopPropagation?.();
+      void turnOffEmailAlerts();
     }
   }, { allowEditable: true });
 }

package/src/plugins/builtin/account-management/model.test.ts

@@ -1,8 +1,16 @@
 import { describe, expect, test } from "bun:test";
 import type { Portfolio, TickerRecord } from "../../../types/ticker";
-import { buildPortfolioChoices, countPortfolioHoldings, NO_PORTFOLIO_VALUE } from "./model";
+import {
+  buildPublishedProfileAnalyticsPreview,
+  buildPortfolioChoices,
+  buildProfileAnalyticsPreview,
+  computeCumulativeReturn,
+  countPortfolioHoldings,
+  getPortfolioPositionTickers,
+  NO_PORTFOLIO_VALUE,
+} from "./model";
 
-function makeTicker(symbol: string, portfolios: string[]): TickerRecord {
+function makeTicker(symbol: string, portfolios: string[], positionedPortfolios: string[] = []): TickerRecord {
   return {
     metadata: {
       ticker: symbol,
@@ -11,7 +19,13 @@ function makeTicker(symbol: string, portfolios: string[]): TickerRecord {
       name: symbol,
       portfolios,
       watchlists: [],
-      positions: [],
+      positions: positionedPortfolios.map((portfolio) => ({
+        portfolio,
+        shares: 10,
+        avgCost: 90,
+        currency: "USD",
+        broker: "manual",
+      })),
       custom: {},
       tags: [],
     },
@@ -47,8 +61,89 @@ describe("account management model", () => {
         id: "main",
         label: "Main Portfolio",
         detail: "2 tickers",
-        description: "Shares this portfolio's YTD % and SPY Beta on your public profile.",
+        description: "Shares this portfolio's 1Y return and SPY Beta on your public profile.",
       },
     ]);
   });
+
+  test("filters shared analytics tickers by actual portfolio positions", () => {
+    const tickers = new Map([
+      ["AAPL", makeTicker("AAPL", ["main"], ["main"])],
+      ["MSFT", makeTicker("MSFT", ["main"], [])],
+      ["NVDA", makeTicker("NVDA", ["other"], ["other"])],
+    ]);
+
+    expect(getPortfolioPositionTickers(tickers, "main").map((ticker) => ticker.metadata.ticker)).toEqual(["AAPL"]);
+  });
+
+  test("compounds the selected one-year return series", () => {
+    expect(computeCumulativeReturn([
+      { dateKey: "2025-06-01", value: 0.1 },
+      { dateKey: "2025-06-02", value: 0.05 },
+      { dateKey: "2025-06-03", value: -0.02 },
+    ])).toBeCloseTo(0.1319, 5);
+  });
+
+  test("builds a real public analytics preview snapshot", () => {
+    const portfolio: Portfolio = { id: "main", name: "Main Portfolio", currency: "USD" };
+    const ticker = makeTicker("AAPL", ["main"], ["main"]);
+    const preview = buildProfileAnalyticsPreview({
+      beta: 1.1,
+      portfolio,
+      portfolioTickers: [ticker],
+      selectedPortfolioId: "main",
+      oneYearReturn: 0.1,
+    });
+
+    expect(preview.status).toBe("ready");
+    expect(preview.subtitle).toBe("");
+    expect(preview.metrics).toHaveLength(2);
+    expect(preview.metrics[0]).toMatchObject({ label: "1Y", value: "+10.00%", tone: "positive" });
+    expect(preview.metrics[1]).toMatchObject({ label: "SPY Beta", value: "1.10" });
+    expect(preview.publicAnalytics).toEqual({
+      oneYearReturn: 0.1,
+      spyBeta: 1.1,
+    });
+  });
+
+  test("builds the visible profile analytics card from published account data", () => {
+    const portfolio: Portfolio = { id: "main", name: "Main Portfolio", currency: "USD" };
+    const preview = buildPublishedProfileAnalyticsPreview({
+      analytics: { oneYearReturn: 0.15, spyBeta: 1.25 },
+      draftProfilePublic: true,
+      portfolio,
+      profileLoaded: true,
+      savedProfilePublic: true,
+      savedSharedPortfolioId: "main",
+      selectedPortfolioId: "main",
+      syncing: false,
+    });
+
+    expect(preview.status).toBe("ready");
+    expect(preview.title).toBe("Main Portfolio");
+    expect(preview.metrics).toEqual([
+      { id: "one-year", label: "1Y", value: "+15.00%", tone: "positive" },
+      { id: "beta", label: "SPY Beta", value: "1.25" },
+    ]);
+    expect(preview.publicAnalytics).toEqual({ oneYearReturn: 0.15, spyBeta: 1.25 });
+  });
+
+  test("does not show stale published analytics when the selected profile portfolio is unsaved", () => {
+    const portfolio: Portfolio = { id: "new", name: "New Portfolio", currency: "USD" };
+    const preview = buildPublishedProfileAnalyticsPreview({
+      analytics: { oneYearReturn: 0.15, spyBeta: 1.25 },
+      draftProfilePublic: true,
+      portfolio,
+      profileLoaded: true,
+      savedProfilePublic: true,
+      savedSharedPortfolioId: "old",
+      selectedPortfolioId: "new",
+      syncing: false,
+    });
+
+    expect(preview.status).toBe("pending");
+    expect(preview.metrics).toEqual([]);
+    expect(preview.subtitle).toBe("Save profile to update published metrics.");
+    expect(preview.publicAnalytics).toBeNull();
+  });
 });