gloomberb 0.4.1 → 0.5.1

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

@@ -35,6 +35,8 @@ import {
   cloneLayout,
   createPaneInstance,
   findPaneInstance,
+  findPrimaryPaneInstance,
+  resolveFollowBindingInstance,
   type LayoutConfig,
 } from "../../types/config";
 import { resolveBrokerConfigFields, type BrokerConfigField } from "../../types/broker";
@@ -52,6 +54,7 @@ import {
   removePane,
   swapPanes,
 } from "../../plugins/pane-manager";
+import { notifyGridlockComplete } from "../../plugins/gridlock-notification";
 import { CHART_RENDERER_PREFERENCES } from "../chart/chart-types";
 import {
   buildSections,
@@ -85,6 +88,7 @@ import {
   applyCollectionMembershipChange,
   getCollectionTargetOptions,
   resolvePreferredCollectionTarget,
+  resolveSoleCollectionTarget,
   resolveTickerInput,
   resolveTickerInputOrThrow,
   resolveTickerListInput,
@@ -260,6 +264,7 @@ export function CommandBar({
   const rootThemeBaseIdRef = useRef<string | null>(null);
   const workflowInputRefs = useRef<Record<string, RefObject<InputRenderable | TextareaRenderable | null>>>({});
   const visibleListStateRef = useRef<ListScreenState | null>(null);
+  const processedLaunchSequenceRef = useRef<number | null>(null);
   const currentRoute = routeStack[routeStack.length - 1] ?? null;
   const currentRouteRef = useRef<CommandBarRoute | null>(currentRoute);
   currentRouteRef.current = currentRoute;
@@ -348,16 +353,12 @@ export function CommandBar({
 
   const setActiveCollection = useCallback((collectionId: string) => {
     const currentState = stateRef.current;
-    const resolvePortfolioPane = (candidate?: string | null): string | null => {
-      if (!candidate) return null;
-      const instance = findPaneInstance(currentState.config.layout, candidate);
-      if (!instance) return null;
-      if (instance.paneId === "portfolio-list") return instance.instanceId;
-      if (instance.binding?.kind === "follow") return resolvePortfolioPane(instance.binding.sourceInstanceId);
-      return null;
-    };
-    const targetPaneId = resolvePortfolioPane(currentState.focusedPaneId)
-      ?? currentState.config.layout.instances.find((instance) => instance.paneId === "portfolio-list")?.instanceId
+    const targetPaneId = resolveFollowBindingInstance(
+      currentState.config.layout,
+      currentState.focusedPaneId,
+      (instance) => instance.paneId === "portfolio-list",
+    )?.instanceId
+      ?? findPrimaryPaneInstance(currentState.config.layout, "portfolio-list")?.instanceId
       ?? null;
     if (!targetPaneId) return;
     dispatch({ type: "UPDATE_PANE_STATE", paneId: targetPaneId, patch: { collectionId } });
@@ -414,6 +415,12 @@ export function CommandBar({
     pluginRegistry.updateLayoutFn(nextLayout);
   }, [pluginRegistry]);
 
+  const notifyGridlockRevert = useCallback(() => {
+    notifyGridlockComplete(pluginRegistry.notify.bind(pluginRegistry), () => {
+      dispatch({ type: "UNDO_LAYOUT" });
+    });
+  }, [dispatch, pluginRegistry]);
+
   const duplicatePane = useCallback((paneId: string) => {
     const currentState = stateRef.current;
     const pane = findPaneInstance(currentState.config.layout, paneId);
@@ -606,6 +613,9 @@ export function CommandBar({
     next[selectorKey] = brokerId;
     return next;
   }, []);
+  const notify = useCallback((body: string, options?: { type?: "info" | "success" | "error" }) => {
+    pluginRegistry.notify({ body, ...options });
+  }, [pluginRegistry]);
 
   const openAddToPortfolioWorkflow = useCallback((
     ticker: TickerRecord,
@@ -618,7 +628,7 @@ export function CommandBar({
       defaultAvgCost,
     });
     if (!workflow) {
-      pluginRegistry.showToastFn("Create a manual portfolio first.", { type: "info" });
+      notify("Create a manual portfolio first.", { type: "info" });
       return;
     }
 
@@ -638,7 +648,7 @@ export function CommandBar({
       successBehavior: "close",
       payload: { kind: "builtin", actionId: "add-portfolio" },
     });
-  }, [openWorkflowRoute, pluginRegistry]);
+  }, [notify, openWorkflowRoute]);
 
   const connectBrokerProfile = useCallback(async (
     brokerId: string,
@@ -670,8 +680,8 @@ export function CommandBar({
     dispatch({ type: "SET_CONFIG", config: freshConfig });
     const brokerTab = freshConfig.portfolios.find((portfolio) => portfolio.brokerInstanceId === instance.id);
     if (brokerTab) setActiveCollection(brokerTab.id);
-    pluginRegistry.showToastFn("Connected! Positions will sync automatically.", { type: "success" });
-  }, [dispatch, pluginRegistry, setActiveCollection]);
+    notify("Connected! Positions will sync automatically.", { type: "success" });
+  }, [dispatch, notify, pluginRegistry, setActiveCollection]);
 
   const createManualPortfolio = useCallback(async (name: string) => {
     const currentState = stateRef.current;
@@ -683,8 +693,8 @@ export function CommandBar({
     dispatch({ type: "SET_CONFIG", config: nextConfig });
     setActiveCollection(portfolio.id);
     await saveConfig(nextConfig);
-    pluginRegistry.showToastFn(`Created portfolio "${portfolio.name}".`, { type: "success" });
-  }, [dispatch, pluginRegistry, setActiveCollection]);
+    notify(`Created portfolio "${portfolio.name}".`, { type: "success" });
+  }, [dispatch, notify, setActiveCollection]);
 
   const createWatchlist = useCallback(async (name: string) => {
     const currentState = stateRef.current;
@@ -702,8 +712,8 @@ export function CommandBar({
     dispatch({ type: "SET_CONFIG", config: nextConfig });
     setActiveCollection(id);
     await saveConfig(nextConfig);
-    pluginRegistry.showToastFn(`Created watchlist "${trimmedName}".`, { type: "success" });
-  }, [dispatch, pluginRegistry, setActiveCollection]);
+    notify(`Created watchlist "${trimmedName}".`, { type: "success" });
+  }, [dispatch, notify, setActiveCollection]);
 
   const deleteWatchlist = useCallback(async (watchlistId: string) => {
     const currentState = stateRef.current;
@@ -722,8 +732,8 @@ export function CommandBar({
       if (fallback) setActiveCollection(fallback);
     }
     await saveConfig(nextConfig);
-    pluginRegistry.showToastFn(`Deleted "${watchlist.name}".`, { type: "success" });
-  }, [activeCollectionId, dispatch, pluginRegistry, setActiveCollection]);
+    notify(`Deleted "${watchlist.name}".`, { type: "success" });
+  }, [activeCollectionId, dispatch, notify, setActiveCollection]);
 
   const deletePortfolio = useCallback(async (portfolioId: string) => {
     const currentState = stateRef.current;
@@ -752,8 +762,8 @@ export function CommandBar({
       if (fallback) setActiveCollection(fallback);
     }
     await saveConfig(nextConfig);
-    pluginRegistry.showToastFn(`Deleted "${portfolio.name}".`, { type: "success" });
-  }, [activeCollectionId, dispatch, pluginRegistry, setActiveCollection, tickerRepository]);
+    notify(`Deleted "${portfolio.name}".`, { type: "success" });
+  }, [activeCollectionId, dispatch, notify, setActiveCollection, tickerRepository]);
 
   const setPortfolioPositionFromWorkflow = useCallback(async (values: Record<string, CommandBarFieldValue>) => {
     const currentState = stateRef.current;
@@ -800,8 +810,8 @@ export function CommandBar({
     });
     await tickerRepository.saveTicker(result.ticker);
     dispatch({ type: "UPDATE_TICKER", ticker: result.ticker });
-    pluginRegistry.showToastFn(`Set position for ${result.ticker.metadata.ticker} in "${portfolio.name}".`, { type: "success" });
-  }, [activeCollectionId, activeTickerSymbol, dataProvider, dispatch, pluginRegistry, tickerRepository]);
+    notify(`Set position for ${result.ticker.metadata.ticker} in "${portfolio.name}".`, { type: "success" });
+  }, [activeCollectionId, activeTickerSymbol, dataProvider, dispatch, notify, pluginRegistry, tickerRepository]);
 
   const addTickerMembershipFromWorkflow = useCallback(async (values: Record<string, CommandBarFieldValue>) => {
     const currentState = stateRef.current;
@@ -828,12 +838,12 @@ export function CommandBar({
     if (result.changed) {
       await tickerRepository.saveTicker(result.ticker);
       dispatch({ type: "UPDATE_TICKER", ticker: result.ticker });
-      pluginRegistry.showToastFn(`Added ${result.ticker.metadata.ticker} to "${portfolio.name}".`, { type: "success" });
+      notify(`Added ${result.ticker.metadata.ticker} to "${portfolio.name}".`, { type: "success" });
       return;
     }
 
-    pluginRegistry.showToastFn(`${result.ticker.metadata.ticker} is already in "${portfolio.name}".`, { type: "info" });
-  }, [activeCollectionId, activeTickerSymbol, dataProvider, dispatch, pluginRegistry, tickerRepository]);
+    notify(`${result.ticker.metadata.ticker} is already in "${portfolio.name}".`, { type: "info" });
+  }, [activeCollectionId, activeTickerSymbol, dataProvider, dispatch, notify, pluginRegistry, tickerRepository]);
 
   const disconnectBrokerInstance = useCallback(async (instanceId: string) => {
     const instance = stateRef.current.config.brokerInstances.find((entry) => entry.id === instanceId);
@@ -843,8 +853,8 @@ export function CommandBar({
     await pluginRegistry.removeBrokerInstanceFn(instanceId);
     const freshConfig = pluginRegistry.getConfigFn();
     dispatch({ type: "SET_CONFIG", config: freshConfig });
-    pluginRegistry.showToastFn(`Removed ${instance.label}.`, { type: "success" });
-  }, [dispatch, pluginRegistry]);
+    notify(`Removed ${instance.label}.`, { type: "success" });
+  }, [dispatch, notify, pluginRegistry]);
 
   const openBuiltInWorkflow = useCallback((actionId: string) => {
     switch (actionId) {
@@ -907,7 +917,7 @@ export function CommandBar({
           true,
         );
         if (!workflow) {
-          pluginRegistry.showToastFn("No connectable brokers are installed.", { type: "info" });
+          notify("No connectable brokers are installed.", { type: "info" });
           return;
         }
         openWorkflowRoute(workflow);
@@ -919,7 +929,7 @@ export function CommandBar({
           activeTicker: activeTickerData,
         });
         if (!workflow) {
-          pluginRegistry.showToastFn("Create a manual portfolio first.", { type: "info" });
+          notify("Create a manual portfolio first.", { type: "info" });
           return;
         }
         openWorkflowRoute({
@@ -949,7 +959,7 @@ export function CommandBar({
           false,
         );
         if (!workflow) {
-          pluginRegistry.showToastFn("No connectable brokers are installed.", { type: "info" });
+          notify("No connectable brokers are installed.", { type: "info" });
           return;
         }
         openWorkflowRoute(workflow);
@@ -957,8 +967,8 @@ export function CommandBar({
       }
       default:
         return;
-    }
-  }, [activeCollectionId, activeTickerData, buildBrokerWorkflow, openWorkflowRoute, pluginRegistry, state.config]);
+      }
+  }, [activeCollectionId, activeTickerData, buildBrokerWorkflow, notify, openWorkflowRoute, pluginRegistry, state.config]);
 
   const openPickerRoute = useCallback((
     route: CommandBarRoute,
@@ -1031,7 +1041,7 @@ export function CommandBar({
   const openPaneSettingsRoute = useCallback((paneId: string) => {
     const descriptor = pluginRegistry.resolvePaneSettings(paneId);
     if (!descriptor) {
-      pluginRegistry.showToastFn("The focused pane has no settings.", { type: "info" });
+      notify("The focused pane has no settings.", { type: "info" });
       return;
     }
     pushRoute({
@@ -1043,7 +1053,7 @@ export function CommandBar({
       error: null,
       pendingFieldKey: null,
     });
-  }, [pluginRegistry, pushRoute]);
+  }, [notify, pluginRegistry, pushRoute]);
 
   const executeCollectionCommand = useCallback(async (
     commandId: "add-watchlist" | "add-portfolio" | "remove-watchlist" | "remove-portfolio",
@@ -1072,7 +1082,7 @@ export function CommandBar({
     if (kind === "portfolio" && action === "add") {
       const manualPortfolios = stateForCommand.config.portfolios.filter(isManualPortfolio);
       if (manualPortfolios.length === 0) {
-        pluginRegistry.showToastFn("Create a manual portfolio first.", { type: "info" });
+        notify("Create a manual portfolio first.", { type: "info" });
         return;
       }
 
@@ -1119,12 +1129,27 @@ export function CommandBar({
     }
 
     const targetId = explicitTargetId
-      ?? resolvePreferredCollectionTarget(
-        stateForCommand,
-        kind,
-        activeCollectionId,
-        action,
-        resolvedTicker.ticker,
+      ?? (
+        kind === "watchlist" && action === "add"
+          ? resolvePreferredCollectionTarget(
+            stateForCommand,
+            kind,
+            activeCollectionId,
+            action,
+            resolvedTicker.ticker,
+          ) ?? resolveSoleCollectionTarget(
+            stateForCommand,
+            kind,
+            action,
+            resolvedTicker.ticker,
+          )
+          : resolvePreferredCollectionTarget(
+            stateForCommand,
+            kind,
+            activeCollectionId,
+            action,
+            resolvedTicker.ticker,
+          )
       );
 
     if (!targetId) {
@@ -1136,7 +1161,7 @@ export function CommandBar({
           description: option.description,
         }));
       if (options.length === 0) {
-        pluginRegistry.showToastFn(
+        notify(
           action === "add"
             ? `No ${kind}s are available for ${resolvedTicker.symbol}.`
             : `${resolvedTicker.symbol} is not in any ${kind}.`,
@@ -1174,7 +1199,7 @@ export function CommandBar({
     } else {
       const portfolio = stateForCommand.config.portfolios.find((entry) => entry.id === targetId);
       if (!portfolio || !isManualPortfolio(portfolio)) {
-        pluginRegistry.showToastFn("Choose a manual portfolio.", { type: "error" });
+        notify("Choose a manual portfolio.", { type: "error" });
         return;
       }
 
@@ -1192,12 +1217,12 @@ export function CommandBar({
       ? stateForCommand.config.watchlists.find((entry) => entry.id === targetId)?.name
       : stateForCommand.config.portfolios.find((entry) => entry.id === targetId)?.name) || targetId;
     if (changed) {
-      pluginRegistry.showToastFn(
+      notify(
         `${action === "add" ? "Added" : "Removed"} ${resolvedTicker.symbol} ${action === "add" ? "to" : "from"} "${targetName}".`,
         { type: "success" },
       );
     } else {
-      pluginRegistry.showToastFn(
+      notify(
         action === "add"
           ? `${resolvedTicker.symbol} is already in "${targetName}".`
           : `${resolvedTicker.symbol} is not in "${targetName}".`,
@@ -1210,6 +1235,7 @@ export function CommandBar({
     activeTickerSymbol,
     buildSharedWorkflowDeps,
     closeAll,
+    notify,
     openAddToPortfolioWorkflow,
     openModeRoute,
     openPickerRoute,
@@ -1433,14 +1459,14 @@ export function CommandBar({
               const name = coerceFieldString(route.values.name).trim();
               if (!name) throw new Error("Layout name is required.");
               dispatch({ type: "NEW_LAYOUT", name });
-              pluginRegistry.showToastFn(`Created layout "${name}".`, { type: "success" });
+              notify(`Created layout "${name}".`, { type: "success" });
               break;
             }
             case "rename-layout": {
               const name = coerceFieldString(route.values.name).trim();
               if (!name) throw new Error("Layout name is required.");
               dispatch({ type: "RENAME_LAYOUT", index: state.config.activeLayoutIndex, name });
-              pluginRegistry.showToastFn(`Renamed layout to "${name}".`, { type: "success" });
+              notify(`Renamed layout to "${name}".`, { type: "success" });
               break;
             }
             case "new-portfolio": {
@@ -1492,7 +1518,7 @@ export function CommandBar({
           }
           await command.execute(values);
           if (route.successLabel) {
-            pluginRegistry.showToastFn(route.successLabel, { type: "success" });
+            notify(route.successLabel, { type: "success" });
           }
           break;
         }
@@ -1516,7 +1542,7 @@ export function CommandBar({
           };
           await pluginRegistry.createPaneFromTemplateAsyncFn(template.id, createOptions);
           if (route.successLabel) {
-            pluginRegistry.showToastFn(route.successLabel, { type: "success" });
+            notify(route.successLabel, { type: "success" });
           }
           break;
         }
@@ -1566,6 +1592,7 @@ export function CommandBar({
     dispatch,
     extractBrokerWorkflowValues,
     getWorkflowFieldStringValue,
+    notify,
     pluginRegistry,
     addTickerMembershipFromWorkflow,
     setPortfolioPositionFromWorkflow,
@@ -1574,9 +1601,16 @@ export function CommandBar({
     updateTopRoute,
   ]);
 
-  const openPluginCommandWorkflow = useCallback((command: CommandDef) => {
+  const openPluginCommandWorkflow = useCallback((
+    command: CommandDef,
+    options?: { values?: Record<string, string> },
+  ) => {
     if (!command.wizard || command.wizard.length === 0) return;
     const normalized = normalizeWizardFields(command.wizard);
+    const values = {
+      ...normalized.initialValues,
+      ...(options?.values ?? {}),
+    };
     openWorkflowRoute({
       kind: "workflow",
       workflowId: `plugin-command:${command.id}`,
@@ -1584,8 +1618,8 @@ export function CommandBar({
       subtitle: command.description,
       description: normalized.description,
       fields: normalized.fields,
-      values: normalized.initialValues,
-      activeFieldId: getFirstVisibleFieldId(normalized.fields, normalized.initialValues),
+      values,
+      activeFieldId: getFirstVisibleFieldId(normalized.fields, values),
       submitLabel: command.label,
       cancelLabel: "Back",
       pendingLabel: normalized.pendingLabel,
@@ -1600,6 +1634,28 @@ export function CommandBar({
     });
   }, [openWorkflowRoute]);
 
+  useEffect(() => {
+    const launch = state.commandBarLaunchRequest;
+    if (!launch) {
+      processedLaunchSequenceRef.current = null;
+      return;
+    }
+    if (!state.commandBarOpen) return;
+    if (processedLaunchSequenceRef.current === launch.sequence) return;
+    processedLaunchSequenceRef.current = launch.sequence;
+
+    if (launch.kind === "plugin-command") {
+      const command = pluginRegistry.commands.get(launch.commandId);
+      if (!command?.wizard || command.wizard.length === 0) return;
+      openPluginCommandWorkflow(command);
+    }
+  }, [
+    openPluginCommandWorkflow,
+    pluginRegistry,
+    state.commandBarLaunchRequest,
+    state.commandBarOpen,
+  ]);
+
   const shouldOpenTemplateConfig = useCallback((template: PaneTemplateDef, arg?: string): boolean => {
     if (template.wizard && template.wizard.length > 0) {
       if (!arg?.trim()) {
@@ -1668,12 +1724,12 @@ export function CommandBar({
       closeAll({ revertThemePreview: false });
     } catch (error) {
       const displayLabel = getPaneTemplateDisplayLabel(template);
-      pluginRegistry.showToastFn(
+      notify(
         error instanceof Error ? error.message : `Could not create ${displayLabel.toLowerCase()}.`,
         { type: "error" },
       );
     }
-  }, [closeAll, pluginRegistry]);
+  }, [closeAll, notify, pluginRegistry]);
 
   async function runPaneTemplateShortcut(
     template: PaneTemplateDef,
@@ -1925,12 +1981,24 @@ export function CommandBar({
     });
   }, [getPaneTemplateContext, pluginRegistry, state.config.disabledPlugins]);
 
+  const getAvailablePluginCommands = useCallback((): CommandDef[] => {
+    const disabledPlugins = new Set(state.config.disabledPlugins || []);
+    return [...pluginRegistry.commands.values()]
+      .filter((command) => {
+        if (command.hidden?.()) return false;
+        const pluginId = pluginRegistry.getCommandPluginId(command.id);
+        if (pluginId && disabledPlugins.has(pluginId)) return false;
+        return true;
+      });
+  }, [pluginRegistry, state.config.disabledPlugins]);
+
   const rootShortcutIntent = useMemo(() => parseRootShortcutIntent({
     query: rootQuery,
     commands,
+    pluginCommands: getAvailablePluginCommands(),
     paneTemplates: getAvailablePaneShortcutTemplates(rootQuery),
     activeTicker: activeTickerSymbol,
-  }), [activeTickerSymbol, getAvailablePaneShortcutTemplates, rootQuery]);
+  }), [activeTickerSymbol, getAvailablePaneShortcutTemplates, getAvailablePluginCommands, rootQuery]);
 
   const createPaneTemplateItem = useCallback((
     template: PaneTemplateDef,
@@ -2009,69 +2077,108 @@ export function CommandBar({
       : items;
   }, [createPaneTemplateItem, getAvailablePaneTemplates]);
 
-  const runPluginCommandDirect = useCallback(async (command: CommandDef) => {
+  const runPluginCommandDirect = useCallback(async (
+    command: CommandDef,
+    values?: Record<string, string>,
+  ) => {
     try {
-      await command.execute();
+      await command.execute(values);
       closeAll({ revertThemePreview: false });
     } catch (error) {
-      pluginRegistry.showToastFn(
+      notify(
         error instanceof Error ? error.message : `Could not run ${command.label.toLowerCase()}.`,
         { type: "error" },
       );
     }
-  }, [closeAll, pluginRegistry]);
+  }, [closeAll, notify, pluginRegistry]);
+
+  const parsePluginCommandShortcutArg = useCallback((
+    command: CommandDef,
+    shortcutArg: string,
+  ): Record<string, string> => {
+    if (!shortcutArg.trim()) return {};
+    return command.shortcutArg?.parse?.(shortcutArg, {
+      activeTicker: activeTickerSymbol,
+    }) ?? { shortcut: shortcutArg };
+  }, [activeTickerSymbol]);
 
-  const pluginCommandItems = useCallback((): ResultItem[] => {
-    const disabledPlugins = new Set(state.config.disabledPlugins || []);
-    return [...pluginRegistry.commands.values()]
-      .filter((command) => {
-        if (command.hidden?.()) return false;
-        const pluginId = pluginRegistry.getCommandPluginId(command.id);
-        if (pluginId && disabledPlugins.has(pluginId)) return false;
-        return true;
-      })
-      .map((command) => {
-        const pluginId = pluginRegistry.getCommandPluginId(command.id);
-        const pluginName = pluginId ? pluginRegistry.allPlugins.get(pluginId)?.name : null;
-        return {
-          id: command.id,
-          label: command.label,
-          detail: command.description || "",
-          category: pluginName || "Plugin Commands",
-          kind: "command" as const,
-          action: () => {
-            if (command.wizard && command.wizard.length > 0) {
-              openPluginCommandWorkflow(command);
-              return;
-            }
-            const confirm = resolvePluginCommandConfirm(command);
-            if (confirm) {
-              openInlineConfirm({
-                confirmId: `plugin-command:${command.id}`,
-                title: confirm.title,
-                body: confirm.body,
-                confirmLabel: confirm.confirmLabel || command.label,
-                cancelLabel: confirm.cancelLabel || "Back",
-                tone: confirm.tone || "danger",
-                onConfirm: async () => {
-                  await command.execute();
-                },
-              });
-              return;
-            }
-            void runPluginCommandDirect(command);
-          },
-        };
-      });
+  const createPluginCommandItem = useCallback((
+    command: CommandDef,
+    options?: { shortcutArg?: string },
+  ): ResultItem => {
+    const pluginId = pluginRegistry.getCommandPluginId(command.id);
+    const pluginName = pluginId ? pluginRegistry.allPlugins.get(pluginId)?.name : null;
+    const shortcut = command.shortcut?.trim() || undefined;
+    const shortcutArg = options?.shortcutArg?.trim() || "";
+    return {
+      id: command.id,
+      label: command.label,
+      detail: shortcutArg || command.description || "",
+      category: pluginName || "Plugin Commands",
+      kind: "command",
+      right: shortcut,
+      searchText: `${command.label} ${command.description || ""} ${(command.keywords ?? []).join(" ")} ${shortcut || ""}`,
+      action: () => {
+        if (shortcutArg && command.wizard && command.wizard.length > 0) {
+          try {
+            openPluginCommandWorkflow(command, {
+              values: parsePluginCommandShortcutArg(command, shortcutArg),
+            });
+          } catch (error) {
+            notify(
+              error instanceof Error ? error.message : `Could not parse ${command.label.toLowerCase()}.`,
+              { type: "error" },
+            );
+          }
+          return;
+        }
+        if (shortcutArg) {
+          try {
+            void runPluginCommandDirect(command, parsePluginCommandShortcutArg(command, shortcutArg));
+          } catch (error) {
+            notify(
+              error instanceof Error ? error.message : `Could not parse ${command.label.toLowerCase()}.`,
+              { type: "error" },
+            );
+          }
+          return;
+        }
+        if (command.wizard && command.wizard.length > 0) {
+          openPluginCommandWorkflow(command);
+          return;
+        }
+        const confirm = resolvePluginCommandConfirm(command);
+        if (confirm) {
+          openInlineConfirm({
+            confirmId: `plugin-command:${command.id}`,
+            title: confirm.title,
+            body: confirm.body,
+            confirmLabel: confirm.confirmLabel || command.label,
+            cancelLabel: confirm.cancelLabel || "Back",
+            tone: confirm.tone || "danger",
+            onConfirm: async () => {
+              await command.execute();
+            },
+          });
+          return;
+        }
+        void runPluginCommandDirect(command);
+      },
+    };
   }, [
     openInlineConfirm,
     openPluginCommandWorkflow,
+    parsePluginCommandShortcutArg,
+    notify,
     pluginRegistry,
     resolvePluginCommandConfirm,
     runPluginCommandDirect,
-    state.config.disabledPlugins,
   ]);
 
+  const pluginCommandItems = useCallback((): ResultItem[] => {
+    return getAvailablePluginCommands().map((command) => createPluginCommandItem(command));
+  }, [createPluginCommandItem, getAvailablePluginCommands]);
+
   const tickerActionItems = useCallback((): ResultItem[] => {
     const ticker = activeTickerData;
     const financials = activeFinancials;
@@ -2200,11 +2307,11 @@ export function CommandBar({
         const exportPath = `${process.env.HOME || "~"}/gloomberb-config-backup.json`;
         void exportConfig(state.config, exportPath)
           .then(() => {
-            pluginRegistry.showToastFn(`Config exported to ${exportPath}`, { type: "success" });
+            notify(`Config exported to ${exportPath}`, { type: "success" });
             closeAll({ revertThemePreview: false });
           })
           .catch((error) => {
-            pluginRegistry.showToastFn(error instanceof Error ? error.message : "Export failed.", { type: "error" });
+            notify(error instanceof Error ? error.message : "Export failed.", { type: "error" });
           });
         return;
       }
@@ -2215,11 +2322,11 @@ export function CommandBar({
             dispatch({ type: "SET_CONFIG", config: imported });
             applyTheme(imported.theme);
             dispatch({ type: "SET_THEME", theme: imported.theme });
-            pluginRegistry.showToastFn(`Imported config from ${importPath}.`, { type: "success" });
+            notify(`Imported config from ${importPath}.`, { type: "success" });
             closeAll({ revertThemePreview: false });
           })
           .catch((error) => {
-            pluginRegistry.showToastFn(error instanceof Error ? error.message : "Import failed.", { type: "error" });
+            notify(error instanceof Error ? error.message : "Import failed.", { type: "error" });
           });
         return;
       }
@@ -2537,6 +2644,12 @@ export function CommandBar({
         });
       }
 
+      if (rootShortcutIntent.source === "plugin-command") {
+        return createPluginCommandItem(rootShortcutIntent.command, {
+          shortcutArg: rootShortcutIntent.argText,
+        });
+      }
+
       const { command } = rootShortcutIntent;
       if (command.id === "search-ticker") {
         const inferredSymbol = normalizeTickerInput(activeTickerSymbol, undefined);
@@ -2567,12 +2680,22 @@ export function CommandBar({
             : manualPortfolios.length === 1
               ? manualPortfolios[0]!.id
               : null)
-          : resolvePreferredCollectionTarget(
-            state,
-            kind,
-            activeCollectionId,
-            action,
-            localTicker,
+          : (
+            resolvePreferredCollectionTarget(
+              state,
+              kind,
+              activeCollectionId,
+              action,
+              localTicker,
+            )
+            ?? (commandId === "add-watchlist"
+              ? resolveSoleCollectionTarget(
+                state,
+                kind,
+                action,
+                localTicker,
+              )
+              : null)
           );
         const preferredTargetName = preferredTargetId
           ? (kind === "watchlist"
@@ -2605,7 +2728,11 @@ export function CommandBar({
     let initialIdx = 0;
     const shortcutItem = buildRootShortcutItem();
 
-    if (rootShortcutIntent.kind !== "none" && rootShortcutIntent.source === "pane-template" && shortcutItem) {
+    if (
+      rootShortcutIntent.kind !== "none"
+      && (rootShortcutIntent.source === "pane-template" || rootShortcutIntent.source === "plugin-command")
+      && shortcutItem
+    ) {
       items.push(shortcutItem);
     } else if (match && match.command.id === "plugins") {
       const disabledPlugins = state.config.disabledPlugins || [];
@@ -2842,6 +2969,7 @@ export function CommandBar({
         action: () => {
           const { width, height } = pluginRegistry.getTermSizeFn();
           persistLayoutChange(gridlockAllPanes(currentLayout, { x: 0, y: 0, width, height }));
+          notifyGridlockRevert();
           closeAll({ revertThemePreview: false });
         },
       });
@@ -2991,12 +3119,14 @@ export function CommandBar({
     activeTickerData,
     activeTickerSymbol,
     closeAll,
+    createPluginCommandItem,
     currentRoute,
     dispatch,
     duplicatePane,
     executeCollectionCommand,
     localTickerSearchResultItems,
     nonShortcutPaneTemplateItems,
+    notifyGridlockRevert,
     openBuiltInWorkflow,
     openPickerRoute,
     paneShortcutItems,
@@ -3166,6 +3296,12 @@ export function CommandBar({
       return `Shortcut: ${rootShortcutIntent.label}`;
     }
 
+    if (rootShortcutIntent.source === "plugin-command") {
+      return rootShortcutIntent.argText
+        ? `Shortcut: ${rootShortcutIntent.label} · ${rootShortcutIntent.argText}`
+        : `Shortcut: ${rootShortcutIntent.label}`;
+    }
+
     if (rootShortcutIntent.command.id === "search-ticker") {
       const symbol = normalizeTickerInput(activeTickerSymbol, rootShortcutIntent.argText);
       if (symbol) {
@@ -3188,7 +3324,14 @@ export function CommandBar({
         activeCollectionId,
         action,
         localTicker,
-      );
+      ) ?? (commandId === "add-watchlist"
+        ? resolveSoleCollectionTarget(
+          state,
+          kind,
+          action,
+          localTicker,
+        )
+        : null);
       const preferredTargetName = preferredTargetId
         ? (kind === "watchlist"
           ? state.config.watchlists.find((entry) => entry.id === preferredTargetId)?.name
@@ -3209,6 +3352,7 @@ export function CommandBar({
     const intent = parseRootShortcutIntent({
       query: rootQueryRef.current,
       commands,
+      pluginCommands: getAvailablePluginCommands(),
       paneTemplates: getAvailablePaneShortcutTemplates(rootQueryRef.current),
       activeTicker: activeTickerSymbol,
     });
@@ -3233,6 +3377,10 @@ export function CommandBar({
       return false;
     }
 
+    if (intent.source === "plugin-command") {
+      return false;
+    }
+
     if (intent.command.id === "search-ticker") {
       openModeRoute("ticker-search", intent.argText);
       return true;
@@ -3247,6 +3395,7 @@ export function CommandBar({
     return false;
   }, [
     activeTickerSymbol,
+    getAvailablePluginCommands,
     getAvailablePaneShortcutTemplates,
     openModeRoute,
     openPaneTemplateWorkflow,
@@ -3257,6 +3406,7 @@ export function CommandBar({
     const intent = parseRootShortcutIntent({
       query,
       commands,
+      pluginCommands: getAvailablePluginCommands(),
       paneTemplates: getAvailablePaneShortcutTemplates(query),
       activeTicker: activeTickerSymbol,
     });
@@ -3269,6 +3419,12 @@ export function CommandBar({
       });
     }
 
+    if (intent.kind !== "none" && intent.source === "plugin-command") {
+      return createPluginCommandItem(intent.command, {
+        shortcutArg: intent.argText,
+      });
+    }
+
     const match = matchPrefix(query);
     if (!match) {
       return null;
@@ -3376,8 +3532,10 @@ export function CommandBar({
     return null;
   }, [
     createPaneTemplateItem,
+    createPluginCommandItem,
     activeTickerSymbol,
     executeCollectionCommand,
+    getAvailablePluginCommands,
     getAvailablePaneShortcutTemplates,
     openModeRoute,
     paneTemplateItems,
@@ -3679,6 +3837,7 @@ export function CommandBar({
             action: () => {
               const { width, height } = pluginRegistry.getTermSizeFn();
               persistLayoutChange(gridlockAllPanes(currentLayout, { x: 0, y: 0, width, height }));
+              notifyGridlockRevert();
               closeAll({ revertThemePreview: false });
             },
           });
@@ -3867,6 +4026,7 @@ export function CommandBar({
     localTickerSearchResultItems,
     mapTickerSearchCandidateToResultItem,
     nonShortcutPaneTemplateItems,
+    notifyGridlockRevert,
     openBuiltInWorkflow,
     openInlineConfirm,
     openPaneSettingsRoute,
@@ -3999,20 +4159,31 @@ export function CommandBar({
   }, [moveListSelection, setHoveredIndex]);
 
   const updateWorkflowValue = useCallback((fieldId: string, value: CommandBarFieldValue) => {
-    updateTopRoute((route) => {
-      if (route.kind !== "workflow") return route;
+    setRouteStack((current) => {
+      let workflowIndex = -1;
+      for (let index = current.length - 1; index >= 0; index -= 1) {
+        if (current[index]?.kind === "workflow") {
+          workflowIndex = index;
+          break;
+        }
+      }
+      if (workflowIndex < 0) return current;
+      const next = [...current];
+      const route = next[workflowIndex]!;
+      if (route.kind !== "workflow") return current;
       const nextValues = { ...route.values, [fieldId]: value };
       const nextActiveFieldId = route.activeFieldId && getVisibleWorkflowFields(route.fields, nextValues).some((field) => field.id === route.activeFieldId)
         ? route.activeFieldId
         : getFirstVisibleFieldId(route.fields, nextValues);
-      return {
+      next[workflowIndex] = {
         ...route,
         values: nextValues,
         activeFieldId: nextActiveFieldId,
         error: null,
       };
+      return next;
     });
-  }, [updateTopRoute]);
+  }, []);
 
   const moveWorkflowFocus = useCallback((delta: number) => {
     if (currentRoute?.kind !== "workflow") return;
@@ -4875,6 +5046,7 @@ export function CommandBar({
                         placeholderColor={paletteSubtleText}
                         backgroundColor={colors.panel}
                         flexGrow={1}
+                        wrapText
                       />
                     ) : (
                       <box flexDirection="column" paddingX={1} paddingY={0}>