gloomberb 0.15.2 → 0.15.4

package/src/components/command-bar/surface/index.tsx

@@ -3,10 +3,11 @@ import type { DataProvider } from "../../../types/data-provider";
 import type { AppTickerRepositoryPort } from "../../../core/app-service-ports";
 import type { PluginRegistry } from "../../../plugins/registry";
 import type { LayoutBounds } from "../../../plugins/pane-manager";
-import { usePlanAccess } from "../../../plugins/builtin/shared/plan-access";
+import { usePlanAccess } from "../../../api-client/plan-access";
 import { buildAssistCommandInventory } from "../assist/inventory";
 import { useCommandBarAssist } from "../assist/runtime";
 import { shouldAutoAskAssist, type AssistRowHandlers } from "../assist/model";
+import { automationActive, usageTelemetryAllowed } from "../../../telemetry/usage-counts";
 
 /** Command-bar prefix of the assistant pane. */
 const ASKG_SHORTCUT_PREFIX = "ASKG";
@@ -17,8 +18,12 @@ import {
 import { openUrl } from "../../ui/external-link";
 import { useRouteListState } from "../routing/list-state";
 import { useCommandBarRootRuntime } from "../routes/root/runtime";
+import { useCommandSearchReport } from "../routes/root/search-report";
+import { useAppStateRef } from "../../../state/app/context";
 import { parseRootShortcutIntent } from "../routes/root/shortcuts";
+import { useRootPluginInstallItem } from "../routes/root/plugin-install";
 import { useCommandBarThemePreview } from "../theme-preview";
+import { matchThemeOptions } from "../theme-picker";
 import { CommandBarPanel } from "../panel";
 import { useCommandBarNavigationState } from "../routing/navigation-state";
 import { useCommandBarSelectionRuntime } from "../selection-runtime";
@@ -88,7 +93,9 @@ export function CommandBar({
     currentRoute,
     currentRouteRef,
     dismissCommandBar,
+    isAutomationQuery,
     lastMainBrowseRef,
+    openingQuery,
     markRootSelectionNavigated,
     popRoute,
     pushRoute,
@@ -111,6 +118,42 @@ export function CommandBar({
     restoreThemePreview,
   });
 
+  // Searches follow the Usage setting, both what the AI may keep and the
+  // report. Read from the live store: turning Usage off from the bar must
+  // count at once, not at the bar's next render (it may never render again).
+  const liveStateRef = useAppStateRef();
+  const searchLoggingAllowed = useCallback(() => usageTelemetryAllowed(liveStateRef.current.config), [liveStateRef]);
+  // Filled in below, once the assist runtime has run.
+  const searchIdForRef = useRef<(query: string) => string | undefined>(() => undefined);
+  const searchIdFor = useCallback((query: string) => searchIdForRef.current(query), []);
+  const {
+    choose: chooseSearchResult,
+    dismiss: dismissSearchReport,
+    finish: finishSearchReport,
+    runRootRow,
+    settle: settleSearchReport,
+  } = useCommandSearchReport({
+    currentRouteRef,
+    isAutomationQuery,
+    isEnabled: searchLoggingAllowed,
+    openingQuery,
+    rootQueryRef,
+    routeOpen: currentRoute !== null,
+    searchIdFor,
+  });
+  // Every close that follows something running goes through here, so the
+  // search report sends what ran rather than a dismissal. Esc, a click outside
+  // the bar and the bar's own key close without it.
+  const closeAfterRun = useCallback((options?: { revertThemePreview?: boolean }) => {
+    finishSearchReport();
+    closeAll(options);
+  }, [closeAll, finishSearchReport]);
+  // A click outside the bar, read before closing clears the route it was on.
+  const dismissOverlay = useCallback(() => {
+    dismissSearchReport();
+    closeAll();
+  }, [closeAll, dismissSearchReport]);
+
   const {
     adaptTickerSearchRouteResult,
     buildLayoutItems,
@@ -157,7 +200,7 @@ export function CommandBar({
     activeFinancials,
     activeTickerData,
     activeTickerSymbol,
-    closeAll,
+    closeAll: closeAfterRun,
     config: state.config,
     currentRoute,
     dataProvider,
@@ -191,6 +234,22 @@ export function CommandBar({
     activeTicker: activeTickerSymbol,
   }), [activeTickerSymbol, availableCommands, getAvailablePaneShortcutTemplates, getAvailablePluginCommands, rootQuery]);
 
+  // Runs the typed text again once a plugin installed from the bar is in, the
+  // way a key bound to it would.
+  const rerunQuery = useCallback((query: string) => {
+    dispatch({ type: "SET_COMMAND_BAR", open: true, query, launch: { kind: "run-query", query } });
+  }, [dispatch]);
+  const closeBar = useCallback(() => closeAfterRun({ revertThemePreview: false }), [closeAfterRun]);
+  const pluginInstallItem = useRootPluginInstallItem({
+    enabled: !currentRoute && rootShortcutIntent.kind === "none",
+    query: rootQuery,
+    commands: allAvailableCommands,
+    pluginRegistry,
+    openInlineConfirm,
+    rerunQuery,
+    closeBar,
+  });
+
   const planAccess = usePlanAccess();
   const buildAssistInventory = useCallback(() => buildAssistCommandInventory({
     commands: availableCommands,
@@ -202,15 +261,22 @@ export function CommandBar({
   const assistAutoAsk = !currentRoute
     && planAccess.emailVerified
     && shouldAutoAskAssist({ query: rootQuery, hasShortcutIntent: rootShortcutIntent.kind !== "none" });
-  const { assistActive, assistState, askAssist, resetAssist } = useCommandBarAssist({
+  // The server keeps a question only when asked to: with the Usage setting
+  // on, and never for text remote control typed.
+  const logSearches = useCallback((query: string) => (
+    searchLoggingAllowed() && !automationActive() && !isAutomationQuery(query)
+  ), [isAutomationQuery, searchLoggingAllowed]);
+  const { assistActive, assistState, askAssist, resetAssist, searchIdFor: assistSearchIdFor } = useCommandBarAssist({
     autoAsk: assistAutoAsk,
     getInventory: buildAssistInventory,
+    logSearches,
     rootQuery,
   });
+  searchIdForRef.current = assistSearchIdFor;
   // Filled in below once the selection runtime exists, so an AI candidate runs
   // through the very same submit path as text the user typed.
   const runRootQueryRef = useRef<
-    ((query: string, options?: { fallbackPrefix?: string }) => void) | null
+    ((query: string, options?: { fallbackPrefix?: string }) => boolean) | null
   >(null);
   /**
    * Query whose answer the user is already waiting on, set by activating the
@@ -234,11 +300,21 @@ export function CommandBar({
     if (rootQueryRef.current.trim() !== pendingQuery) return;
     const candidate = assistState.candidates[0];
     if (!candidate) return;
-    runRootQueryRef.current?.(
-      candidate.input,
-      candidate.prefix ? { fallbackPrefix: candidate.prefix } : undefined,
-    );
-  }, [assistState, rootQueryRef]);
+    const run = () => {
+      runRootQueryRef.current?.(
+        candidate.input,
+        candidate.prefix ? { fallbackPrefix: candidate.prefix } : undefined,
+      );
+    };
+    // The claimed answer is the first AI row, which is what the user picked.
+    const listState = visibleListStateRef.current;
+    const rank = listState?.kind === "root"
+      ? listState.results.findIndex((item) => item.searchChoice?.kind === "assist")
+      : -1;
+    const row = rank >= 0 ? listState?.results[rank] : undefined;
+    if (row) runRootRow({ item: row, query: rootQueryRef.current, rank, isShortcut: () => false }, run);
+    else run();
+  }, [assistState, rootQueryRef, runRootRow, visibleListStateRef]);
   const startAssistSignUp = useCallback(() => {
     const signUpCommand = getAvailablePluginCommands().find((command) => command.id === "auth-signup");
     if (signUpCommand?.wizard?.length) {
@@ -279,9 +355,9 @@ export function CommandBar({
   // goes to Help > Shortcuts, which captures once the bar is gone.
   const bindKey = useCallback((query: string) => {
     requestKeybindingCapture({ kind: "command", query });
-    closeAll({ revertThemePreview: false });
+    closeAfterRun({ revertThemePreview: false });
     pluginRegistry.showPane("help");
-  }, [closeAll, pluginRegistry]);
+  }, [closeAfterRun, pluginRegistry]);
 
   const searchProviders = useMemo(
     () => getAvailableCommandBarSearchProviders(pluginRegistry, state.config.disabledPlugins),
@@ -292,8 +368,8 @@ export function CommandBar({
     activeCollectionId,
   }), [activeCollectionId, activeTickerSymbol]);
   const closeAfterProviderResult = useCallback(() => {
-    closeAll({ revertThemePreview: false });
-  }, [closeAll]);
+    closeAfterRun({ revertThemePreview: false });
+  }, [closeAfterRun]);
   const { providerResultItems, providerSearching } = useCommandBarSearchProviders({
     providers: searchProviders,
     query: rootQuery,
@@ -344,6 +420,7 @@ export function CommandBar({
     paneShortcutItems,
     pluginCommandItems,
     pluginCommandResultItems,
+    pluginInstallItem,
     providerResultItems,
     providerCategoryPriorities,
     providerSearching,
@@ -363,6 +440,23 @@ export function CommandBar({
   });
   const themePickerActive = !currentRoute && activeMatch?.command.id === "theme";
   const themePickerFilter = themePickerActive ? activeMatch.arg : "";
+  // A theme picked from the root ("TH dracula", Enter) is the typed shortcut
+  // running, so the visit reports it as it closes.
+  const commitRootTheme = useCallback((themeId: string) => {
+    if (!currentRouteRef.current) {
+      const themes = matchThemeOptions(themePickerFilter);
+      const rank = themes.findIndex((theme) => theme.id === themeId);
+      chooseSearchResult(rootQueryRef.current, {
+        kind: "shortcut",
+        label: themes[rank]?.name ?? themeId,
+        input: rootQueryRef.current.trim(),
+        rank: Math.max(0, rank),
+        category: "Themes",
+        fromAssist: false,
+      });
+    }
+    commitTheme(themeId);
+  }, [chooseSearchResult, commitTheme, currentRouteRef, rootQueryRef, themePickerFilter]);
 
   const {
     acceptRootShortcutTab,
@@ -374,7 +468,7 @@ export function CommandBar({
     activeTickerSymbol,
     availableCommands,
     clearThemePreview,
-    closeAll,
+    closeAll: closeAfterRun,
     collectionWorkflowActions,
     createPaneTemplateItem,
     createPluginCommandItem,
@@ -394,6 +488,7 @@ export function CommandBar({
     rootQueryRef,
     rootThemeBaseIdRef,
     runDirectCommand,
+    runRootRow,
     runSecurityDescriptionShortcut,
     setRootQuery,
     setRouteStack,
@@ -407,15 +502,16 @@ export function CommandBar({
 
   // A key bound to command bar text opens the bar with a run-query launch:
   // the text is submitted exactly as if typed and entered, once per request,
-  // and text the parser cannot run stays in the input.
+  // and text the parser cannot run stays in the input. What a key runs is not
+  // a search, so the visit ends with no report.
   const processedRunQuerySequenceRef = useRef<number | null>(null);
   useEffect(() => {
     const launch = state.commandBarLaunchRequest;
     if (!launch || launch.kind !== "run-query" || !state.commandBarOpen) return;
     if (processedRunQuerySequenceRef.current === launch.sequence) return;
     processedRunQuerySequenceRef.current = launch.sequence;
-    runRootQuery(launch.query);
-  }, [runRootQuery, state.commandBarLaunchRequest, state.commandBarOpen]);
+    if (runRootQuery(launch.query)) settleSearchReport();
+  }, [runRootQuery, settleSearchReport, state.commandBarLaunchRequest, state.commandBarOpen]);
 
   const routeListState = useRouteListState({
     activeMatch,
@@ -456,13 +552,14 @@ export function CommandBar({
     applyThemePreview,
     cellHeightPx,
     cellWidthPx,
-    closeAll,
-    commitTheme,
+    closeAll: closeAfterRun,
+    commitTheme: commitRootTheme,
     committedThemeId: state.config.theme,
     confirmCurrentRoute,
     currentRoute,
     currentRouteRef,
     dismissCommandBar,
+    dismissOverlay,
     focusWorkflowField,
     getWorkflowInputRef,
     getWorkflowFieldStringValue,

package/src/components/command-bar/theme-picker.tsx

@@ -11,11 +11,12 @@ import {
 import { t } from "../../i18n";
 import { getThemeIds, isDarkTheme, themes as themeRegistry } from "../../theme/themes";
 import { Box, Text, TextAttributes } from "../../ui";
+import { truncateToDisplayWidth } from "../../utils/format";
 import { ListView, type ListViewItem } from "../ui";
 import type { ListRowState } from "../ui/list-view";
 import type { ListJump } from "./list/model";
 import { useCommandBarPalette } from "./panel/palette";
-import { truncateText } from "./view-model";
+import { clampIndex } from "../../utils/math";
 
 const THEME_PREVIEW_DEBOUNCE_MS = 120;
 /**
@@ -78,10 +79,6 @@ export interface ThemePickerHandle {
   cancelPreview: () => void;
 }
 
-function clampIndex(index: number, length: number): number {
-  return Math.max(0, Math.min(index, Math.max(0, length - 1)));
-}
-
 export const ThemePicker = memo(forwardRef<ThemePickerHandle, ThemePickerProps>(function ThemePicker({
   filter,
   committedThemeId,
@@ -189,11 +186,15 @@ export const ThemePicker = memo(forwardRef<ThemePickerHandle, ThemePickerProps>(
   }), [cancelPreview, commit, jump, move]);
 
   useEffect(() => {
-    const preferredIndex = themes.findIndex((theme) => theme.id === committedThemeId);
+    // "TH nord" means Nord even while Nord Light is the committed theme.
+    const exactIndex = themes.findIndex((theme) => theme.id === normalizedFilter);
+    const preferredIndex = exactIndex >= 0
+      ? exactIndex
+      : themes.findIndex((theme) => theme.id === committedThemeId);
     const nextIndex = preferredIndex >= 0 ? preferredIndex : 0;
     selectedIndexRef.current = nextIndex;
     setSelectedIndex(nextIndex);
-  }, [committedThemeId, themes]);
+  }, [committedThemeId, normalizedFilter, themes]);
 
   useEffect(() => cancelPreview, [cancelPreview]);
 
@@ -228,7 +229,7 @@ export const ThemePicker = memo(forwardRef<ThemePickerHandle, ThemePickerProps>(
 
   const nameWidth = Math.max(1, labelWidth - GLYPH_GUTTER_WIDTH);
   const renderRow = useCallback((item: ListViewItem, state: ListRowState) => {
-    const label = truncateText(item.label, nameWidth);
+    const label = truncateToDisplayWidth(item.label, nameWidth);
     const trailing = item.current ? "current" : "";
     return (
       <Box
@@ -254,7 +255,7 @@ export const ThemePicker = memo(forwardRef<ThemePickerHandle, ThemePickerProps>(
         </Box>
         <Box width={trailingWidth}>
           <Text fg={state.selected ? palette.selectedText : palette.subtle}>
-            {truncateText(trailing, trailingWidth)}
+            {truncateToDisplayWidth(trailing, trailingWidth)}
           </Text>
         </Box>
       </Box>
@@ -279,7 +280,7 @@ export const ThemePicker = memo(forwardRef<ThemePickerHandle, ThemePickerProps>(
       bgColor={nativePaneChrome ? palette.panelBg : palette.bg}
       selectedBgColor={palette.selectedBg}
       hoverBgColor={palette.hoverBg}
-      emptyMessage={truncateText(t("No themes match"), queryDisplayWidth)}
+      emptyMessage={truncateToDisplayWidth(t("No themes match"), queryDisplayWidth)}
       showSelectedDescription={false}
       onSelect={handleSelect}
       onActivate={handleActivate}

package/src/components/command-bar/view-model.ts

@@ -1,6 +1,5 @@
 import { matchPrefix, type Command } from "./commands/registry";
 import { t, tf } from "../../i18n";
-import { truncateToDisplayWidth } from "../../utils/format";
 
 export { rankTickerSearchItems } from "../../tickers/search";
 
@@ -173,13 +172,17 @@ export function getRowPresentation(item: CommandBarItemView, selected: boolean,
   };
 }
 
-export function truncateText(text: string, width: number): string {
-  return truncateToDisplayWidth(text, width);
-}
-
+/**
+ * The section holding the offer to install an official plugin whose code was
+ * typed. It leads even an exact symbol, so plain Enter installs what the user
+ * named; the code is often a ticker too (PM is Philip Morris), and that stock
+ * sits right below it rather than being hidden.
+ */
+export const PLUGIN_INSTALL_CATEGORY = "Plugins";
+const PLUGIN_INSTALL_SECTION_PRIORITY = -200;
 /**
  * An exactly matching symbol is the most certain answer the terminal has, so
- * nothing outranks it. Typing "sive" put the AI's "DES SIVE" above the SIVE row
+ * only a plugin install offer outranks it. Typing "sive" put the AI's "DES SIVE" above the SIVE row
  * it was derived from, which is a guess sitting above the fact behind it.
  */
 const EXACT_MATCH_SECTION_PRIORITY = -150;
@@ -206,6 +209,7 @@ function getCategoryPriority(category: string, options?: CommandBarSectionOption
   if (sectionOrder === "ranked") return 0;
   if (normalized === "ask ai") return ASSIST_SECTION_PRIORITY;
   if (normalized === "exact match") return EXACT_MATCH_SECTION_PRIORITY;
+  if (category === PLUGIN_INSTALL_CATEGORY) return PLUGIN_INSTALL_SECTION_PRIORITY;
   if (normalized === "instruments") return INSTRUMENTS_SECTION_PRIORITY;
   if (sectionOrder === "app-first") {
     if (normalized === "saved") return 100;

package/src/components/command-bar/workflow/body.tsx

@@ -10,6 +10,7 @@ import {
   type ScrollBoxRenderable,
   type TextareaRenderable,
 } from "../../../ui";
+import { truncateToDisplayWidth } from "../../../utils/format";
 import { formatPrimaryShortcut, getShortcutDisplayMode } from "../../../utils/shortcut-labels";
 import { Button, Spinner } from "../../ui";
 import type { SelectFieldHandle } from "../../ui/select-field";
@@ -17,8 +18,8 @@ import {
   getVisibleWorkflowFields,
 } from "../helpers";
 import { useCommandBarPalette } from "../panel/palette";
-import { truncateText } from "../view-model";
 import { CommandBarWorkflowFieldRow } from "./field-row";
+import { getWorkflowSubmitLabel } from "./fields";
 import type {
   CommandBarFieldValue,
   CommandBarWorkflowField,
@@ -85,12 +86,12 @@ export function CommandBarWorkflowBody({
     <>
       {route.subtitle && (
         <Box height={1}>
-          <Text fg={palette.subtle}>{truncateText(t(route.subtitle), queryDisplayWidth)}</Text>
+          <Text fg={palette.subtle}>{truncateToDisplayWidth(t(route.subtitle), queryDisplayWidth)}</Text>
         </Box>
       )}
       {route.description?.map((line, index) => (
         <Box key={`workflow-desc:${index}`} height={1}>
-          <Text fg={palette.subtle}>{truncateText(t(line), queryDisplayWidth)}</Text>
+          <Text fg={palette.subtle}>{truncateToDisplayWidth(t(line), queryDisplayWidth)}</Text>
         </Box>
       ))}
       {route.subtitle || (route.description?.length ?? 0) > 0 ? <Box height={1} /> : null}
@@ -116,7 +117,7 @@ export function CommandBarWorkflowBody({
       })}
       {route.error && (
         <Box height={1}>
-          <Text fg={palette.negative}>{truncateText(route.error, queryDisplayWidth)}</Text>
+          <Text fg={palette.negative}>{truncateToDisplayWidth(route.error, queryDisplayWidth)}</Text>
         </Box>
       )}
       {route.pendingLabel && route.pending && (
@@ -127,7 +128,7 @@ export function CommandBarWorkflowBody({
       {!nativePaneChrome && <Box flexGrow={1} />}
       <Box flexDirection="row" gap={1} justifyContent={visibleFields.some((field) => field.type === "textarea") ? "flex-end" : "flex-start"}>
         <Button
-          label={t(route.submitLabel)}
+          label={t(getWorkflowSubmitLabel(route))}
           variant="primary"
           shortcut={submitShortcut}
           onPress={() => { void onSubmit(route); }}

package/src/components/command-bar/workflow/broker.ts

@@ -1,4 +1,8 @@
-import type { BrokerAdapter } from "../../../types/broker";
+import {
+  brokerMethodLabel,
+  type BrokerDirectoryEntry,
+  type BrokerMethod,
+} from "../../../brokers/directory";
 import {
   coerceFieldString,
   normalizeFieldOptions,
@@ -13,35 +17,23 @@ import { buildCommandBarWorkflowRoute } from "./route-builder";
 
 export type WorkflowStringValues = Record<string, string>;
 
-export interface CommandBarBrokerChoice {
-  id: string;
-  label: string;
-  description: string;
-  adapter: BrokerAdapter;
-}
+type BrokerSelectorKey = "brokerType" | "source";
 
-export function buildBrokerChoices(brokers: ReadonlyMap<string, BrokerAdapter>): CommandBarBrokerChoice[] {
-  return [...brokers.values()]
-    .filter((adapter) => adapter.configSchema.length > 0)
-    .sort((a, b) => a.name.localeCompare(b.name))
-    .map((adapter) => ({
-      id: adapter.id,
-      label: adapter.name,
-      description: `Create a new ${adapter.name} profile`,
-      adapter,
-    }));
+/** Asked only for a broker offered more than one way. */
+function brokerMethodFieldId(entryKey: string): string {
+  return `method:${entryKey}`;
 }
 
 export function buildBrokerWorkflowRoute({
-  brokerChoices,
+  directory,
   includeManualOption,
   selectorKey,
   submitLabel,
   subtitle,
   title,
 }: {
-  brokerChoices: CommandBarBrokerChoice[];
-  selectorKey: "brokerType" | "source";
+  directory: BrokerDirectoryEntry[];
+  selectorKey: BrokerSelectorKey;
   title: string;
   subtitle: string | undefined;
   submitLabel: string;
@@ -55,10 +47,10 @@ export function buildBrokerWorkflowRoute({
       description: "Add tickers and positions by hand",
     });
   }
-  options.push(...brokerChoices.map((choice) => ({
-    label: `Connect ${choice.label}`,
-    value: choice.id,
-    description: includeManualOption ? `Auto-import positions via ${choice.label}` : choice.description,
+  options.push(...directory.map((entry) => ({
+    label: `Connect ${entry.name}`,
+    value: entry.key,
+    description: includeManualOption ? `Auto-import positions via ${entry.name}` : `Create a new ${entry.name} profile`,
   })));
 
   if (options.length === 0) return null;
@@ -73,6 +65,7 @@ export function buildBrokerWorkflowRoute({
   const values: Record<string, CommandBarFieldValue> = {
     [selectorKey]: options[0]!.value,
   };
+  const submitLabels: NonNullable<CommandBarWorkflowRoute["submitLabels"]> = [];
 
   if (includeManualOption) {
     fields.push({
@@ -86,67 +79,111 @@ export function buildBrokerWorkflowRoute({
     values.name = "Main Portfolio";
   }
 
-  for (const choice of brokerChoices) {
-    for (const field of choice.adapter.configSchema) {
-      const fieldId = `${choice.id}:${field.key}`;
-      const dependsOn = [
-        { key: selectorKey, value: choice.id },
-        ...(field.dependsOn
-          ? [{ key: `${choice.id}:${field.dependsOn.key}`, value: field.dependsOn.value }]
-          : []),
-      ];
-      if (field.type === "select") {
-        fields.push({
-          id: fieldId,
-          label: field.label,
-          type: "select",
-          placeholder: field.placeholder,
-          description: field.placeholder,
-          required: field.required,
-          options: normalizeFieldOptions(field.options),
-          dependsOn,
-        });
-      } else {
-        fields.push({
-          id: fieldId,
-          label: field.label,
-          type: field.type === "number"
-            ? "number"
-            : field.type === "password"
-              ? "password"
-              : "text",
-          placeholder: field.placeholder,
-          description: field.placeholder,
-          required: field.required,
-          dependsOn,
-        });
+  for (const entry of directory) {
+    const entryDependency = { key: selectorKey, value: entry.key };
+    const methodFieldId = brokerMethodFieldId(entry.key);
+    const choosesMethod = entry.methods.length > 1;
+    if (choosesMethod) {
+      fields.push({
+        id: methodFieldId,
+        label: "Method",
+        type: "select",
+        options: entry.methods.map((method) => ({ label: brokerMethodLabel(entry, method), value: method.kind })),
+        required: true,
+        dependsOn: [entryDependency],
+      });
+      values[methodFieldId] = entry.methods[0]!.kind;
+    }
+    const whenMethod = (kind: BrokerMethod["kind"]) => [
+      entryDependency,
+      ...(choosesMethod ? [{ key: methodFieldId, value: kind }] : []),
+    ];
+
+    for (const method of entry.methods) {
+      if (method.kind === "signed-in") {
+        // Nothing to fill in: the dialog does the rest.
+        submitLabels.push({ dependsOn: whenMethod("signed-in"), label: "Connect" });
+        continue;
       }
-      if (field.defaultValue) {
-        values[fieldId] = field.defaultValue;
-      } else if (field.type === "select" && field.options?.[0]?.value) {
-        values[fieldId] = field.options[0].value;
+      for (const field of method.adapter.configSchema) {
+        const fieldId = `${entry.key}:${field.key}`;
+        const dependsOn = [
+          ...whenMethod("device"),
+          ...(field.dependsOn
+            ? [{ key: `${entry.key}:${field.dependsOn.key}`, value: field.dependsOn.value }]
+            : []),
+        ];
+        if (field.type === "select") {
+          fields.push({
+            id: fieldId,
+            label: field.label,
+            type: "select",
+            placeholder: field.placeholder,
+            description: field.placeholder,
+            required: field.required,
+            options: normalizeFieldOptions(field.options),
+            dependsOn,
+          });
+        } else {
+          fields.push({
+            id: fieldId,
+            label: field.label,
+            type: field.type === "number"
+              ? "number"
+              : field.type === "password"
+                ? "password"
+                : "text",
+            placeholder: field.placeholder,
+            description: field.placeholder,
+            required: field.required,
+            dependsOn,
+          });
+        }
+        if (field.defaultValue) {
+          values[fieldId] = field.defaultValue;
+        } else if (field.type === "select" && field.options?.[0]?.value) {
+          values[fieldId] = field.options[0].value;
+        }
       }
     }
   }
 
-  return buildCommandBarWorkflowRoute({
-    workflowId: `builtin:${title.toLowerCase().replace(/\s+/g, "-")}`,
-    title,
-    subtitle,
-    fields,
-    values,
-    submitLabel,
-    pendingLabel: "Connecting broker…",
-    payload: {
-      kind: "builtin",
-      actionId: includeManualOption ? "new-portfolio" : "add-broker-account",
-    },
-  });
+  return {
+    ...buildCommandBarWorkflowRoute({
+      workflowId: `builtin:${title.toLowerCase().replace(/\s+/g, "-")}`,
+      title,
+      subtitle,
+      fields,
+      values,
+      submitLabel,
+      pendingLabel: "Connecting broker…",
+      payload: {
+        kind: "builtin",
+        actionId: includeManualOption ? "new-portfolio" : "add-broker-account",
+      },
+      // Submit resolves the choice against the list the user saw, not a newer one.
+      payloadMeta: { brokerDirectory: directory },
+    }),
+    ...(submitLabels.length > 0 ? { submitLabels } : {}),
+  };
+}
+
+/** The broker and method a submitted workflow chose, or null when none was. */
+export function resolveBrokerWorkflowSelection(
+  route: CommandBarWorkflowRoute,
+  selectorKey: BrokerSelectorKey,
+): { entry: BrokerDirectoryEntry; method: BrokerMethod } | null {
+  const directory = (route.payloadMeta?.brokerDirectory ?? []) as BrokerDirectoryEntry[];
+  const entry = directory.find((candidate) => candidate.key === coerceFieldString(route.values[selectorKey]));
+  if (!entry) return null;
+  const kind = entry.methods.length > 1 ? coerceFieldString(route.values[brokerMethodFieldId(entry.key)]) : "";
+  const method = entry.methods.find((candidate) => candidate.kind === kind) ?? entry.methods[0];
+  return method ? { entry, method } : null;
 }
 
 export function extractBrokerWorkflowValues(
   values: Record<string, CommandBarFieldValue>,
-  selectorKey: "brokerType" | "source",
+  selectorKey: BrokerSelectorKey,
   brokerId: string,
 ): WorkflowStringValues {
   const next: WorkflowStringValues = {};