@gloom-sh/terminal 0.18.5 → 0.19.1

package/src/plugins/builtin/clinical-trials/client.ts

@@ -11,6 +11,7 @@ const STUDY_FIELDS = [
   "protocolSection.designModule.phases",
   "protocolSection.designModule.enrollmentInfo",
   "protocolSection.conditionsModule.conditions",
+  "protocolSection.armsInterventionsModule.interventions",
   "protocolSection.descriptionModule.briefSummary",
 ].join(",");
 const CLINICAL_TRIALS_API_BASE_URL = "https://clinicaltrials.gov/api/v2";
@@ -45,6 +46,8 @@ export interface ClinicalTrial {
   /** Lead sponsor class, e.g. "INDUSTRY". */
   sponsorClass: string;
   conditions: string[];
+  /** What is tested, in the registry's order: a drug, a device, a procedure; a placebo arm is left out. */
+  interventions: TrialIntervention[];
   summary: string;
   studyType: string;
   enrollment: number | null;
@@ -62,12 +65,18 @@ export interface ClinicalTrial {
   firstSubmitDate: Date | null;
   /** When the registry first posted the study. */
   firstPostDate: Date | null;
-  /** When the registry last posted a change to the study; the list is newest first by it. */
+  /** When the registry last posted a change to the study; the registry hands studies over newest first by it. */
   lastUpdatePostDate: Date | null;
   /** Deep link to the study page for [o]pen. */
   url: string;
 }
 
+interface TrialIntervention {
+  name: string;
+  /** Raw registry type, e.g. "DRUG" or "DEVICE". */
+  type: string;
+}
+
 export type DatePrecision = "year" | "month" | "day";
 export type TrialDateType = "ACTUAL" | "ESTIMATED";
 
@@ -107,6 +116,28 @@ function asDate(value: unknown): Date | null {
   return Number.isNaN(date.getTime()) ? null : date;
 }
 
+/** Arms that test nothing: a placebo, a sham or the usual treatment. */
+const CONTROL_INTERVENTION = /^(?:placebo|sham|vehicle|saline|standard (?:of )?care|usual care|no intervention|control)\b/i;
+
+function parseInterventions(value: unknown): TrialIntervention[] {
+  if (!Array.isArray(value)) return [];
+  return value.flatMap((item) => {
+    if (!item || typeof item !== "object") return [];
+    const record = item as Record<string, unknown>;
+    const name = asString(record.name);
+    if (!name || CONTROL_INTERVENTION.test(name)) return [];
+    return [{ name, type: asString(record.type) ?? "" }];
+  });
+}
+
+/** Kinds of intervention that are a product being tested, ahead of a device, a procedure or a behaviour. */
+const PRODUCT_TYPES = new Set(["DRUG", "BIOLOGICAL", "COMBINATION_PRODUCT", "GENETIC", "DIETARY_SUPPLEMENT"]);
+
+/** The one intervention the list names: the first drug or biologic, else the first thing tested; empty when none. */
+export function trialDrug(trial: Pick<ClinicalTrial, "interventions">): string {
+  return (trial.interventions.find((item) => PRODUCT_TYPES.has(item.type)) ?? trial.interventions[0])?.name ?? "";
+}
+
 function moduleOf(record: Record<string, unknown>, key: string): Record<string, unknown> {
   const value = record[key];
   return value && typeof value === "object" ? (value as Record<string, unknown>) : {};
@@ -144,6 +175,7 @@ export function parseClinicalTrial(raw: unknown): ClinicalTrial | null {
   const conditionsModule = moduleOf(protocol, "conditionsModule");
   const description = moduleOf(protocol, "descriptionModule");
   const enrollmentInfo = moduleOf(design, "enrollmentInfo");
+  const armsInterventions = moduleOf(protocol, "armsInterventionsModule");
 
   const start = trialDate(moduleOf(statusModule, "startDateStruct"));
   const primaryCompletion = trialDate(moduleOf(statusModule, "primaryCompletionDateStruct"));
@@ -161,6 +193,7 @@ export function parseClinicalTrial(raw: unknown): ClinicalTrial | null {
     sponsor: asString(leadSponsor.name) ?? "Unknown sponsor",
     sponsorClass: asString(leadSponsor.class) ?? "",
     conditions: asStringArray(conditionsModule.conditions),
+    interventions: parseInterventions(armsInterventions.interventions),
     summary: asString(description.briefSummary) ?? "",
     studyType: asString(design.studyType) ?? "",
     enrollment: asCount(enrollmentInfo.count),
@@ -204,6 +237,8 @@ export interface StudiesQuery {
   phases?: readonly string[];
   /** Lead sponsor classes, any of, e.g. `INDUSTRY`. */
   sponsorClasses?: readonly string[];
+  /** Lead sponsor classes to leave out, e.g. `INDUSTRY` for everything but companies. */
+  excludedSponsorClasses?: readonly string[];
   pageSize?: number;
   /** The previous page's `nextPageToken`; without it, the first page. */
   pageToken?: string;
@@ -222,10 +257,16 @@ function areaClause(area: string, values: string[]): string | null {
   return values.length === 1 ? `AREA[${area}]${values[0]}` : `AREA[${area}](${values.join(" OR ")})`;
 }
 
+/** `NOT AREA[LeadSponsorClass]INDUSTRY`, or `NOT AREA[LeadSponsorClass](NIH OR FED)` for several. */
+function excludeClause(area: string, values: string[]): string | null {
+  const clause = areaClause(area, values);
+  return clause ? `NOT ${clause}` : null;
+}
+
 /**
  * Build the v2 studies URL. Pure: no network, no API key. The most recently
- * updated studies come first, the order the pane lists them in, so each page
- * continues the one before it. Filters go to the registry with the search, so
+ * updated studies come first, so each page continues the one before it; the
+ * pane orders what has loaded. Filters go to the registry with the search, so
  * every page it returns already matches them.
  */
 export function buildStudiesUrl(query: StudiesQuery = {}): string {
@@ -240,7 +281,11 @@ export function buildStudiesUrl(query: StudiesQuery = {}): string {
   if (sponsor) params.set("query.spons", sponsor);
   const statuses = codes(query.statuses);
   if (statuses.length > 0) params.set("filter.overallStatus", statuses.join(","));
-  const advanced = [areaClause("Phase", codes(query.phases)), areaClause("LeadSponsorClass", codes(query.sponsorClasses))]
+  const advanced = [
+    areaClause("Phase", codes(query.phases)),
+    areaClause("LeadSponsorClass", codes(query.sponsorClasses)),
+    excludeClause("LeadSponsorClass", codes(query.excludedSponsorClasses)),
+  ]
     .filter((clause): clause is string => clause !== null);
   if (advanced.length > 0) params.set("filter.advanced", advanced.join(" AND "));
   if (query.pageToken) params.set("pageToken", query.pageToken);

package/src/plugins/builtin/clinical-trials/model.ts

@@ -1,7 +1,8 @@
 import type { DataTableColumn } from "../../../components";
 import { blendHex, type ThemeColors } from "../../../theme/colors";
 import type { PaneReportOptionDef } from "../../../types/plugin";
-import type { StudiesQuery } from "./client";
+import type { ClinicalTrial, StudiesQuery } from "./client";
+import type { SponsorTicker } from "./sponsor-tickers";
 
 /**
  * Where a study stands, as a reader of the list sorts it: open to patients,
@@ -109,6 +110,55 @@ export function trialPhaseLabel(phases: readonly string[], compact = false): str
   return `${compact ? "Ph" : "Phase"} ${numbers.join("/")}`;
 }
 
+/** Whether the study has a phase to show: not an observational study with none, nor a device study the registry calls not applicable. */
+export function hasTrialPhase(phases: readonly string[]): boolean {
+  const label = trialPhaseLabel(phases);
+  return label !== "--" && label !== "N/A";
+}
+
+/**
+ * How far along a study's phase is, for ordering: Phase 4 before 3 before 2
+ * before 1 before early phase 1, a study of two phases (2/3) by its later
+ * one, and a study with no phase to show after them all.
+ */
+export function trialPhaseRank(phases: readonly string[]): number {
+  let rank = 0;
+  for (const phase of phases) {
+    const code = phase.trim().toUpperCase();
+    const value = code === "EARLY_PHASE1" ? 0.5 : Number(code.replace("PHASE", ""));
+    if (Number.isFinite(value) && value > rank) rank = value;
+  }
+  return rank;
+}
+
+/**
+ * The three kinds of lead sponsor the list is ordered by: a company whose
+ * ticker Gloom Cloud found (0), any other company (1), and everything else:
+ * universities, hospitals, agencies, networks and individuals (2).
+ */
+type TrialSponsorGroup = 0 | 1 | 2;
+
+function trialSponsorGroup(trial: Pick<ClinicalTrial, "sponsorClass">, ticker: SponsorTicker | undefined): TrialSponsorGroup {
+  if (ticker?.kind === "listed") return 0;
+  return trial.sponsorClass === "INDUSTRY" ? 1 : 2;
+}
+
+/**
+ * The studies as the pane lists them: listed sponsors first, then other
+ * companies, then everything else, the latest phase first within each; studies
+ * of one group and phase stay in the registry's order (most recently updated
+ * first). A new array, so the loaded rows keep their order.
+ */
+export function orderTrials<T extends Pick<ClinicalTrial, "sponsorClass" | "phases" | "sponsor">>(
+  trials: readonly T[],
+  tickerOf: (trial: T) => SponsorTicker | undefined,
+): T[] {
+  return trials
+    .map((trial, index) => ({ trial, index, group: trialSponsorGroup(trial, tickerOf(trial)), phase: trialPhaseRank(trial.phases) }))
+    .sort((a, b) => a.group - b.group || b.phase - a.phase || a.index - b.index)
+    .map(({ trial }) => trial);
+}
+
 /** The phase as the detail view says it. */
 export function trialPhaseDetail(phases: readonly string[]): string {
   const label = trialPhaseLabel(phases);
@@ -228,7 +278,7 @@ export const TRIAL_REPORT_OPTIONS: readonly PaneReportOptionDef[] = [
   },
 ];
 
-type TrialColumnId = "updated" | "phase" | "status" | "title" | "sponsor" | "ticker";
+type TrialColumnId = "updated" | "phase" | "status" | "title" | "drug" | "sponsor" | "ticker";
 export type TrialColumn = DataTableColumn & { id: TrialColumnId };
 
 export interface TrialLayout {
@@ -242,37 +292,42 @@ export interface TrialLayout {
 /** The gap after each column plus the table's padding, as the terminal table draws them. */
 const TABLE_CHROME = 1 + 2;
 
+/** The title is what the list is read by: the drug and then the date give way before it has less than this. */
+const TITLE_ROOM_WITH_DRUG = 24;
+const TITLE_ROOM_WITH_DATE = 36;
+/** An ISO day, as every date column reads. */
+const DATE_WIDTH = 10;
+
 /**
- * The title takes what is left; status, phase and ticker stay narrow and the
- * sponsor keeps a readable width. Status reads in full, and the sponsor and
- * ticker widen, only once the title has room of its own. The columns add up
- * to the pane, so nothing scrolls sideways.
+ * The title takes what is left; phase, status and ticker stay narrow and the
+ * sponsor keeps a readable width. Status reads in full, and the sponsor, drug
+ * and ticker widen, only once the title has room of its own. The columns add
+ * up to the pane, so nothing scrolls sideways. Narrower than a terminal the
+ * drug, and before it the update date (the detail has it, and the list's
+ * dates run close together), give way to the title.
  */
 export function trialLayout(width: number): TrialLayout {
-  const compact = width < 90;
+  const compact = width < 100;
   const wide = width >= 140;
-  // Narrower than a terminal, the update date gives way to the title: the list
-  // is newest first and the detail has the date.
-  const timed = width >= 76;
-  const fixed: TrialColumn[] = [
-    // An ISO day, as every date column reads.
-    ...(timed ? [{ id: "updated" as const, label: "Updated", width: 10, align: "left" as const }] : []),
-    { id: "phase", label: "Phase", width: compact ? 7 : 9, align: "left" },
-    { id: "status", label: "Status", width: wide ? 23 : 11, align: "left" },
-    { id: "sponsor", label: "Sponsor", width: wide ? 30 : compact ? 15 : 22, align: "left" },
-    { id: "ticker", label: "Ticker", width: wide ? 11 : 6, align: "left" },
-  ];
-  const used = fixed.reduce((sum, column) => sum + column.width + 1, 0) + TABLE_CHROME;
-  const title: TrialColumn = { id: "title", label: "Title", width: Math.max(12, width - used - 1), align: "left", flexGrow: 1 };
-  const statusAt = fixed.findIndex((column) => column.id === "status") + 1;
-  return { compact, showVenue: wide, columns: [...fixed.slice(0, statusAt), title, ...fixed.slice(statusAt)] };
-}
-
-/**
- * A search typed as a ticker (`TRIAL VKTX`): one to five letters, with a
- * share class. The registry knows sponsors by name, so a symbol no study
- * mentions is looked up as its company.
- */
-export function looksLikeTicker(term: string): boolean {
-  return /^[A-Za-z]{1,5}(?:[.-][A-Za-z])?$/.test(term.trim());
+  const phase: TrialColumn = { id: "phase", label: "Phase", width: compact ? 7 : 9, align: "left" };
+  const status: TrialColumn = { id: "status", label: "Status", width: wide ? 23 : 11, align: "left" };
+  const drug: TrialColumn = { id: "drug", label: "Drug", width: wide ? 18 : compact ? 12 : 14, align: "left" };
+  const sponsor: TrialColumn = { id: "sponsor", label: "Sponsor", width: wide ? 28 : compact ? 15 : 22, align: "left" };
+  const ticker: TrialColumn = { id: "ticker", label: "Ticker", width: wide ? 11 : 6, align: "left" };
+  const updated: TrialColumn = { id: "updated", label: "Updated", width: DATE_WIDTH, align: "left" };
+  const cells = (columns: TrialColumn[]) => columns.reduce((sum, column) => sum + column.width + 1, 0) + TABLE_CHROME;
+  // What the title keeps beside the other columns: its own gap, and the pane's last column's.
+  const titleWidth = (columns: TrialColumn[]) => width - cells(columns) - 1;
+  const base = [phase, status, sponsor, ticker];
+  const withDrug = titleWidth([...base, drug]) >= TITLE_ROOM_WITH_DRUG;
+  const lead = withDrug ? [...base, drug] : base;
+  const timed = titleWidth([...lead, updated]) >= TITLE_ROOM_WITH_DATE;
+  const rest = timed ? [...lead, updated] : lead;
+  const title: TrialColumn = { id: "title", label: "Title", width: Math.max(12, titleWidth(rest)), align: "left", flexGrow: 1 };
+  return {
+    compact,
+    showVenue: wide,
+    // Phase and status, the title, then what is about the study (drug, sponsor, ticker) and when it was updated.
+    columns: [phase, status, title, ...(withDrug ? [drug] : []), sponsor, ticker, ...(timed ? [updated] : [])],
+  };
 }

package/src/plugins/builtin/clinical-trials/pane.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef } from "react";
 import {
   DataTableStackView,
   PaneLinkMenu,
@@ -12,11 +12,9 @@ import {
   type DataTableCell,
   type DataTableKeyEvent,
   type DataTableRootKeyContext,
-  type PageRequest,
   type PaneFooterSegment,
   type PaneHint,
   type QueryBarFilter,
-  type RowPage,
 } from "../../../components";
 import { usePaneRefreshKey } from "../../../components/data-table/table-pane";
 import { DetailReader, type DetailFact } from "../../../components/reader/detail-reader";
@@ -34,15 +32,17 @@ import { Box, Text, TextAttributes, type ScrollBoxRenderable } from "../../../ui
 import { isPlainArrowUp, stopSearchFocusNavigation } from "../../../utils/search-focus-navigation";
 import { useOpenDescription } from "../shared/open-description";
 import { useResearchCloudSession } from "../shared/research-cloud-session";
-import { ClinicalTrialsClient, type ClinicalTrial, type DatePrecision, type TrialDateType } from "./client";
+import { missingCell, NO_VALUE } from "../shared/research-cells";
+import { ClinicalTrialsClient, trialDrug, type ClinicalTrial, type DatePrecision, type TrialDateType } from "./client";
 import {
   ALL,
   PHASE_FILTER_OPTIONS,
   SPONSOR_FILTER_OPTIONS,
   STATUS_FILTER_OPTIONS,
+  hasTrialPhase,
   keepsToneWhenSelected,
-  looksLikeTicker,
   normalizeTrialFilters,
+  orderTrials,
   sponsorClassLabel,
   trialFiltersNarrow,
   trialFiltersQuery,
@@ -56,16 +56,19 @@ import {
   type TrialFilterOption,
   type TrialFilters,
 } from "./model";
-import { useSponsorTickers, type SponsorTicker } from "./sponsor-tickers";
-import { tickerSponsorName } from "./ticker-sponsor";
+import { sponsorTickerStore, useSponsorTickers, type SponsorTicker } from "./sponsor-tickers";
+import { COMPANIES_FIRST, createTrialPageLoader } from "./trial-pages";
+import { looksLikeTicker, useTickerCompanySearch } from "../shared/ticker-company";
 import { CLINICAL_TRIALS_PANE_ID } from "./types";
 
 const SEARCH_DEBOUNCE_MS = 250;
 const DEFAULT_PAGE_SIZE = 50;
+/** How long a page waits for its sponsors' tickers, so the list draws already in order; a slower lookup fills in after. */
+const TICKER_WAIT_MS = 2000;
 
 /** As precise as the registry gave it, marked when it is the sponsor's estimate. */
 function formatDate(date: Date | null, precision: DatePrecision = "day", type?: TrialDateType): string {
-  if (!date || Number.isNaN(date.getTime()) || date.getTime() === 0) return "-";
+  if (!date || Number.isNaN(date.getTime()) || date.getTime() === 0) return NO_VALUE;
   const text = date.toISOString().slice(0, precision === "year" ? 4 : precision === "month" ? 7 : 10);
   return type === "ESTIMATED" ? `${text} (est.)` : text;
 }
@@ -75,7 +78,7 @@ function trialPosted(trial: ClinicalTrial): Date | null {
   return trial.firstPostDate ?? trial.firstSubmitDate;
 }
 
-/** The ticker cell: the symbol, its venue when there is room; blank when there is none; `?` when it was not looked up. */
+/** The ticker cell: the symbol, its venue when there is room; the blank mark when there is none; `?` when it was not looked up; nothing while it is being looked up. */
 function tickerCell(ticker: SponsorTicker | undefined, showVenue: boolean, colors: ThemeColors, selected: boolean, open: () => void): DataTableCell {
   if (ticker?.kind === "listed") {
     const venue = showVenue && ticker.exchange && !/^(NYSE|NASDAQ|AMEX|ARCA|BATS|CBOE)$/.test(ticker.exchange) ? ticker.exchange : "";
@@ -91,6 +94,7 @@ function tickerCell(ticker: SponsorTicker | undefined, showVenue: boolean, color
     };
   }
   if (ticker?.kind === "failed") return { text: "?", value: null, color: colors.textMuted };
+  if (ticker?.kind === "none") return missingCell(colors);
   return { text: "", value: null };
 }
 
@@ -122,7 +126,7 @@ function trialFacts(trial: ClinicalTrial, ticker: SponsorTicker | undefined, col
     ticker?.kind === "listed"
       ? { label: "Ticker", value: tickerDetail(ticker), color: colors.textBright, link: { label: tf("Open {ticker}", { ticker: ticker.ticker }), onOpen: openTicker } }
       : { label: "Ticker", value: tickerDetail(ticker), color: colors.textDim },
-    { label: "Enrollment", value: trial.enrollment != null ? trial.enrollment.toLocaleString("en-US") : "-" },
+    { label: "Enrollment", value: trial.enrollment != null ? trial.enrollment.toLocaleString("en-US") : NO_VALUE },
     { label: "Registry ID", value: trial.nctId },
     { label: "Start", value: formatDate(trial.startDate, trial.startDatePrecision, trial.startDateType) },
     { label: "Posted", value: formatDate(trialPosted(trial)) },
@@ -169,25 +173,27 @@ export function TrialsPane({ width, height, focused }: PaneProps) {
 
   // The registry pages by an opaque token, which the next page's offset keys.
   // A new search or filter makes a new loader and so starts over with no tokens.
+  // With no sponsor class chosen, the companies' studies page first and the rest
+  // after them, so the list opens on the companies instead of on whatever was
+  // updated last; the pane orders what has loaded (`orderTrials`).
   const term = query.trim();
   const filtersKey = `${filters.status}|${filters.phase}|${filters.sponsorClass}`;
-  const loadPage = useMemo(() => {
-    const tokens = new Map<number, string>();
-    const narrowing = trialFiltersQuery(filters);
-    return async ({ offset, signal }: PageRequest): Promise<RowPage<ClinicalTrial>> => {
-      const pageToken = offset > 0 ? tokens.get(offset) : undefined;
-      if (offset > 0 && !pageToken) return { rows: [], hasMore: false };
-      const page = await client.listTrials({ term: term || undefined, ...narrowing, pageSize: DEFAULT_PAGE_SIZE, pageToken }, signal);
-      const nextOffset = offset + page.trials.length;
-      if (page.nextPageToken) tokens.set(nextOffset, page.nextPageToken);
-      return { rows: page.trials, hasMore: !!page.nextPageToken, nextOffset };
-    };
+  const loadPage = useMemo(() => createTrialPageLoader({
+    list: (studiesQuery, signal) => client.listTrials(studiesQuery, signal),
+    query: { term: term || undefined, ...trialFiltersQuery(filters), pageSize: DEFAULT_PAGE_SIZE },
+    stages: filters.sponsorClass === ALL ? COMPANIES_FIRST : [{}],
+    // A page's sponsors are asked for before it shows, so it lands in order; a slow lookup fills in after.
+    onPage: (pageTrials, signal) => sponsorTickerStore.loadWithin(
+      pageTrials.map((trial) => trial.sponsor),
+      TICKER_WAIT_MS,
+      signal,
+      { companies: pageTrials.filter((trial) => trial.sponsorClass === "INDUSTRY").map((trial) => trial.sponsor) },
+    ),
     // `filtersKey` stands for `filters`, which is rebuilt each render.
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [client, filtersKey, term]);
+  }), [client, filtersKey, term]);
   const studies = usePagedRows(loadPage, { getId: (trial) => trial.nctId, keepPreviousRows: true });
-  const trials = studies.rows;
-  const error = studies.error?.message ?? null;
+  const loadedTrials = studies.rows;
   const loadMore = useTableLoadMore(scrollRef, studies.hasMore && !openItemId, studies.loadMore);
   // Scrolling asks for the next page, so a page that does not fill a tall
   // pane asks for it once it is laid out.
@@ -199,12 +205,19 @@ export function TrialsPane({ width, height, focused }: PaneProps) {
       if (box?.viewport && box.scrollHeight > 0 && box.scrollHeight <= box.viewport.height) loadNextPage();
     }, 0);
     return () => clearTimeout(timer);
-  }, [hasMore, height, loadNextPage, loadingMore, openItemId, trials.length]);
+  }, [hasMore, height, loadNextPage, loadingMore, openItemId, loadedTrials.length]);
 
-  // Tickers come from Gloom Cloud a page of sponsors at a time; rows never wait for them.
-  const sponsors = useMemo(() => [...new Set(trials.map((trial) => trial.sponsor))], [trials]);
-  const sponsorTickers = useSponsorTickers(sponsors, session.requestKey);
+  // Tickers come from Gloom Cloud a page of sponsors at a time; a page waits a moment for them (see the loader).
+  // A company its ticker lookup has no name for is looked up in its search (Bayer is BAYN on Xetra).
+  const sponsors = useMemo(() => [...new Set(loadedTrials.map((trial) => trial.sponsor))], [loadedTrials]);
+  const companies = useMemo(
+    () => [...new Set(loadedTrials.filter((trial) => trial.sponsorClass === "INDUSTRY").map((trial) => trial.sponsor))],
+    [loadedTrials],
+  );
+  const sponsorTickers = useSponsorTickers(sponsors, session.requestKey, { companies });
   const tickerOf = useCallback((trial: ClinicalTrial) => sponsorTickers.tickers.get(trial.sponsor), [sponsorTickers.tickers]);
+  // Listed sponsors first, then other companies, then the rest, the latest phase first in each.
+  const trials = useMemo(() => orderTrials(loadedTrials, tickerOf), [loadedTrials, tickerOf]);
 
   const selectedTrial = trials.find((item) => item.nctId === selectedId) ?? trials[0] ?? null;
   const openTrial = openItemId
@@ -230,28 +243,23 @@ export function TrialsPane({ width, height, focused }: PaneProps) {
     setOpenItemId(null);
   }, [filters, setOpenItemId, setSavedFilters, setSelectedId]);
 
-  const reload = useCallback(() => {
-    studies.reload();
-    sponsorTickers.retry();
-  }, [sponsorTickers, studies]);
   // `TRIAL VKTX`: no study names a symbol, so one that finds nothing is
   // searched as its company's name, quoted so the registry matches the whole
   // name as a sponsor files it, and the search box then shows it. Each term
   // is looked up once.
-  const [looked, setLooked] = useState<ReadonlySet<string>>(() => new Set());
-  const resolvingTicker = studies.status === "loaded" && trials.length === 0 && !studies.error
-    && looksLikeTicker(term) && !looked.has(term.toUpperCase());
-  useEffect(() => {
-    if (!resolvingTicker) return;
-    let live = true;
-    void tickerSponsorName(dataProvider, term).catch(() => null).then((name) => {
-      if (!live) return;
-      setLooked((current) => new Set([...current, term.toUpperCase()]));
-      if (name) updateQuery(`"${name}"`);
-    });
-    return () => { live = false; };
-  }, [dataProvider, resolvingTicker, term, updateQuery]);
-  const loading = (studies.loading && trials.length === 0) || resolvingTicker;
+  const companySearch = useTickerCompanySearch(dataProvider, term, {
+    eligible: studies.status === "loaded" && trials.length === 0 && !studies.error && looksLikeTicker(term),
+    key: term.toUpperCase(),
+    onCompany: (name) => updateQuery(`"${name}"`),
+  });
+  const retryCompanySearch = companySearch.retry;
+  const error = studies.error?.message ?? companySearch.error;
+  const reload = useCallback(() => {
+    retryCompanySearch();
+    studies.reload();
+    sponsorTickers.retry();
+  }, [retryCompanySearch, sponsorTickers, studies]);
+  const loading = (studies.loading && trials.length === 0) || companySearch.resolving;
   usePaneRefreshKey(reload, { focused, enabled: !searchFocused && !openItemId });
 
   const detailTicker = detailTrial ? tickerOf(detailTrial) : undefined;
@@ -314,11 +322,11 @@ export function TrialsPane({ width, height, focused }: PaneProps) {
     switch (column.id) {
       case "updated": {
         const updated = formatDate(trial.lastUpdatePostDate);
-        return trial.lastUpdatePostDate ? { text: updated, value: updated, color: colors.textDim } : { text: "--", value: null, color: colors.textMuted };
+        return trial.lastUpdatePostDate ? { text: updated, value: updated, color: colors.textDim } : missingCell(colors);
       }
       case "phase": {
-        const text = trialPhaseLabel(trial.phases, layout.compact);
-        return { text, color: text === "--" || text === "N/A" ? colors.textMuted : colors.text };
+        if (!hasTrialPhase(trial.phases)) return missingCell(colors);
+        return { text: trialPhaseLabel(trial.phases, layout.compact), color: colors.text };
       }
       case "status": {
         const status = trialStatus(trial.status);
@@ -331,6 +339,10 @@ export function TrialsPane({ width, height, focused }: PaneProps) {
       }
       case "title":
         return { text: trial.title, color: colors.text, attributes: rowState.selected ? TextAttributes.BOLD : undefined };
+      case "drug": {
+        const drug = trialDrug(trial);
+        return drug ? { text: drug, color: colors.text } : missingCell(colors);
+      }
       case "sponsor":
         return { text: trial.sponsor, color: trial.sponsorClass === "INDUSTRY" ? colors.textBright : colors.textDim };
       case "ticker": {

package/src/plugins/builtin/clinical-trials/sponsor-listing.ts

@@ -0,0 +1,90 @@
+import { apiClient } from "../../../api-client";
+import { companyNameExtraWords, shortCompanyName } from "../../../tickers/company-name";
+import { classifyInstrumentKind } from "../../../tickers/search/ranking";
+import type { InstrumentSearchResult } from "../../../types/instrument";
+import { canonicalExchange } from "../../../utils/exchanges";
+
+/** A company's listing as Gloom Cloud's search marks its primary one. */
+export interface FoundListing {
+  ticker: string;
+  exchange: string | null;
+  entityName: string | null;
+}
+
+/** The listing of each name asked, null for a name with none that qualifies; rejects when the search could not answer. */
+export type ListingFinder = (names: readonly string[], signal?: AbortSignal) => Promise<Map<string, FoundListing | null>>;
+
+/** Rows asked of the search for each name: enough to see every company's primary listing that carries it. */
+const SEARCH_LIMIT = 30;
+
+/**
+ * Legal forms that say which country's company a name is. The search drops
+ * them when it compares names, so "Merck KGaA" reads as "Merck & Co.": a
+ * sponsor filed with one of them is only matched to a listing that has it.
+ */
+const COUNTRY_FORMS = new Set([
+  "ag", "kgaa", "gmbh", "kg", "se", "sa", "sas", "sarl", "srl", "spa", "nv", "bv", "ab", "as", "asa", "aps", "oy", "oyj", "plc", "pcl", "bhd", "berhad",
+]);
+
+/** Legal forms and titles written out in a listing's name ("Bayer Aktiengesellschaft", "Koninklijke Philips"), which the search reads as words of the name. */
+const WRITTEN_FORMS = new Set([
+  "aktiengesellschaft", "aktieselskab", "aktiebolag", "naamloze", "vennootschap", "societe", "anonyme", "sociedad", "anonima",
+  "kabushiki", "kaisha", "spolka", "akcyjna", "osakeyhtio", "koninklijke",
+]);
+
+function wordsOf(name: string): string[] {
+  return name.normalize("NFKD").replace(/\p{M}/gu, "").toLowerCase().split(/[^\p{L}\p{N}]+/u).filter(Boolean);
+}
+
+function listedExchange(result: InstrumentSearchResult): string {
+  return canonicalExchange(result.exchange === "SMART" ? result.primaryExchange : result.exchange || result.primaryExchange);
+}
+
+/** What a sponsor's name is searched as: the name without its legal form, when that is one word; null for any longer name. */
+export function sponsorSearchName(sponsor: string): string | null {
+  const short = shortCompanyName(sponsor.trim());
+  return short && !/\s/.test(short) ? short : null;
+}
+
+/**
+ * The listing of the company a sponsor's name stands for, from the rows the
+ * search gave for `sponsorSearchName`, for a sponsor Gloom Cloud has no
+ * reviewed name for (`Bayer` is Bayer AG, BAYN on Xetra). Careful by design,
+ * since a wrong ticker beside a sponsor is worse than none:
+ * - only a name that is one word once its legal form is dropped is asked;
+ * - the listing is a primary listing whose name is that word and nothing
+ *   more, apart from legal forms (Bayer AG, but not Evolv Technologies
+ *   Holdings for Evolv);
+ * - when more than one company's primary listing fits (Siemens), none does;
+ * - a sponsor filed under a legal form of its own country (Merck KGaA) never
+ *   takes a listing without it.
+ * A longer name (a university, a hospital, a start-up with its subsidiary
+ * line) is never matched.
+ */
+export function pickSponsorListing(sponsor: string, rows: readonly InstrumentSearchResult[]): FoundListing | null {
+  const short = sponsorSearchName(sponsor);
+  if (!short) return null;
+  const sponsorForms = wordsOf(sponsor).filter((word) => COUNTRY_FORMS.has(word));
+  const fits = rows.filter((row) => {
+    if (row.homeListing !== true || classifyInstrumentKind(row.type) !== "equity" || !listedExchange(row)) return false;
+    const words = wordsOf(row.name);
+    if (sponsorForms.some((form) => !words.includes(form))) return false;
+    return companyNameExtraWords(short, row.name) === words.filter((word) => WRITTEN_FORMS.has(word)).length;
+  });
+  if (fits.length !== 1) return null;
+  const [row] = fits;
+  return { ticker: row!.symbol.toUpperCase(), exchange: listedExchange(row!), entityName: row!.name };
+}
+
+/** One batched search of Gloom Cloud for every sponsor name that can be matched; the rest answer null without a request. */
+export const findSponsorListings: ListingFinder = async (sponsors, signal) => {
+  const found = new Map<string, FoundListing | null>(sponsors.map((sponsor) => [sponsor, null]));
+  const searched = new Map(sponsors.flatMap((sponsor) => {
+    const name = sponsorSearchName(sponsor);
+    return name ? [[sponsor, name] as const] : [];
+  }));
+  if (searched.size === 0) return found;
+  const answers = await apiClient.searchInstrumentsBatch([...new Set(searched.values())], SEARCH_LIMIT, signal ? { signal } : {});
+  for (const [sponsor, name] of searched) found.set(sponsor, pickSponsorListing(sponsor, answers.get(name) ?? []));
+  return found;
+};