gloomberb 0.6.0 → 0.7.0

package/src/components/ui/ui.test.tsx

@@ -1,11 +1,10 @@
 import { afterEach, describe, expect, test } from "bun:test";
 import { act, useEffect, useRef, useState } from "react";
-import { testRender } from "../../renderers/opentui/test-utils";
-import { DialogProvider } from "@opentui-ui/dialog/react";
+import { TestDialogProvider, testRender } from "../../renderers/opentui/test-utils";
 import type { BoxRenderable, ScrollBoxRenderable } from "@opentui/core";
 import { Button } from "./button";
 import { ChoiceDialog } from "./choice-dialog";
-import { DataTable } from "./data-table";
+import { DataTable, type DataTableColumn } from "./data-table";
 import { TextField } from "./fields";
 import { ListView } from "./list-view";
 import { MultiSelectDialogButton } from "./multi-select-dialog";
@@ -21,12 +20,13 @@ import { Tabs } from "./tabs";
 import { ToggleList } from "../toggle-list";
 import { AppContext, PaneInstanceProvider, createInitialState } from "../../state/app-context";
 import { createDefaultConfig } from "../../types/config";
+import { DataTableView } from "../data-table-view";
 
 let testSetup: Awaited<ReturnType<typeof testRender>> | undefined;
 let setListSelection: ((index: number) => void) | null = null;
 let selectedTableRow: string | null = null;
 let activatedTableRow: string | null = null;
-let tableHorizontalScrollbarVisible: boolean | null = null;
+let tableScrollBoxForTest: ScrollBoxRenderable | null = null;
 let closedTab: string | null = null;
 let addedTab = false;
 let resolvedChoice: string | null = null;
@@ -125,34 +125,47 @@ function DataTableSectionHarness() {
   );
 }
 
-function DataTableNoHorizontalScrollHarness() {
+function DataTableHorizontalScrollHarness({
+  columns = [{ id: "name", label: "NAME", width: 12, align: "left" }],
+  containerWidth = 32,
+  containerHeight = 5,
+  rowCount = 1,
+  showHorizontalScrollbar,
+}: {
+  columns?: DataTableColumn[];
+  containerWidth?: number;
+  containerHeight?: number;
+  rowCount?: number;
+  showHorizontalScrollbar?: boolean;
+}) {
   const headerScrollRef = useRef<ScrollBoxRenderable>(null);
   const scrollRef = useRef<ScrollBoxRenderable>(null);
-  const [hoveredIdx, setHoveredIdx] = useState<number | null>(null);
+  const items = Array.from({ length: rowCount }, (_, index) => ({
+    id: `row-${index}`,
+    name: index === 0 ? "Alpha" : `Alpha ${index + 1}`,
+  }));
 
   useEffect(() => {
-    tableHorizontalScrollbarVisible = scrollRef.current?.horizontalScrollBar.visible ?? null;
+    tableScrollBoxForTest = scrollRef.current;
   });
 
   return (
-    <DataTable
-      columns={[{ id: "name", label: "NAME", width: 12, align: "left" }]}
-      items={[{ id: "alpha", name: "Alpha" }]}
+    <DataTableView
+      rootWidth={containerWidth}
+      rootHeight={containerHeight}
+      columns={columns}
+      items={items}
       sortColumnId={null}
       sortDirection="asc"
       onHeaderClick={() => {}}
       headerScrollRef={headerScrollRef}
       scrollRef={scrollRef}
-      syncHeaderScroll={() => {}}
-      onBodyScrollActivity={() => {}}
-      hoveredIdx={hoveredIdx}
-      setHoveredIdx={setHoveredIdx}
       getItemKey={(row) => row.id}
       isSelected={() => false}
       onSelect={() => {}}
       renderCell={(row) => ({ text: row.name })}
       emptyStateTitle="No rows."
-      showHorizontalScrollbar={false}
+      showHorizontalScrollbar={showHorizontalScrollbar}
     />
   );
 }
@@ -192,7 +205,7 @@ function MultiSelectDialogButtonHarness() {
   const [values, setValues] = useState(["sma"]);
 
   return (
-    <DialogProvider dialogOptions={{ style: { backgroundColor: "#000000", borderColor: "#ffffff", borderStyle: "single" } }}>
+    <TestDialogProvider>
       <MultiSelectDialogButton
         label="IND"
         title="Chart Indicators"
@@ -204,7 +217,7 @@ function MultiSelectDialogButtonHarness() {
           { value: "ema", label: "EMA" },
         ]}
       />
-    </DialogProvider>
+    </TestDialogProvider>
   );
 }
 
