gloomberb 0.5.0 → 0.6.0

package/src/plugins/builtin/yield-curve/index.tsx

@@ -1,25 +1,26 @@
-import { useEffect, useRef, useState } from "react";
-import { TextAttributes } from "@opentui/core";
-import { useKeyboard } from "@opentui/react";
-import type { GloomPlugin, PaneProps } from "../../../types/plugin";
+import { Box, ScrollBox, Text } from "../../../ui";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { useShortcut } from "../../../react/input";
+import { StaticChartSurface, usePaneFooter } from "../../../components";
+import type { GloomPluginContext, PaneProps } from "../../../types/plugin";
 import { colors } from "../../../theme/colors";
-import { useAppSelector } from "../../../state/app-context";
-import { renderChart, resolveChartPalette } from "../../../components/chart/chart-renderer";
+import { resolveChartPalette } from "../../../components/chart/chart-renderer";
 import type { ProjectedChartPoint } from "../../../components/chart/chart-data";
 import {
-  attachYieldCurvePersistence,
   loadYieldCurve,
   parseYieldPoints,
   isInverted,
-  resetYieldCurvePersistence,
   TREASURY_MATURITIES,
   type YieldPoint,
 } from "./treasury-data";
-import { FRED_API_KEY_COMMAND_LABEL, getSharedFredApiKey } from "../fred-settings";
 
 function formatYield(y: number | null): string {
   if (y == null) return "—";
-  return y.toFixed(2);
+  return `${y.toFixed(2)}%`;
+}
+
+function formatYieldAxis(value: number): string {
+  return `${value.toFixed(2)}%`;
 }
 
 function spreadBp(points: YieldPoint[]): number | null {
@@ -30,25 +31,20 @@ function spreadBp(points: YieldPoint[]): number | null {
 }
 
 export function YieldCurvePane({ focused, width, height }: PaneProps) {
-  const config = useAppSelector((s) => s.config);
-  const apiKey = getSharedFredApiKey(config);
-
   const [points, setPoints] = useState<YieldPoint[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
   const fetchGenRef = useRef(0);
 
-  const load = async (force = false) => {
-    if (!apiKey) return;
-
+  const load = useCallback(async (force = false) => {
     fetchGenRef.current += 1;
     const gen = fetchGenRef.current;
     setLoading(true);
     setError(null);
 
     try {
-      const data = await loadYieldCurve(apiKey, { force });
+      const data = await loadYieldCurve();
       if (fetchGenRef.current !== gen) return;
       setPoints(data);
     } catch (err) {
@@ -57,65 +53,56 @@ export function YieldCurvePane({ focused, width, height }: PaneProps) {
     } finally {
       if (fetchGenRef.current === gen) setLoading(false);
     }
-  };
+  }, []);
 
   useEffect(() => {
     load();
-  }, [apiKey]);
+  }, [load]);
 
-  useKeyboard((ev) => {
+  useShortcut((ev) => {
     if (!focused) return;
     if (ev.name === "r") {
       load(true);
     }
   });
 
-  if (!apiKey) {
-    return (
-      <box flexDirection="column" width={width} height={height}>
-        <box flexGrow={1} justifyContent="center" alignItems="center">
-          <text fg={colors.textMuted}>{`Configure FRED API key: type '${FRED_API_KEY_COMMAND_LABEL}' in command bar`}</text>
-        </box>
-        <box height={1} paddingX={1}>
-          <text fg={colors.textMuted}>[r]efresh</text>
-        </box>
-      </box>
-    );
-  }
+  const inverted = isInverted(points);
+  const bp = spreadBp(points);
+
+  usePaneFooter("yield-curve", () => ({
+    info: [
+      ...(inverted ? [{ id: "inverted", parts: [{ text: "INVERTED", tone: "warning" as const, bold: true }] }] : []),
+      ...(bp != null ? [{ id: "spread", parts: [{ text: `2Y-10Y ${bp >= 0 ? "+" : ""}${bp}bp`, tone: bp < 0 ? "warning" as const : "muted" as const }] }] : []),
+      ...(loading ? [{ id: "loading", parts: [{ text: "loading", tone: "muted" as const }] }] : []),
+      ...(error ? [{ id: "error", parts: [{ text: error, tone: "warning" as const }] }] : []),
+    ],
+    hints: [{ id: "refresh", key: "r", label: "efresh", onPress: () => load(true) }],
+  }), [bp, error, inverted, load, loading]);
 
   if (loading && points.length === 0) {
     return (
-      <box flexDirection="column" width={width} height={height}>
-        <box flexGrow={1} justifyContent="center" alignItems="center">
-          <text fg={colors.textMuted}>Loading...</text>
-        </box>
-        <box height={1} paddingX={1}>
-          <text fg={colors.textMuted}>[r]efresh</text>
-        </box>
-      </box>
+      <Box flexDirection="column" width={width} height={height}>
+        <Box flexGrow={1} justifyContent="center" alignItems="center">
+          <Text fg={colors.textMuted}>Loading...</Text>
+        </Box>
+      </Box>
     );
   }
 
   if (error && points.length === 0) {
     return (
-      <box flexDirection="column" width={width} height={height}>
-        <box flexGrow={1} justifyContent="center" alignItems="center">
-          <text fg={colors.negative}>{error}</text>
-        </box>
-        <box height={1} paddingX={1}>
-          <text fg={colors.textMuted}>[r]efresh</text>
-        </box>
-      </box>
+      <Box flexDirection="column" width={width} height={height}>
+        <Box flexGrow={1} justifyContent="center" alignItems="center">
+          <Text fg={colors.negative}>{error}</Text>
+        </Box>
+      </Box>
     );
   }
 
   const validPoints = parseYieldPoints(points);
-  const inverted = isInverted(points);
-  const bp = spreadBp(points);
-  const spreadStr = bp != null ? `  2Y-10Y: ${bp >= 0 ? "+" : ""}${bp}bp` : "";
 
   const chartWidth = Math.max(10, width - 2);
-  const chartHeight = Math.min(12, Math.max(6, Math.floor(height * 0.3)));
+  const chartHeight = Math.min(18, Math.max(8, height - 5));
 
   const palette = resolveChartPalette(colors, "positive");
 
@@ -129,21 +116,6 @@ export function YieldCurvePane({ focused, width, height }: PaneProps) {
     volume: 0,
   }));
 
-  let chartResult: ReturnType<typeof renderChart> | null = null;
-  if (chartPoints.length >= 2) {
-    chartResult = renderChart(chartPoints, {
-      width: chartWidth,
-      height: chartHeight,
-      showVolume: false,
-      volumeHeight: 0,
-      cursorX: null,
-      cursorY: null,
-      mode: "line",
-      colors: palette,
-      timeAxisDates: chartPoints.map((p) => p.date),
-    });
-  }
-
   // Build maturity label row and yield value row for the table
   const colWidth = Math.max(6, Math.floor((width - 2) / TREASURY_MATURITIES.length));
   const maturityLabels = TREASURY_MATURITIES.map((m) => m.maturity.padEnd(colWidth)).join("").trimEnd();
@@ -153,90 +125,60 @@ export function YieldCurvePane({ focused, width, height }: PaneProps) {
   }).join("").trimEnd();
 
   return (
-    <box flexDirection="column" width={width} height={height}>
-      {/* Header */}
-      <box height={1} paddingX={1} flexDirection="row">
-        {inverted ? (
-          <text fg={colors.warning} attributes={TextAttributes.BOLD}>⚠ INVERTED</text>
-        ) : null}
-        {spreadStr ? (
-          <text fg={colors.textDim}>{inverted ? spreadStr : spreadStr.trimStart()}</text>
-        ) : null}
-        <box flexGrow={1} />
-        {loading ? <text fg={colors.textDim}>updating…</text> : null}
-      </box>
-
+    <Box flexDirection="column" width={width} height={height}>
       {/* Scrollable chart + table */}
-      <scrollbox flexGrow={1} scrollY focusable={false}>
-        <box flexDirection="column">
+      <ScrollBox flexGrow={1} scrollY focusable={false}>
+        <Box flexDirection="column">
           {/* Chart */}
-          {chartResult && chartResult.lines.length > 0 ? (
-            <box flexDirection="column" paddingX={1} marginTop={1}>
-              <box flexDirection="column" height={chartHeight} backgroundColor={palette.bgColor}>
-                {chartResult.lines.map((line, i) => (
-                  <text key={i} content={line} />
-                ))}
-              </box>
-            </box>
+          {chartPoints.length >= 2 ? (
+            <Box flexDirection="column" paddingX={1} marginTop={1}>
+              <StaticChartSurface
+                points={chartPoints}
+                width={chartWidth}
+                height={chartHeight}
+                mode="line"
+                colors={palette}
+                yAxisLabel="Yield (%)"
+                yAxisColor={colors.textDim}
+                formatYAxisValue={formatYieldAxis}
+              />
+            </Box>
           ) : (
-            <box paddingX={1} marginTop={1}>
-              <text fg={colors.textMuted}>Not enough data for chart</text>
-            </box>
+            <Box paddingX={1} marginTop={1}>
+              <Text fg={colors.textMuted}>Not enough data for chart</Text>
+            </Box>
           )}
 
           {/* Maturity table */}
-          <box paddingX={1} marginTop={1} height={1}>
-            <text fg={colors.textDim}>{maturityLabels}</text>
-          </box>
-          <box paddingX={1} height={1}>
-            <text fg={colors.text}>{yieldValues}</text>
-          </box>
-        </box>
-      </scrollbox>
-
-      {/* Footer */}
-      <box height={1} paddingX={1}>
-        <text fg={colors.textMuted}>[r]efresh</text>
-      </box>
-    </box>
+          <Box paddingX={1} marginTop={1} height={1}>
+            <Text fg={colors.textDim}>{maturityLabels}</Text>
+          </Box>
+          <Box paddingX={1} height={1}>
+            <Text fg={colors.text}>{yieldValues}</Text>
+          </Box>
+        </Box>
+      </ScrollBox>
+    </Box>
   );
 }
 
-export const yieldCurvePlugin: GloomPlugin = {
-  id: "yield-curve",
-  name: "Yield Curve",
-  version: "1.0.0",
-  description: "US Treasury yield curve from FRED",
-  toggleable: true,
-
-  setup(ctx) {
-    attachYieldCurvePersistence(ctx.persistence);
-  },
-
-  dispose() {
-    resetYieldCurvePersistence();
-  },
-
-  panes: [
-    {
-      id: "yield-curve",
-      name: "US Treasury Yield Curve",
-      icon: "Y",
-      component: YieldCurvePane,
-      defaultPosition: "right",
-      defaultMode: "floating",
-      defaultFloatingSize: { width: 80, height: 20 },
-    },
-  ],
-
-  paneTemplates: [
-    {
-      id: "yield-curve-pane",
-      paneId: "yield-curve",
-      label: "Yield Curve",
-      description: "US Treasury yield curve charted from FRED data.",
-      keywords: ["yield", "curve", "treasury", "bonds", "rates", "gc", "interest"],
-      shortcut: { prefix: "GC" },
-    },
-  ],
-};
+export function registerYieldCurveFeature(ctx: GloomPluginContext): void {
+  ctx.registerPane({
+    id: "yield-curve",
+    name: "US Treasury Yield Curve",
+    icon: "Y",
+    component: YieldCurvePane,
+    defaultPosition: "right",
+    defaultMode: "floating",
+    defaultFloatingSize: { width: 80, height: 20 },
+  });
+
+  ctx.registerPaneTemplate({
+    id: "yield-curve-pane",
+    paneId: "yield-curve",
+    label: "Yield Curve",
+    description: "US Treasury yield curve charted from FRED data.",
+    keywords: ["yield", "curve", "treasury", "bonds", "rates", "gc", "interest"],
+    shortcut: { prefix: "GC" },
+  });
+}

package/src/plugins/builtin/yield-curve/treasury-data.ts

@@ -1,6 +1,4 @@
-import { fetchFredObservations } from "../econ/fred-client";
-import type { PersistedResourceValue } from "../../../types/persistence";
-import type { PluginPersistence } from "../../../types/plugin";
+import { apiClient } from "../../../utils/api-client";
 
 export interface YieldPoint {
   maturity: string;      // "1M", "3M", "6M", "1Y", "2Y", "5Y", "7Y", "10Y", "20Y", "30Y"
@@ -21,83 +19,14 @@ export const TREASURY_MATURITIES: Array<{ maturity: string; years: number; serie
   { maturity: "30Y", years: 30,    seriesId: "DGS30" },
 ];
 
-const CACHE_KIND = "treasury-yield-curve";
-const CACHE_KEY = "latest";
-const CACHE_SOURCE = "fred";
-const CACHE_SCHEMA_VERSION = 1;
-
-export const YIELD_CURVE_CACHE_POLICY = {
-  staleMs: 15 * 60 * 1000,
-  expireMs: 7 * 24 * 60 * 60 * 1000,
-} as const;
-
-let yieldCurvePersistence: PluginPersistence | null = null;
-
-export function attachYieldCurvePersistence(persistence: PluginPersistence): void {
-  yieldCurvePersistence = persistence;
-}
-
-export function resetYieldCurvePersistence(): void {
-  yieldCurvePersistence = null;
-}
-
-function readYieldCurveCache(options?: {
-  allowExpired?: boolean;
-}): PersistedResourceValue<YieldPoint[]> | null {
-  return yieldCurvePersistence?.getResource<YieldPoint[]>(CACHE_KIND, CACHE_KEY, {
-    sourceKey: CACHE_SOURCE,
-    schemaVersion: CACHE_SCHEMA_VERSION,
-    allowExpired: options?.allowExpired,
-  }) ?? null;
-}
-
-function writeYieldCurveCache(points: YieldPoint[]): void {
-  yieldCurvePersistence?.setResource(CACHE_KIND, CACHE_KEY, points, {
-    sourceKey: CACHE_SOURCE,
-    schemaVersion: CACHE_SCHEMA_VERSION,
-    cachePolicy: YIELD_CURVE_CACHE_POLICY,
-  });
-}
-
-export async function fetchYieldCurve(apiKey: string): Promise<YieldPoint[]> {
-  const results = await Promise.allSettled(
-    TREASURY_MATURITIES.map(async ({ maturity, years, seriesId }) => {
-      const obs = await fetchFredObservations(apiKey, seriesId, { limit: 1, sortOrder: "desc" });
-      const value = obs[0]?.value ?? null;
-      return { maturity, maturityYears: years, yield: value };
-    }),
-  );
-  return results.map((r, i) => {
-    if (r.status === "fulfilled") return r.value;
-    return { maturity: TREASURY_MATURITIES[i]!.maturity, maturityYears: TREASURY_MATURITIES[i]!.years, yield: null };
-  });
-}
-
-export async function loadYieldCurve(
-  apiKey: string,
-  options?: {
-    force?: boolean;
-    fetcher?: (apiKey: string) => Promise<YieldPoint[]>;
-  },
-): Promise<YieldPoint[]> {
-  const freshCache = readYieldCurveCache();
-  if (!options?.force && freshCache && !freshCache.stale) {
-    return freshCache.value;
-  }
-
-  try {
-    const points = await (options?.fetcher ?? fetchYieldCurve)(apiKey);
-    writeYieldCurveCache(points);
-    return points;
-  } catch (error) {
-    const staleCache = freshCache ?? readYieldCurveCache({ allowExpired: true });
-    if (staleCache) return staleCache.value;
-    throw error;
-  }
+export async function loadYieldCurve(): Promise<YieldPoint[]> {
+  return apiClient.getCloudYieldCurve();
 }
 
 export function parseYieldPoints(points: YieldPoint[]): YieldPoint[] {
-  return points.filter((p) => p.yield !== null);
+  return points
+    .filter((p) => p.yield !== null)
+    .sort((a, b) => a.maturityYears - b.maturityYears);
 }
 
 export function isInverted(points: YieldPoint[]): boolean {

package/src/plugins/catalog-ui.test.ts

@@ -0,0 +1,24 @@
+import { describe, expect, test } from "bun:test";
+import { getRendererBuiltinPlugins } from "./catalog-ui";
+
+describe("renderer builtin plugins", () => {
+  test("includes broker manager after the IBKR broker adapter", () => {
+    const pluginIds = getRendererBuiltinPlugins().map((plugin) => plugin.id);
+
+    expect(pluginIds).toContain("ibkr");
+    expect(pluginIds).toContain("broker-manager");
+    expect(pluginIds.indexOf("ibkr")).toBeLessThan(pluginIds.indexOf("broker-manager"));
+  });
+
+  test("groups related built-in panes into domain plugins", () => {
+    const pluginIds = getRendererBuiltinPlugins().map((plugin) => plugin.id);
+
+    expect(pluginIds).toContain("company-research");
+    expect(pluginIds).toContain("market-overview");
+    expect(pluginIds).toContain("macro");
+    expect(pluginIds).not.toContain("options");
+    expect(pluginIds).not.toContain("sec");
+    expect(pluginIds).not.toContain("world-indices");
+    expect(pluginIds).not.toContain("earnings-calendar");
+  });
+});

package/src/plugins/catalog-ui.ts

@@ -0,0 +1,44 @@
+import type { GloomPlugin } from "../types/plugin";
+import { portfolioListPlugin } from "./builtin/portfolio-list";
+import { tickerDetailPlugin } from "./builtin/ticker-detail";
+import { manualEntryPlugin } from "./builtin/manual-entry";
+import { newsPlugin } from "./builtin/news";
+import { notesPlugin } from "./builtin/notes";
+import { aiPlugin } from "./builtin/ai";
+import { gloomberbCloudPlugin } from "./builtin/chat";
+import { helpPlugin } from "./builtin/help";
+import { ibkrPlugin } from "./ibkr";
+import { layoutManagerPlugin } from "./builtin/layout-manager";
+import { predictionMarketsPlugin } from "./prediction-markets";
+import { analyticsPlugin } from "./builtin/analytics";
+import { alertsPlugin } from "./builtin/alerts";
+import { brokerManagerPlugin } from "./builtin/broker-manager";
+import {
+  companyResearchPlugin,
+  macroPlugin,
+  marketOverviewPlugin,
+} from "./builtin/plugin-groups";
+
+export const uiBuiltinPlugins: GloomPlugin[] = [
+  gloomberbCloudPlugin,
+  portfolioListPlugin,
+  tickerDetailPlugin,
+  manualEntryPlugin,
+  ibkrPlugin,
+  brokerManagerPlugin,
+  layoutManagerPlugin,
+  newsPlugin,
+  companyResearchPlugin,
+  notesPlugin,
+  aiPlugin,
+  helpPlugin,
+  predictionMarketsPlugin,
+  marketOverviewPlugin,
+  macroPlugin,
+  analyticsPlugin,
+  alertsPlugin,
+];
+
+export function getRendererBuiltinPlugins(): GloomPlugin[] {
+  return uiBuiltinPlugins;
+}

package/src/plugins/catalog.ts

@@ -1,32 +1,8 @@
 import type { GloomPlugin } from "../types/plugin";
 import type { LoadedExternalPlugin } from "./loader";
-import { portfolioListPlugin } from "./builtin/portfolio-list";
-import { tickerDetailPlugin } from "./builtin/ticker-detail";
-import { manualEntryPlugin } from "./builtin/manual-entry";
-import { ibkrPlugin } from "./ibkr";
-import { newsPlugin } from "./builtin/news";
-import { secPlugin } from "./builtin/sec";
-import { optionsPlugin } from "./builtin/options";
-import { notesPlugin } from "./builtin/notes";
-import { aiPlugin } from "./builtin/ai";
-import { gloomberbCloudPlugin } from "./builtin/chat";
-import { helpPlugin } from "./builtin/help";
-import { comparisonChartPlugin } from "./builtin/comparison-chart";
-import { econCalendarPlugin } from "./builtin/econ";
-import { worldIndicesPlugin } from "./builtin/world-indices";
-import { marketMoversPlugin } from "./builtin/market-movers";
 import { debugPlugin } from "./builtin/debug";
-import { layoutManagerPlugin } from "./builtin/layout-manager";
 import { yahooPlugin } from "./builtin/yahoo";
-import { predictionMarketsPlugin } from "./prediction-markets";
-import { correlationPlugin } from "./builtin/correlation";
-import { analyticsPlugin } from "./builtin/analytics";
-import { insiderPlugin } from "./builtin/insider";
-import { alertsPlugin } from "./builtin/alerts";
-import { fxMatrixPlugin } from "./builtin/fx-matrix";
-import { yieldCurvePlugin } from "./builtin/yield-curve";
-import { sectorsPlugin } from "./builtin/sectors";
-import { earningsPlugin } from "./builtin/earnings";
+import { uiBuiltinPlugins } from "./catalog-ui";
 
 export interface PluginCatalogEntry {
   plugin: GloomPlugin;
@@ -37,31 +13,7 @@ export interface PluginCatalogEntry {
 
 export const builtinPlugins: GloomPlugin[] = [
   yahooPlugin,
-  gloomberbCloudPlugin,
-  portfolioListPlugin,
-  tickerDetailPlugin,
-  manualEntryPlugin,
-  ibkrPlugin,
-  layoutManagerPlugin,
-  newsPlugin,
-  secPlugin,
-  optionsPlugin,
-  notesPlugin,
-  aiPlugin,
-  helpPlugin,
-  comparisonChartPlugin,
-  predictionMarketsPlugin,
-  correlationPlugin,
-  analyticsPlugin,
-  insiderPlugin,
-  econCalendarPlugin,
-  worldIndicesPlugin,
-  marketMoversPlugin,
-  alertsPlugin,
-  fxMatrixPlugin,
-  yieldCurvePlugin,
-  sectorsPlugin,
-  earningsPlugin,
+  ...uiBuiltinPlugins,
   debugPlugin,
 ];
 

package/src/plugins/ibkr/__snapshots__/trade-tab.test.tsx.snap

@@ -5,17 +5,17 @@ exports[`renders the compact trade tab layout 1`] = `
  $199.8  -3.97 · Bid 199.7 · Ask 199.9 · Spd 0.2  Paper Gateway    DU123456    —        
                                                                                         
                                                                                         
-  Next Submit order   Ticket Standby   Refresh  r                                       
+  Next Submit order   Ticket Standby   Refresh                                          
                                                                                         
   Refreshed Paper.                                                                      
                                                                                         
  ╭────────────────────────────────────────────────────────────────────────────────────╮ 
- │ Ticket                                                         Click field / Enter │ 
- │ Click a field or press Enter to edit. Shortcuts are shown inline.                  │ 
+ │ Ticket                                                                       Ready │ 
+ │ Click a field to edit. Shortcuts are in the pane footer.                           │ 
  │                                                                                    │ 
  │  Profile Paper              Ticker AMD STK             Account DU123456            │ 
  │                                                                                    │ 
- │  Side [b/v] BUY      Type [t] MKT        Qty [q] 1           TIF DAY               │ 
+ │  Side BUY            Type MKT            Qty 1               TIF DAY               │ 
  │                                                                                    │ 
  │ Advanced Micro Devices, Inc.                                                       │ 
  ╰────────────────────────────────────────────────────────────────────────────────────╯ 
@@ -25,7 +25,7 @@ exports[`renders the compact trade tab layout 1`] = `
  │ What-if: init 12.4k → 13.2k · commission $1.25                                     │ 
  │  Fee $1.25                              Init 12.4k → 13.2k                         │ 
  │  Maint 10.1k → 10.7k                    Equity 58.4k → 57.1k                       │ 
- │  Preview  p  Submit Order  Enter                                                   │ 
+ │  Preview   Submit Order                                                            │ 
  ╰────────────────────────────────────────────────────────────────────────────────────╯ 
                                                                                         
                                                                                         

package/src/plugins/ibkr/account-cache.test.ts

@@ -2,15 +2,16 @@ import { afterEach, describe, expect, test } from "bun:test";
 import { existsSync, rmSync } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
+import {
+  clearPersistedBrokerAccounts,
+  loadPersistedBrokerAccountMap,
+  loadPersistedBrokerAccounts,
+  persistBrokerAccounts,
+} from "../../brokers/account-cache";
 import { AppPersistence } from "../../data/app-persistence";
 import type { BrokerInstanceConfig } from "../../types/config";
 import type { BrokerAccount } from "../../types/trading";
-import {
-  clearPersistedIbkrAccounts,
-  loadPersistedIbkrAccountMap,
-  loadPersistedIbkrAccounts,
-  persistIbkrAccounts,
-} from "./account-cache";
+import { ibkrBroker } from "./broker-adapter";
 
 const tempPaths: string[] = [];
 
@@ -55,10 +56,10 @@ describe("IBKR account cache", () => {
     const persistence = new AppPersistence(createTempDbPath("ibkr-account-cache"));
     const instance = createIbkrInstance("flex", { id: "ibkr-personal" });
 
-    persistIbkrAccounts(persistence.resources, instance, TEST_ACCOUNTS);
+    persistBrokerAccounts(persistence.resources, instance, ibkrBroker, TEST_ACCOUNTS);
 
-    expect(loadPersistedIbkrAccounts(persistence.resources, instance)).toEqual(TEST_ACCOUNTS);
-    expect(loadPersistedIbkrAccountMap(persistence.resources, [instance])).toEqual({
+    expect(loadPersistedBrokerAccounts(persistence.resources, instance, ibkrBroker)).toEqual(TEST_ACCOUNTS);
+    expect(loadPersistedBrokerAccountMap(persistence.resources, [instance], new Map([["ibkr", ibkrBroker]]))).toEqual({
       "ibkr-personal": TEST_ACCOUNTS,
     });
 
@@ -73,9 +74,9 @@ describe("IBKR account cache", () => {
       config: { connectionMode: "gateway", gateway: { host: "127.0.0.1", port: 4003, clientId: 1 } },
     });
 
-    persistIbkrAccounts(persistence.resources, original, TEST_ACCOUNTS);
+    persistBrokerAccounts(persistence.resources, original, ibkrBroker, TEST_ACCOUNTS);
 
-    expect(loadPersistedIbkrAccounts(persistence.resources, updated)).toBeNull();
+    expect(loadPersistedBrokerAccounts(persistence.resources, updated, ibkrBroker)).toBeNull();
     expect(persistence.resources.list({
       namespace: "plugin:ibkr",
       kind: "account-snapshot",
@@ -92,10 +93,10 @@ describe("IBKR account cache", () => {
     const persistence = new AppPersistence(createTempDbPath("ibkr-account-cache-clear"));
     const instance = createIbkrInstance("gateway", { id: "ibkr-live" });
 
-    persistIbkrAccounts(persistence.resources, instance, TEST_ACCOUNTS);
-    clearPersistedIbkrAccounts(persistence.resources, instance.id);
+    persistBrokerAccounts(persistence.resources, instance, ibkrBroker, TEST_ACCOUNTS);
+    clearPersistedBrokerAccounts(persistence.resources, instance);
 
-    expect(loadPersistedIbkrAccounts(persistence.resources, instance)).toBeNull();
+    expect(loadPersistedBrokerAccounts(persistence.resources, instance, ibkrBroker)).toBeNull();
     persistence.close();
   });
 });