gloomberb 0.16.2 → 0.16.4

package/src/components/command-bar/layout-items/focused-pane.ts

@@ -4,7 +4,10 @@ import {
   getDockedPaneIds,
   removePane,
 } from "../../../layout/pane-manager";
+import { paneMoveBackTarget, paneNewLayoutBlock } from "../../../layout/pane-layout-move";
+import { resolveTickerForPane } from "../../../state/app/context";
 import { findPaneInstance } from "../../../types/config";
+import { tf } from "../../../i18n";
 import type { ResultItem } from "../list/model";
 import type { LayoutItemsContext } from "./types";
 import { WINDOW_MODE_COMMAND_OPTIONS } from "./window-mode";
@@ -20,6 +23,7 @@ export function buildFocusedPaneLayoutItems({
   persistLayoutChange,
   pluginRegistry,
   pushRoute,
+  state,
 }: LayoutItemsContext): ResultItem[] {
   const focusedPane = focusedPaneId ? findPaneInstance(currentLayout, focusedPaneId) : null;
   const focusedPaneDef = focusedPane ? pluginRegistry.panes.get(focusedPane.paneId) : null;
@@ -37,6 +41,12 @@ export function buildFocusedPaneLayoutItems({
 
   const dockedPaneIds = getDockedPaneIds(currentLayout);
   const focusedFloating = currentLayout.floating.find((entry) => entry.instanceId === focusedPane.instanceId);
+  const newLayoutBlock = paneNewLayoutBlock(
+    currentLayout,
+    focusedPane.instanceId,
+    (instanceId) => resolveTickerForPane(state, instanceId),
+  );
+  const moveBack = paneMoveBackTarget(state.config, focusedPane.instanceId);
 
   return [
     {
@@ -65,6 +75,34 @@ export function buildFocusedPaneLayoutItems({
         pluginRegistry.togglePaneFullscreen(focusedPane.instanceId);
       },
     },
+    {
+      id: "layout-move-to-new-layout",
+      label: "Move to New Layout",
+      detail: newLayoutBlock === "only-pane"
+        ? "Already the only pane in this layout"
+        : "Give the focused pane a layout of its own that it fills",
+      searchText: "own layout tab fullscreen",
+      category: "Focused Pane",
+      kind: "action",
+      disabled: newLayoutBlock === "only-pane" || newLayoutBlock === "detached",
+      action: () => {
+        closeAll({ revertThemePreview: false });
+        pluginRegistry.movePaneToNewLayout(focusedPane.instanceId);
+      },
+    },
+    ...(moveBack ? [{
+      id: "layout-move-back",
+      label: tf("Move Back to {layout}", { layout: moveBack.name }),
+      detail: moveBack.original
+        ? "Return the focused pane to the layout it came from"
+        : "The layout it came from is gone, so it docks in this one instead",
+      category: "Focused Pane",
+      kind: "action" as const,
+      action: () => {
+        closeAll({ revertThemePreview: false });
+        pluginRegistry.movePaneBack(focusedPane.instanceId);
+      },
+    }] : []),
     ...WINDOW_MODE_COMMAND_OPTIONS.map((option) => ({
       id: `layout-window-mode:${option.mode}`,
       label: option.label,

package/src/components/command-bar/pane-templates/workflow.ts

@@ -29,6 +29,7 @@ import {
   type SharedWorkflowDeps,
 } from "../workflow/ops";
 import type { PluginRegistry } from "../../../plugins/registry";
+import { PluginOffError, notifyPluginOff } from "../../../plugins/plugin-off";
 import { shouldOpenPaneTemplateConfig } from "./workflow-route";
 
 type CloseAllFn = (options?: { revertThemePreview?: boolean }) => void;
@@ -107,6 +108,10 @@ export function useCommandBarPaneTemplateActions({
       await pluginRegistry.createPaneFromTemplateAsync(template.id, createOptions);
       closeAll({ revertThemePreview: false });
     } catch (error) {
+      if (error instanceof PluginOffError) {
+        notifyPluginOff(pluginRegistry, error, () => { void openPaneTemplateDirect(template, createOptions); });
+        return;
+      }
       const displayLabel = getPaneTemplateDisplayLabel(template);
       notify(
         error instanceof Error ? error.message : `Could not create ${displayLabel.toLowerCase()}.`,

package/src/components/command-bar/routes/root/command-items.ts

@@ -147,6 +147,8 @@ export function createRootCommandItemBuilder({
         return command.description;
       case "toggle-value-flashing":
         return state.config.valueFlashingEnabled ? "Currently on" : "Currently off";
+      case "toggle-presentation-mode":
+        return state.config.presentationMode ? "Currently on" : "Currently off";
       case "toggle-crash-reports":
         return state.config.telemetry?.crashReports === false ? "Currently off" : "Currently on";
       case "toggle-usage-counts":

package/src/components/command-bar/routes/root/plugin-turn-on.ts

@@ -0,0 +1,92 @@
+import { useMemo } from "react";
+import type { DisabledPluginOwner, PluginRegistry } from "../../../../plugins/registry";
+import { getPaneTemplateDisplayLabel, paneTemplateShortcutPrefixes } from "../../pane-templates/items";
+import type { ResultItem } from "../../list/model";
+import { PLUGIN_INSTALL_CATEGORY } from "../../view-model";
+
+/** A typed code whose function belongs to a plugin that is switched off. */
+interface PluginTurnOnOffer {
+  owner: DisabledPluginOwner;
+  code: string;
+  /** The function's name, as its row reads when the plugin is on. */
+  label: string;
+}
+
+type TurnOnRegistry = Pick<
+  PluginRegistry,
+  "allPlugins" | "commands" | "getCommandPluginId" | "getDisabledPaneTemplateOwner" | "paneTemplates"
+>;
+
+/**
+ * Matches the code alone or as the first word, case-insensitively, against
+ * the functions of switched-off plugins. Only plugins the user can switch
+ * back on are offered.
+ */
+function matchPluginTurnOnOffer({
+  query,
+  pluginRegistry,
+  disabledPlugins,
+}: {
+  query: string;
+  pluginRegistry: TurnOnRegistry;
+  disabledPlugins: readonly string[];
+}): PluginTurnOnOffer | null {
+  const code = (query.trim().split(/\s+/, 1)[0] ?? "").toUpperCase();
+  if (!code || disabledPlugins.length === 0) return null;
+  const canTurnOn = (owner: DisabledPluginOwner | null): owner is DisabledPluginOwner => (
+    !!owner && pluginRegistry.allPlugins.get(owner.id)?.toggleable === true
+  );
+
+  for (const template of pluginRegistry.paneTemplates.values()) {
+    if (!paneTemplateShortcutPrefixes(template).some((prefix) => prefix.trim().toUpperCase() === code)) continue;
+    const owner = pluginRegistry.getDisabledPaneTemplateOwner(template.id, disabledPlugins);
+    if (canTurnOn(owner)) return { owner, code, label: getPaneTemplateDisplayLabel(template) };
+  }
+  for (const [commandId, command] of pluginRegistry.commands) {
+    if (command.shortcut?.trim().toUpperCase() !== code) continue;
+    const pluginId = pluginRegistry.getCommandPluginId(commandId);
+    const plugin = pluginId ? pluginRegistry.allPlugins.get(pluginId) : undefined;
+    const owner = plugin && disabledPlugins.includes(plugin.id) ? { id: plugin.id, name: plugin.name } : null;
+    if (canTurnOn(owner)) return { owner, code, label: command.label };
+  }
+  return null;
+}
+
+/**
+ * The row for a code whose plugin is off, or null. Enter turns the plugin on,
+ * then runs the typed text again, argument and all, as if just entered.
+ * `enabled` is false whenever something else claimed the query.
+ */
+export function useRootPluginTurnOnItem({
+  enabled,
+  query,
+  pluginRegistry,
+  disabledPlugins,
+  rerunQuery,
+}: {
+  enabled: boolean;
+  query: string;
+  pluginRegistry: PluginRegistry;
+  disabledPlugins: readonly string[];
+  rerunQuery: (query: string) => void;
+}): ResultItem | null {
+  return useMemo(() => {
+    const offer = enabled ? matchPluginTurnOnOffer({ query, pluginRegistry, disabledPlugins }) : null;
+    if (!offer) return null;
+    const actionLine = `Turn on ${offer.owner.name}`;
+    return {
+      id: `plugin-turn-on:${offer.owner.id}:${offer.code}`,
+      label: offer.label,
+      detail: actionLine,
+      category: PLUGIN_INSTALL_CATEGORY,
+      kind: "action",
+      right: offer.code,
+      searchText: [offer.code, offer.label, offer.owner.name].join(" "),
+      lines: [{ segments: [{ text: actionLine, emphasis: "match" }] }],
+      action: () => {
+        pluginRegistry.setPluginEnabled(offer.owner.id, true);
+        rerunQuery(query);
+      },
+    };
+  }, [disabledPlugins, enabled, pluginRegistry, query, rerunQuery]);
+}

package/src/components/command-bar/routes/root/results.ts

@@ -86,6 +86,12 @@ export interface RootResultModelOptions {
    * user is aiming at, and only ever adds to what the bar already resolved.
    */
   providerResultItems?: ResultItem[];
+  /**
+   * Rows from providers that answer from memory, built with the keystroke. The
+   * empty bar shows them under Suggested; typed text ranks them as one block
+   * among the local matches, at the place of their best row.
+   */
+  providerMatchItems?: ResultItem[];
   runDirectCommand: (command: Command, arg: string) => void;
   runSecurityDescriptionShortcut: (query?: string) => void | Promise<void>;
   state: AppState;
@@ -134,6 +140,32 @@ function buildBindKeyItem(
   };
 }
 
+/**
+ * Ranks a provider's in-memory rows with the local matches without reordering
+ * them: the provider decided which rows answer and in what order, so the block
+ * moves as one to where its best row would rank. A block none of whose rows
+ * the bar's own matching finds still shows, after the local matches.
+ */
+function rankMatchBlock(
+  localItems: ResultItem[],
+  blockItems: ResultItem[],
+  query: string,
+): ResultItem[] {
+  if (blockItems.length === 0) {
+    return fuzzyFilter(localItems, query, rootItemSearchText, (item) => item.label);
+  }
+  const block = new Set(blockItems);
+  const ranked = fuzzyFilter([...localItems, ...blockItems], query, rootItemSearchText, (item) => item.label);
+  const firstBlockIndex = ranked.findIndex((item) => block.has(item));
+  const local = ranked.filter((item) => !block.has(item));
+  if (firstBlockIndex < 0) return [...local, ...blockItems];
+  return [...local.slice(0, firstBlockIndex), ...blockItems, ...local.slice(firstBlockIndex)];
+}
+
+function rootItemSearchText(item: ResultItem): string {
+  return `${item.label} ${item.searchText || ""} ${item.detail} ${item.right || ""}`;
+}
+
 /** Kept short: the empty bar is still a browse list of everything below. */
 const MAX_RECENT_TICKER_ROWS = 4;
 const MAX_RECENT_PANE_ROWS = 4;
@@ -211,6 +243,7 @@ export function buildRootResultModel(options: RootResultModelOptions): RootResul
     rootQuery,
     rootShortcutIntent,
     providerResultItems = [],
+    providerMatchItems = [],
     runDirectCommand,
     runSecurityDescriptionShortcut,
     state,
@@ -316,6 +349,7 @@ export function buildRootResultModel(options: RootResultModelOptions): RootResul
         recentTickers: state.recentTickers ?? [],
       }));
     }
+    items.push(...providerMatchItems);
     items.push(...paneShortcutItems());
     for (const command of availableCommands) {
       const item = commandToItem(command);
@@ -336,13 +370,7 @@ export function buildRootResultModel(options: RootResultModelOptions): RootResul
       ...tickerActionItems(),
       ...pluginCommandItems(),
     ];
-    const matchedItems = fuzzyFilter(
-      allItems,
-      rootQuery,
-      (item) => `${item.label} ${item.searchText || ""} ${item.detail} ${item.right || ""}`,
-      (item) => item.label,
-    );
-    items.push(...matchedItems);
+    items.push(...rankMatchBlock(allItems, providerMatchItems, rootQuery));
   }
 
   const shortcutClaimedQuery = rootShortcutIntent.kind !== "none";
@@ -356,10 +384,12 @@ export function buildRootResultModel(options: RootResultModelOptions): RootResul
     items.push(buildBindKeyItem(rootShortcutIntent, bindKey));
   }
   // A resolved prefix means the user is speaking the command language, so
-  // free-text providers stay out of the way.
-  if (!shortcutClaimedQuery) {
-    items.push(...providerResultItems);
+  // only providers that asked to answer after that code add rows, below the
+  // code's own.
+  if (shortcutClaimedQuery) {
+    items.push(...providerMatchItems);
   }
+  items.push(...providerResultItems);
 
   // Built from the local matches, then placed above them: the AI turns the
   // typed sentence into commands, so its answer leads the list. Its Thinking

package/src/components/command-bar/routes/root/runtime.ts

@@ -14,6 +14,7 @@ import { normalizeCommandTickerSearchText } from "../ticker-search/results";
 import { useTickerSearchRouteResults } from "../ticker-search/route";
 import { buildRootResultModel, type RootResultModel } from "./results";
 import { useRootProviderSearch } from "./provider-search";
+import { isProviderResultItem } from "./search-providers";
 import { buildRootShortcutFeedback } from "./shortcut-feedback";
 import type { ShortcutIntent } from "./shortcuts";
 import { clampIndex } from "../../../../utils/math";
@@ -66,6 +67,7 @@ interface UseCommandBarRootRuntimeOptions {
   pluginCommandResultItems(command: CommandDef, shortcutArg: string): ResultItem[];
   pluginInstallItem?: ResultItem | null;
   providerResultItems?: ResultItem[];
+  providerMatchItems?: ResultItem[];
   providerCategoryPriorities?: CommandBarCategoryPriorities;
   providerSearching?: boolean;
   readTickerSearchCache(
@@ -123,6 +125,7 @@ export function useCommandBarRootRuntime({
   pluginCommandResultItems,
   pluginInstallItem = null,
   providerResultItems = [],
+  providerMatchItems = [],
   providerCategoryPriorities,
   providerSearching = false,
   readTickerSearchCache,
@@ -202,6 +205,7 @@ export function useCommandBarRootRuntime({
     rootQuery,
     rootShortcutIntent,
     providerResultItems,
+    providerMatchItems,
     runDirectCommand,
     runSecurityDescriptionShortcut,
     state,
@@ -234,6 +238,7 @@ export function useCommandBarRootRuntime({
     rootQuery,
     rootShortcutIntent,
     providerResultItems,
+    providerMatchItems,
     runDirectCommand,
     runSecurityDescriptionShortcut,
     state,
@@ -261,10 +266,13 @@ export function useCommandBarRootRuntime({
     const normalizedQuery = normalizeCommandTickerSearchText(symbolQuery);
     // The install row for "TV" is labelled TV, but it leads on purpose and
     // must not keep Grupo Televisa out of the list.
+    // A plugin's row never stands in for the symbol: a DM with @spy must not
+    // keep SPY out of the list.
     const hasExactLocalRow = rootResultModel.items.some((item) => (
       item !== pluginInstallItem
       && item.kind !== "ticker"
       && item.kind !== "search"
+      && !isProviderResultItem(item)
       && normalizeCommandTickerSearchText(item.label) === normalizedQuery
     ));
     return hasExactLocalRow ? null : symbolQuery;

package/src/components/command-bar/routes/root/search-providers.ts

@@ -9,6 +9,29 @@ import type { ResultItem } from "../../list/model";
 
 const DEFAULT_MIN_QUERY_LENGTH = 3;
 const DEFAULT_DEBOUNCE_MS = 300;
+const PROVIDER_ROW_PREFIX = "search-provider:";
+
+/** A row a plugin search provider contributed, as opposed to one the bar resolved itself. */
+export function isProviderResultItem(item: Pick<ResultItem, "id">): boolean {
+  return item.id.startsWith(PROVIDER_ROW_PREFIX);
+}
+
+/**
+ * Whether a provider answers the text in the bar: free text, or text a code
+ * claimed that the provider asked to keep hearing.
+ */
+function answersQuery(provider: CommandBarSearchProvider, claimedShortcut: string | null): boolean {
+  if (!claimedShortcut) return true;
+  return provider.shortcuts?.some((code) => code.trim().toUpperCase() === claimedShortcut) ?? false;
+}
+
+function meetsMinQueryLength(provider: CommandBarSearchProvider, trimmedQuery: string): boolean {
+  return trimmedQuery.length >= (provider.minQueryLength ?? DEFAULT_MIN_QUERY_LENGTH);
+}
+
+function sortByPriority(providers: readonly CommandBarSearchProvider[]): CommandBarSearchProvider[] {
+  return [...providers].sort((left, right) => (left.priority ?? 0) - (right.priority ?? 0));
+}
 
 export function getAvailableCommandBarSearchProviders(
   pluginRegistry: Pick<PluginRegistry, "commandBarSearchProviders" | "getCommandBarSearchProviderPluginId">,
@@ -31,15 +54,16 @@ export function toProviderResultItem(
   onExecuted: () => void,
 ): ResultItem {
   return {
-    id: `search-provider:${provider.id}:${result.id}`,
+    id: `${PROVIDER_ROW_PREFIX}${provider.id}:${result.id}`,
     label: result.label,
     detail: result.detail ?? "",
     category: result.category ?? provider.category,
     kind: "action",
     lines: result.lines,
     badge: result.badge,
+    name: result.name,
     right: result.right,
-    searchText: [result.label, result.detail ?? "", ...(result.keywords ?? [])].join(" "),
+    searchText: [result.label, result.detail ?? "", result.name ?? "", ...(result.keywords ?? [])].join(" "),
     disabled: result.disabled,
     action: async () => {
       if (result.disabled) return;
@@ -58,26 +82,73 @@ interface ProviderResults {
 interface UseCommandBarSearchProvidersOptions {
   providers: readonly CommandBarSearchProvider[];
   query: string;
-  /** False while a route is open or a prefix already claimed the query. */
+  /** False while a route is open or the venue list owns the query. */
   enabled: boolean;
+  /**
+   * The code that claimed the query (`CHAT`), upper case, or null for free
+   * text. Only providers that list it among their `shortcuts` still answer.
+   */
+  claimedShortcut?: string | null;
   context: CommandBarSearchContext;
   onExecuted: () => void;
 }
 
+/**
+ * Rows from providers that answer from memory (`match`), worked out as the bar
+ * renders so they land with the keystroke instead of a frame behind it. A
+ * provider that throws contributes nothing.
+ */
+function useProviderMatchItems({
+  providers,
+  query,
+  enabled,
+  claimedShortcut,
+  context,
+  onExecutedRef,
+}: {
+  providers: readonly CommandBarSearchProvider[];
+  query: string;
+  enabled: boolean;
+  claimedShortcut: string | null;
+  context: CommandBarSearchContext;
+  onExecutedRef: { current: () => void };
+}): ResultItem[] {
+  return useMemo(() => {
+    if (!enabled) return [];
+    const trimmed = query.trim();
+    return sortByPriority(providers).flatMap((provider) => {
+      if (!provider.match || !answersQuery(provider, claimedShortcut) || !meetsMinQueryLength(provider, trimmed)) {
+        return [];
+      }
+      let results: CommandBarResultDef[];
+      try {
+        results = provider.match(trimmed, context);
+      } catch {
+        return [];
+      }
+      return results.map((result) => toProviderResultItem(provider, result, () => onExecutedRef.current()));
+    });
+  }, [claimedShortcut, context, enabled, onExecutedRef, providers, query]);
+}
+
 /**
  * Runs plugin search providers for the root list. Each provider debounces and
  * aborts on its own, answers are memoized for the life of the bar, and rows are
  * only ever added to the static list: a provider that fails, hangs, or answers
  * late leaves what the command bar already resolved exactly as it was.
+ * Providers that answer from memory skip all of that and come back as
+ * `providerMatchItems`, for the bar to rank with its own matches.
  */
 export function useCommandBarSearchProviders({
   providers,
   query,
   enabled,
+  claimedShortcut = null,
   context,
   onExecuted,
 }: UseCommandBarSearchProvidersOptions): {
   providerResultItems: ResultItem[];
+  providerMatchItems: ResultItem[];
   providerSearching: boolean;
 } {
   const [resultsByProvider, setResultsByProvider] = useState<Record<string, ProviderResults>>({});
@@ -136,8 +207,12 @@ export function useCommandBarSearchProviders({
     }
 
     for (const provider of providers) {
-      const minLength = provider.minQueryLength ?? DEFAULT_MIN_QUERY_LENGTH;
-      if (!enabled || trimmed.length < minLength) {
+      if (
+        !enabled
+        || provider.match
+        || !answersQuery(provider, claimedShortcut)
+        || !meetsMinQueryLength(provider, trimmed)
+      ) {
         cancel(provider.id);
         setLoading(provider.id, false);
         continue;
@@ -179,7 +254,7 @@ export function useCommandBarSearchProviders({
         })();
       }, provider.debounceMs ?? DEFAULT_DEBOUNCE_MS));
     }
-  }, [enabled, providers, query]);
+  }, [claimedShortcut, enabled, providers, query]);
 
   useEffect(() => () => {
     for (const timer of timersRef.current.values()) clearTimeout(timer);
@@ -191,15 +266,23 @@ export function useCommandBarSearchProviders({
   const providerResultItems = useMemo(() => {
     const trimmed = query.trim();
     if (!enabled) return [];
-    return [...providers]
-      .sort((left, right) => (left.priority ?? 0) - (right.priority ?? 0))
-      .flatMap((provider) => {
-        const results = resultsByProvider[provider.id];
-        return results?.query === trimmed ? results.items : [];
-      });
-  }, [enabled, providers, query, resultsByProvider]);
+    return sortByPriority(providers).flatMap((provider) => {
+      if (provider.match || !answersQuery(provider, claimedShortcut)) return [];
+      const results = resultsByProvider[provider.id];
+      return results?.query === trimmed ? results.items : [];
+    });
+  }, [claimedShortcut, enabled, providers, query, resultsByProvider]);
+
+  const providerMatchItems = useProviderMatchItems({
+    providers,
+    query,
+    enabled,
+    claimedShortcut,
+    context,
+    onExecutedRef,
+  });
 
   const providerSearching = enabled && providers.some((provider) => loadingProviderIds.includes(provider.id));
 
-  return { providerResultItems, providerSearching };
+  return { providerResultItems, providerMatchItems, providerSearching };
 }

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

@@ -23,6 +23,7 @@ import { useAppStateRef } from "../../../state/app/context";
 import { listingChoiceQuery } from "../../../tickers/search";
 import { parseRootShortcutIntent } from "../routes/root/shortcuts";
 import { useRootPluginInstallItem } from "../routes/root/plugin-install";
+import { useRootPluginTurnOnItem } from "../routes/root/plugin-turn-on";
 import { useCommandBarThemePreview } from "../theme-preview";
 import { matchThemeOptions } from "../theme-picker";
 import { CommandBarPanel } from "../panel";
@@ -243,6 +244,15 @@ export function CommandBar({
     dispatch({ type: "SET_COMMAND_BAR", open: true, query, launch: { kind: "run-query", query } });
   }, [dispatch]);
   const closeBar = useCallback(() => closeAfterRun({ revertThemePreview: false }), [closeAfterRun]);
+  // A code whose plugin is switched off offers to turn it on. The install row
+  // never offers a code the app has, so the two never compete.
+  const pluginTurnOnItem = useRootPluginTurnOnItem({
+    enabled: !currentRoute && rootShortcutIntent.kind === "none",
+    query: rootQuery,
+    pluginRegistry,
+    disabledPlugins: state.config.disabledPlugins,
+    rerunQuery,
+  });
   const pluginInstallItem = useRootPluginInstallItem({
     enabled: !currentRoute && rootShortcutIntent.kind === "none",
     query: rootQuery,
@@ -374,12 +384,15 @@ export function CommandBar({
   const closeAfterProviderResult = useCallback(() => {
     closeAfterRun({ revertThemePreview: false });
   }, [closeAfterRun]);
-  const { providerResultItems, providerSearching } = useCommandBarSearchProviders({
+  const { providerResultItems, providerMatchItems, providerSearching } = useCommandBarSearchProviders({
     providers: searchProviders,
     query: rootQuery,
+    // A colon is the venue list.
+    enabled: !currentRoute && !listingChoice,
     // A resolved prefix means the user is running a command, so free-text
-    // providers neither ask the network nor add rows. A colon is the venue list.
-    enabled: !currentRoute && rootShortcutIntent.kind === "none" && !listingChoice,
+    // providers neither ask the network nor add rows, unless they asked to
+    // answer after that code.
+    claimedShortcut: rootShortcutIntent.kind === "none" ? null : rootShortcutIntent.prefix,
     context: searchProviderContext,
     onExecuted: closeAfterProviderResult,
   });
@@ -426,8 +439,9 @@ export function CommandBar({
     paneShortcutItems,
     pluginCommandItems,
     pluginCommandResultItems,
-    pluginInstallItem,
+    pluginInstallItem: pluginTurnOnItem ?? pluginInstallItem,
     providerResultItems,
+    providerMatchItems,
     providerCategoryPriorities,
     providerSearching,
     readTickerSearchCache,

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

@@ -11,7 +11,7 @@ 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 { displayWidth, truncateToDisplayWidth } from "../../utils/format";
 import { ListView, type ListViewItem } from "../ui";
 import type { ListRowState } from "../ui/list-view";
 import type { ListJump } from "./list/model";
@@ -28,6 +28,8 @@ const THEME_PREVIEW_DEBOUNCE_MS = 120;
 const DARK_THEME_GLYPH = "☾";
 /** The glyph plus the space that keeps names on one left edge, dark or light. */
 const GLYPH_GUTTER_WIDTH = 2;
+/** Between a name and its config id. */
+const ID_GAP = 2;
 
 export interface ThemeOption {
   id: string;
@@ -38,6 +40,32 @@ export interface ThemeOption {
 const THEME_OPTIONS: ThemeOption[] = getThemeIds()
   .map((id) => ({ id, name: themeRegistry[id]!.name, dark: isDarkTheme(id) }))
   .sort((a, b) => a.name.localeCompare(b.name));
+/** Ids line up in one column after the longest name. */
+const LONGEST_THEME_NAME = Math.max(...THEME_OPTIONS.map((theme) => displayWidth(theme.name)));
+const CURRENT_LABEL = "current";
+
+interface ThemeRowLayout {
+  name: number;
+  /** Zero when the id has no room. */
+  id: number;
+  showCurrent: boolean;
+}
+
+/**
+ * A row's name, then the id `config set theme` and the docs use, in one
+ * column after the longest name. The id is copied, so it never shows cut:
+ * the current row gives up its "current" tag first (its name is bold), then
+ * the id goes, before any of a name does.
+ */
+function themeRowLayout(width: number, id: string, current: boolean): ThemeRowLayout {
+  const name = Math.min(LONGEST_THEME_NAME, width);
+  const idWidth = displayWidth(id);
+  const room = width - name - ID_GAP;
+  const currentWidth = displayWidth(CURRENT_LABEL) + 1;
+  if (current && room - currentWidth >= idWidth) return { name, id: idWidth, showCurrent: true };
+  if (room >= idWidth) return { name, id: idWidth, showCurrent: false };
+  return { name, id: 0, showCurrent: current && width - name >= currentWidth };
+}
 
 /**
  * Shared with the panel layout, which sizes the sheet to whatever this returns
@@ -227,10 +255,12 @@ export const ThemePicker = memo(forwardRef<ThemePickerHandle, ThemePickerProps>(
     onCommitRef.current(selected.id);
   }, [cancelPreview]);
 
-  const nameWidth = Math.max(1, labelWidth - GLYPH_GUTTER_WIDTH);
+  // The whole row past the glyph: the name, the id and, on the current row, its tag.
+  const rowWidth = Math.max(1, labelWidth - GLYPH_GUTTER_WIDTH + trailingWidth);
   const renderRow = useCallback((item: ListViewItem, state: ListRowState) => {
-    const label = truncateToDisplayWidth(item.label, nameWidth);
-    const trailing = item.current ? "current" : "";
+    const layout = themeRowLayout(rowWidth, item.id, item.current === true);
+    const label = truncateToDisplayWidth(item.label, layout.name);
+    const subtle = state.selected ? palette.selectedText : palette.subtle;
     return (
       <Box
         flexDirection="row"
@@ -241,11 +271,11 @@ export const ThemePicker = memo(forwardRef<ThemePickerHandle, ThemePickerProps>(
         style={nativePaneChrome ? { borderRadius: 6 } : undefined}
       >
         <Box width={GLYPH_GUTTER_WIDTH}>
-          <Text fg={state.selected ? palette.selectedText : palette.subtle}>
+          <Text fg={subtle}>
             {isDarkTheme(item.id) ? DARK_THEME_GLYPH : ""}
           </Text>
         </Box>
-        <Box width={nameWidth}>
+        <Box width={layout.name}>
           <Text
             fg={state.selected ? palette.selectedText : palette.text}
             attributes={item.current ? TextAttributes.BOLD : undefined}
@@ -253,19 +283,24 @@ export const ThemePicker = memo(forwardRef<ThemePickerHandle, ThemePickerProps>(
             {label}
           </Text>
         </Box>
-        <Box width={trailingWidth}>
-          <Text fg={state.selected ? palette.selectedText : palette.subtle}>
-            {truncateToDisplayWidth(trailing, trailingWidth)}
-          </Text>
-        </Box>
+        {layout.id > 0 ? (
+          <Box width={ID_GAP + layout.id} paddingLeft={ID_GAP}>
+            <Text fg={subtle}>{item.id}</Text>
+          </Box>
+        ) : null}
+        <Box flexGrow={1} />
+        {layout.showCurrent ? (
+          <Box width={displayWidth(CURRENT_LABEL) + 1} flexShrink={0}>
+            <Text fg={subtle}>{CURRENT_LABEL}</Text>
+          </Box>
+        ) : null}
       </Box>
     );
   }, [
     contentPadding,
-    nameWidth,
     nativePaneChrome,
     palette,
-    trailingWidth,
+    rowWidth,
   ]);
 
   return (