gloomberb 0.5.1 → 0.6.1

package/src/plugins/registry.ts

@@ -1,15 +1,20 @@
-import type { CliRenderer } from "@opentui/core";
-import { createReactSlotRegistry, createSlot } from "@opentui/react";
-import { createElement } from "react";
+import { Fragment, createElement, type ReactNode } from "react";
 import type { AppPersistence } from "../data/app-persistence";
 import type { TickerRepository } from "../data/ticker-repository";
 import type { BrokerAdapter } from "../types/broker";
+import {
+  CapabilityRegistry,
+  type NewsCapability,
+  type PluginCapability,
+} from "../capabilities";
 import type { BrokerInstanceConfig, LayoutConfig, PaneInstanceConfig } from "../types/config";
 import type { DataProvider } from "../types/data-provider";
 import type { TickerFinancials } from "../types/financials";
 import type {
   AppNotificationRequest,
+  BrokerInstanceUpdateOptions,
   CommandDef,
+  ContextMenuProviderDef,
   CustomColumnDef,
   DetailTabDef,
   GloomPlugin,
@@ -25,6 +30,7 @@ import type {
   PluginResumeState,
   TickerAction,
 } from "../types/plugin";
+import type { ContextMenuContext, ContextMenuItem } from "../types/context-menu";
 import type { TickerRecord } from "../types/ticker";
 import { addPaneFloating, removePane } from "./pane-manager";
 import { EventBus, type PluginEvents } from "./event-bus";
@@ -36,17 +42,31 @@ import {
   resolveCollectionForPane,
   resolveTickerForPane,
   type PaneRuntimeState,
-} from "../state/app-context";
+} from "../core/state/app-state";
 import { deletePaneSetting, getPaneSettings, setPaneSetting } from "../pane-settings";
 
-let sharedDataProvider: DataProvider | undefined;
+let sharedMarketData: DataProvider | undefined;
 let sharedRegistry: PluginRegistry | undefined;
-const SLOT_REGISTRY_CONTEXT: Record<string, never> = {};
+type SlotEntry = {
+  pluginId: string;
+  order: number;
+  render: (props: unknown) => ReactNode;
+};
+
+interface ContextMenuProviderEntry {
+  pluginId: string;
+  provider: ContextMenuProviderDef;
+}
+
+interface PluginRegistryOptions {
+  enableCapabilityHandlers?: boolean;
+  wrapBrokerAdapter?: (broker: BrokerAdapter, pluginId: string) => BrokerAdapter;
+}
 
-export function getSharedDataProvider(): DataProvider | undefined { return sharedDataProvider; }
+export function getSharedMarketData(): DataProvider | undefined { return sharedMarketData; }
 export function getSharedRegistry(): PluginRegistry | undefined { return sharedRegistry; }
