gloomberb 0.11.1 → 0.11.2

package/src/components/layout/shell/menu.ts

@@ -32,6 +32,8 @@ export function menuForPane(
   openPaneSettings: (paneId: string) => void,
   desktopWindowBridge?: DesktopWindowBridge,
   copyPaneScreenshot?: (paneId: string) => void | Promise<void>,
+  sharePane?: () => void | Promise<void>,
+  linkItems: ContextMenuItem[] = [],
 ): ContextMenuItem[] {
   const baseActions: ContextMenuItem[] = [];
   if (pluginRegistry.hasPaneSettings(pane.instance.instanceId)) {
@@ -42,6 +44,14 @@ export function menuForPane(
       onSelect: () => openPaneSettings(pane.instance.instanceId),
     });
   }
+  if (sharePane) {
+    baseActions.push({
+      id: "share-pane",
+      label: "Share Pane",
+      accelerator: PANE_MANAGEMENT_ACCELERATORS.share,
+      onSelect: sharePane,
+    });
+  }
   if (copyPaneScreenshot) {
     baseActions.push({
       id: "copy-screenshot",
@@ -91,6 +101,10 @@ export function menuForPane(
     onSelect: () => persistLayout(removePane(layout, pane.instance.instanceId)),
   });
 
+  if (linkItems.length > 0) {
+    baseActions.push(contextMenuDivider("pane:link-divider"), ...linkItems);
+  }
+
   baseActions.push(
     contextMenuDivider("pane:layout-divider"),
     {

package/src/components/layout/shell/native/pointer-runtime.ts

@@ -22,6 +22,7 @@ interface UseShellNativePointerRuntimeOptions {
   setMenuState: Dispatch<SetStateAction<ActionMenuState | null>>;
   transientFocusActive: boolean;
   windowMode: WindowEditState | null;
+  commandBarOpen?: boolean;
 }
 
 export function useShellNativePointerRuntime({
@@ -38,6 +39,7 @@ export function useShellNativePointerRuntime({
   setMenuState,
   transientFocusActive,
   windowMode,
+  commandBarOpen = false,
 }: UseShellNativePointerRuntimeOptions) {
   const {
     dragRef,
@@ -59,6 +61,11 @@ export function useShellNativePointerRuntime({
   }, [focusPane, menuState, setHoveredMenuItemId, setMenuState]);
 
   const handleNativePaneMouseDown = useCallback((paneId: string, event: ShellMouseEvent) => {
+    if (commandBarOpen) {
+      event.stopPropagation();
+      event.preventDefault();
+      return;
+    }
     if (windowMode) {
       selectWindowModePane(paneId);
       event.stopPropagation();
@@ -69,10 +76,11 @@ export function useShellNativePointerRuntime({
       if (event.isDefaultPrevented?.()) return;
       focusNativePane(paneId);
     });
-  }, [focusNativePane, selectWindowModePane, windowMode]);
+  }, [commandBarOpen, focusNativePane, selectWindowModePane, windowMode]);
 
   const startNativeFloatingDrag = useCallback((paneId: string, rect: FloatingRect, event: ShellMouseEvent) => {
     if (!nativePaneChrome) return;
+    if (commandBarOpen) return;
     if (windowMode) return;
     if (transientFocusActive) return;
     if (event.button === 2) return;
@@ -89,10 +97,11 @@ export function useShellNativePointerRuntime({
     };
     updateDragFloatingRect({ paneId, rect: { x: rect.x, y: rect.y, width: rect.width, height: rect.height } });
     event.preventDefault();
-  }, [dragRef, focusNativePane, getShellPointer, nativePaneChrome, transientFocusActive, updateDragFloatingRect, windowMode]);
+  }, [commandBarOpen, dragRef, focusNativePane, getShellPointer, nativePaneChrome, transientFocusActive, updateDragFloatingRect, windowMode]);
 
   const startNativeDockedDrag = useCallback((paneId: string, rect: LayoutBounds, event: ShellMouseEvent) => {
     if (!nativePaneChrome) return;
+    if (commandBarOpen) return;
     if (windowMode) return;
     if (transientFocusActive) return;
     if (event.button === 2) return;
@@ -108,10 +117,11 @@ export function useShellNativePointerRuntime({
       origRect: { x: rect.x, y: rect.y, width: rect.width, height: rect.height },
     };
     event.preventDefault();
-  }, [dragRef, focusNativePane, getShellPointer, nativePaneChrome, transientFocusActive, windowMode]);
+  }, [commandBarOpen, dragRef, focusNativePane, getShellPointer, nativePaneChrome, transientFocusActive, windowMode]);
 
   const startNativeFloatResize = useCallback((paneId: string, rect: FloatingRect, event: ShellMouseEvent) => {
     if (!nativePaneChrome) return;
+    if (commandBarOpen) return;
     if (transientFocusActive) return;
 
     const pointer = getShellPointer(event);
@@ -130,10 +140,11 @@ export function useShellNativePointerRuntime({
     updateDragFloatingRect({ paneId, rect: { x: rect.x, y: rect.y, width: rect.width, height: rect.height } });
     event.stopPropagation();
     event.preventDefault();
-  }, [dragRef, focusNativePane, getShellPointer, nativePaneChrome, selectWindowModePane, transientFocusActive, updateDragFloatingRect, windowMode]);
+  }, [commandBarOpen, dragRef, focusNativePane, getShellPointer, nativePaneChrome, selectWindowModePane, transientFocusActive, updateDragFloatingRect, windowMode]);
 
   const startNativeDividerDrag = useCallback((divider: DockDividerLayout, event: ShellMouseEvent) => {
     if (!nativePaneChrome) return;
+    if (commandBarOpen) return;
     if (transientFocusActive) return;
 
     const pointer = getShellPointer(event);
@@ -157,27 +168,30 @@ export function useShellNativePointerRuntime({
     });
     event.stopPropagation();
     event.preventDefault();
-  }, [dragRef, getShellPointer, menuState, nativePaneChrome, setHoveredMenuItemId, setMenuState, transientFocusActive, updateDividerPreview]);
+  }, [commandBarOpen, dragRef, getShellPointer, menuState, nativePaneChrome, setHoveredMenuItemId, setMenuState, transientFocusActive, updateDividerPreview]);
 
   const handlePaneAction = useCallback((paneId: string, rect: LayoutBounds, event: ShellMouseEvent) => {
+    if (commandBarOpen) return;
     if (windowMode) return;
     if (event.button === 2) return;
     event.stopPropagation();
     event.preventDefault();
     openPaneMenu(paneId, rect, event);
-  }, [openPaneMenu, windowMode]);
+  }, [commandBarOpen, openPaneMenu, windowMode]);
 
   const handleNativePaneContextMenu = useCallback((paneId: string, rect: LayoutBounds, event: ShellMouseEvent) => {
+    if (commandBarOpen) return;
     if (windowMode) return;
     openPaneMenu(paneId, rect, event);
-  }, [openPaneMenu, windowMode]);
+  }, [commandBarOpen, openPaneMenu, windowMode]);
 
   const handleFloatingCloseMouseDown = useCallback((paneId: string, event: ShellMouseEvent) => {
+    if (commandBarOpen) return;
     if (windowMode) return;
     event.stopPropagation();
     event.preventDefault();
     handleFloatingClose(paneId);
-  }, [handleFloatingClose, windowMode]);
+  }, [commandBarOpen, handleFloatingClose, windowMode]);
 
   return {
     handleFloatingCloseMouseDown,

package/src/components/layout/shell/pane/actions.ts

@@ -54,10 +54,6 @@ export function useShellPaneActions({
   visibleLayout,
   width,
 }: UseShellPaneActionsOptions) {
-  const openLayoutMenu = useCallback(() => {
-    pluginRegistry.openCommandBar("LAY ");
-  }, [pluginRegistry]);
-
   const openPaneSettings = useCallback((paneId: string) => {
     pluginRegistry.openPaneSettingsFn(paneId);
     closePaneMenu();
@@ -143,7 +139,6 @@ export function useShellPaneActions({
     gridlockVisiblePanes,
     handleFloatingClose,
     openFocusedPaneSettings,
-    openLayoutMenu,
     openPaneSettings,
     popOutFocusedPane,
     toggleFocusedPaneFloating,

package/src/components/layout/shell/pane/management-shortcuts.ts

@@ -21,9 +21,10 @@ interface ShellPaneManagementShortcutOptions {
   hasActiveDrag(): boolean;
   inputCaptured: boolean;
   openFocusedPaneSettings(): boolean;
-  openLayoutMenu(): void;
+  openLayoutGallery(): void;
   overlayOpen: boolean;
   popOutFocusedPane(): boolean;
+  shareFocusedPane(): boolean;
   startWindowMode(paneId?: string, mode?: WindowEditMode): void;
   toggleFocusedPaneFullscreen(): boolean;
   toggleFocusedPaneFloating(): boolean;
@@ -39,9 +40,10 @@ export function useShellPaneManagementShortcuts({
   hasActiveDrag,
   inputCaptured,
   openFocusedPaneSettings,
-  openLayoutMenu,
+  openLayoutGallery,
   overlayOpen,
   popOutFocusedPane,
+  shareFocusedPane,
   startWindowMode,
   toggleFocusedPaneFullscreen,
   toggleFocusedPaneFloating,
@@ -119,8 +121,11 @@ export function useShellPaneManagementShortcuts({
       case "copy-screenshot":
         handled = copyFocusedPaneScreenshot();
         break;
-      case "layout-actions":
-        openLayoutMenu();
+      case "share":
+        handled = shareFocusedPane();
+        break;
+      case "layout-gallery":
+        openLayoutGallery();
         handled = true;
         break;
       case "gridlock-all":

package/src/components/layout/shell/shortcuts.ts

@@ -6,9 +6,10 @@ export const PANE_MANAGEMENT_ACCELERATORS = {
   toggleFloating: "CmdOrCtrl+Shift+D",
   popOut: "CmdOrCtrl+Shift+O",
   copyScreenshot: "CmdOrCtrl+Shift+C",
+  share: "CmdOrCtrl+Shift+S",
   close: "CmdOrCtrl+W",
   closeAllFloating: "CmdOrCtrl+Alt+W",
-  layoutActions: "CmdOrCtrl+Shift+L",
+  layoutGallery: "CmdOrCtrl+Shift+L",
   gridlockAll: "CmdOrCtrl+Shift+G",
   windowMode: "CmdOrCtrl+Shift+M",
   windowResizeMode: "CmdOrCtrl+Shift+R",
@@ -20,9 +21,10 @@ export type PaneManagementShortcut =
   | "toggle-floating"
   | "pop-out"
   | "copy-screenshot"
+  | "share"
   | "close"
   | "close-all-floating"
-  | "layout-actions"
+  | "layout-gallery"
   | "gridlock-all"
   | "window-mode"
   | "window-resize-mode";
@@ -39,10 +41,11 @@ export function resolvePaneManagementShortcut(
   if (!shifted && name === ",") return "settings";
   if (!shifted || event.alt) return null;
   if (name === "c") return "copy-screenshot";
+  if (name === "s") return "share";
   if (name === "d") return "toggle-floating";
   if (name === "f") return "toggle-fullscreen";
   if (name === "o") return "pop-out";
-  if (name === "l") return "layout-actions";
+  if (name === "l") return "layout-gallery";
   if (name === "g") return "gridlock-all";
   if (name === "m") return "window-mode";
   if (name === "r") return "window-resize-mode";

package/src/components/layout/shell/ticker-link-menu.test.ts

@@ -0,0 +1,82 @@
+import { describe, expect, test } from "bun:test";
+import { createInitialState } from "../../../state/app/context";
+import {
+  createDefaultConfig,
+  createPaneInstance,
+  findPaneInstance,
+  TICKER_RESEARCH_PANE_ID,
+  type LayoutConfig,
+} from "../../../types/config";
+import type { PaneDef } from "../../../types/plugin";
+import { getPaneDisplayTitle } from "../pane/title";
+import { tickerLinkMenuItems } from "./ticker-link-menu";
+
+const panes = new Map<string, PaneDef>([
+  ["portfolio-list", {
+    id: "portfolio-list",
+    name: "Portfolio",
+    component: () => null,
+    defaultPosition: "left",
+    tickerSource: true,
+  }],
+  [TICKER_RESEARCH_PANE_ID, {
+    id: TICKER_RESEARCH_PANE_ID,
+    name: "Ticker Research",
+    component: () => null,
+    defaultPosition: "right",
+  }],
+]);
+
+describe("tickerLinkMenuItems", () => {
+  test("pins the current ticker when unlinking and can link back to the source", () => {
+    const state = createInitialState(createDefaultConfig("/tmp/gloomberb-link-menu-test"));
+    state.paneState["portfolio-list:main"] = { collectionId: "main", cursorSymbol: "AAPL" };
+    const target = findPaneInstance(state.config.layout, "ticker-detail:main")!;
+    let layout: LayoutConfig = state.config.layout;
+
+    expect(getPaneDisplayTitle(state, target, panes.get(TICKER_RESEARCH_PANE_ID)!, panes)).toBe(
+      "AAPL  ⧉ Linked to Main Portfolio",
+    );
+
+    tickerLinkMenuItems({
+      instance: target,
+      layout,
+      panes,
+      state,
+      persistLayout: (nextLayout) => { layout = nextLayout; },
+    }).find((item) => item.id === "unlink:portfolio-list:main")?.onSelect?.();
+
+    const pinned = findPaneInstance(layout, target.instanceId)!;
+    expect(pinned.binding).toEqual({ kind: "fixed", symbol: "AAPL" });
+
+    const previousFollower = createPaneInstance(TICKER_RESEARCH_PANE_ID, {
+      instanceId: "ticker-detail:previous",
+      binding: { kind: "follow", sourceInstanceId: "portfolio-list:main" },
+    });
+    layout = {
+      ...layout,
+      instances: [...layout.instances, previousFollower],
+      floating: [
+        ...layout.floating,
+        { instanceId: previousFollower.instanceId, x: 1, y: 1, width: 40, height: 12 },
+      ],
+    };
+    const pinnedState = { ...state, config: { ...state.config, layout } };
+    tickerLinkMenuItems({
+      instance: pinned,
+      layout,
+      panes,
+      state: pinnedState,
+      persistLayout: (nextLayout) => { layout = nextLayout; },
+    }).find((item) => item.id === "link:portfolio-list:main")?.onSelect?.();
+
+    expect(findPaneInstance(layout, target.instanceId)?.binding).toEqual({
+      kind: "follow",
+      sourceInstanceId: "portfolio-list:main",
+    });
+    expect(findPaneInstance(layout, previousFollower.instanceId)?.binding).toEqual({
+      kind: "fixed",
+      symbol: "AAPL",
+    });
+  });
+});

package/src/components/layout/shell/ticker-link-menu.ts

@@ -0,0 +1,78 @@
+import { updatePaneInstance } from "../../../pane-settings";
+import { listVisibleTickerSourcePanes } from "../../../plugins/ticker-navigation";
+import { resolveTickerForPane, type AppState } from "../../../state/app/context";
+import {
+  TICKER_RESEARCH_PANE_ID,
+  type LayoutConfig,
+  type PaneInstanceConfig,
+} from "../../../types/config";
+import type { ContextMenuItem } from "../../../types/context-menu";
+import type { PaneDef } from "../../../types/plugin";
+import { getPaneDisplayTitle } from "../pane/title";
+
+/**
+ * Flat link controls for a Ticker Research pane: one entry per visible ticker source, plus an
+ * unlink entry that pins the pane on the symbol it currently shows.
+ */
+export function tickerLinkMenuItems({
+  instance,
+  layout,
+  panes,
+  state,
+  persistLayout,
+}: {
+  instance: PaneInstanceConfig;
+  layout: LayoutConfig;
+  panes: ReadonlyMap<string, PaneDef>;
+  state: Pick<AppState, "config" | "paneState">;
+  persistLayout: (nextLayout: LayoutConfig) => void;
+}): ContextMenuItem[] {
+  if (instance.paneId !== TICKER_RESEARCH_PANE_ID) return [];
+
+  const sourceInstanceId = instance.binding?.kind === "follow" ? instance.binding.sourceInstanceId : null;
+  const rebind = (binding: PaneInstanceConfig["binding"]) => {
+    persistLayout(updatePaneInstance(layout, instance.instanceId, (current) => ({ ...current, binding })));
+  };
+  const linkToSource = (nextSourceId: string) => {
+    persistLayout({
+      ...layout,
+      instances: layout.instances.map((current) => {
+        if (current.instanceId === instance.instanceId) {
+          return { ...current, binding: { kind: "follow" as const, sourceInstanceId: nextSourceId } };
+        }
+        if (
+          current.paneId !== TICKER_RESEARCH_PANE_ID
+          || current.binding?.kind !== "follow"
+          || current.binding.sourceInstanceId !== nextSourceId
+        ) return current;
+
+        const symbol = resolveTickerForPane(state as AppState, current.instanceId);
+        return { ...current, binding: symbol ? { kind: "fixed" as const, symbol } : { kind: "none" as const } };
+      }),
+    });
+  };
+
+  return listVisibleTickerSourcePanes(layout, panes).flatMap((source): ContextMenuItem[] => {
+    const paneDef = panes.get(source.paneId);
+    if (!paneDef) return [];
+    const title = getPaneDisplayTitle(state, source, paneDef, panes);
+
+    if (source.instanceId !== sourceInstanceId) {
+      return [{
+        id: `link:${source.instanceId}`,
+        label: `Link to ${title}`,
+        onSelect: () => linkToSource(source.instanceId),
+      }];
+    }
+
+    // Unlinking keeps the pane alive, so it only works once a symbol has resolved.
+    const symbol = resolveTickerForPane(state as AppState, instance.instanceId);
+    return symbol
+      ? [{
+        id: `unlink:${source.instanceId}`,
+        label: `Unlink from ${title}`,
+        onSelect: () => rebind({ kind: "fixed", symbol }),
+      }]
+      : [];
+  });
+}

package/src/components/layout/status-bar.test.tsx

@@ -1,9 +1,10 @@
 import { afterEach, describe, expect, test } from "bun:test";
 import { testRender } from "../../renderers/opentui/test-utils";
 import { AppContext, createInitialState } from "../../state/app/context";
-import { cloneLayout, createDefaultConfig, TICKER_RESEARCH_PANE_ID, type LayoutConfig } from "../../types/config";
+import { cloneLayout, createDefaultConfig, createPaneInstance, type LayoutConfig } from "../../types/config";
 import type { AppNotificationRequest } from "../../types/plugin";
 import { StatusBar } from "./status-bar";
+import { getDockedPaneIds } from "../../plugins/pane-manager";
 import { setSharedRegistryForTests } from "../../plugins/registry";
 import { act, useEffect, useState } from "react";
 import { TransientLayoutProvider, useTransientLayout } from "./transient-layout";
@@ -185,34 +186,35 @@ describe("StatusBar", () => {
     expect(actions).toContainEqual({ type: "REORDER_LAYOUT", fromIndex: 0, toIndex: 2 });
   });
 
-  test("shows a gridlock tip after a corner snap and runs gridlock on click", async () => {
-    const config = createDefaultConfig("/tmp/gloomberb-test");
-    const floatingLayout = cloneLayout(config.layout);
-    floatingLayout.dockRoot = { kind: "pane", instanceId: "portfolio-list:main" };
-    floatingLayout.floating = [{ instanceId: "ticker-detail:main", x: 8, y: 2, width: 36, height: 12 }];
-
+  test("offers to tidy three floating windows and tiles them on click", async () => {
+    const config = createDefaultConfig("/tmp/gloomberb-tidy-test");
+    const floatingLayout: LayoutConfig = {
+      dockRoot: null,
+      instances: Array.from({ length: 3 }, (_, index) => createPaneInstance("chat", { instanceId: `chat-${index}` })),
+      floating: Array.from({ length: 3 }, (_, index) => ({
+        instanceId: `chat-${index}`,
+        x: index * 40,
+        y: 0,
+        width: 40,
+        height: 20,
+        zIndex: 50 + index,
+      })),
+      detached: [],
+    };
     const state = {
       ...createInitialState({
         ...config,
         layout: floatingLayout,
-        layouts: [
-          { name: "Default", layout: cloneLayout(floatingLayout) },
-          { name: "Research", layout: cloneLayout(floatingLayout) },
-        ],
+        layouts: [{ name: "Default", layout: cloneLayout(floatingLayout) }],
       }),
       statusBarVisible: true,
-      gridlockTipVisible: true,
     };
-
     const actions: Array<{ type: string }> = [];
-    let updatedLayout = null as ReturnType<typeof cloneLayout> | null;
+    let updatedLayout: LayoutConfig | null = null;
     const notifications: AppNotificationRequest[] = [];
 
     setSharedRegistryForTests({
-      panes: new Map([
-        ["portfolio-list", {}],
-        [TICKER_RESEARCH_PANE_ID, {}],
-      ]),
+      panes: new Map([["chat", { name: "Chat" }]]),
       getLayoutFn: () => state.config.layout,
       getTermSizeFn: () => ({ width: 120, height: 40 }),
       updateLayoutFn: (layout: LayoutConfig) => { updatedLayout = layout; },
@@ -228,76 +230,75 @@ describe("StatusBar", () => {
     );
 
     await testSetup.renderOnce();
-
     const frame = testSetup.captureCharFrame();
-    expect(frame).toContain("Snapped a window?");
-    expect(frame).toContain("Gridlock All");
-
-    const buttonX = frame.split("\n")[0]?.indexOf("Gridlock All") ?? -1;
+    const buttonX = frame.split("\n")[0]?.indexOf("Tidy Windows") ?? -1;
     expect(buttonX).toBeGreaterThanOrEqual(0);
 
     await testSetup.mockMouse.click(buttonX + 1, 0);
     await testSetup.renderOnce();
 
     expect(updatedLayout?.floating).toHaveLength(0);
-    expect(notifications).toHaveLength(1);
     expect(notifications[0]).toMatchObject({
-      body: "Retiled all panes",
+      body: "Windows tidied",
       type: "success",
       action: { label: "Revert" },
     });
-    expect(actions).toContainEqual({ type: "DISMISS_GRIDLOCK_TIP" });
-
     notifications[0]!.action!.onClick();
     expect(actions).toContainEqual({ type: "UNDO_LAYOUT" });
   });
 
-  test("auto-dismisses the gridlock tip after its timeout", async () => {
-    const config = createDefaultConfig("/tmp/gloomberb-test");
+  test("tidies covered windows instead of leaving them floating", async () => {
+    const config = createDefaultConfig("/tmp/gloomberb-covered-test");
+    const floatingLayout: LayoutConfig = {
+      dockRoot: null,
+      instances: Array.from({ length: 3 }, (_, index) => createPaneInstance("chat", { instanceId: `chat-${index}` })),
+      floating: Array.from({ length: 3 }, (_, index) => ({
+        instanceId: `chat-${index}`,
+        x: 10,
+        y: 4,
+        width: 50,
+        height: 20,
+        zIndex: 50 + index,
+      })),
+      detached: [],
+    };
     const state = {
-      ...createInitialState(config),
+      ...createInitialState({
+        ...config,
+        layout: floatingLayout,
+        layouts: [{ name: "Default", layout: cloneLayout(floatingLayout) }],
+      }),
       statusBarVisible: true,
-      gridlockTipVisible: true,
-      gridlockTipSequence: 1,
     };
-    const actions: Array<{ type: string }> = [];
-    const timers: Array<{ callback: (() => void) | null; delay: number | undefined }> = [];
-    const originalSetTimeout = globalThis.setTimeout;
-    const originalClearTimeout = globalThis.clearTimeout;
-
-    globalThis.setTimeout = ((callback: Parameters<typeof setTimeout>[0], delay?: number) => {
-      timers.push({ callback: typeof callback === "function" ? callback : null, delay });
-      return 1 as unknown as ReturnType<typeof setTimeout>;
-    }) as typeof setTimeout;
-    globalThis.clearTimeout = (() => {}) as typeof clearTimeout;
+    let updatedLayout: LayoutConfig | null = null;
+    const notifications: AppNotificationRequest[] = [];
 
     setSharedRegistryForTests({
-      panes: new Map(),
+      panes: new Map([["chat", { name: "Chat" }]]),
       getLayoutFn: () => state.config.layout,
       getTermSizeFn: () => ({ width: 120, height: 40 }),
-      updateLayoutFn: () => {},
-      notify: () => {},
+      updateLayoutFn: (layout: LayoutConfig) => { updatedLayout = layout; },
+      notify: (notification: AppNotificationRequest) => { notifications.push(notification); },
       Slot: () => null,
     } as any);
 
-    try {
-      testSetup = await testRender(
-        <AppContext value={{ state, dispatch: (action) => actions.push(action as { type: string }) }}>
-          <StatusBar />
-        </AppContext>,
-        { width: 120, height: 1 },
-      );
+    testSetup = await testRender(
+      <AppContext value={{ state, dispatch: () => {} }}>
+        <StatusBar />
+      </AppContext>,
+      { width: 120, height: 1 },
+    );
 
-      await testSetup.renderOnce();
+    await testSetup.renderOnce();
+    const frame = testSetup.captureCharFrame();
+    const tidyX = frame.split("\n")[0]?.indexOf("Tidy Windows") ?? -1;
+    expect(tidyX).toBeGreaterThanOrEqual(0);
 
-      const gridlockTimer = timers.find((entry) => entry.delay === 60_000);
-      expect(gridlockTimer?.callback).toBeDefined();
-      gridlockTimer?.callback?.();
+    await testSetup.mockMouse.click(tidyX + 1, 0);
+    await testSetup.renderOnce();
 
-      expect(actions).toContainEqual({ type: "DISMISS_GRIDLOCK_TIP" });
-    } finally {
-      globalThis.setTimeout = originalSetTimeout;
-      globalThis.clearTimeout = originalClearTimeout;
-    }
+    expect(updatedLayout?.floating).toHaveLength(0);
+    expect(getDockedPaneIds(updatedLayout!)).toHaveLength(3);
+    expect(notifications[0]?.body).toBe("Windows tidied");
   });
 });