@gloom-sh/terminal 0.19.1 → 0.19.3

package/src/plugins/builtin/cloud/trial-offer-status-widget.tsx

@@ -14,7 +14,7 @@
  * Where the status bar has no room for it, as on a phone, it never shows and
  * neither arm is counted.
  */
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState, useSyncExternalStore } from "react";
 import { apiClient } from "../../../api-client";
 import { usePlanAccess } from "../../../api-client/plan-access";
 import { exposeWebExperiment } from "../../../api-client/research-activity";
@@ -88,6 +88,27 @@ interface TrialOfferStatusWidgetProps {
   delayMs?: number;
 }
 
+let offerShowing = false;
+const offerListeners = new Set<() => void>();
+
+function setOfferShowing(next: boolean): void {
+  if (offerShowing === next) return;
+  offerShowing = next;
+  for (const listener of offerListeners) listener();
+}
+
+function subscribeOfferShowing(listener: () => void): () => void {
+  offerListeners.add(listener);
+  return () => {
+    offerListeners.delete(listener);
+  };
+}
+
+/** Whether the offer line is in the status bar, so the upgrade chip beside it does not pitch Pro twice. */
+export function useTrialOfferShowing(): boolean {
+  return useSyncExternalStore(subscribeOfferShowing, () => offerShowing, () => offerShowing);
+}
+
 export function TrialOfferStatusWidget(props: TrialOfferStatusWidgetProps) {
   if (getCurrentPluginTarget() !== "web") return null;
   return <WebTrialOffer {...props} />;
@@ -150,8 +171,10 @@ function WebTrialOffer({ expose = exposeWebExperiment, delayMs = TRIAL_OFFER_DEL
   useEffect(() => {
     if (!showing) return;
     hideShowingOffer = hide;
+    setOfferShowing(true);
     return () => {
       if (hideShowingOffer === hide) hideShowingOffer = null;
+      setOfferShowing(false);
     };
   }, [hide, showing]);
 

package/src/plugins/builtin/cloud/upgrade-status-widget.tsx

@@ -3,24 +3,29 @@ import { apiClient } from "../../../api-client";
 import { t, tf } from "../../../i18n";
 import { useAppLanguage } from "../../../i18n/react";
 import { Button } from "../../../components/ui/button";
-import { useCommandBarShortcut } from "../../../ui";
+import { DelayedMark } from "../../../components/ui/delayed-mark";
+import { Box, useCommandBarShortcut, useUiCapabilities } from "../../../ui";
 import { chatController, type ChatController } from "../chat/controller";
 import { useCloudPlanAction, useCloudUpgradeAction } from "../shared/cloud-upgrade";
-import { resolvePlanAccess } from "../../../api-client/plan-access";
+import { CLOUD_QUOTE_DELAY_MINUTES, resolvePlanAccess } from "../../../api-client/plan-access";
+import { useTrialOfferShowing } from "./trial-offer-status-widget";
 
 interface CloudUpgradeStatusWidgetProps {
   controller?: Pick<ChatController, "getSnapshot" | "subscribe">;
 }
 
 /**
- * Global entitlement status: the trial countdown while Pro is on loan, or the
- * delay free accounts get on cloud data. Signed-out users already have sign-in
- * affordances next to it, and paying subscribers have nothing to report.
+ * Global entitlement status: the trial countdown while Pro is on loan, or,
+ * signed out or on the free plan, the delayed mark the app's prices carry and
+ * the upgrade. While the trial offer line already pitches Pro, the mark stands
+ * alone. Pro accounts have nothing to report.
  */
 export function CloudUpgradeStatusWidget({ controller = chatController }: CloudUpgradeStatusWidgetProps) {
   useAppLanguage();
   const openUpgrade = useCloudUpgradeAction("status-widget");
   const openPlan = useCloudPlanAction();
+  const offerShowing = useTrialOfferShowing();
+  const { nativePaneChrome } = useUiCapabilities();
   // The status bar takes no keyboard focus; the chip names the command instead.
   const commandBarKey = useCommandBarShortcut();
   const [access, setAccess] = useState(() => resolvePlanAccess(apiClient.getCurrentUser()));
@@ -31,15 +36,34 @@ export function CloudUpgradeStatusWidget({ controller = chatController }: CloudU
     [controller],
   );
 
-  if (!access.signedIn || access.isPayingPro) return null;
+  if (access.isTrialActive) {
+    return (
+      <Button
+        label={tf("Pro trial {days}d", { days: access.trialDaysLeft })}
+        title={tf("Your plan ({key}, then {command})", { key: commandBarKey, command: "ACM" })}
+        variant="plain"
+        compact
+        stopPropagation
+        onPress={openPlan}
+      />
+    );
+  }
+  if (access.hasProAccess) return null;
 
-  const trial = access.isTrialActive;
-  const label = trial
-    ? tf("Pro trial {days}d", { days: access.trialDaysLeft })
-    : t("delayed data · upgrade");
-
-  const title = trial
-    ? tf("Your plan ({key}, then {command})", { key: commandBarKey, command: "ACM" })
-    : tf("Upgrade to Pro ({key}, then {command})", { key: commandBarKey, command: "UPGRADE" });
-  return <Button label={label} title={title} variant="plain" compact stopPropagation onPress={trial ? openPlan : openUpgrade} />;
+  const mark = <DelayedMark minutes={CLOUD_QUOTE_DELAY_MINUTES} />;
+  return (
+    <Box flexDirection="row" alignItems="center" gap={1} paddingRight={offerShowing || !nativePaneChrome ? 1 : 0} data-gloom-role="delayed-status">
+      {mark}
+      {offerShowing ? null : (
+        <Button
+          label={t("delayed data · upgrade")}
+          title={tf("Upgrade to Pro ({key}, then {command})", { key: commandBarKey, command: "UPGRADE" })}
+          variant="plain"
+          compact
+          stopPropagation
+          onPress={openUpgrade}
+        />
+      )}
+    </Box>
+  );
 }

package/src/plugins/builtin/comment-letters/index.tsx

@@ -1,5 +1,4 @@
 import type { GloomPlugin, PaneTemplateCreateOptions } from "../../../types/plugin";
-import { CommentLettersPane } from "./pane";
 import { COMMENT_LETTERS_PANE_ID, COMMENT_LETTERS_PLUGIN_ID } from "./types";
 
 const createCommentLettersPaneInstance = (options?: PaneTemplateCreateOptions) => {
@@ -37,7 +36,7 @@ export const commentLettersPlugin: GloomPlugin = {
       reportFreshness: { source: "SEC EDGAR", status: "not-a-feed", basis: "comment letters" },
       name: "Comment Letters",
       icon: "L",
-      component: CommentLettersPane,
+      get component(): typeof import("./pane").CommentLettersPane { const { CommentLettersPane } = require("./pane"); return CommentLettersPane; },
       defaultPosition: "right",
       defaultMode: "floating",
       defaultFloatingSize: { width: 100, height: 30 },

package/src/plugins/builtin/commodity-balances/client.ts

@@ -1,4 +1,5 @@
 import { apiClient } from "../../../api-client";
+import { sourceDidNotAnswer } from "../../../api-client/errors";
 import type { PsdBoardPayload } from "../../../api-client/commodity-balances";
 import { unavailableOnServer } from "../shared/cloud-resource";
 import type { BalanceRow, PriceForecast } from "./model";
@@ -37,7 +38,9 @@ function readBoard(payload: PsdBoardPayload): CommodityBalances {
     || (payload.marketYear != null && !text(payload.marketYear))) {
     throw new Error("The server returned an invalid crop balance board");
   }
-  if (payload.status === "unavailable" || payload.rows.length === 0) throw new Error(CROPS_NOT_AVAILABLE);
+  // The server's source did not answer this time, which may pass; a board with no rows has none yet.
+  if (payload.status === "unavailable") throw sourceDidNotAnswer(CROPS_NOT_AVAILABLE);
+  if (payload.rows.length === 0) throw new Error(CROPS_NOT_AVAILABLE);
   return {
     rows: payload.rows,
     prices: payload.prices,

package/src/plugins/builtin/commodity-balances/index.tsx

@@ -2,7 +2,6 @@ import type { PluginModule } from "../plugin-module";
 import { commandRequestParams } from "../shared/command-tab";
 import { commodityBalancesHeadless } from "./headless";
 import { PSD_CROPS, psdCrop, unknownCropMessage } from "./model";
-import { CommodityBalancesPane } from "./pane";
 
 export const commodityBalancesModule: PluginModule = {
   panes: [
@@ -10,7 +9,7 @@ export const commodityBalancesModule: PluginModule = {
       id: "commodity-balances",
       name: "Crop Balances",
       icon: "B",
-      component: CommodityBalancesPane,
+      get component(): typeof import("./pane").CommodityBalancesPane { const { CommodityBalancesPane } = require("./pane"); return CommodityBalancesPane; },
       defaultPosition: "right",
       defaultMode: "floating",
       defaultFloatingSize: { width: 108, height: 28 },
@@ -25,7 +24,8 @@ export const commodityBalancesModule: PluginModule = {
       paneId: "commodity-balances",
       label: "Crop Balances",
       description: "World balances for wheat, corn, soybeans, cotton, coffee and sugar, with season-average price forecasts when a table is published.",
-      keywords: ["wheat", "corn", "soybeans", "cotton", "coffee", "sugar", "crop", "balances", "production", "exports", "stocks", "harvest"],
+      keywords: ["wheat", "corn", "soybeans", "cotton", "coffee", "sugar", "crop", "balances", "production", "exports", "stocks", "harvest",
+        "usda", "wasde", "grain", "grains", "fertilizer", "fertiliser", "potash"],
       shortcut: {
         prefix: "PSD",
         argKind: "text",

package/src/plugins/builtin/commodity-balances/pane.tsx

@@ -9,7 +9,7 @@ import {
   type DataTableColumn,
 } from "../../../components";
 import { usePaneRefreshKey } from "../../../components/data-table/table-pane";
-import type { PaneFooterSegment } from "../../../components/layout/pane/footer";
+import { ageFooterSegment, type PaneFooterSegment } from "../../../components/layout/pane/footer";
 import { useAsyncResource } from "../../../react/async-resource";
 import { useAutoRefresh, useUpdatedAgo } from "../../../react/auto-refresh";
 import { usePaneInstance } from "../../../state/app/context";
@@ -96,7 +96,7 @@ export function CommodityBalancesPane({ width, height, focused }: PaneProps) {
   const updatedAgo = useUpdatedAgo(updatedAt);
   const info = useMemo<PaneFooterSegment[]>(() => {
     const year = data?.marketYear;
-    const updated: PaneFooterSegment[] = updatedAgo ? [{ id: "updated", parts: [{ text: updatedAgo, tone: "muted" }] }] : [];
+    const updated: PaneFooterSegment[] = updatedAgo ? [ageFooterSegment(updatedAgo)] : [];
     return year ? [...updated, { id: "year", parts: [{ text: year, tone: "muted" }] }] : updated;
   }, [data?.marketYear, updatedAgo]);
 

package/src/plugins/builtin/congress-trades/aggregates.ts

@@ -1,5 +1,11 @@
 import type { CloudCongressMemberPayload, CloudCongressTickerPayload, CloudCongressTradePayload } from "../../../api-client";
 
+function median(values: number[]): number | null {
+  if (!values.length) return null;
+  const sorted = [...values].sort((a, b) => a - b);
+  return (sorted[Math.floor((sorted.length - 1) / 2)]! + sorted[Math.floor(sorted.length / 2)]!) / 2;
+}
+
 /** Aggregates exactly the distinct trades loaded, including appended years. */
 export function aggregateLoadedCongress(trades: CloudCongressTradePayload[], metadata: CloudCongressMemberPayload[] = []) {
   const members = new Map<string, CloudCongressMemberPayload>();
@@ -7,6 +13,7 @@ export function aggregateLoadedCongress(trades: CloudCongressTradePayload[], met
   const lags = new Map<string, number[]>();
   const returns = new Map<string, number[]>();
   const buys = new Map<string, number[]>();
+  const excess = new Map<string, number[]>();
   const known = new Map(metadata.map((member) => [member.id, member]));
   const seen = new Set<string>();
   for (const trade of trades) {
@@ -22,6 +29,7 @@ export function aggregateLoadedCongress(trades: CloudCongressTradePayload[], met
       lags.set(memberId, []);
       returns.set(memberId, []);
       buys.set(memberId, []);
+      excess.set(memberId, []);
     }
     const summaries: (CloudCongressMemberPayload | CloudCongressTickerPayload)[] = [member];
     if (trade.ticker) {
@@ -39,6 +47,7 @@ export function aggregateLoadedCongress(trades: CloudCongressTradePayload[], met
       returns.get(memberId)!.push(trade.returnSinceTx);
       if (trade.side === "BUY") buys.get(memberId)!.push(trade.returnSinceTx);
     }
+    if (trade.excessSinceFiling != null && Number.isFinite(trade.excessSinceFiling)) excess.get(memberId)!.push(trade.excessSinceFiling);
     if (!member.lastFilingDate || trade.filingDate >= member.lastFilingDate) {
       member.party = trade.party ?? member.party ?? null;
       member.committees = trade.committees ?? member.committees ?? [];
@@ -57,11 +66,13 @@ export function aggregateLoadedCongress(trades: CloudCongressTradePayload[], met
   }
   for (const [id, member] of members) {
     const values = lags.get(id)!;
-    const priced = returns.get(id)!.sort((a, b) => a - b);
+    const priced = returns.get(id)!;
     const pricedBuys = buys.get(id)!;
     member.pricedTradeCount = priced.length;
     member.pricedBuyCount = pricedBuys.length;
-    member.medianReturn = priced.length ? (priced[Math.floor((priced.length - 1) / 2)]! + priced[Math.floor(priced.length / 2)]!) / 2 : null;
+    member.excessTradeCount = excess.get(id)!.length;
+    member.medianReturn = median(priced);
+    member.medianExcessSinceFiling = median(excess.get(id)!);
     member.buyHitRate = pricedBuys.length ? 100 * pricedBuys.filter(value => value > 0).length / pricedBuys.length : null;
     member.avgLagDays = values.length ? Math.round(values.reduce((a, b) => a + b, 0) / values.length) : null;
   }

package/src/plugins/builtin/congress-trades/detail.tsx

@@ -40,11 +40,24 @@ import {
   type TradeColumn,
   type TradeColumnId,
 } from "./model";
-import { renderCongressTradeCell } from "./table";
+import { congressReturnColor, renderCongressTradeCell } from "./table";
 import { loadCongressHouse } from "./client";
 
 const DETAIL_ROW = { labelWidth: 16, emphasis: false } as const;
 
+/** A window's return, or its excess with SPY's own return beside it. */
+function ReturnRow({ label, value, spy }: { label: string; value: number | null | undefined; spy?: number | null }) {
+  return (
+    <KeyValueRow
+      {...DETAIL_ROW}
+      label={label}
+      value={formatCongressReturn(value)}
+      color={congressReturnColor(value)}
+      detail={spy == null ? undefined : `SPY ${formatCongressReturn(spy)}`}
+    />
+  );
+}
+
 export function TradeDetail({
   trade,
   width,
@@ -68,8 +81,10 @@ export function TradeDetail({
         <KeyValueRow {...DETAIL_ROW} label="asset" value={fit(trade.assetName)} />
         <KeyValueRow {...DETAIL_ROW} label="amount" value={trade.amount} color={colors.textBright} />
         <KeyValueRow {...DETAIL_ROW} label="owner" value={trade.owner} />
-        <KeyValueRow {...DETAIL_ROW} label="tx return" value={formatCongressReturn(trade.returnSinceTx)} />
-        <KeyValueRow {...DETAIL_ROW} label="filed return" value={formatCongressReturn(trade.returnSinceFiling)} />
+        <ReturnRow label="tx return" value={trade.returnSinceTx} />
+        <ReturnRow label="tx vs SPY" value={trade.excessSinceTx} spy={trade.spyReturnSinceTx} />
+        <ReturnRow label="filed return" value={trade.returnSinceFiling} />
+        <ReturnRow label="filed vs SPY" value={trade.excessSinceFiling} spy={trade.spyReturnSinceFiling} />
         <KeyValueRow {...DETAIL_ROW} label="price as of" value={trade.returnAsOf ?? "--"} />
         <KeyValueRow {...DETAIL_ROW} label="tx date" value={trade.transactionDate ?? "--"} />
         <KeyValueRow {...DETAIL_ROW} label="notification" value={trade.notificationDate ?? "--"} />
@@ -292,7 +307,8 @@ export function MemberTradesDetail({
   // detail adds what the row lacks: how many priced trades stand behind the
   // return figures, and the committees.
   const summaryItems: StatItem[] = [
-    { id: "median", label: "Median return", value: formatCongressReturn(summaryMember.medianReturn), detail: `${summaryMember.pricedTradeCount ?? 0} priced` },
+    { id: "median", label: "Median return", value: formatCongressReturn(summaryMember.medianReturn), color: congressReturnColor(summaryMember.medianReturn), detail: `${summaryMember.pricedTradeCount ?? 0} priced` },
+    { id: "vs-spy", label: "Median vs SPY", value: formatCongressReturn(summaryMember.medianExcessSinceFiling), color: congressReturnColor(summaryMember.medianExcessSinceFiling), detail: `since filing, ${summaryMember.excessTradeCount ?? 0} priced`, detailVariants: ["since filing"] },
     { id: "hit", label: "Buy hit rate", value: summaryMember.buyHitRate == null ? "--" : `${summaryMember.buyHitRate.toFixed(0)}%`, detail: `${summaryMember.pricedBuyCount ?? 0} priced buys` },
     ...(summaryMember.committees ?? []).map((committee): StatItem => ({ id: `committee:${committee}`, label: "Committee", value: committee, wide: true })),
   ];

package/src/plugins/builtin/congress-trades/headless.ts

@@ -51,6 +51,7 @@ const TRADE_COLUMNS: HeadlessPaneColumn[] = [
   { key: "owner", header: "Owner" },
   { key: "returnSinceTx", header: "Tx return", format: value => formatCongressReturn(typeof value === "number" ? value : null) },
   { key: "returnSinceFiling", header: "Filed return", format: value => formatCongressReturn(typeof value === "number" ? value : null) },
+  { key: "excessSinceFiling", header: "Vs SPY", format: value => formatCongressReturn(typeof value === "number" ? value : null) },
 ];
 
 const MEMBER_COLUMNS: HeadlessPaneColumn[] = [
@@ -73,6 +74,7 @@ const MEMBER_COLUMNS: HeadlessPaneColumn[] = [
   { key: "avgLagDays", header: "Avg", align: "right", format: (value) => formatLag(typeof value === "number" ? value : null) },
   { key: "medianReturn", header: "Median return", format: value => formatCongressReturn(typeof value === "number" ? value : null) },
   { key: "pricedTradeCount", header: "Priced trades" },
+  { key: "medianExcessSinceFiling", header: "Median vs SPY", format: value => formatCongressReturn(typeof value === "number" ? value : null) },
   { key: "buyHitRate", header: "Buy hit", align: "right", format: value => typeof value === "number" && Number.isFinite(value) ? `${value.toFixed(1)}%` : "--" },
   { key: "pricedBuyCount", header: "Priced buys" },
 ];

package/src/plugins/builtin/congress-trades/model.ts

@@ -1,4 +1,5 @@
 import type { DataTableColumn } from "../../../components";
+import { dropColumnsToFit, getTableWidth } from "../../../components/ui/table-layout";
 import type { ShortDateOptions } from "../../../utils/datetime-format";
 import { formatCompact } from "../../../utils/format";
 import type { SortDirection } from "../../../utils/sort-values";
@@ -28,6 +29,7 @@ export type DetailMode =
 export type TradeColumnId =
   | "returnSinceTx"
   | "returnSinceFiling"
+  | "excessSinceFiling"
   | "filed"
   | "tx"
   | "lag"
@@ -45,6 +47,7 @@ export type TradeColumn = DataTableColumn & {
 export type MemberColumnId =
   | "party"
   | "medianReturn"
+  | "medianExcessSinceFiling"
   | "buyHitRate"
   | "member"
   | "district"
@@ -151,6 +154,7 @@ function compareTrade(
   switch (columnId) {
     case "returnSinceTx":
     case "returnSinceFiling":
+    case "excessSinceFiling":
       return compareOptionalNumber(left[columnId], right[columnId]);
     case "filed":
       return dateValue(left.filingDate) - dateValue(right.filingDate);
@@ -182,6 +186,7 @@ function compareMember(
     case "party":
       return compareText(left.party ?? "", right.party ?? "");
     case "medianReturn":
+    case "medianExcessSinceFiling":
     case "buyHitRate":
       return compareOptionalNumber(left[columnId], right[columnId]);
     case "member":
@@ -203,87 +208,102 @@ function compareMember(
   }
 }
 
+const VS_SPY_COLUMN: TradeColumn = { id: "excessSinceFiling", label: "VS SPY", width: 10, align: "right" };
+const TRADE_MEMBER_MIN_WIDTH = 14;
+/** Narrower than this cuts most member names, so other columns give way first. */
+const MEMBER_READABLE_WIDTH = 18;
+
+/**
+ * Short of room, the trades give way in this order. The return since the
+ * trade goes first: FILE RET% and VS SPY read over the same days, from the
+ * filing a follower could act on. Then the dates lose their year, the lag
+ * (it follows from the two dates), the owner and the trade date go, and VS
+ * SPY outlasts FILE RET%. The detail keeps every figure.
+ */
+const TRADE_DROP_ORDER = ["returnSinceTx", "lag", "owner", "tx", "returnSinceFiling"] as const;
+
+function tradeColumns(tickerView: boolean, dateWidth: number, memberWidth: number, assetWidth: number | null): TradeColumn[] {
+  return [
+    { id: "filed", label: "FILED", width: dateWidth, align: "left" },
+    { id: "tx", label: "TX", width: dateWidth, align: "left" },
+    { id: "lag", label: "LAG", width: 5, align: "right" },
+    { id: "member", label: "MEMBER", width: memberWidth, align: "left" },
+    { id: "side", label: "SIDE", width: 5, align: "left" },
+    ...(!tickerView ? [{ id: "ticker" as const, label: "TICKER", width: 12, align: "left" as const, assetFallback: assetWidth == null }] : []),
+    ...(assetWidth != null ? [{ id: "asset" as const, label: "ASSET", width: assetWidth, align: "left" as const }] : []),
+    { id: "amount", label: "AMOUNT", width: 14, align: "right" },
+    { id: "owner", label: "OWNER", width: 8, align: "left" },
+    { id: "returnSinceTx", label: "TX RET%", width: 10, align: "right" },
+    { id: "returnSinceFiling", label: "FILE RET%", width: 10, align: "right" },
+    VS_SPY_COLUMN,
+  ];
+}
+
 export function buildTradeColumns(width: number, tickerView = false): TradeColumn[] {
-  const filedWidth = 10;
-  const txWidth = 10;
-  const lagWidth = 5;
-  const sideWidth = 5;
-  const tickerWidth = tickerView ? 0 : 12;
-  const amountWidth = 14;
-  const ownerWidth = 8;
-  const flexWidth = Math.max(
-    14,
-    width - filedWidth - txWidth - lagWidth - sideWidth - tickerWidth - amountWidth - ownerWidth - 36,
-  );
+  // Full dates while dropping TX RET% is enough, then short ones and the rest of the order.
+  const long = dropColumnsToFit(tradeColumns(tickerView, 10, MEMBER_READABLE_WIDTH, null), width, TRADE_DROP_ORDER.slice(0, 1));
+  const fitted = getTableWidth(long) <= width ? long : dropColumnsToFit(tradeColumns(tickerView, 7, MEMBER_READABLE_WIDTH, null), width, TRADE_DROP_ORDER);
+  const shown = new Set(fitted.map((column) => column.id));
+  const dateWidth = fitted[0]!.width;
+  const layout = (memberWidth: number, assetWidth: number | null) => tradeColumns(tickerView, dateWidth, memberWidth, assetWidth)
+    .filter((column) => shown.has(column.id) || column.id === "asset");
+  // What the other columns leave, as the table draws them, names the member and then the asset.
+  const flexWidth = Math.max(TRADE_MEMBER_MIN_WIDTH, MEMBER_READABLE_WIDTH + width - getTableWidth(fitted));
   // Member names rarely pass 22 cells; the rest names the asset, which is the
   // only identification for trades without a ticker (bonds, T-bills, funds).
   const memberWidth = Math.min(22, Math.max(18, flexWidth - 13));
   const assetWidth = flexWidth - memberWidth - 1;
-  const showAsset = assetWidth >= 12;
-  return [
-    { id: "filed", label: "FILED", width: filedWidth, align: "left" },
-    { id: "tx", label: "TX", width: txWidth, align: "left" },
-    { id: "lag", label: "LAG", width: lagWidth, align: "right" },
-    { id: "member", label: "MEMBER", width: showAsset ? memberWidth : flexWidth, align: "left" },
-    { id: "side", label: "SIDE", width: sideWidth, align: "left" },
-    ...(!tickerView ? [{ id: "ticker" as const, label: "TICKER", width: tickerWidth, align: "left" as const, assetFallback: !showAsset }] : []),
-    ...(showAsset ? [{ id: "asset" as const, label: "ASSET", width: assetWidth, align: "left" as const }] : []),
-    { id: "amount", label: "AMOUNT", width: amountWidth, align: "right" },
-    { id: "owner", label: "OWNER", width: ownerWidth, align: "left" },
-    { id: "returnSinceTx", label: "TX RET%", width: 10, align: "right" },
-    { id: "returnSinceFiling", label: "FILE RET%", width: 10, align: "right" },
-  ];
+  return assetWidth >= 12 ? layout(memberWidth, assetWidth) : layout(flexWidth, null);
 }
 
+const MEMBER_TRADE_ASSET_MIN_WIDTH = 18;
+/** As on the trades; the member row above also carries their average lag. */
+const MEMBER_TRADE_DROP_ORDER = ["lag", "owner", "tx"] as const;
+
 export function buildMemberTradeColumns(width: number): TradeColumn[] {
-  const filedWidth = 7;
-  const txWidth = 7;
-  const sideWidth = 8;
-  const tickerWidth = 12;
-  const amountWidth = 14;
-  const ownerWidth = 8;
-  const lagWidth = 5;
-  const assetWidth = Math.max(
-    18,
-    width - filedWidth - txWidth - sideWidth - tickerWidth - amountWidth - ownerWidth - lagWidth - 9,
-  );
-  return [
-    { id: "filed", label: "FILED", width: filedWidth, align: "left" },
-    { id: "tx", label: "TX", width: txWidth, align: "left" },
-    { id: "side", label: "SIDE", width: sideWidth, align: "left" },
-    { id: "ticker", label: "TICKER", width: tickerWidth, align: "left" },
-    { id: "amount", label: "AMOUNT", width: amountWidth, align: "right" },
+  const layout = (assetWidth: number): TradeColumn[] => [
+    { id: "filed", label: "FILED", width: 7, align: "left" },
+    { id: "tx", label: "TX", width: 7, align: "left" },
+    { id: "side", label: "SIDE", width: 8, align: "left" },
+    { id: "ticker", label: "TICKER", width: 12, align: "left" },
+    { id: "amount", label: "AMOUNT", width: 14, align: "right" },
     { id: "asset", label: "ASSET", width: assetWidth, align: "left" },
-    { id: "owner", label: "OWNER", width: ownerWidth, align: "left" },
-    { id: "lag", label: "LAG", width: lagWidth, align: "right" },
+    { id: "owner", label: "OWNER", width: 8, align: "left" },
+    { id: "lag", label: "LAG", width: 5, align: "right" },
+    VS_SPY_COLUMN,
   ];
+  const fitted = dropColumnsToFit(layout(MEMBER_TRADE_ASSET_MIN_WIDTH), width, MEMBER_TRADE_DROP_ORDER);
+  const shown = new Set(fitted.map((column) => column.id));
+  const assetWidth = Math.max(MEMBER_TRADE_ASSET_MIN_WIDTH, MEMBER_TRADE_ASSET_MIN_WIDTH + width - getTableWidth(fitted));
+  return layout(assetWidth).filter((column) => shown.has(column.id));
 }
 
+/**
+ * As on the trades, the median return since the trade gives way before the one
+ * against SPY; then the average lag, the last filing, the district and the
+ * buy hit rate, which the member's detail repeats.
+ */
+const MEMBER_DROP_ORDER = ["medianReturn", "lag", "last", "district", "buyHitRate"] as const;
+
 export function buildMemberColumns(width: number): MemberColumn[] {
-  const districtWidth = 6;
-  const tradesWidth = 7;
-  const buysWidth = 5;
-  const sellsWidth = 6;
-  const rangeWidth = 17;
-  const lastWidth = 7;
-  const lagWidth = 6;
-  const memberWidth = Math.max(
-    18,
-    width - districtWidth - tradesWidth - buysWidth - sellsWidth - rangeWidth - lastWidth - lagWidth - 47,
-  );
-  return [
+  const layout = (memberWidth: number): MemberColumn[] => [
     { id: "member", label: "MEMBER", width: memberWidth, align: "left" },
-    { id: "district", label: "DIST", width: districtWidth, align: "left" },
+    { id: "district", label: "DIST", width: 6, align: "left" },
     { id: "party", label: "PARTY", width: 11, align: "left" },
-    { id: "trades", label: "TRADES", width: tradesWidth, align: "right" },
-    { id: "buys", label: "BUY", width: buysWidth, align: "right" },
-    { id: "sells", label: "SELL", width: sellsWidth, align: "right" },
-    { id: "range", label: "EST RANGE", width: rangeWidth, align: "right" },
-    { id: "last", label: "LAST", width: lastWidth, align: "left" },
-    { id: "lag", label: "AVG", width: lagWidth, align: "right" },
+    { id: "trades", label: "TRADES", width: 7, align: "right" },
+    { id: "buys", label: "BUY", width: 5, align: "right" },
+    { id: "sells", label: "SELL", width: 6, align: "right" },
+    { id: "range", label: "EST RANGE", width: 17, align: "right" },
+    { id: "last", label: "LAST", width: 7, align: "left" },
+    { id: "lag", label: "AVG", width: 6, align: "right" },
     { id: "medianReturn", label: "MED RET%", width: 9, align: "right" },
+    { id: "medianExcessSinceFiling", label: "MED VS SPY", width: 10, align: "right" },
     { id: "buyHitRate", label: "BUY HIT%", width: 9, align: "right" },
   ];
+  const fitted = dropColumnsToFit(layout(MEMBER_READABLE_WIDTH), width, MEMBER_DROP_ORDER);
+  const shown = new Set(fitted.map((column) => column.id));
+  const memberWidth = Math.max(MEMBER_READABLE_WIDTH, MEMBER_READABLE_WIDTH + width - getTableWidth(fitted));
+  return layout(memberWidth).filter((column) => shown.has(column.id));
 }
 
 export function sortedTrades(
@@ -394,6 +414,14 @@ export function mergeCongressPages(
   return { ...next, trades: [...byTradeId.values()], members };
 }
 
+/** Percent to one decimal; a figure that rounds to zero reads 0.0%, never -0.0%. */
 export function formatCongressReturn(value: number | null | undefined): string {
-  return value == null || !Number.isFinite(value) ? "--" : `${value > 0 ? "+" : ""}${value.toFixed(1)}%`;
+  if (value == null || !Number.isFinite(value)) return "--";
+  const shown = roundCongressReturn(value);
+  return `${shown > 0 ? "+" : ""}${shown === 0 ? "0.0" : shown.toFixed(1)}%`;
+}
+
+/** The figure as shown, so its colour follows the digits: SPY at -0.04% is flat, not red. */
+export function roundCongressReturn(value: number): number {
+  return Math.round(value * 10) / 10 || 0;
 }

package/src/plugins/builtin/congress-trades/table.tsx

@@ -1,6 +1,7 @@
 import { TextAttributes } from "../../../ui";
 import { TickerBadgeList, type DataTableCell } from "../../../components";
 import { colors } from "../../../theme/colors";
+import { signedColor } from "../shared/research-cells";
 import { formatShortDate } from "../../../utils/datetime-format";
 import type {
   CloudCongressMemberPayload,
@@ -11,6 +12,7 @@ import {
   formatAmountRange,
   formatCongressReturn,
   formatLag,
+  roundCongressReturn,
   FILING_DAY_FORMAT,
   tradeAssetLabel,
   type MemberColumn,
@@ -18,6 +20,15 @@ import {
   type TickerColumn,
 } from "./model";
 
+/** A return or its excess over SPY takes the shared signed colours wherever CG shows one, by its digits. */
+export function congressReturnColor(value: number | null | undefined): string {
+  return signedColor(value == null ? value : roundCongressReturn(value), colors);
+}
+
+function congressReturnCell(value: number | null | undefined): DataTableCell {
+  return { text: formatCongressReturn(value), color: congressReturnColor(value) };
+}
+
 function sideColor(side: CloudCongressTradePayload["side"]): string {
   if (side === "BUY") return colors.positive;
   if (side === "SELL") return colors.negative;
@@ -32,7 +43,7 @@ export function renderCongressTradeCell(
   rowState: { selected: boolean },
 ): DataTableCell {
   switch (column.id) {
-    case "returnSinceTx": case "returnSinceFiling": return { text: formatCongressReturn(trade[column.id]), color: trade[column.id] == null ? colors.textDim : trade[column.id]! >= 0 ? colors.positive : colors.negative };
+    case "returnSinceTx": case "returnSinceFiling": case "excessSinceFiling": return congressReturnCell(trade[column.id]);
     case "filed":
       return { text: column.width >= 10 ? trade.filingDate : formatShortDate(trade.filingDate, FILING_DAY_FORMAT), color: colors.textDim };
     case "tx":
@@ -81,7 +92,8 @@ export function renderCongressMemberCell(
 ): DataTableCell {
   switch (column.id) {
     case "party": return { text: member.party ?? "--", color: colors.textDim };
-    case "medianReturn": case "buyHitRate": return { text: column.id === "buyHitRate" ? member.buyHitRate == null ? "--" : `${member.buyHitRate.toFixed(0)}%` : formatCongressReturn(member.medianReturn), color: colors.text };
+    case "medianReturn": case "medianExcessSinceFiling": return congressReturnCell(member[column.id]);
+    case "buyHitRate": return { text: member.buyHitRate == null ? "--" : `${member.buyHitRate.toFixed(0)}%`, color: colors.text };
     case "member":
       return { text: member.memberName, color: colors.text };
     case "district":

package/src/plugins/builtin/connections/index.ts

@@ -1,7 +1,6 @@
 import type { PluginCapability } from "../../../capabilities";
 import type { ConnectionHealthRegistry } from "../../../core/connection-health";
 import type { PluginModule } from "../plugin-module";
-import { ConnectionsPane } from "./pane";
 
 export const CONNECTION_HEALTH_CAPABILITY_ID = "application.connection-health";
 
@@ -35,8 +34,8 @@ export const connectionsModule: PluginModule = {
     name: "Connections",
     personalData: "account",
     icon: "C",
-    component: ConnectionsPane,
-    reportFreshness: { status: "not-a-feed", basis: "connection health" },
+    get component(): typeof import("./pane").ConnectionsPane { const { ConnectionsPane } = require("./pane"); return ConnectionsPane; },
+    reportFreshness: { status: "not-a-feed", basis: "connection health", local: true },
     defaultPosition: "right",
     defaultMode: "floating",
     defaultFloatingSize: { width: 80, height: 24 },