-export function setSharedDataProviderForTests(provider: DataProvider | undefined): void {
-  sharedDataProvider = provider;
+export function setSharedMarketDataForTests(provider: DataProvider | undefined): void {
+  sharedMarketData = provider;
 }
 export function setSharedRegistryForTests(registry: PluginRegistry | undefined): void {
   sharedRegistry = registry;
@@ -58,22 +78,27 @@ interface PluginItems {
   commands: string[];
   columns: string[];
   brokers: string[];
-  dataProviders: string[];
+  capabilities: string[];
   detailTabs: string[];
   shortcuts: string[];
   tickerActions: string[];
+  contextMenuProviders: string[];
   eventDisposers: Array<() => void>;
+  capabilityDisposers: Array<() => void>;
+  newsQueryWatchDisposers: Array<() => void>;
 }
 
 export class PluginRegistry implements PluginRuntimeAccess {
-  private slotRegistry;
+  private slotEntries = new Map<string, SlotEntry[]>();
   private plugins = new Map<string, GloomPlugin>();
   private unregisterFns = new Map<string, () => void>();
   private pluginItems = new Map<string, PluginItems>();
   private commandOwners = new Map<string, string>();
+  private paneOwners = new Map<string, string>();
   private paneTemplateOwners = new Map<string, string>();
   private shortcutOwners = new Map<string, string>();
-  private dataProviderOwners = new Map<string, string>();
+  private capabilityOwners = new Map<string, string>();
+  private detailTabOwners = new Map<string, string>();
   private pluginResumeListeners = new Map<string, Set<() => void>>();
 
   private panesMap = new Map<string, PaneDef>();
@@ -81,15 +106,18 @@ export class PluginRegistry implements PluginRuntimeAccess {
   private commandsMap = new Map<string, CommandDef>();
   private columnsMap = new Map<string, CustomColumnDef>();
   private brokersMap = new Map<string, BrokerAdapter>();
-  private dataProvidersMap = new Map<string, DataProvider>();
   private detailTabsMap = new Map<string, DetailTabDef>();
   private shortcutsMap = new Map<string, KeyboardShortcut>();
   private tickerActionsMap = new Map<string, TickerAction>();
+  private contextMenuProvidersMap = new Map<string, ContextMenuProviderEntry>();
 
   readonly events: EventBus;
-  readonly dataProvider: DataProvider;
+  readonly capabilities: CapabilityRegistry;
+  readonly marketData: DataProvider;
   readonly tickerRepository: TickerRepository;
   readonly persistence: AppPersistence;
+  private readonly enableCapabilityHandlers: boolean;
+  private readonly wrapBrokerAdapter?: (broker: BrokerAdapter, pluginId: string) => BrokerAdapter;
 
   getTickerFn: ((symbol: string) => TickerRecord | null) = () => null;
   getDataFn: ((symbol: string) => TickerFinancials | null) = () => null;
@@ -97,7 +125,8 @@ export class PluginRegistry implements PluginRuntimeAccess {
   createBrokerInstanceFn: ((brokerType: string, label: string, values: Record<string, unknown>) => Promise<BrokerInstanceConfig>) = async () => {
     throw new Error("createBrokerInstanceFn not set");
   };
-  updateBrokerInstanceFn: ((instanceId: string, values: Record<string, unknown>) => Promise<void>) = async () => {};
+  connectBrokerInstanceFn: ((instanceId: string) => Promise<void>) = async () => {};
+  updateBrokerInstanceFn: ((instanceId: string, values: Record<string, unknown>, options?: BrokerInstanceUpdateOptions) => Promise<void>) = async () => {};
   syncBrokerInstanceFn: ((instanceId: string) => Promise<void>) = async () => {};
   removeBrokerInstanceFn: ((instanceId: string) => Promise<void>) = async () => {};
 
@@ -114,42 +143,86 @@ export class PluginRegistry implements PluginRuntimeAccess {
   focusPaneFn: ((paneId: string) => void) = () => {};
   pinTickerFn: ((symbol: string, options?: { floating?: boolean; paneType?: string }) => void) = () => {};
   navigateTickerFn: ((symbol: string) => void) = () => {};
+  getMarketData = () => this.marketData;
+  getCapability = (capabilityId: string) => this.capabilities.get(capabilityId)?.capability ?? null;
+  getBrokerAdapter = (brokerType: string) => this.brokersMap.get(brokerType) ?? null;
+  connectBrokerInstance = (instanceId: string) => this.connectBrokerInstanceFn(instanceId);
+  updateBrokerInstance = (instanceId: string, values: Record<string, unknown>, options?: BrokerInstanceUpdateOptions) => (
+    this.updateBrokerInstanceFn(instanceId, values, options)
+  );
+  syncBrokerInstance = (instanceId: string) => this.syncBrokerInstanceFn(instanceId);
+  removeBrokerInstance = (instanceId: string) => this.removeBrokerInstanceFn(instanceId);
   pinTicker = (symbol: string, options?: { floating?: boolean; paneType?: string }) => {
     this.pinTickerFn(symbol, options);
   };
   navigateTicker = (symbol: string) => {
     this.navigateTickerFn(symbol);
   };
+  selectTicker = (symbol: string, paneId?: string) => {
+    this.selectTickerFn(symbol, paneId);
+  };
+  switchPanel = (panel: "left" | "right") => {
+    this.switchPanelFn(panel);
+  };
+  switchTab = (tabId: string, paneId?: string) => {
+    this.switchTabFn(tabId, paneId);
+  };
+  openCommandBar = (query?: string) => {
+    this.openCommandBarFn(query);
+  };
   openPluginCommandWorkflow = (commandId: string) => {
     this.openPluginCommandWorkflowFn(commandId);
   };
 
-  getLayoutFn: (() => LayoutConfig) = () => ({ dockRoot: null, instances: [], floating: [] });
+  getLayoutFn: (() => LayoutConfig) = () => ({ dockRoot: null, instances: [], floating: [], detached: [] });
   updateLayoutFn: ((layout: LayoutConfig) => void) = () => {};
   getTermSizeFn: (() => { width: number; height: number }) = () => ({ width: 120, height: 40 });
 
+  registerNewsCapabilityFn: ((capability: NewsCapability) => () => void) = () => () => {};
+  watchNewsQueryFn: ((
+    query: import("../types/news-source").NewsQuery,
+    listener: (state: import("../types/news-source").NewsQueryState) => void,
+  ) => () => void) = () => () => {};
+
   notifyFn: ((notification: AppNotificationRequest) => void) = () => {};
   getPaneRuntimeStateFn: ((paneId: string) => PaneRuntimeState | null) = () => null;
   updatePaneRuntimeStateFn: ((paneId: string, patch: Partial<PaneRuntimeState>) => void) = () => {};
   applyPaneSettingValueFn: ((paneId: string, field: import("../types/plugin").PaneSettingField, value: unknown) => Promise<void>) = async () => {};
-  getPluginConfigValueFn: (<T = unknown>(pluginId: string, key: string) => T | null) = () => null;
+  getPluginConfigValueFn: (<T = unknown>(pluginId: string, key: string) => T | null) = (pluginId, key) => (
+    (this.getConfigFn().pluginConfig[pluginId]?.[key] as T | undefined) ?? null
+  );
   setPluginConfigValueFn: ((pluginId: string, key: string, value: unknown) => Promise<void>) = async () => {};
+  setPluginConfigValuesFn: ((pluginId: string, values: Record<string, unknown>) => Promise<void>) = async () => {};
   deletePluginConfigValueFn: ((pluginId: string, key: string) => Promise<void>) = async () => {};
 
   readonly Slot;
 
-  constructor(renderer: CliRenderer, dataProvider: DataProvider, tickerRepository: TickerRepository, persistence: AppPersistence) {
-    this.dataProvider = dataProvider;
+  constructor(
+    marketData: DataProvider,
+    tickerRepository: TickerRepository,
+    persistence: AppPersistence,
+    options: PluginRegistryOptions = {},
+  ) {
+    this.marketData = marketData;
     this.tickerRepository = tickerRepository;
     this.persistence = persistence;
+    this.enableCapabilityHandlers = options.enableCapabilityHandlers ?? true;
+    this.wrapBrokerAdapter = options.wrapBrokerAdapter;
     this.events = new EventBus();
 
-    sharedDataProvider = dataProvider;
+    sharedMarketData = marketData;
     sharedRegistry = this;
     (globalThis as any).__gloomRegistry = this;
-
-    this.slotRegistry = createReactSlotRegistry<GloomSlots & Record<string, object>>(renderer, SLOT_REGISTRY_CONTEXT);
-    this.Slot = createSlot(this.slotRegistry) as any;
+    this.capabilities = new CapabilityRegistry({
+      isPluginEnabled: (pluginId) => !this.getConfigFn().disabledPlugins.includes(pluginId),
+      isCapabilityEnabled: (capability, pluginId) => {
+        const disabledSources = this.getConfigFn().disabledSources ?? [];
+        return !disabledSources.includes(capability.sourceId ?? capability.id) && !this.getConfigFn().disabledPlugins.includes(pluginId);
+      },
+    });
+    this.Slot = ({ name, ...props }: { name: keyof GloomSlots } & Record<string, unknown>) => (
+      this.renderSlot(name, props as any)
+    );
   }
 
   get panes(): ReadonlyMap<string, PaneDef> { return this.panesMap; }
@@ -157,28 +230,45 @@ export class PluginRegistry implements PluginRuntimeAccess {
   get commands(): ReadonlyMap<string, CommandDef> { return this.commandsMap; }
   get columns(): ReadonlyMap<string, CustomColumnDef> { return this.columnsMap; }
   get brokers(): ReadonlyMap<string, BrokerAdapter> { return this.brokersMap; }
-  get dataProviders(): ReadonlyMap<string, DataProvider> { return this.dataProvidersMap; }
   get detailTabs(): ReadonlyMap<string, DetailTabDef> { return this.detailTabsMap; }
   get shortcuts(): ReadonlyMap<string, KeyboardShortcut> { return this.shortcutsMap; }
   get tickerActions(): ReadonlyMap<string, TickerAction> { return this.tickerActionsMap; }
   get allPlugins(): ReadonlyMap<string, GloomPlugin> { return this.plugins; }
 
-  getDataProviderPluginId(providerId: string): string | undefined {
-    return this.dataProviderOwners.get(providerId);
+  getContextMenuItems(context: ContextMenuContext): ContextMenuItem[] {
+    const disabledPlugins = new Set(this.getConfigFn().disabledPlugins ?? []);
+    const entries = [...this.contextMenuProvidersMap.entries()]
+      .filter(([, entry]) => !disabledPlugins.has(entry.pluginId))
+      .filter(([, entry]) => !entry.provider.contexts || entry.provider.contexts.includes(context.kind))
+      .sort((left, right) => (
+        (left[1].provider.order ?? 0) - (right[1].provider.order ?? 0)
+        || left[1].pluginId.localeCompare(right[1].pluginId)
+        || left[1].provider.id.localeCompare(right[1].provider.id)
+      ));
+
+    const items: ContextMenuItem[] = [];
+    for (const [, entry] of entries) {
+      try {
+        const provided = entry.provider.getItems(context);
+        if (provided?.length) items.push(...provided);
+      } catch (error) {
+        this.registryLog.error("Context menu provider failed", {
+          pluginId: entry.pluginId,
+          providerId: entry.provider.id,
+          context: context.kind,
+          error: error instanceof Error ? error.message : String(error),
+        });
+      }
+    }
+    return items;
   }
 
-  getEnabledDataProviders(): DataProvider[] {
-    const disabledPlugins = new Set(this.getConfigFn().disabledPlugins ?? []);
-    return [...this.dataProvidersMap.values()].filter((provider) => {
-      const ownerId = this.dataProviderOwners.get(provider.id);
-      return !ownerId || !disabledPlugins.has(ownerId);
-    });
+  getCapabilityPluginId(capabilityId: string): string | undefined {
+    return this.capabilityOwners.get(capabilityId);
   }
 
-  getActiveProvider(): DataProvider | undefined {
-    let active: DataProvider | undefined;
-    for (const provider of this.dataProvidersMap.values()) active = provider;
-    return active;
+  getEnabledCapabilities(kind?: string): PluginCapability[] {
+    return this.capabilities.list(kind).map((entry) => entry.capability);
   }
 
   getPluginPaneIds(pluginId: string): string[] {
@@ -193,6 +283,20 @@ export class PluginRegistry implements PluginRuntimeAccess {
     this.notifyFn(notification);
   }
 
+  renderSlot<K extends keyof GloomSlots>(name: K, props: GloomSlots[K]): ReactNode {
+    const entries = this.slotEntries.get(name as string) ?? [];
+    if (entries.length === 0) return null;
+    return createElement(
+      Fragment,
+      null,
+      ...entries.map((entry) => createElement(
+        Fragment,
+        { key: entry.pluginId },
+        entry.render(props),
+      )),
+    );
+  }
+
   private getOrCreatePluginItems(pluginId: string): PluginItems {
     const existing = this.pluginItems.get(pluginId);
     if (existing) return existing;
@@ -203,23 +307,50 @@ export class PluginRegistry implements PluginRuntimeAccess {
       commands: [],
       columns: [],
       brokers: [],
-      dataProviders: [],
+      capabilities: [],
       detailTabs: [],
       shortcuts: [],
       tickerActions: [],
+      contextMenuProviders: [],
       eventDisposers: [],
+      capabilityDisposers: [],
+      newsQueryWatchDisposers: [],
     };
     this.pluginItems.set(pluginId, items);
     return items;
   }
 
+  private registerCapabilityForPlugin(pluginId: string, capability: PluginCapability, items: PluginItems): void {
+    const ownedCapability: PluginCapability = {
+      ...capability,
+      isEnabled: () => {
+        const config = this.getConfigFn();
+        const disabledPlugin = config.disabledPlugins.includes(pluginId);
+        const disabledSource = config.disabledSources?.includes(capability.sourceId ?? capability.id) ?? false;
+        return !disabledPlugin && !disabledSource && (capability.isEnabled?.() ?? true);
+      },
+    };
+    const disposeCapability = this.capabilities.register(pluginId, ownedCapability);
+    this.capabilityOwners.set(capability.id, pluginId);
+    items.capabilities.push(capability.id);
+    items.capabilityDisposers.push(disposeCapability);
+
+    if (ownedCapability.kind === "news") {
+      const dispose = this.registerNewsCapabilityFn(ownedCapability as NewsCapability);
+      items.capabilityDisposers.push(dispose);
+    }
+  }
+
   private wrapPaneDef(pluginId: string, pane: PaneDef): PaneDef {
     return {
       ...pane,
       component: (props) => createElement(
         PluginRenderProvider,
-        { pluginId, runtime: this },
-        createElement(pane.component as any, props),
+        {
+          pluginId,
+          runtime: this,
+          children: createElement(pane.component as any, props),
+        },
       ),
     };
   }
@@ -229,8 +360,11 @@ export class PluginRegistry implements PluginRuntimeAccess {
       ...tab,
       component: (props) => createElement(
         PluginRenderProvider,
-        { pluginId, runtime: this },
-        createElement(tab.component as any, props),
+        {
+          pluginId,
+          runtime: this,
+          children: createElement(tab.component as any, props),
+        },
       ),
     };
   }
@@ -280,6 +414,10 @@ export class PluginRegistry implements PluginRuntimeAccess {
     return this.setPluginConfigValueFn(pluginId, key, value);
   }
 
+  setConfigStates(pluginId: string, values: Record<string, unknown>): Promise<void> {
+    return this.setPluginConfigValuesFn(pluginId, values);
+  }
+
   deleteConfigState(pluginId: string, key: string): Promise<void> {
     return this.deletePluginConfigValueFn(pluginId, key);
   }
@@ -294,6 +432,7 @@ export class PluginRegistry implements PluginRuntimeAccess {
 
   resolvePaneSettings(paneId: string): {
     paneId: string;
+    pluginId?: string;
     pane: PaneInstanceConfig;
     paneDef: PaneDef;
     settingsDef: PaneSettingsDef;
@@ -310,6 +449,8 @@ export class PluginRegistry implements PluginRuntimeAccess {
     if (!paneDef?.settings) return null;
 
     const config = this.getConfigFn();
+    const pluginId = this.paneOwners.get(pane.paneId);
+    const paneSettings = getPaneSettings(pane);
     const paneStateMap = Object.fromEntries(
       layout.instances.map((instance) => [instance.instanceId, this.getPaneRuntimeStateFn(instance.instanceId) ?? {}]),
     );
@@ -324,7 +465,7 @@ export class PluginRegistry implements PluginRuntimeAccess {
       paneId: targetPaneId,
       paneType: pane.paneId,
       pane,
-      settings: getPaneSettings(pane),
+      settings: paneSettings,
       paneState,
       activeTicker: resolveTickerForPane(stateView, targetPaneId),
       activeCollectionId: resolveCollectionForPane(stateView, targetPaneId),
@@ -334,8 +475,23 @@ export class PluginRegistry implements PluginRuntimeAccess {
       : paneDef.settings;
     if (!settingsDef) return null;
 
+    if (pluginId) {
+      const resolvedSettings = { ...paneSettings };
+      for (const field of settingsDef.fields) {
+        if (field.storage !== "plugin") continue;
+        const configValue = this.getConfigState(pluginId, field.key);
+        if (configValue === null) {
+          delete resolvedSettings[field.key];
+        } else {
+          resolvedSettings[field.key] = configValue;
+        }
+      }
+      context.settings = resolvedSettings;
+    }
+
     return {
       paneId: targetPaneId,
+      pluginId,
       pane,
       paneDef,
       settingsDef,
@@ -359,6 +515,10 @@ export class PluginRegistry implements PluginRuntimeAccess {
     return this.shortcutOwners.get(shortcutId);
   }
 
+  getDetailTabPluginId(tabId: string): string | undefined {
+    return this.detailTabOwners.get(tabId);
+  }
+
   isPaneFloating(paneId: string): boolean {
     try {
       const target = this.resolvePaneTarget(paneId);
@@ -414,9 +574,10 @@ export class PluginRegistry implements PluginRuntimeAccess {
       getState: (key, options) => this.getResumeState(pluginId, key, options?.schemaVersion),
       setState: (key, value, options) => this.setResumeState(pluginId, key, value, options?.schemaVersion),
       deleteState: (key) => this.deleteResumeState(pluginId, key),
-      getPaneState: (paneId, key) => (
-        this.getPaneRuntimeStateFn(paneId)?.pluginState?.[pluginId]?.[key] ?? null
-      ),
+      getPaneState: <T = unknown>(paneId: string, key: string): T | null => {
+        const value = this.getPaneRuntimeStateFn(paneId)?.pluginState?.[pluginId]?.[key];
+        return value === undefined ? null : value as T;
+      },
       setPaneState: (paneId, key, value) => {
         const currentPaneState = this.getPaneRuntimeStateFn(paneId) ?? {};
         const pluginState = {
@@ -466,7 +627,11 @@ export class PluginRegistry implements PluginRuntimeAccess {
     };
 
     return {
-      registerPane: (pane) => { this.panesMap.set(pane.id, this.wrapPaneDef(pluginId, pane)); items.panes.push(pane.id); },
+      registerPane: (pane) => {
+        this.panesMap.set(pane.id, this.wrapPaneDef(pluginId, pane));
+        this.paneOwners.set(pane.id, pluginId);
+        items.panes.push(pane.id);
+      },
       registerPaneTemplate: (template) => {
         this.paneTemplatesMap.set(template.id, template);
         this.paneTemplateOwners.set(template.id, pluginId);
@@ -478,25 +643,43 @@ export class PluginRegistry implements PluginRuntimeAccess {
         items.commands.push(command.id);
       },
       registerColumn: (column) => { this.columnsMap.set(column.id, column); items.columns.push(column.id); },
-      registerBroker: (broker) => { this.brokersMap.set(broker.id, broker); items.brokers.push(broker.id); },
-      registerDataProvider: (provider) => {
-        this.dataProvidersMap.set(provider.id, provider);
-        this.dataProviderOwners.set(provider.id, pluginId);
-        items.dataProviders.push(provider.id);
+      registerBroker: (broker) => {
+        this.brokersMap.set(broker.id, this.wrapBrokerAdapter?.(broker, pluginId) ?? broker);
+        items.brokers.push(broker.id);
+      },
+      registerCapability: (capability) => {
+        if (this.enableCapabilityHandlers) {
+          this.registerCapabilityForPlugin(pluginId, capability, items);
+        }
+      },
+      registerDetailTab: (tab) => {
+        this.detailTabsMap.set(tab.id, this.wrapDetailTabDef(pluginId, tab));
+        this.detailTabOwners.set(tab.id, pluginId);
+        items.detailTabs.push(tab.id);
       },
-      registerDetailTab: (tab) => { this.detailTabsMap.set(tab.id, this.wrapDetailTabDef(pluginId, tab)); items.detailTabs.push(tab.id); },
       registerShortcut: (shortcut) => {
         this.shortcutsMap.set(shortcut.id, shortcut);
         this.shortcutOwners.set(shortcut.id, pluginId);
         items.shortcuts.push(shortcut.id);
       },
       registerTickerAction: (action) => { this.tickerActionsMap.set(action.id, action); items.tickerActions.push(action.id); },
+      registerContextMenuProvider: (provider) => {
+        const providerKey = `${pluginId}:${provider.id}`;
+        this.contextMenuProvidersMap.set(providerKey, { pluginId, provider });
+        items.contextMenuProviders.push(providerKey);
+      },
+      watchNewsQuery: (query, listener) => {
+        const dispose = this.watchNewsQueryFn(query, listener);
+        items.newsQueryWatchDisposers.push(dispose);
+        return dispose;
+      },
 
       getData: (ticker) => this.getDataFn(ticker),
       getTicker: (ticker) => this.getTickerFn(ticker),
       getConfig: () => this.getConfigFn(),
+      getPaneDef: (paneId) => this.panesMap.get(paneId),
 
-      dataProvider: this.dataProvider,
+      marketData: this.marketData,
       tickerRepository: this.tickerRepository,
       persistence,
       log,
@@ -510,14 +693,14 @@ export class PluginRegistry implements PluginRuntimeAccess {
       },
 
       createBrokerInstance: (brokerType, label, values) => this.createBrokerInstanceFn(brokerType, label, values),
-      updateBrokerInstance: (instanceId, values) => this.updateBrokerInstanceFn(instanceId, values),
+      updateBrokerInstance: (instanceId, values, options) => this.updateBrokerInstanceFn(instanceId, values, options),
       syncBrokerInstance: (instanceId) => this.syncBrokerInstanceFn(instanceId),
       removeBrokerInstance: (instanceId) => this.removeBrokerInstanceFn(instanceId),
 
-      selectTicker: (symbol, paneId) => this.selectTickerFn(symbol, paneId),
-      switchPanel: (panel) => this.switchPanelFn(panel),
-      switchTab: (tabId, paneId) => this.switchTabFn(tabId, paneId),
-      openCommandBar: (query) => this.openCommandBarFn(query),
+      selectTicker: this.selectTicker,
+      switchPanel: this.switchPanel,
+      switchTab: this.switchTab,
+      openCommandBar: this.openCommandBar,
       showPane: (paneId) => this.showPaneFn(paneId),
       createPaneFromTemplate: (templateId, options) => this.createPaneFromTemplateFn(templateId, options),
       hidePane: (paneId) => this.hidePaneFn(paneId),
@@ -547,6 +730,7 @@ export class PluginRegistry implements PluginRuntimeAccess {
     if (plugin.panes) {
       for (const pane of plugin.panes) {
         this.panesMap.set(pane.id, this.wrapPaneDef(plugin.id, pane));
+        this.paneOwners.set(pane.id, plugin.id);
         items.panes.push(pane.id);
       }
     }
@@ -560,34 +744,51 @@ export class PluginRegistry implements PluginRuntimeAccess {
     }
 
     if (plugin.broker) {
-      this.brokersMap.set(plugin.broker.id, plugin.broker);
+      this.brokersMap.set(plugin.broker.id, this.wrapBrokerAdapter?.(plugin.broker, plugin.id) ?? plugin.broker);
       items.brokers.push(plugin.broker.id);
     }
 
-    if (plugin.dataProvider) {
-      this.dataProvidersMap.set(plugin.dataProvider.id, plugin.dataProvider);
-      this.dataProviderOwners.set(plugin.dataProvider.id, plugin.id);
-      items.dataProviders.push(plugin.dataProvider.id);
+    if (this.enableCapabilityHandlers && plugin.capabilities) {
+      for (const capability of plugin.capabilities) {
+        this.registerCapabilityForPlugin(plugin.id, capability, items);
+      }
     }
 
     if (plugin.slots) {
-      const corePlugin = {
-        id: plugin.id,
-        order: plugin.order,
-        slots: {} as Record<string, unknown>,
-      };
-
+      const registeredSlotNames: string[] = [];
       for (const [slotName, renderer] of Object.entries(plugin.slots)) {
         if (renderer) {
-          corePlugin.slots[slotName] = (_ctx: unknown, props: unknown) => createElement(
-            PluginRenderProvider,
-            { pluginId: plugin.id, runtime: this },
-            (renderer as any)(props),
-          );
+          const entries = this.slotEntries.get(slotName) ?? [];
+          entries.push({
+            pluginId: plugin.id,
+            order: plugin.order ?? 0,
+            render: (props: unknown) => createElement(
+              PluginRenderProvider,
+              {
+                pluginId: plugin.id,
+                runtime: this,
+                children: (renderer as any)(props),
+              },
+            ),
+          });
+          entries.sort((left, right) => left.order - right.order || left.pluginId.localeCompare(right.pluginId));
+          this.slotEntries.set(slotName, entries);
+          registeredSlotNames.push(slotName);
         }
       }
 
-      const unregister = this.slotRegistry.register(corePlugin as any);
+      const unregister = () => {
+        for (const slotName of registeredSlotNames) {
+          const entries = this.slotEntries.get(slotName);
+          if (!entries) continue;
+          const nextEntries = entries.filter((entry) => entry.pluginId !== plugin.id);
+          if (nextEntries.length === 0) {
+            this.slotEntries.delete(slotName);
+          } else {
+            this.slotEntries.set(slotName, nextEntries);
+          }
+        }
+      };
       this.unregisterFns.set(plugin.id, unregister);
     }
 
@@ -611,7 +812,10 @@ export class PluginRegistry implements PluginRuntimeAccess {
 
     const items = this.pluginItems.get(pluginId);
     if (items) {
-      for (const paneId of items.panes) this.panesMap.delete(paneId);
+      for (const paneId of items.panes) {
+        this.panesMap.delete(paneId);
+        this.paneOwners.delete(paneId);
+      }
       for (const templateId of items.paneTemplates) {
         this.paneTemplatesMap.delete(templateId);
         this.paneTemplateOwners.delete(templateId);
@@ -622,17 +826,22 @@ export class PluginRegistry implements PluginRuntimeAccess {
       }
       for (const columnId of items.columns) this.columnsMap.delete(columnId);
       for (const brokerId of items.brokers) this.brokersMap.delete(brokerId);
-      for (const providerId of items.dataProviders) {
-        this.dataProvidersMap.delete(providerId);
-        this.dataProviderOwners.delete(providerId);
+      for (const capabilityId of items.capabilities) {
+        this.capabilityOwners.delete(capabilityId);
+      }
+      for (const tabId of items.detailTabs) {
+        this.detailTabsMap.delete(tabId);
+        this.detailTabOwners.delete(tabId);
       }
-      for (const tabId of items.detailTabs) this.detailTabsMap.delete(tabId);
       for (const shortcutId of items.shortcuts) {
         this.shortcutsMap.delete(shortcutId);
         this.shortcutOwners.delete(shortcutId);
       }
       for (const actionId of items.tickerActions) this.tickerActionsMap.delete(actionId);
+      for (const providerKey of items.contextMenuProviders) this.contextMenuProvidersMap.delete(providerKey);
       for (const dispose of items.eventDisposers) dispose();
+      for (const dispose of items.capabilityDisposers) dispose();
+      for (const dispose of items.newsQueryWatchDisposers) dispose();
       this.pluginItems.delete(pluginId);
     }
 
@@ -651,12 +860,14 @@ export class PluginRegistry implements PluginRuntimeAccess {
         });
       }
     }
+    this.capabilities.destroy();
+    this.capabilityOwners.clear();
     this.pluginResumeListeners.clear();
     if (sharedRegistry === this) {
       sharedRegistry = undefined;
     }
-    if (sharedDataProvider === this.dataProvider) {
-      sharedDataProvider = undefined;
+    if (sharedMarketData === this.marketData) {
+      sharedMarketData = undefined;
     }
     if ((globalThis as any).__gloomRegistry === this) {
       delete (globalThis as any).__gloomRegistry;