gloomberb 0.15.2 → 0.15.4

package/src/plugins/builtin/account-management/password-dialog.tsx

@@ -5,9 +5,9 @@ import { Box, Text } from "../../../ui";
 import { useDialogKeyboard, type AlertContext } from "../../../ui/dialog";
 import { colors } from "../../../theme/colors";
 import { isPlainKey } from "../../../utils/keyboard";
+import { truncateWithEllipsis } from "../../../utils/text-wrap";
 import { t } from "../../../i18n";
-import { truncate } from "./model";
-import { useFieldLabel } from "./form-components";
+import { MIN_ACCOUNT_PASSWORD_LENGTH } from "../cloud/auth-model";
 
 type PasswordDialogField = "current" | "new" | "confirm";
 
@@ -31,7 +31,7 @@ export function PasswordChangeDialog({
       setError(t("Current and new password are required."));
       return;
     }
-    if (newPassword.length < 8) {
+    if (newPassword.length < MIN_ACCOUNT_PASSWORD_LENGTH) {
       setError(t("New password must be at least 8 characters."));
       return;
     }
@@ -75,12 +75,12 @@ export function PasswordChangeDialog({
   }, { allowEditable: true });
 
   const fieldWidth = 42;
-  const fieldLabel = useFieldLabel();
   return (
     <DialogFrame title={t("Change Password")}>
       <Box flexDirection="column" gap={1}>
         <TextField
-          label={fieldLabel(t("Current Password"), activeField === "current")}
+          label={t("Current Password")}
+          active={activeField === "current"}
           value={currentPassword}
           focused={activeField === "current"}
           width={fieldWidth}
@@ -90,7 +90,8 @@ export function PasswordChangeDialog({
           onSubmit={() => setActiveField("new")}
         />
         <TextField
-          label={fieldLabel(t("New Password"), activeField === "new")}
+          label={t("New Password")}
+          active={activeField === "new"}
           value={newPassword}
           focused={activeField === "new"}
           width={fieldWidth}
@@ -100,7 +101,8 @@ export function PasswordChangeDialog({
           onSubmit={() => setActiveField("confirm")}
         />
         <TextField
-          label={fieldLabel(t("Confirm Password"), activeField === "confirm")}
+          label={t("Confirm Password")}
+          active={activeField === "confirm"}
           value={confirmPassword}
           focused={activeField === "confirm"}
           width={fieldWidth}
@@ -109,7 +111,7 @@ export function PasswordChangeDialog({
           onChange={setConfirmPassword}
           onSubmit={() => { void submit(); }}
         />
-        {error ? <Text fg={colors.negative}>{truncate(error, fieldWidth)}</Text> : null}
+        {error ? <Text fg={colors.negative}>{truncateWithEllipsis(error, fieldWidth)}</Text> : null}
         <Box flexDirection="row" justifyContent="flex-end">
           <Button
             label={submitting ? t("Changing...") : t("Update Password")}

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

@@ -0,0 +1,96 @@
+import { withConfigData } from "../../../cli/scoped-context";
+import { CLI_COMMAND_GROUPS } from "../../../cli/help";
+import { dryRunNote } from "../../../cli/helpers";
+import { requireArg } from "../../../cli/commands/command-utils";
+import { saveConfig } from "../../../data/config/store";
+import type { CliCommandDef } from "../../../types/plugin";
+import { cliStyles } from "../../../utils/cli-output";
+import { createAlert, deserializeAlerts, serializeAlerts } from "./alert-engine";
+import { ALERTS_KEY } from "./constants";
+import type { AlertCondition } from "./types";
+
+const ALERTS_PLUGIN_ID = "alerts";
+
+export const alertsCliCommand: CliCommandDef = {
+  name: "alerts",
+  aliases: ["alert"],
+  description: "List, add, and remove price alerts",
+  help: {
+    group: CLI_COMMAND_GROUPS.portfolios,
+    usage: ["alerts list", "alerts add <symbol> <above|below|crosses> <price>", "alerts delete <id>", "alerts rearm <id>"],
+    examples: ["alerts", "alerts add AAPL above 250", "alerts add BTC-USD below 60000"],
+  },
+  execute: async (args, ctx) => {
+    const action = args[0] ?? "list";
+    await withConfigData(ctx, async (config) => {
+      const raw = config.config.pluginConfig[ALERTS_PLUGIN_ID]?.[ALERTS_KEY];
+      const alerts = deserializeAlerts(typeof raw === "string" ? raw : "[]");
+      const saveAlerts = async (nextAlerts: typeof alerts) => {
+        const nextConfig = {
+          ...config.config,
+          pluginConfig: {
+            ...config.config.pluginConfig,
+            [ALERTS_PLUGIN_ID]: {
+              ...(config.config.pluginConfig[ALERTS_PLUGIN_ID] ?? {}),
+              [ALERTS_KEY]: serializeAlerts(nextAlerts),
+            },
+          },
+        };
+        if (!ctx.cliOptions.dryRun) await saveConfig(nextConfig);
+      };
+
+      if (action === "list") {
+        ctx.printResult({ data: alerts }, {
+          textColumns: [
+            { key: "id", header: "ID", shrink: false },
+            { key: "symbol", header: "Symbol" },
+            { key: "condition", header: "Condition" },
+            { key: "targetPrice", header: "Target", align: "right" },
+            { key: "status", header: "Status" },
+            { key: "lastCheckedPrice", header: "Last Price", align: "right", optional: true },
+            { key: "createdAt", header: "Created", optional: true },
+            { key: "triggeredAt", header: "Triggered" },
+          ],
+          empty: "No alerts. Add one with gloomberb alerts add <symbol> <above|below|crosses> <price>.",
+        });
+        return;
+      }
+      if (action === "add") {
+        const symbol = requireArg(args[1]?.toUpperCase(), "Usage: gloomberb alerts add <symbol> <above|below|crosses> <price>", ctx);
+        const condition = requireArg(args[2], "Usage: gloomberb alerts add <symbol> <above|below|crosses> <price>", ctx) as AlertCondition;
+        if (!["above", "below", "crosses"].includes(condition)) ctx.fail("Condition must be above, below, or crosses.");
+        const price = Number(requireArg(args[3], "Usage: gloomberb alerts add <symbol> <above|below|crosses> <price>", ctx));
+        if (!Number.isFinite(price)) ctx.fail("Alert price must be a finite number.");
+        const alert = createAlert(symbol, condition, price);
+        await saveAlerts([...alerts, alert]);
+        ctx.printResult({ data: { changed: !ctx.cliOptions.dryRun, dryRun: ctx.cliOptions.dryRun, alert } }, {
+          text: (data) => `Added alert ${data.alert.id}: ${symbol} ${condition} ${price}.${dryRunNote(data.dryRun)}`,
+        });
+        return;
+      }
+      if (action === "delete" || action === "rm") {
+        const id = requireArg(args[1], "Usage: gloomberb alerts delete <id>", ctx);
+        const next = alerts.filter((alert) => alert.id !== id);
+        await saveAlerts(next);
+        ctx.printResult({ data: { changed: !ctx.cliOptions.dryRun && next.length !== alerts.length, dryRun: ctx.cliOptions.dryRun, id } }, {
+          text: (data) => next.length === alerts.length
+            ? cliStyles.muted(`No alert with ID ${id}.`)
+            : `Deleted alert ${id}.${dryRunNote(data.dryRun)}`,
+        });
+        return;
+      }
+      if (action === "rearm") {
+        const id = requireArg(args[1], "Usage: gloomberb alerts rearm <id>", ctx);
+        const next = alerts.map((alert) => alert.id === id ? { ...alert, status: "active" as const, triggeredAt: undefined } : alert);
+        await saveAlerts(next);
+        ctx.printResult({ data: { changed: !ctx.cliOptions.dryRun, dryRun: ctx.cliOptions.dryRun, id } }, {
+          text: (data) => alerts.some((alert) => alert.id === id)
+            ? `Re-armed alert ${id}.${dryRunNote(data.dryRun)}`
+            : cliStyles.muted(`No alert with ID ${id}.`),
+        });
+        return;
+      }
+      ctx.fail("Usage: gloomberb alerts list|add|delete|rearm");
+    });
+  },
+};

package/src/plugins/builtin/alerts/events-pane.tsx

@@ -1,18 +1,16 @@
-import { isPlainKey } from "../../../utils/keyboard";
+import { nextHeaderSort, type SortDirection } from "../../../utils/sort-values";
 import { useCallback, useMemo, useState } from "react";
-import { Box } from "../../../ui";
 import {
   Button,
-  ConfirmDialog,
+  confirmDialog,
   DataTableView,
-  EmptyState,
+  PaneStatusBody,
   usePaneFooter,
   type DataTableColumn,
-  type DataTableKeyEvent,
 } from "../../../components";
 import { colors } from "../../../theme/colors";
 import type { PaneProps } from "../../../types/plugin";
-import { useDialog, type PromptContext } from "../../../ui/dialog";
+import { useDialog } from "../../../ui/dialog";
 import { useCloudSyncStatus } from "../../../sync/react";
 import { usePluginAppActions, usePluginConfigState } from "../../runtime";
 import {
@@ -26,7 +24,7 @@ import { relativeTime } from "./format";
 import { alertKindLabel, fetchAlertHistory, ruleStateText } from "./history";
 import { isResearchAlertKind } from "./research-rules";
 import { useAsyncResource } from "../../../public/react";
-import { usePlanAccess } from "../shared/plan-access";
+import { usePlanAccess } from "../../../api-client/plan-access";
 import { useResearchCloudSession } from "../shared/research-cloud-session";
 
 const columnsFor = (width: number, lastCheck: boolean): DataTableColumn[] => [
@@ -43,7 +41,7 @@ export function EventAlertsPane({ focused, width, height }: PaneProps) {
   const [json, setJson] = usePluginConfigState<string>(EVENT_ALERTS_KEY, "[]");
   const { rules, error } = useMemo(() => readEventAlerts(json), [json]);
   const [selected, setSelected] = useState(0);
-  const [sort, setSort] = useState({ id: "created", direction: "desc" as "asc" | "desc" });
+  const [sort, setSort] = useState<{ columnId: string; direction: SortDirection }>({ columnId: "created", direction: "desc" });
   const sync = useCloudSyncStatus();
   const dialog = useDialog();
   const { openPluginCommandWorkflow } = usePluginAppActions();
@@ -51,11 +49,11 @@ export function EventAlertsPane({ focused, width, height }: PaneProps) {
     () =>
       [...rules].sort((a, b) => {
         const value = (rule: EventAlertRule) =>
-          sort.id === "target"
+          sort.columnId === "target"
             ? eventAlertTarget(rule)
-            : sort.id === "created"
+            : sort.columnId === "created"
               ? rule.createdAt
-              : sort.id === "kind"
+              : sort.columnId === "kind"
                 ? rule.kind
                 : rule.status;
         return (
@@ -97,19 +95,11 @@ export function EventAlertsPane({ focused, width, height }: PaneProps) {
   const remove = useCallback(async () => {
     if (!selectedRule) return;
     const id = selectedRule.id;
-    const confirmed = await dialog
-      .prompt<boolean>({
-        closeOnClickOutside: true,
-        content: (context: PromptContext<boolean>) => (
-          <ConfirmDialog
-            {...context}
-            title="Delete event alert?"
-            body={[eventAlertTarget(selectedRule)]}
-            confirmLabel="Delete"
-          />
-        ),
-      })
-      .catch(() => false);
+    const confirmed = await confirmDialog(dialog, {
+      title: "Delete event alert?",
+      body: [eventAlertTarget(selectedRule)],
+      confirmLabel: "Delete",
+    });
     if (confirmed)
       setJson((current) => {
         const result = readEventAlerts(current);
@@ -154,17 +144,6 @@ export function EventAlertsPane({ focused, width, height }: PaneProps) {
     }),
     [status, error, selectedRule, add, toggle, remove],
   );
-  const onKey = useCallback(
-    (event: DataTableKeyEvent) => {
-      if (isPlainKey(event, "a") && !error) add();
-      else if (isPlainKey(event, "p")) toggle(selectedRule);
-      else if (isPlainKey(event, "d")) void remove();
-      else return false;
-      event.preventDefault?.();
-      return true;
-    },
-    [add, error, remove, selectedRule, toggle],
-  );
   return (
     <DataTableView<EventAlertRule, DataTableColumn>
       focused={focused}
@@ -179,15 +158,9 @@ export function EventAlertsPane({ focused, width, height }: PaneProps) {
       }}
       getItemKey={(rule) => rule.id}
       onActivate={toggle}
-      onRootKeyDown={onKey}
-      sortColumnId={sort.id}
+      sortColumnId={sort.columnId}
       sortDirection={sort.direction}
-      onHeaderClick={(id) =>
-        setSort((current) => ({
-          id,
-          direction: current.id === id && current.direction === "asc" ? "desc" : "asc",
-        }))
-      }
+      onHeaderClick={(id) => setSort((current) => nextHeaderSort(current, id))}
       renderCell={(rule, column, _index, row) => ({
         text:
           column.id === "kind"
@@ -211,13 +184,12 @@ export function EventAlertsPane({ focused, width, height }: PaneProps) {
       })}
       emptyStateTitle={error ?? "No event alerts"}
       emptyContent={error ? undefined : (
-        <Box paddingX={1} paddingY={1}>
-          <EmptyState
-            title="No event alerts"
-            message="Follow filings, news, earnings, members, funds or market moves."
-            actions={<Button label="Add event alert" compact onPress={add} />}
-          />
-        </Box>
+        <PaneStatusBody
+          empty
+          emptyTitle="No event alerts"
+          emptyMessage="Follow filings, news, earnings, members, funds or market moves."
+          actions={<Button label="Add event alert" compact onPress={add} />}
+        />
       )}
     />
   );

package/src/plugins/builtin/alerts/history-pane.tsx

@@ -1,77 +1,43 @@
-import { useCallback, useMemo, useRef, useState } from "react";
-import { isPlainKey } from "../../../utils/keyboard";
+import { useCallback, useRef, useState } from "react";
 import {
   DataTableView,
   PaneStatusBody,
+  usePagedRows,
   usePaneFooter,
   useTableLoadMore,
   type DataTableColumn,
+  type PageRequest,
 } from "../../../components";
-import { useAsyncResource } from "../../../public/react";
+import { handleRefreshKey } from "../../../components/data-table/table-pane";
 import { colors } from "../../../theme/colors";
 import type { PaneProps } from "../../../types/plugin";
 import type { ScrollBoxRenderable } from "../../../ui";
 import { SignInWall } from "../cloud/auth-actions";
-import { usePlanAccess } from "../shared/plan-access";
+import { usePlanAccess } from "../../../api-client/plan-access";
 import { useResearchCloudSession } from "../shared/research-cloud-session";
-import { alertKindLabel, fetchAlertHistory, type AlertHistory, type AlertHistoryItem } from "./history";
+import { alertKindLabel, fetchAlertHistory, type AlertHistoryItem } from "./history";
 import { relativeTime } from "./format";
 
 const stamp = (value: string) => value.slice(0, 16).replace("T", " ");
-
-/** Later pages, kept against the first page they continue so a reload starts over. */
-interface OlderPages {
-  first: AlertHistory;
-  items: AlertHistoryItem[];
-  hasMore: boolean;
-  nextOffset: number | null;
-}
+const itemId = (item: AlertHistoryItem) => item.id;
 
 /** Alerts the push service accepted for this account over the last 90 days. */
 export function AlertHistoryPane({ focused, width, height }: PaneProps) {
   const access = usePlanAccess();
   const session = useResearchCloudSession();
   const [selected, setSelected] = useState(0);
-  const loader = useCallback(() => fetchAlertHistory(0), [session.requestKey]);
-  const history = useAsyncResource(access.signedIn ? loader : null);
-  const data = history.data;
+  // A new session starts the history over. A failed later page leaves what is
+  // loaded, and the next scroll to the end asks again.
+  const loadPage = useCallback(async ({ offset }: PageRequest) => {
+    const page = await fetchAlertHistory(offset);
+    return { ...page, rows: page.items, hasMore: page.hasMore && page.nextOffset != null };
+  }, [session.requestKey]);
+  const history = usePagedRows(access.signedIn ? loadPage : null, { getId: itemId });
+  const data = history.pages[0] ?? null;
+  const items = history.rows;
+  const loadingMore = history.loadingMore;
   const scrollRef = useRef<ScrollBoxRenderable | null>(null);
-  const [older, setOlder] = useState<OlderPages | null>(null);
-  const [loadingMore, setLoadingMore] = useState(false);
-  const pageRequest = useRef(0);
-  const pages = data && older?.first === data ? older : null;
-  const items = useMemo(
-    () => (data ? (pages ? [...data.items, ...pages.items] : data.items) : []),
-    [data, pages],
-  );
-  const hasMore = pages ? pages.hasMore : !!data?.hasMore;
-  const nextOffset = pages ? pages.nextOffset : (data?.nextOffset ?? null);
-
-  const loadMore = useCallback(() => {
-    if (!data || !hasMore || nextOffset == null || loadingMore) return;
-    const request = ++pageRequest.current;
-    setLoadingMore(true);
-    void fetchAlertHistory(nextOffset)
-      .then((page) => {
-        if (pageRequest.current !== request) return;
-        setOlder((current) => {
-          const prior = current?.first === data ? current.items : [];
-          const seen = new Set([...data.items, ...prior].map((item) => item.id));
-          return {
-            first: data,
-            items: [...prior, ...page.items.filter((item) => !seen.has(item.id))],
-            hasMore: page.hasMore,
-            nextOffset: page.nextOffset,
-          };
-        });
-      })
-      // A failed page leaves what is loaded; the next scroll to the end tries again.
-      .catch(() => {})
-      .finally(() => {
-        if (pageRequest.current === request) setLoadingMore(false);
-      });
-  }, [data, hasMore, loadingMore, nextOffset]);
-  const loadMoreOnScroll = useTableLoadMore(scrollRef, hasMore && !loadingMore, loadMore);
+  const loadMoreOnScroll = useTableLoadMore(scrollRef, history.hasMore && !loadingMore, history.loadMore);
 
   const columns: DataTableColumn[] = [
     { id: "time", label: "Sent (UTC)", width: 16, align: "left" },
@@ -104,7 +70,7 @@ export function AlertHistoryPane({ focused, width, height }: PaneProps) {
   return (
     <PaneStatusBody
       loading={history.loading && !data}
-      error={!data ? history.error : null}
+      error={!data ? history.error?.message ?? null : null}
       subject="alert history"
     >
       {data?.status === "unavailable" ? (
@@ -124,12 +90,7 @@ export function AlertHistoryPane({ focused, width, height }: PaneProps) {
             onChange: setSelected,
           }}
           getItemKey={(item) => item.id}
-          onRootKeyDown={(event) => {
-            if (!isPlainKey(event, "r")) return false;
-            event.preventDefault?.();
-            void history.reload();
-            return true;
-          }}
+          onRootKeyDown={(event) => handleRefreshKey(event, history.reload)}
           sortColumnId={null}
           sortDirection="desc"
           renderCell={(item, column, _index, row) => ({

package/src/plugins/builtin/alerts/history.ts

@@ -56,7 +56,7 @@ export function validateAlertHistory(value: unknown): AlertHistory {
     data.items.some((item) => !item || typeof item.title !== "string" || typeof item.kind !== "string" || !dated(item.deliveredAt)) ||
     data.states.some((state) => !state || typeof state.ruleId !== "string" || (state.asOf !== null && !dated(state.asOf)))
   )
-    throw new Error("Invalid alert history from Gloom Cloud.");
+    throw new Error("Invalid alert history.");
   return data;
 }
 export async function fetchAlertHistory(offset = 0) {

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

@@ -15,6 +15,7 @@ import {
 } from "./command";
 import { POLL_INTERVAL_MS, POLL_SECONDS_KEY } from "./constants";
 import { AlertsPane } from "./pane";
+import { alertsCliCommand } from "./cli";
 import {
   createQuoteErrorMessage,
   quoteAlertFields,
@@ -45,6 +46,7 @@ export const alertsPlugin: GloomPlugin = {
   version: "1.0.0",
   description: "Price, market and filing event alerts",
   toggleable: true,
+  cliCommands: [alertsCliCommand],
 
   setup(ctx) {
     const generation = ++pollGeneration;

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

@@ -1,11 +1,11 @@
 import { Box } from "../../../ui";
-import { Button, EmptyState, Tabs, PaneFooterScope, usePaneHeaderTabs } from "../../../components";
+import { Button, PaneStatusBody, PaneFooterScope, usePaneTabs } from "../../../components";
 import { usePluginPaneState } from "../../runtime";
 import { EventAlertsPane } from "./events-pane";
 import { AlertHistoryPane } from "./history-pane";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import {
-  ConfirmDialog,
+  confirmDialog,
   DataTableView,
   usePaneFooter,
   type DataTableCell,
@@ -16,7 +16,7 @@ import { TextFieldDialog } from "../../../components/pane-settings-dialog/field-
 import { colors } from "../../../theme/colors";
 import { isPlainKey } from "../../../utils/keyboard";
 import { TextAttributes } from "../../../ui";
-import { useDialog, type AlertContext, type PromptContext } from "../../../ui/dialog";
+import { useDialog, type AlertContext } from "../../../ui/dialog";
 import type { PaneProps } from "../../../types/plugin";
 import { usePluginAppActions, usePluginConfigState } from "../../runtime";
 import {
@@ -79,24 +79,16 @@ const ALERT_TABS = [
 
 export function AlertsPane(props: PaneProps) {
   const [tab, setTab] = usePluginPaneState<string>("tab", "prices");
-  const tabsInHeader = usePaneHeaderTabs({
+  const { strip: tabStrip, rows: tabRows } = usePaneTabs({
     tabs: ALERT_TABS,
     activeValue: tab,
     onSelect: setTab,
     focused: props.focused,
+    dense: true,
   });
-  const tabRows = tabsInHeader ? 0 : 1;
   return (
     <Box flexDirection="column" width={props.width} height={props.height}>
-      {!tabsInHeader && (
-        <Tabs
-          tabs={ALERT_TABS}
-          activeValue={tab}
-          onSelect={setTab}
-          focused={props.focused}
-          dense
-        />
-      )}
+      {tabStrip}
       <PaneFooterScope active>
         {tab === "events" ? (
           <EventAlertsPane {...props} height={Math.max(1, props.height - tabRows)} />
@@ -164,18 +156,12 @@ function PriceAlertsPane({ focused, width, height }: PaneProps) {
   const deleteAlert = useCallback(async (id: string) => {
     const alert = alerts.find((a) => a.id === id);
     if (!alert) return;
-    const confirmed = await dialog.prompt<boolean>({
-      closeOnClickOutside: true,
-      content: (ctx: PromptContext<boolean>) => (
-        <ConfirmDialog
-          {...ctx}
-          title="Delete alert?"
-          body={[`${formatAlertDescription(alert)} will no longer be watched.`]}
-          confirmLabel="Delete"
-        />
-      ),
-    }).catch(() => false);
-    if (confirmed !== true) return;
+    const confirmed = await confirmDialog(dialog, {
+      title: "Delete alert?",
+      body: [`${formatAlertDescription(alert)} will no longer be watched.`],
+      confirmLabel: "Delete",
+    });
+    if (!confirmed) return;
     savePaneAlerts(alerts.filter((a) => a.id !== id));
     setSelectedIdx((prev) => Math.max(0, Math.min(prev, rows.length - 2)));
   }, [alerts, dialog, rows.length, savePaneAlerts]);
@@ -275,76 +261,53 @@ function PriceAlertsPane({ focused, width, height }: PaneProps) {
     setSelectedIdx((prev) => (rows.length === 0 ? 0 : Math.min(prev, rows.length - 1)));
   }, [rows.length]);
 
+  // The footer hints bind a, e, d and m; `n` is a second key for adding.
   const handleTableKeyDown = useCallback((event: DataTableKeyEvent) => {
-    if (isPlainKey(event, "d")) {
-      event.preventDefault?.();
-      deleteSelectedAlert();
-      return true;
-    }
-    if (isPlainKey(event, "a", "n")) {
-      event.preventDefault?.();
-      startAddAlert();
-      return true;
-    }
-    if (isPlainKey(event, "e")) {
-      event.preventDefault?.();
-      editSelectedAlert();
-      return true;
-    }
-    if (isPlainKey(event, "m")) {
-      event.preventDefault?.();
-      rearmSelectedAlert();
-      return true;
-    }
-    return false;
-  }, [deleteSelectedAlert, editSelectedAlert, rearmSelectedAlert, startAddAlert]);
+    if (!isPlainKey(event, "n")) return false;
+    startAddAlert();
+    return true;
+  }, [startAddAlert]);
 
   const renderCell = useCallback((
     alert: AlertRule,
     column: AlertColumn,
-    _index: number,
-    rowState: { selected: boolean },
   ): DataTableCell => {
-    const selectedColor = rowState.selected ? colors.selectedText : undefined;
     switch (column.id) {
       case "status":
         return {
           text: alert.status === "triggered" ? "Triggered" : "Active",
-          color: selectedColor ?? (alert.status === "triggered" ? colors.positive : colors.textDim),
+          color: alert.status === "triggered" ? colors.positive : colors.textDim,
           attributes: alert.status === "triggered" ? TextAttributes.BOLD : TextAttributes.NONE,
         };
       case "symbol":
         return {
           text: alert.symbol,
-          color: selectedColor ?? colors.textBright,
+          color: colors.textBright,
           attributes: TextAttributes.BOLD,
         };
       case "current":
         return {
           text: formatCurrentPrice(alert, column.width),
-          color: selectedColor ?? (alert.lastCheckError ? colors.negative : colors.text),
+          color: alert.lastCheckError ? colors.negative : colors.text,
         };
       case "target":
-        return { text: formatAlertTargetPrice(alert, column.width), color: selectedColor };
+        return { text: formatAlertTargetPrice(alert, column.width) };
       case "away":
         return {
           text: formatAlertDistance(alert),
-          color: selectedColor ?? colors.textDim,
+          color: colors.textDim,
         };
       case "condition":
-        return {
-          text: conditionLabel(alert.condition),
-          color: selectedColor,
-        };
+        return { text: conditionLabel(alert.condition) };
       case "quote":
         return {
           text: formatQuoteChecked(alert),
-          color: selectedColor ?? colors.textDim,
+          color: colors.textDim,
         };
       case "triggered":
         return {
           text: alert.triggeredAt ? relativeTime(alert.triggeredAt) : "-",
-          color: selectedColor ?? colors.textDim,
+          color: colors.textDim,
         };
     }
   }, []);
@@ -370,12 +333,11 @@ function PriceAlertsPane({ focused, width, height }: PaneProps) {
         if (alert.status === "triggered") rearmAlert(alert.id);
       }}
       renderCell={renderCell}
+      selectedTextOverridesCellColor
       emptyStateTitle="Saved alerts could not be read."
       emptyStateHint={storeError ?? undefined}
       emptyContent={storeError ? undefined : (
-        <Box paddingX={1} paddingY={1}>
-          <EmptyState title="No alerts" actions={<Button label="Add alert" compact onPress={startAddAlert} />} />
-        </Box>
+        <PaneStatusBody empty emptyTitle="No alerts" actions={<Button label="Add alert" compact onPress={startAddAlert} />} />
       )}
       showHorizontalScrollbar={showHorizontalScrollbar}
     />

package/src/plugins/builtin/alerts/research-rules.ts

@@ -30,11 +30,15 @@ export const RESEARCH_ALERT_FORMS = [
   "10-K",
   "10-Q",
   "S-1",
-  "SC 13D",
-  "SC 13G",
+  "SCHEDULE 13D",
+  "SCHEDULE 13D/A",
+  "SCHEDULE 13G",
+  "SCHEDULE 13G/A",
   "6-K",
   "20-F",
 ] as const
+/** EDGAR renamed SC 13D/13G to SCHEDULE 13D/13G on 2024-12-18; rules saved with the old names stay valid and the server matches both. */
+const LEGACY_RESEARCH_ALERT_FORMS: readonly string[] = ["SC 13D", "SC 13G"]
 const US_EXCHANGES = new Set([
   "",
   "NASDAQ",
@@ -140,7 +144,8 @@ export function normalizeResearchRule(
         if (
           !RESEARCH_ALERT_FORMS.includes(
             form as (typeof RESEARCH_ALERT_FORMS)[number],
-          )
+          ) &&
+          !LEGACY_RESEARCH_ALERT_FORMS.includes(form)
         )
           return null
         result.form = form