gloomberb 0.15.6 → 0.15.8

package/src/app/pane-runtime/pane-template-runtime.ts

@@ -1,6 +1,7 @@
 import { useCallback, type Dispatch } from "react";
 import { getPaneTemplateDisplayLabel } from "../../components/command-bar/pane-templates/items";
 import { createPaneTemplateOrThrow } from "../../components/command-bar/workflow/ops";
+import { openFormModal } from "../../components/form-modal";
 import type { AppTickerRepositoryPort } from "../../core/app-service-ports";
 import type { PluginRegistry } from "../../plugins/registry";
 import type { AppAction, AppState } from "../../state/app/context";
@@ -10,10 +11,7 @@ import type {
   PaneDef,
   PaneTemplateCreateOptions,
   PaneTemplateInstanceConfig,
-  WizardStep,
 } from "../../types/plugin";
-import type { DialogApi } from "../../ui/dialog";
-import { runPaneTemplateDialogWizard } from "../pane-template-dialog-wizard";
 
 interface UseAppPaneTemplateRuntimeOptions {
   buildPaneInstance: (paneType: string, options?: {
@@ -24,7 +22,6 @@ interface UseAppPaneTemplateRuntimeOptions {
     instanceId?: string;
   }) => PaneInstanceConfig | null;
   dataProvider: DataProvider;
-  dialog: DialogApi;
   dispatch: Dispatch<AppAction>;
   notify: (body: string, options?: { type?: "info" | "success" | "error" }) => void;
   placePaneInstance: (
@@ -40,7 +37,6 @@ interface UseAppPaneTemplateRuntimeOptions {
 export function useAppPaneTemplateRuntime({
   buildPaneInstance,
   dataProvider,
-  dialog,
   dispatch,
   notify,
   placePaneInstance,
@@ -48,38 +44,23 @@ export function useAppPaneTemplateRuntime({
   stateRef,
   tickerRepository,
 }: UseAppPaneTemplateRuntimeOptions) {
-  const runPaneTemplateWizard = useCallback((steps: WizardStep[]) => (
-    runPaneTemplateDialogWizard(dialog, steps)
-  ), [dialog]);
-
   const createPaneFromTemplate = useCallback(async (templateId: string, options?: PaneTemplateCreateOptions) => {
     const template = pluginRegistry.paneTemplates.get(templateId);
     if (!template) return;
 
-    let resolvedOptions = options;
-    const shouldRunDialogWizard = !!template.wizard
+    // A template that asks for settings asks in the same form the command bar
+    // opens, which creates the pane when it is sent.
+    const asksForSettings = !!template.wizard
       && template.wizard.length > 0
       && !options?.values
       && (!options?.arg || template.wizard.some((step) => step.type === "textarea"));
-    if (shouldRunDialogWizard && template.wizard) {
-      const wizardSteps = options?.arg && template.shortcut?.argPlaceholder
-        ? template.wizard.map((step) => (
-          step.key === template.shortcut?.argPlaceholder
-            ? { ...step, defaultValue: options.arg }
-            : step
-        ))
-        : template.wizard;
-      const values = await runPaneTemplateWizard(wizardSteps);
-      if (!values) return;
-      resolvedOptions = {
-        ...options,
-        values,
-        arg: template.shortcut?.argPlaceholder ? values[template.shortcut.argPlaceholder] : options?.arg,
-      };
+    if (asksForSettings) {
+      openFormModal({ kind: "pane-template", templateId, arg: options?.arg, options });
+      return;
     }
 
     try {
-      await createPaneTemplateOrThrow(templateId, resolvedOptions, {
+      await createPaneTemplateOrThrow(templateId, options, {
         dataProvider,
         tickerRepository,
         pluginRegistry,
@@ -101,7 +82,6 @@ export function useAppPaneTemplateRuntime({
     notify,
     placePaneInstance,
     pluginRegistry,
-    runPaneTemplateWizard,
     stateRef,
     tickerRepository,
   ]);

package/src/app/pane-runtime/plugin-bindings.ts

@@ -4,6 +4,9 @@ import {
   createPaneTemplateOrThrow,
 } from "../../components/command-bar/workflow/ops";
 import type { AppTickerRepositoryPort } from "../../core/app-service-ports";
+import { openFormModal } from "../../components/form-modal";
+import { t } from "../../i18n";
+import { openBrokerAddFlow } from "../../plugins/builtin/broker-manager/add-request";
 import { getPanelFocusTarget } from "../../core/state/app/layout";
 import { setLayoutManagerDispatch } from "../../plugins/builtin/layout-manager";
 import { setMarketplaceHost } from "../../plugins/builtin/plugin-marketplace/store";
@@ -48,6 +51,7 @@ import type {
 import type { TickerOpenTarget } from "../../tickers/open-target";
 import { instrumentFromTicker } from "../../market-data/request-types";
 import { tickerInstrumentLabel } from "../../tickers/instrument-label";
+import { isDialogOpen } from "../../ui/dialog-stack";
 import { stableStringify } from "../../utils/hash";
 
 // Registry callbacks are rebound on renders. Request ownership must survive
@@ -70,7 +74,7 @@ interface BindAppPanePluginRegistryOptions {
   externalPlugins: readonly LoadedExternalPlugin[];
   focusVisiblePane: (paneId: string, layout?: LayoutConfig) => void;
   isDetachedWindow: boolean;
-  openPaneSettings: (paneId?: string) => Promise<void>;
+  openPaneSettings: (paneId?: string, options?: { fieldKey?: string }) => Promise<void>;
   openPinnedTicker: (rawSymbol: string, options?: PinTickerOptions) => Promise<void>;
   persistConfig: (nextConfig: AppState["config"]) => void;
   persistLayout: (layout: LayoutConfig, options?: { pushHistory?: boolean }) => void;
@@ -131,25 +135,43 @@ export function bindAppPanePluginRegistry({
       if (paneId) dispatch({ type: "FOCUS_PANE", paneId });
     },
     switchTab: (tabId, paneId) => switchTickerResearchTab(tabId, paneId),
+    // The bar would open over a dialog without its keys, so it waits for none to be open.
     openCommandBar: (query) => {
-      if (isDetachedWindow) return;
+      if (isDetachedWindow || isDialogOpen()) return;
       dispatch({ type: "SET_COMMAND_BAR", open: true, query });
     },
+    // Forms submit through the main window's state, so a detached window says where to go.
     openPluginCommandWorkflow: (commandId) => {
-      if (isDetachedWindow) return;
-      dispatch({
-        type: "SET_COMMAND_BAR",
-        open: true,
-        query: "",
-        launch: { kind: "plugin-command", commandId },
-      });
+      if (isDetachedWindow) {
+        pluginRegistry.notify({ body: t("Open this from the main window."), type: "info" });
+        return;
+      }
+      const command = pluginRegistry.commands.get(commandId);
+      if (!command?.wizard || command.wizard.length === 0) {
+        // Nothing to fill in: the bar opens, as it always has for such a command.
+        if (!isDialogOpen()) dispatch({ type: "SET_COMMAND_BAR", open: true, query: "" });
+        return;
+      }
+      openFormModal({ kind: "plugin-command", commandId });
+    },
+    openBuiltInWorkflow: (actionId) => {
+      if (isDetachedWindow) {
+        pluginRegistry.notify({ body: t("Open this from the main window."), type: "info" });
+        return;
+      }
+      // Profiles are added in the Brokers pane, not in a form.
+      if (actionId === "add-broker-account") {
+        openBrokerAddFlow(pluginRegistry);
+        return;
+      }
+      openFormModal({ kind: "builtin", actionId });
     },
     getLayout: () => stateRef.current.config.layout,
     updateLayout: (layout) => {
       if (isDetachedWindow) return;
       persistLayout(layout);
     },
-    openPaneSettings: (paneId) => { void openPaneSettings(paneId); },
+    openPaneSettings: (paneId, options) => { void openPaneSettings(paneId, options); },
     showPane: (paneId) => {
       if (isDetachedWindow) return;
       showPane(paneId);
@@ -335,7 +357,7 @@ export function bindAppPanePluginRegistry({
           toggleable: plugin.toggleable === true,
           enabled: !disabled.has(plugin.id),
           source: external ? "external" : "builtin",
-          ...(external?.directory ? { directory: external.directory } : {}),
+          ...(external?.directory ? { directory: external.directory, path: external.path } : {}),
           ...(external?.commit ? { commit: external.commit } : {}),
           ...(external?.linked ? { linked: true } : {}),
           hasSetup,
@@ -358,7 +380,7 @@ export function bindAppPanePluginRegistry({
           toggleable: true,
           enabled: !disabled.has(entry.plugin.id),
           source: "external",
-          ...(entry.directory ? { directory: entry.directory } : {}),
+          ...(entry.directory ? { directory: entry.directory, path: entry.path } : {}),
           ...(entry.commit ? { commit: entry.commit } : {}),
           ...(entry.linked ? { linked: true } : {}),
           ...(entry.unsupportedTarget ? { unsupportedTarget: entry.unsupportedTarget } : {}),

package/src/app/pane-runtime/ticker-open-runtime.ts

@@ -23,8 +23,9 @@ import {
   type TickerOpenTarget,
 } from "../../tickers/open-target";
 import { AmbiguousTickerError, findExactTickerSearchMatch } from "../../tickers/search";
+import { isDialogOpen } from "../../ui/dialog-stack";
 import { parsePublicTickerKey } from "../../utils/exchanges";
-import { tickerHasYahooSuffix } from "../../sources/yahoo-finance/symbols";
+import { tickerHasListingSuffix } from "../../sources/listing-symbols";
 import { instrumentFromTicker } from "../../market-data/request-types";
 import { tickerInstrumentLabel } from "../../tickers/instrument-label";
 
@@ -75,7 +76,8 @@ export function useAppTickerOpenRuntime({
       return target;
     } catch (err) {
       if (!canPresentFeedback()) return null;
-      if (err instanceof AmbiguousTickerError) {
+      // Ticker search offers the listings, unless a dialog would sit over the bar.
+      if (err instanceof AmbiguousTickerError && !isDialogOpen()) {
         dispatch({ type: "SET_COMMAND_BAR", open: true, query: rawSymbol,
           launch: { kind: "ticker-search", query: rawSymbol } });
       }
@@ -114,7 +116,7 @@ export function useAppTickerOpenRuntime({
     if (!options?.forceNewPane && !existing && instrument === null && !target.ticker.metadata.broker_contracts?.length) {
       existing = findFixedTickerPaneForSymbol(currentLayout, paneType, symbol);
     }
-    if (!options?.forceNewPane && !existing && !instrument && (parsePublicTickerKey(symbol).exchange || tickerHasYahooSuffix(symbol))) {
+    if (!options?.forceNewPane && !existing && !instrument && (parsePublicTickerKey(symbol).exchange || tickerHasListingSuffix(symbol))) {
       existing = currentLayout.instances.find((instance) => {
         if (instance.paneId !== paneType || instance.binding?.kind !== "fixed" || instance.binding.instrument || !isPaneInLayout(currentLayout, instance.instanceId)) return false;
         const ticker = currentState.tickers.get(instance.binding.symbol);

package/src/app/runtime/broker-import.ts

@@ -87,7 +87,7 @@ export function useBrokerImportRuntime({
 
     for (const position of result.positions) {
       throwIfBrokerImportCancelled(options?.signal);
-      // Skip Yahoo Finance for broker option symbols; position marks are already available.
+      // Skip market data for broker option symbols; position marks are already available.
       // Position data (markPrice, marketValue, unrealizedPnl) is used directly.
       if (options?.refreshImportedTickers !== false && position.assetCategory !== "OPT") {
         refreshQuote(position.ticker, position.exchange, undefined, 1);

package/src/app/runtime/desktop-menu.ts

@@ -4,9 +4,12 @@ import type { PluginRegistry } from "../../plugins/registry";
 import type { AppAction, AppState } from "../../state/app/context";
 import type { DesktopApplicationMenuBridge } from "../../types/desktop-menu";
 import type { DesktopWindowBridge } from "../../types/desktop-window";
+import { isDialogOpen } from "../../ui/dialog-stack";
 import type { RendererHost } from "../../ui/host";
 import { recordFunctionOpen } from "../../telemetry/usage-counts";
 
+const OPENS_OVER_DIALOGS = new Set<string>(["open-command-bar", "open-plugin-workflow", "open-builtin-workflow"]);
+
 export function useDesktopApplicationMenuRuntime({
   desktopApplicationMenuBridge,
   desktopWindowKind,
@@ -27,6 +30,11 @@ export function useDesktopApplicationMenuRuntime({
   useEffect(() => {
     if (desktopWindowKind !== "main" || !desktopApplicationMenuBridge) return;
     return desktopApplicationMenuBridge.subscribe((command) => {
+      // The native menu stays reachable over a dialog, accelerators included.
+      // A bar opened there would sit over the dialog without its keys, and Esc
+      // would close the dialog under it; a form would stack over one the user
+      // has not finished. Both wait for the dialog to close.
+      if (OPENS_OVER_DIALOGS.has(command.type) && isDialogOpen()) return;
       switch (command.type) {
         case "open-command-bar":
           dispatch({ type: "SET_COMMAND_BAR", open: true, query: command.query });
@@ -35,12 +43,7 @@ export function useDesktopApplicationMenuRuntime({
           pluginRegistry.openPluginCommandWorkflow(command.commandId);
           break;
         case "open-builtin-workflow":
-          dispatch({
-            type: "SET_COMMAND_BAR",
-            open: true,
-            query: "",
-            launch: { kind: "builtin-workflow", actionId: command.actionId },
-          });
+          pluginRegistry.openBuiltInWorkflow(command.actionId);
           break;
         case "open-url":
           void rendererHost.openExternal(command.url).catch((error) => {

package/src/app/runtime/plugin-bindings.ts

@@ -9,6 +9,7 @@ import type { MarketDataCoordinator } from "../../market-data/coordinator";
 import { instrumentFromTicker } from "../../market-data/request-types";
 import type { PluginRegistry } from "../../plugins/registry";
 import { saveConfigImmediately } from "../../state/config-save-scheduler";
+import { settleWithin } from "../../utils/async-deadline";
 import type { AppAction, AppState } from "../../state/app/context";
 import type { AppConfig, BrokerInstanceConfig } from "../../types/config";
 import type { DataProvider } from "../../types/data-provider";
@@ -18,6 +19,9 @@ import {
   getBrokerInstance,
 } from "../../utils/broker-instances";
 
+/** How long removing a profile waits for its adapter to disconnect before going on without it. */
+const ADAPTER_DISCONNECT_WAIT_MS = 5_000;
+
 export function bindPluginRegistryRuntimeAccess({
   dataProvider,
   dispatch,
@@ -186,8 +190,10 @@ export function bindPluginRegistryRuntimeAccess({
 
       clearPersistedBrokerAccounts(pluginRegistry.persistence.resources, instance);
 
+      // Best effort: an adapter that throws, rejects or never answers (a desktop
+      // call to a busy Bun process) must not keep the profile.
       const broker = pluginRegistry.brokers.get(instance.brokerType);
-      await broker?.disconnect?.(instance).catch(() => {});
+      await settleWithin(Promise.resolve().then(() => broker?.disconnect?.(instance)), ADAPTER_DISCONNECT_WAIT_MS);
 
       // A portfolio another profile of the account can keep (the account switched
       // to or from sign-in) goes to that profile; only this profile's positions go.

package/src/app/runtime/ticker-refresh.ts

@@ -96,7 +96,7 @@ export function useTickerRefreshRuntime({
       if (quote.currency) void marketData.loadFxRate(quote.currency).catch(() => {});
       void marketData.loadFxRate(baseCurrency).catch(() => {});
     } catch {
-      // Silently fail - the list can fall back to stale cache or Yahoo.
+      // Silently fail - the list can fall back to stale cache or the backend.
     } finally {
       quoteRefreshInFlight.delete(key);
     }

package/src/app.tsx

@@ -19,6 +19,7 @@ import { DetachedPaneShell } from "./components/layout/detached-pane-shell";
 import { TransientLayoutProvider } from "./components/layout/transient-layout";
 import { CommandBar } from "./components/command-bar/surface";
 import { OnboardingWizard } from "./components/onboarding/onboarding-wizard";
+import { CompanyPickerHost } from "./plugins/builtin/cloud/company-picker";
 import { SignInGate } from "./components/sign-in-gate";
 import { useDialog } from "./ui/dialog";
 import { PluginRegistry } from "./plugins/registry";
@@ -39,6 +40,7 @@ import { useBrokerImportRuntime } from "./app/runtime/broker-import";
 import { useDesktopDeepLinkRuntime } from "./app/runtime/desktop-deeplink";
 import { useDesktopApplicationMenuRuntime } from "./app/runtime/desktop-menu";
 import { useAppGlobalShortcuts } from "./app/global-shortcuts";
+import { AppDialogBridge } from "./app/dialog-bridge";
 import { KeybindingsProvider, useResolvedKeybindings } from "./app/keybindings";
 import { useAppPaneRuntime } from "./app/pane-runtime";
 import { bindPluginRegistryRuntimeAccess } from "./app/runtime/plugin-bindings";
@@ -181,6 +183,10 @@ function AppInner({
   const toast = useToastHost();
   const isDetachedWindow = desktopWindowBridge?.kind === "detached";
   const detachedPaneId = isDetachedWindow ? desktopWindowBridge.paneId ?? null : null;
+  const focusDetachedPane = useMemo(() => {
+    const focus = desktopWindowBridge?.kind === "main" ? desktopWindowBridge.focusDetachedPane : undefined;
+    return focus ? (paneId: string) => { void focus(paneId).catch(() => {}); } : undefined;
+  }, [desktopWindowBridge]);
   const [desktopDockPreview, setDesktopDockPreview] = useState<DesktopDockPreviewState | null>(null);
   const [commandBarNativeOccluder, setCommandBarNativeOccluder] = useState<LayoutBounds | null>(null);
   appActiveRef.current = appActive;
@@ -354,6 +360,7 @@ function AppInner({
     dialog,
     dispatch,
     externalPlugins,
+    focusDetachedPane,
     isDetachedWindow,
     notify,
     persistConfig,
@@ -409,6 +416,7 @@ function AppInner({
   if (desktopWindowBridge?.kind === "detached" && desktopWindowBridge.paneId) {
     return (
       <KeybindingsProvider value={keybindings}>
+        <AppDialogBridge />
         <ContextMenuProvider pluginRegistry={pluginRegistry}>
           <RemoteControlHost
             adapter={remoteControlAdapter}
@@ -432,6 +440,7 @@ function AppInner({
 
   return (
     <KeybindingsProvider value={keybindings}>
+    <AppDialogBridge />
     <ContextMenuProvider pluginRegistry={pluginRegistry}>
       <RemoteControlHost
         adapter={remoteControlAdapter}
@@ -448,6 +457,8 @@ function AppInner({
           <TransientLayoutProvider>
             <Shell
               pluginRegistry={pluginRegistry}
+              dataProvider={dataProvider}
+              tickerRepository={tickerRepository}
               desktopWindowBridge={desktopWindowBridge}
               desktopDockPreview={desktopDockPreview}
               commandBarNativeOccluder={commandBarNativeOccluder}
@@ -460,6 +471,7 @@ function AppInner({
               }}
             />
           </TransientLayoutProvider>
+          {!onboardingActive ? <CompanyPickerHost pluginRegistry={pluginRegistry} /> : null}
           {onboardingActive && onOnboardingComplete ? (
             <OnboardingWizard
               pluginRegistry={pluginRegistry}

package/src/brokers/directory.ts

@@ -4,6 +4,7 @@
  * adapter. One broker offered both ways is one entry with two methods, so Add
  * Broker and onboarding list "Interactive Brokers" once.
  */
+import { t, tf } from "../i18n";
 import type { BrokerAdapter } from "../types/broker";
 import type { SignedInBroker } from "./signed-in/client";
 import { SIGNED_IN_BROKER_TYPE } from "./signed-in/profile";
@@ -48,9 +49,17 @@ export function buildBrokerDirectory({
   return [...entries.values()].sort((left, right) => left.name.localeCompare(right.name));
 }
 
+/** How a broker connects, beside its name in a list of brokers. */
+export function brokerMethodSummary(entry: BrokerDirectoryEntry): string {
+  const signsIn = entry.methods.some((method) => method.kind === "signed-in");
+  const onDevice = entry.methods.some((method) => method.kind === "device");
+  if (signsIn && onDevice) return t("Sign in, or on this device");
+  return signsIn ? t("Sign in") : t("On this device");
+}
+
 export function brokerMethodLabel(entry: BrokerDirectoryEntry, method: BrokerMethod): string {
   if (method.kind === "signed-in") {
-    return entry.methods.some((candidate) => candidate.kind === "device") ? "Sign in (recommended)" : "Sign in";
+    return entry.methods.some((candidate) => candidate.kind === "device") ? t("Sign in (recommended)") : t("Sign in");
   }
-  return entry.methods.length > 1 ? `On this device (${method.adapter.name})` : method.adapter.name;
+  return entry.methods.length > 1 ? tf("On this device ({broker})", { broker: method.adapter.name }) : method.adapter.name;
 }

package/src/brokers/profile-form.ts

@@ -1,6 +1,7 @@
 import type { BrokerAdapter, BrokerConfigField } from "../types/broker";
 import type { BrokerInstanceConfig } from "../types/config";
 import { resolveBrokerConfigFields } from "../types/broker";
+import { t, tf } from "../i18n";
 
 export interface BrokerProfileDraft {
   label: string;
@@ -93,7 +94,7 @@ export function validateBrokerProfileValues(
   for (const field of getVisibleBrokerConfigFields(adapter, resolvedValues)) {
     if (!field.required) continue;
     if (!normalizeFormValue(resolvedValues[field.key]).trim()) {
-      return `${field.label} is required.`;
+      return tf("{label} is required.", { label: t(field.label) });
     }
   }
   return null;

package/src/brokers/remove-profile.ts

@@ -0,0 +1,61 @@
+/**
+ * Removing a broker profile, from the Brokers pane or the command bar. A
+ * signed-in profile's connection belongs to the Gloom account, so it is
+ * disconnected there too, as far as Gloom answers: the profile leaves this
+ * device either way, and the message says what the account kept.
+ */
+import type { ConfirmModalOptions } from "../components/form-modal";
+import { t, tf } from "../i18n";
+import type { BrokerInstanceConfig } from "../types/config";
+import { disconnectSignedInProfile, signedInBrokerForProfile } from "./signed-in/connect";
+import { isSignedInBrokerProfile } from "./signed-in/profile";
+
+/**
+ * The confirm before `onConfirm` removes `instance`. `brokerName` names the
+ * broker when the connector list does not.
+ */
+export function brokerProfileRemovalConfirm(
+  instance: BrokerInstanceConfig,
+  brokerName: string,
+  onConfirm: () => Promise<void>,
+): ConfirmModalOptions {
+  const signedIn = isSignedInBrokerProfile(instance) ? signedInBrokerForProfile(instance, brokerName) : null;
+  return {
+    confirmId: "remove-broker-profile",
+    title: "Disconnect broker?",
+    body: [
+      tf("Remove \"{label}\" and imported broker data?", { label: instance.label }),
+      t("Broker-managed portfolios, positions, and contracts will be removed."),
+      ...(signedIn
+        ? [tf("This also disconnects {broker} from your other devices and agents.", { broker: signedIn.name })]
+        : []),
+    ],
+    confirmLabel: "Disconnect",
+    tone: "danger",
+    onConfirm,
+  };
+}
+
+export interface BrokerProfileRemoval {
+  message: string;
+  /** The Gloom account still holds the broker, so its other devices and agents keep it. */
+  accountKept: boolean;
+}
+
+export async function removeBrokerProfile(
+  instance: BrokerInstanceConfig,
+  brokerName: string,
+  removeBrokerInstance: (instanceId: string) => Promise<void>,
+): Promise<BrokerProfileRemoval> {
+  const account = await disconnectSignedInProfile(instance);
+  await removeBrokerInstance(instance.id);
+  const label = instance.label;
+  if (!account.stillConnected) return { message: tf("Removed {label}.", { label }), accountKept: false };
+  const broker = signedInBrokerForProfile(instance, brokerName).name;
+  return {
+    accountKept: true,
+    message: account.signedOut
+      ? tf("Removed {label}. {broker} is still connected to your Gloom account. Sign in to Gloom to disconnect {broker} from your account.", { label, broker })
+      : tf("Removed {label}. {broker} is still connected to your Gloom account.", { label, broker }),
+  };
+}

package/src/brokers/signed-in/connect.ts

@@ -4,6 +4,7 @@
  * connecting again syncs the profile it already has.
  */
 import { ApiRequestError } from "../../api-client/errors";
+import { withDeadline } from "../../utils/async-deadline";
 import type { AppConfig, BrokerInstanceConfig } from "../../types/config";
 import { findSignedInBroker } from "./catalog";
 import { disconnectSignedInBroker, type SignedInBroker } from "./client";
@@ -31,7 +32,7 @@ export interface ConnectSignedInBrokerDeps<T> {
   getConfig(): AppConfig;
   createBrokerInstance(brokerType: string, label: string, values: Record<string, unknown>): Promise<BrokerInstanceConfig>;
   syncBrokerInstance(instanceId: string): Promise<T>;
-  /** Opens the connect dialog; replaced in tests. */
+  /** Asks the user to connect: a form's own connect step, or the connect dialog when missing. */
   requestSignIn?: (broker: SignedInBroker) => Promise<boolean>;
 }
 
@@ -50,20 +51,32 @@ export async function connectSignedInBrokerProfile<T>(
   return { instance, synced: await deps.syncBrokerInstance(instance.id) };
 }
 
+/** Long enough for a slow answer, short enough that removing a profile never hangs on one. */
+const DISCONNECT_TIMEOUT_MS = 10_000;
+
+/** What became of the Gloom account's connection behind a profile being removed. */
+export type SignedInProfileDisconnect =
+  | { stillConnected: false }
+  /** The account keeps the broker: signed out of Gloom, or Gloom did not do it. */
+  | { stillConnected: true; signedOut: boolean };
+
 /**
  * Disconnects the Gloom account's connection behind a signed-in profile before
- * the profile goes. Already gone is fine; signed out of Gloom, the account
- * keeps the broker, which the caller reports as `stillConnected`.
+ * the profile goes. Already gone is fine. It never throws: the profile leaves
+ * this device whatever Gloom answers, and the caller says what the account kept.
  */
-export async function disconnectSignedInProfile(instance: BrokerInstanceConfig): Promise<{ stillConnected: boolean }> {
+export async function disconnectSignedInProfile(instance: BrokerInstanceConfig): Promise<SignedInProfileDisconnect> {
   if (!isSignedInBrokerProfile(instance)) return { stillConnected: false };
   try {
-    await disconnectSignedInBroker(signedInBrokerId(instance));
+    await withDeadline(
+      disconnectSignedInBroker(signedInBrokerId(instance)),
+      DISCONNECT_TIMEOUT_MS,
+      "Gloom did not answer the disconnect.",
+    );
     return { stillConnected: false };
   } catch (error) {
     if (error instanceof ApiRequestError && error.status === 404) return { stillConnected: false };
-    if (error instanceof ApiRequestError && error.status === 401) return { stillConnected: true };
-    throw error;
+    return { stillConnected: true, signedOut: error instanceof ApiRequestError && error.status === 401 };
   }
 }