@@ -253,7 +266,7 @@ afterEach(() => {
   setListSelection = null;
   selectedTableRow = null;
   activatedTableRow = null;
-  tableHorizontalScrollbarVisible = null;
+  tableScrollBoxForTest = null;
   closedTab = null;
   addedTab = false;
   resolvedChoice = null;
@@ -650,10 +663,77 @@ describe("shared UI kit", () => {
 
   test("hides data table horizontal scrolling when disabled", async () => {
     const state = createInitialState(createDefaultConfig("/tmp/gloomberb-test"));
+    tableScrollBoxForTest = null;
+    testSetup = await testRender(
+      <AppContext value={{ state, dispatch: () => {} }}>
+        <PaneInstanceProvider paneId="portfolio-list:main">
+          <DataTableHorizontalScrollHarness showHorizontalScrollbar={false} />
+        </PaneInstanceProvider>
+      </AppContext>,
+      { width: 32, height: 5 },
+    );
+
+    await act(async () => {
+      await testSetup!.renderOnce();
+      await testSetup!.renderOnce();
+    });
+
+    expect(tableScrollBoxForTest?.horizontalScrollBar.visible).toBe(false);
+  });
+
+  test("hides data table horizontal scrolling when content fits", async () => {
+    const state = createInitialState(createDefaultConfig("/tmp/gloomberb-test"));
+    tableScrollBoxForTest = null;
+    testSetup = await testRender(
+      <AppContext value={{ state, dispatch: () => {} }}>
+        <PaneInstanceProvider paneId="portfolio-list:main">
+          <DataTableHorizontalScrollHarness />
+        </PaneInstanceProvider>
+      </AppContext>,
+      { width: 32, height: 5 },
+    );
+
+    await act(async () => {
+      await testSetup!.renderOnce();
+      await testSetup!.renderOnce();
+    });
+
+    expect(tableScrollBoxForTest?.horizontalScrollBar.visible).toBe(false);
+  });
+
+  test("shows data table horizontal scrolling when content overflows", async () => {
+    const state = createInitialState(createDefaultConfig("/tmp/gloomberb-test"));
+    tableScrollBoxForTest = null;
+    testSetup = await testRender(
+      <AppContext value={{ state, dispatch: () => {} }}>
+        <PaneInstanceProvider paneId="portfolio-list:main">
+          <DataTableHorizontalScrollHarness
+            containerWidth={24}
+            columns={[
+              { id: "name", label: "NAME", width: 24, align: "left" },
+              { id: "price", label: "PRICE", width: 18, align: "right" },
+            ]}
+          />
+        </PaneInstanceProvider>
+      </AppContext>,
+      { width: 24, height: 5 },
+    );
+
+    await act(async () => {
+      await testSetup!.renderOnce();
+      await testSetup!.renderOnce();
+    });
+
+    expect(tableScrollBoxForTest?.horizontalScrollBar.visible).toBe(true);
+  });
+
+  test("shows data table vertical scrolling when rows overflow", async () => {
+    const state = createInitialState(createDefaultConfig("/tmp/gloomberb-test"));
+    tableScrollBoxForTest = null;
     testSetup = await testRender(
       <AppContext value={{ state, dispatch: () => {} }}>
         <PaneInstanceProvider paneId="portfolio-list:main">
-          <DataTableNoHorizontalScrollHarness />
+          <DataTableHorizontalScrollHarness rowCount={20} containerHeight={5} />
         </PaneInstanceProvider>
       </AppContext>,
       { width: 32, height: 5 },
@@ -664,7 +744,7 @@ describe("shared UI kit", () => {
       await testSetup!.renderOnce();
     });
 
-    expect(tableHorizontalScrollbarVisible).toBe(false);
+    expect(tableScrollBoxForTest?.verticalScrollBar.visible).toBe(true);
   });
 
   test("virtualizes data table rows by default", async () => {

package/src/core/state/app-state.ts

@@ -387,10 +387,12 @@ function removeHistoryIndex(layoutHistory: Record<number, LayoutHistoryEntry>, r
 
 /** If paneId is a floating pane, bump its zIndex to the top. */
 function bringFloatingToFront(layout: LayoutConfig, paneId: string): LayoutConfig {
-  const entry = layout.floating.find((e) => e.instanceId === paneId);
+  const entryIndex = layout.floating.findIndex((e) => e.instanceId === paneId);
+  const entry = entryIndex >= 0 ? layout.floating[entryIndex] : undefined;
   if (!entry) return layout;
   const maxZ = layout.floating.reduce((max, e) => Math.max(max, e.zIndex ?? 50), 0);
-  if ((entry.zIndex ?? 50) >= maxZ) return layout; // already on top
+  const topEqualIndex = layout.floating.findLastIndex((e) => (e.zIndex ?? 50) === maxZ);
+  if ((entry.zIndex ?? 50) === maxZ && entryIndex === topEqualIndex) return layout; // already on top
   return {
     ...layout,
     floating: layout.floating.map((e) =>
@@ -792,7 +794,8 @@ export function appReducer(state: AppState, action: AppAction): AppState {
 
     case "FOCUS_PREV": {
       if (action.paneOrder.length === 0) return state;
-      const currentIndex = state.focusedPaneId ? action.paneOrder.indexOf(state.focusedPaneId) : 0;
+      const focusedIndex = state.focusedPaneId ? action.paneOrder.indexOf(state.focusedPaneId) : -1;
+      const currentIndex = focusedIndex >= 0 ? focusedIndex : 0;
       const nextPaneId = action.paneOrder[(currentIndex - 1 + action.paneOrder.length) % action.paneOrder.length]!;
       return focusPaneState(state, nextPaneId);
     }

package/src/market-data/coordinator.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it } from "bun:test";
 import { MarketDataCoordinator } from "./coordinator";
 import type { DataProvider, QuoteSubscriptionTarget } from "../types/data-provider";
 import type { InstrumentSearchResult } from "../types/instrument";
-import type { OptionsChain, PricePoint, Quote, TickerFinancials } from "../types/financials";
+import type { PricePoint, Quote, TickerFinancials } from "../types/financials";
 import { createTestDataProvider } from "../test-support/data-provider";
 
 function createProvider(overrides: Partial<DataProvider> = {}): DataProvider {

package/src/market-data/coordinator.ts

@@ -4,7 +4,6 @@ import type { OptionsChain, PricePoint, Quote, TickerFinancials } from "../types
 import type { ChartRequest, InstrumentRef, NewsRequest, OptionsRequest, SecFilingsRequest } from "./request-types";
 import { QueryStore } from "./query-store";
 import type { ProviderAttempt, ProviderReasonCode, QueryEntry } from "./result-types";
-import { createIdleEntry } from "./result-types";
 import {
   buildArticleSummaryKey,
   buildChartKey,

package/src/news/aggregator.ts

@@ -447,6 +447,3 @@ export class NewsService {
       .slice(0, count);
   }
 }
-
-export type NewsAggregatorOptions = NewsServiceOptions;
-export class NewsAggregator extends NewsService {}

package/src/plugins/builtin/ai/ask-ai-detail-tab.tsx

@@ -1,5 +1,5 @@
 import { Box, ScrollBox, Text, useUiCapabilities } from "../../../ui";
-import { useRef, useEffect, useState, useCallback } from "react";
+import { useRef, useEffect, useState, useCallback, type SetStateAction } from "react";
 import { useShortcut } from "../../../react/input";
 import { TextAttributes } from "../../../ui";
 import { type ScrollBoxRenderable, type TextareaRenderable } from "../../../ui";
@@ -33,7 +33,22 @@ const chatHistories = new Map<string, ChatMessage[]>();
 export { __setDetectedProvidersForTests };
 export type { AiProvider };
 
+function sameMessages(left: readonly ChatMessage[], right: readonly ChatMessage[]): boolean {
+  return left.length === right.length && left.every((message, index) => {
+    const other = right[index];
+    if (!other) return false;
+    return message.role === other.role
+      && message.content === other.content
+      && message.loading === other.loading;
+  });
+}
+
+function historyKeyFor(providerId: string, symbol: string): string {
+  return `conversation:${providerId}:${symbol}`;
+}
+
 export function __setAskAiHistoryForTests(symbol: string, messages: ChatMessage[]): void {
+  chatHistories.set(historyKeyFor("claude", symbol), messages);
   chatHistories.set(symbol, messages);
 }
 
@@ -58,7 +73,7 @@ export function AskAiDetailTab({ width, height, focused, onCapture }: DetailTabP
   const [providers] = useState(() => detectProviders());
   const defaultProviderId = resolveDefaultAiProviderId(providers);
   const [providerId, setProviderId] = usePluginState<string>("providerId", defaultProviderId);
-  const [messages, setMessages] = useState<ChatMessage[]>([]);
+  const [conversationMessagesByKey, setConversationMessagesByKey] = useState<Record<string, ChatMessage[]>>({});
   const [inputFocused, setInputFocused] = useState(false);
   const [inputValue, setInputValue] = useState("");
   const inputRef = useRef<TextareaRenderable>(null);
@@ -73,6 +88,18 @@ export function AskAiDetailTab({ width, height, focused, onCapture }: DetailTabP
   const conversationKey = tickerSymbol && currentProvider
     ? `conversation:${currentProvider.id}:${tickerSymbol}`
     : "__conversation:none__";
+  const historyKey = tickerSymbol && currentProvider ? historyKeyFor(currentProvider.id, tickerSymbol) : null;
+  const messages = conversationMessagesByKey[conversationKey] ?? [];
+  const setMessages = useCallback((nextValue: SetStateAction<ChatMessage[]>) => {
+    setConversationMessagesByKey((previous) => {
+      const previousMessages = previous[conversationKey] ?? [];
+      const nextMessages = typeof nextValue === "function"
+        ? (nextValue as (value: ChatMessage[]) => ChatMessage[])(previousMessages)
+        : nextValue;
+      if (sameMessages(previousMessages, nextMessages)) return previous;
+      return { ...previous, [conversationKey]: nextMessages };
+    });
+  }, [conversationKey]);
   const [persistedConversation, setPersistedConversation] = usePluginState<PersistedConversation | null>(
     conversationKey,
     null,
@@ -81,36 +108,39 @@ export function AskAiDetailTab({ width, height, focused, onCapture }: DetailTabP
 
   useEffect(() => {
     if (!tickerSymbol) {
-      setMessages((previous) => (previous.length === 0 ? previous : []));
+      setConversationMessagesByKey((previous) => {
+        const previousMessages = previous[conversationKey] ?? [];
+        return previousMessages.length === 0 ? previous : { ...previous, [conversationKey]: [] };
+      });
       return;
     }
 
-    if (persistedConversation && Date.now() - persistedConversation.updatedAt <= ASK_AI_RETENTION_MS) {
-      chatHistories.set(tickerSymbol, persistedConversation.messages);
+    if (historyKey && persistedConversation && Date.now() - persistedConversation.updatedAt <= ASK_AI_RETENTION_MS) {
+      chatHistories.set(historyKey, persistedConversation.messages);
     }
 
-    const nextMessages = chatHistories.get(tickerSymbol) ?? [];
-    setMessages((previous) => (
-      previous.length === nextMessages.length && previous.every((message, index) => message === nextMessages[index])
-        ? previous
-        : nextMessages
-    ));
-  }, [persistedConversation, tickerSymbol]);
+    const nextMessages = (historyKey ? chatHistories.get(historyKey) : null) ?? chatHistories.get(tickerSymbol) ?? [];
+    setConversationMessagesByKey((previous) => {
+      const previousMessages = previous[conversationKey] ?? [];
+      return sameMessages(previousMessages, nextMessages) ? previous : { ...previous, [conversationKey]: nextMessages };
+    });
+  }, [conversationKey, historyKey, persistedConversation, tickerSymbol]);
 
   useEffect(() => {
-    if (!tickerSymbol || !currentProvider || messages.length === 0) return;
+    if (!tickerSymbol || !currentProvider || !historyKey || messages.length === 0) return;
     const hasLoading = messages.some((message) => message.loading);
     if (hasLoading) {
-      chatHistories.set(tickerSymbol, messages);
+      chatHistories.set(historyKey, messages);
       return;
     }
     const trimmed = messages.slice(-ASK_AI_HISTORY_LIMIT);
-    chatHistories.set(tickerSymbol, trimmed);
+    chatHistories.set(historyKey, trimmed);
+    if (persistedConversation && sameMessages(persistedConversation.messages, trimmed)) return;
     setPersistedConversation({
       updatedAt: Date.now(),
       messages: trimmed,
     });
-  }, [currentProvider, messages, setPersistedConversation, tickerSymbol]);
+  }, [currentProvider, historyKey, messages, persistedConversation, setPersistedConversation, tickerSymbol]);
 
   useEffect(() => {
     const sb = scrollRef.current;

package/src/plugins/builtin/ai/providers.ts

@@ -65,23 +65,6 @@ export function resolveDefaultAiProviderId(providers = detectProviders()): strin
   return getAvailableProviders(providers)[0]?.id ?? providers[0]?.id ?? "claude";
 }
 
-export function listAiProviderOptions(
-  preferredId?: string | null,
-  providers = detectProviders(),
-): Array<{ label: string; value: string }> {
-  const ordered = [...providers].sort((left, right) => {
-    if (left.id === preferredId) return -1;
-    if (right.id === preferredId) return 1;
-    if (left.available !== right.available) return left.available ? -1 : 1;
-    return left.name.localeCompare(right.name);
-  });
-
-  return ordered.map((provider) => ({
-    value: provider.id,
-    label: provider.available ? provider.name : `${provider.name} (missing)`,
-  }));
-}
-
 export function __setDetectedProvidersForTests(providers: AiProvider[] | null): void {
   detectedProviders = providers;
 }

package/src/plugins/builtin/ai/screener-pane.test.tsx

@@ -1,7 +1,6 @@
 import { afterEach, describe, expect, test } from "bun:test";
 import { act, useReducer, useState } from "react";
-import { testRender } from "../../../renderers/opentui/test-utils";
-import { DialogProvider } from "@opentui-ui/dialog/react";
+import { TestDialogProvider, testRender } from "../../../renderers/opentui/test-utils";
 import { PaneFooterBar, PaneFooterProvider } from "../../../components/layout/pane-footer";
 import { AppContext, PaneInstanceProvider, appReducer, createInitialState } from "../../../state/app-context";
 import { createDefaultConfig } from "../../../types/config";
@@ -121,7 +120,7 @@ function ScreenerHarness({
 
   return (
     <AppContext value={{ state, dispatch }}>
-      <DialogProvider dialogOptions={{ style: { backgroundColor: "#000000", borderColor: "#ffffff", borderStyle: "single" } }}>
+      <TestDialogProvider>
         <PaneInstanceProvider paneId={PANE_ID}>
           <PluginRenderProvider pluginId="ai" runtime={runtime}>
             <PaneFooterProvider>
@@ -134,7 +133,7 @@ function ScreenerHarness({
             </PaneFooterProvider>
           </PluginRenderProvider>
         </PaneInstanceProvider>
-      </DialogProvider>
+      </TestDialogProvider>
     </AppContext>
   );
 }

package/src/plugins/builtin/ai/screener-pane.tsx

@@ -461,8 +461,6 @@ export function AiScreenerPane({ focused, width, height }: PaneProps) {
   const selectedResult = activeTab?.results.find((result) => result.symbol === cursorSymbol)
     ?? activeTab?.results[0]
     ?? null;
-  const selectedIdx = sortedTickers.findIndex((ticker) => ticker.metadata.ticker === cursorSymbol);
-  const safeSelectedIdx = selectedIdx >= 0 ? selectedIdx : 0;
   const isRunningActiveTab = runState?.tabId === activeTab?.id;
   const forceRunArmed = !!activeTab && forceConfirmTabId === activeTab.id;
 
@@ -753,7 +751,6 @@ export function AiScreenerPane({ focused, width, height }: PaneProps) {
       return;
     }
 
-    const key = event.name;
     if (event.name === "t") {
       addTab();
       return;

package/src/plugins/builtin/ask-ai.test.tsx

@@ -1,8 +1,8 @@
 import { afterEach, describe, expect, test } from "bun:test";
-import { act } from "react";
+import { act, useReducer } from "react";
 import { PaneFooterBar, PaneFooterProvider } from "../../components/layout/pane-footer";
 import { testRender } from "../../renderers/opentui/test-utils";
-import { AppContext, PaneInstanceProvider, createInitialState } from "../../state/app-context";
+import { AppContext, PaneInstanceProvider, appReducer, createInitialState } from "../../state/app-context";
 import { createStatefulTestPluginRuntime } from "../../test-support/plugin-runtime";
 import { createDefaultConfig } from "../../types/config";
 import { Box } from "../../ui";
@@ -258,4 +258,91 @@ describe("AskAiTab", () => {
 
     expect(opened).toEqual(["AAPL"]);
   });
+
+  test("does not persist previous ticker messages while hydrating a newly selected ticker", async () => {
+    setProviders([
+      { id: "claude", name: "Claude", command: "claude", available: true, buildArgs: () => [] },
+    ]);
+
+    const runtime = createStatefulTestPluginRuntime();
+    runtime.setResumeState("ai", "conversation:claude:AAPL", {
+      updatedAt: Date.now(),
+      messages: [
+        { role: "user", content: "AAPL question" },
+        { role: "assistant", content: "AAPL answer", loading: false },
+      ],
+    }, 1);
+    runtime.setResumeState("ai", "conversation:claude:MSFT", {
+      updatedAt: Date.now(),
+      messages: [
+        { role: "user", content: "MSFT question" },
+        { role: "assistant", content: "MSFT answer", loading: false },
+      ],
+    }, 1);
+
+    let selectSymbol: ((symbol: string) => void) | null = null;
+
+    const config = createDefaultConfig("/tmp/gloomberb-ai-navigation");
+    const initialState = createInitialState(config);
+    initialState.focusedPaneId = PANE_ID;
+    initialState.paneState["portfolio-list:main"] = {
+      ...initialState.paneState["portfolio-list:main"],
+      cursorSymbol: "AAPL",
+    };
+    initialState.tickers = new Map([
+      ["AAPL", makeTicker("AAPL", "Apple Inc.")],
+      ["MSFT", makeTicker("MSFT", "Microsoft Corporation")],
+    ]);
+
+    function NavigableAskAiHarness() {
+      const [state, dispatch] = useReducer(appReducer, initialState);
+      selectSymbol = (symbol) => {
+        dispatch({
+          type: "UPDATE_PANE_STATE",
+          paneId: "portfolio-list:main",
+          patch: { cursorSymbol: symbol },
+        });
+      };
+
+      return (
+        <AppContext value={{ state, dispatch }}>
+          <PaneInstanceProvider paneId={PANE_ID}>
+            <PluginRenderProvider pluginId="ai" runtime={runtime}>
+              <PaneFooterProvider>
+                {(footer) => (
+                  <Box flexDirection="column" width={60} height={12}>
+                    <AskAiTab width={60} height={11} focused onCapture={() => {}} />
+                    <PaneFooterBar footer={footer} focused width={60} />
+                  </Box>
+                )}
+              </PaneFooterProvider>
+            </PluginRenderProvider>
+          </PaneInstanceProvider>
+        </AppContext>
+      );
+    }
+
+    await act(async () => {
+      testSetup = await testRender(<NavigableAskAiHarness />, {
+        width: 60,
+        height: 12,
+      });
+    });
+    await flushFrame();
+
+    expect(testSetup.captureCharFrame()).toContain("AAPL answer");
+
+    await act(() => {
+      selectSymbol?.("MSFT");
+    });
+    await flushFrame();
+
+    const frame = testSetup.captureCharFrame();
+    expect(frame).toContain("MSFT answer");
+    expect(frame).not.toContain("AAPL answer");
+    expect((runtime.getResumeState("ai", "conversation:claude:MSFT") as any)?.messages).toEqual([
+      { role: "user", content: "MSFT question" },
+      { role: "assistant", content: "MSFT answer", loading: false },
+    ]);
+  });
 });

package/src/plugins/builtin/broker-manager/index.test.tsx

@@ -65,7 +65,7 @@ function Harness({
   const runtime = createTestPluginRuntime({
     getBrokerAdapter: (brokerType) => brokerType === "ibkr" ? ibkrBroker : null,
     openCommandBar: (query) => calls.push(`command:${query ?? ""}`),
-    showWidget: (paneId) => calls.push(`widget:${paneId}`),
+    showPane: (paneId) => calls.push(`pane:${paneId}`),
     connectBrokerInstance: async (instanceId) => { calls.push(`connect:${instanceId}`); },
     syncBrokerInstance: async (instanceId) => { calls.push(`sync:${instanceId}`); },
     updateBrokerInstance: async (instanceId) => { calls.push(`update:${instanceId}`); },
@@ -163,6 +163,6 @@ describe("BrokersPane", () => {
     await pressKey("s");
     await pressKey("o");
 
-    expect(calls).toEqual(["connect:ibkr-paper", "sync:ibkr-paper", "widget:ibkr-trading"]);
+    expect(calls).toEqual(["connect:ibkr-paper", "sync:ibkr-paper", "pane:ibkr-trading"]);
   });
 });

package/src/plugins/builtin/broker-manager/index.tsx

@@ -2,6 +2,7 @@ import { Box, ScrollBox, Text, TextAttributes } from "../../../ui";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
   Button,
+  ConfirmDialog,
   DataTableStackView,
   NumberField,
   SegmentedControl,
@@ -29,8 +30,7 @@ import type { BrokerAdapter, BrokerConfigField, BrokerProfileAction } from "../.
 import type { BrokerInstanceConfig } from "../../../types/config";
 import type { GloomPlugin, PaneProps } from "../../../types/plugin";
 import type { BrokerAccount } from "../../../types/trading";
-import { DialogFrame } from "../../../components/ui/frame";
-import { useDialog, useDialogKeyboard, type PromptContext } from "../../../ui/dialog";
+import { useDialog, type PromptContext } from "../../../ui/dialog";
 import { formatCurrency } from "../../../utils/format";
 import { usePluginAppActions, usePluginBrokerActions } from "../../plugin-runtime";
 import {
@@ -76,34 +76,6 @@ function isBrokerErrorMessage(message: string | null | undefined): boolean {
   return normalized.includes("failed") || normalized.includes("required");
 }
 
-function ConfirmRemoveBrokerDialog({
-  resolve,
-  row,
-}: PromptContext<boolean> & { row: BrokerProfileRow }) {
-  const confirm = useCallback(() => resolve(true), [resolve]);
-  const cancel = useCallback(() => resolve(false), [resolve]);
-
-  useDialogKeyboard((event) => {
-    event.stopPropagation();
-    if (event.name === "enter" || event.name === "return") confirm();
-    if (event.name === "escape") cancel();
-  });
-
-  return (
-    <DialogFrame title="Disconnect broker?" footer="Enter disconnect · Esc cancel">
-      <Box flexDirection="column" width={58}>
-        <Text fg={colors.text}>{`Remove "${row.label}" and imported broker data?`}</Text>
-        <Text fg={colors.textDim}>Broker-managed portfolios, positions, and contracts will be removed.</Text>
-        <Box height={1} />
-        <Box flexDirection="row" gap={1}>
-          <Button label="Disconnect" variant="danger" onPress={confirm} />
-          <Button label="Back" variant="secondary" onPress={cancel} />
-        </Box>
-      </Box>
-    </DialogFrame>
-  );
-}
-
 function brokerFieldLabel(field: BrokerConfigField, focused: boolean): string {
   return focused ? `> ${field.label}` : `  ${field.label}`;
 }
@@ -202,7 +174,7 @@ export function BrokersPane({ focused, width, height }: PaneProps) {
   const config = useAppSelector((state) => state.config);
   const brokerAccounts = useAppSelector((state) => state.brokerAccounts);
   const dialog = useDialog();
-  const { openCommandBar, showWidget } = usePluginAppActions();
+  const { openCommandBar, showPane } = usePluginAppActions();
   const {
     getBrokerAdapter,
     connectBrokerInstance,
@@ -363,15 +335,26 @@ export function BrokersPane({ focused, width, height }: PaneProps) {
       setMessage(action.disabledReason ?? `${action.label} is unavailable for this profile.`);
       return;
     }
-    if (action.widgetId) showWidget(action.widgetId);
-  }, [primaryProfileAction, showWidget]);
+    if (action.paneId) showPane(action.paneId);
+  }, [primaryProfileAction, showPane]);
 
   const removeSelected = useCallback(async () => {
     if (!selectedRow) return;
     const confirmed = await dialog.prompt<boolean>({
       closeOnClickOutside: true,
       content: (ctx: PromptContext<boolean>) => (
-        <ConfirmRemoveBrokerDialog {...ctx} row={selectedRow} />
+        <ConfirmDialog
+          {...ctx}
+          title="Disconnect broker?"
+          body={[
+            `Remove "${selectedRow.label}" and imported broker data?`,
+            "Broker-managed portfolios, positions, and contracts will be removed.",
+          ]}
+          confirmLabel="Disconnect"
+          cancelLabel="Back"
+          width={58}
+          footer="Enter disconnect · Esc cancel"
+        />
       ),
     }).catch(() => false);
     if (confirmed !== true) return;
@@ -392,7 +375,7 @@ export function BrokersPane({ focused, width, height }: PaneProps) {
   const hasSelectedRow = selectedRow !== null;
   const selectedHasAdapter = !!selectedRow?.adapter;
   const canUseSelectedBroker = selectedHasAdapter && !busy;
-  const canOpenSelectedAction = selectedProfileActions.some((action) => !action.disabled && action.widgetId);
+  const canOpenSelectedAction = selectedProfileActions.some((action) => !action.disabled && action.paneId);
   const canRemoveSelected = hasSelectedRow && !busy;
 
   const footerActionsRef = useRef({
@@ -752,7 +735,7 @@ export const brokerManagerPlugin: GloomPlugin = {
       keywords: ["broker", "brokers", "connection", "accounts", "sync"],
       category: "navigation",
       execute: () => {
-        ctx.showWidget("brokers");
+        ctx.showPane("brokers");
       },
     });
   },