gloomberb 0.9.5 → 0.9.7

package/src/components/chart/static/chart/surface.tsx

@@ -253,6 +253,10 @@ export function StaticChartSurface({
             flexDirection="column"
             bitmaps={bitmap ? [bitmap] : null}
             crosshair={canvasCrosshair}
+            onMouseMove={handleCursorEvent}
+            onMouseDown={handleCursorEvent}
+            onMouseOut={clearCursor}
+            data-gloom-remote-kind="static-chart"
           >
             {textResult.lines.map((line, index) => (
               <Text key={index} content={line} />

package/src/components/chart/stock-chart/index.test.ts

@@ -159,6 +159,13 @@ describe("stock chart keyboard helpers", () => {
     expect(resolveChartKeyboardKey({ name: "minus" })).toBe("zoom-out");
     expect(resolveChartKeyboardKey({ name: "A" })).toBe("a");
   });
+
+  test("ignores shortcut-modified keys so app shortcuts can handle them", () => {
+    expect(resolveChartKeyboardKey({ name: "1", ctrl: true })).toBe("");
+    expect(resolveChartKeyboardKey({ name: "2", meta: true })).toBe("");
+    expect(resolveChartKeyboardKey({ name: "3", super: true })).toBe("");
+    expect(resolveChartKeyboardKey({ name: "4", alt: true })).toBe("");
+  });
 });
 
 describe("stock chart viewport helpers", () => {

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

@@ -10,6 +10,7 @@ import {
 import { Spinner } from "../../ui";
 import type { CommandBarListRow, ListScreenState, ResultItem } from "./model";
 import { getRowPresentation, truncateText } from "../view-model";
+import { useRemoteUiNode } from "../../../remote/semantic-tree";
 
 export type CommandBarListScrollEvent = {
   stopPropagation: () => void;
@@ -70,6 +71,8 @@ export const CommandBarListHeader = memo(function CommandBarListHeader({
             onChange={onQueryChange}
             placeholder={kind === "root" ? "Search commands" : title === "Security Description" ? "Search tickers" : "Filter"}
             focused
+            data-gloom-remote-scope="command-bar"
+            data-gloom-remote-surface="command-bar"
             width={nativePaneChrome ? "100%" : queryDisplayWidth}
             backgroundColor={nativePaneChrome ? "transparent" : paletteBg}
             focusedBackgroundColor={nativePaneChrome ? "transparent" : paletteBg}
@@ -114,6 +117,9 @@ interface CommandBarListItemRowProps {
   globalIdx: number;
   isSelected: boolean;
   isHovered: boolean;
+  listKind: ListScreenState["kind"];
+  listTitle: string;
+  listQuery: string;
   contentPadding: number;
   labelWidth: number;
   trailingWidth: number;
@@ -135,6 +141,9 @@ const CommandBarListItemRow = memo(function CommandBarListItemRow({
   globalIdx,
   isSelected,
   isHovered,
+  listKind,
+  listTitle,
+  listQuery,
   contentPadding,
   labelWidth,
   trailingWidth,
@@ -153,6 +162,41 @@ const CommandBarListItemRow = memo(function CommandBarListItemRow({
   const presentation = getRowPresentation(item, isSelected, trailingWidth > 0);
   const label = truncateText(presentation.label, labelWidth);
   const trailing = truncateText(presentation.trailing, trailingWidth);
+  const activate = () => onRowMouseDown({
+    preventDefault() {},
+    stopPropagation() {},
+  }, item, globalIdx);
+  useRemoteUiNode({
+    role: "command-bar-result",
+    label: item.label,
+    disabled: item.disabled === true,
+    actions: {
+      activate,
+      press: activate,
+      secondary: item.secondaryAction ? () => item.secondaryAction?.() : undefined,
+    },
+    metadata: {
+      index: globalIdx,
+      selected: isSelected,
+      hovered: isHovered,
+      listKind,
+      listTitle,
+      listQuery,
+      item: {
+        id: item.id,
+        label: item.label,
+        detail: item.detail,
+        category: item.category,
+        kind: item.kind,
+        right: item.right,
+        shortcutQuery: item.shortcutQuery,
+        searchText: item.searchText,
+        checked: item.checked,
+        current: item.current,
+        disabled: item.disabled === true,
+      },
+    },
+  });
 
   return (
     <Box
@@ -283,6 +327,9 @@ export const CommandBarListBody = memo(function CommandBarListBody({
             globalIdx={row.globalIdx}
             isSelected={isSelected}
             isHovered={isHovered}
+            listKind={visibleListState.kind}
+            listTitle={visibleListState.title}
+            listQuery={visibleListState.query}
             contentPadding={contentPadding}
             labelWidth={labelWidth}
             trailingWidth={trailingWidth}

package/src/components/command-bar/multi-select-picker.tsx

@@ -197,6 +197,13 @@ export function CommandBarMultiSelectBody({
         onSelect={onSelect}
         onToggle={onToggle}
         bgColor={nativePaneChrome ? panelBg : paletteBg}
+        remoteLabel={route.title}
+        remoteScope="command-bar"
+        remoteMetadata={{
+          surface: "multi-select-picker",
+          routeKind: route.kind,
+          pickerId: route.pickerId,
+        }}
       />
       <Box flexDirection="row" gap={1}>
         <Button label="Done" variant="primary" onPress={onCommit} />

package/src/components/command-bar/routing/navigation-state.ts

@@ -1,4 +1,4 @@
-import { useCallback, useRef, useState, type Dispatch, type RefObject, type SetStateAction } from "react";
+import { useCallback, useEffect, useRef, useState, type Dispatch, type RefObject, type SetStateAction } from "react";
 import type { AppAction } from "../../../state/app/context";
 import type { Command } from "../commands/registry";
 import { resolveCommandBarMode } from "../view-model";
@@ -63,6 +63,15 @@ export function useCommandBarNavigationState({
   const currentRouteRef = useRef<CommandBarRoute | null>(currentRoute);
   currentRouteRef.current = currentRoute;
 
+  useEffect(() => {
+    if (currentRouteRef.current) return;
+    if (initialQuery === rootQueryRef.current) return;
+    rootQueryRef.current = initialQuery;
+    setRootQueryValue(initialQuery);
+    setRootSelectedIdx(0);
+    setRootHoveredIdx(null);
+  }, [initialQuery]);
+
   const closeAll = useCallback((options?: CloseCommandBarOptions) => {
     if (options?.revertThemePreview !== false) {
       restoreThemePreview();

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

@@ -129,6 +129,20 @@ describe("CommandBar", () => {
     expect(testSetup.captureCharFrame()).not.toContain("Commands");
   });
 
+  test("shows theme picker rows and commits a filtered light theme", async () => {
+    testSetup = await testRender(<CommandBarHarness query="TH light" live />, {
+      width: 80,
+      height: 24,
+    });
+
+    await testSetup.renderOnce();
+    expect(testSetup.captureCharFrame()).toContain("GitHub Light");
+
+    await clickFrameText("GitHub Light");
+    await waitForFrameToContain("theme:github-light");
+    expect(testSetup.captureCharFrame()).not.toContain("GitHub Light");
+  });
+
   test("runs plugin command shortcuts from the root query", async () => {
     const calls: string[] = [];
 

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

@@ -4,13 +4,14 @@ import {
   useCallback,
   useEffect,
   useImperativeHandle,
-  useLayoutEffect,
   useMemo,
   useRef,
   useState,
 } from "react";
-import { Box, ScrollBox, Text } from "../../ui";
-import { TextAttributes, type ScrollBoxRenderable } from "../../ui";
+import { Box, Text } from "../../ui";
+import { TextAttributes } from "../../ui";
+import { ListView, type ListViewItem } from "../ui";
+import type { ListRowState } from "../ui/list-view";
 import { getThemeIds, themes as themeRegistry } from "../../theme/themes";
 import { truncateText } from "./view-model";
 
@@ -75,7 +76,6 @@ export const ThemePicker = memo(forwardRef<ThemePickerHandle, ThemePickerProps>(
   onPreview,
   onCommit,
 }: ThemePickerProps, ref) {
-  const scrollRef = useRef<ScrollBoxRenderable | null>(null);
   const previewTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const pendingPreviewIdRef = useRef<string | null>(null);
   const committedThemeIdRef = useRef(committedThemeId);
@@ -92,9 +92,20 @@ export const ThemePicker = memo(forwardRef<ThemePickerHandle, ThemePickerProps>(
   const [selectedIndex, setSelectedIndex] = useState(() => (
     Math.max(0, themes.findIndex((theme) => theme.id === committedThemeId))
   ));
-  const [hoveredIndex, setHoveredIndex] = useState<number | null>(null);
   const themesRef = useRef(themes);
   const selectedIndexRef = useRef(selectedIndex);
+  const items = useMemo<ListViewItem[]>(() => themes.map((theme) => {
+    const current = theme.id === committedThemeId;
+    return {
+      id: theme.id,
+      label: theme.name,
+      detail: current ? "current" : "",
+      category: "Themes",
+      kind: "theme",
+      right: current ? "current" : "",
+      current,
+    };
+  }), [committedThemeId, themes]);
 
   themesRef.current = themes;
   selectedIndexRef.current = selectedIndex;
@@ -131,7 +142,6 @@ export const ThemePicker = memo(forwardRef<ThemePickerHandle, ThemePickerProps>(
     if (nextIndex === selectedIndexRef.current) return false;
     selectedIndexRef.current = nextIndex;
     setSelectedIndex(nextIndex);
-    setHoveredIndex(null);
     requestPreview(options[nextIndex]!.id);
     return true;
   }, [requestPreview]);
@@ -155,24 +165,10 @@ export const ThemePicker = memo(forwardRef<ThemePickerHandle, ThemePickerProps>(
     const nextIndex = preferredIndex >= 0 ? preferredIndex : 0;
     selectedIndexRef.current = nextIndex;
     setSelectedIndex(nextIndex);
-    setHoveredIndex(null);
   }, [committedThemeId, themes]);
 
   useEffect(() => cancelPreview, [cancelPreview]);
 
-  useLayoutEffect(() => {
-    const scrollBox = scrollRef.current;
-    if (!scrollBox) return;
-    if (scrollBox.verticalScrollBar) scrollBox.verticalScrollBar.visible = false;
-    if (themes.length === 0) return;
-    const viewportHeight = Math.max(1, scrollBox.viewport?.height ?? height);
-    if (selectedIndex < scrollBox.scrollTop) {
-      scrollBox.scrollTo(selectedIndex);
-    } else if (selectedIndex >= scrollBox.scrollTop + viewportHeight) {
-      scrollBox.scrollTo(selectedIndex - viewportHeight + 1);
-    }
-  }, [height, selectedIndex, themes.length]);
-
   const handleScroll = useCallback((event: ThemePickerScrollEvent) => {
     event.stopPropagation();
     event.preventDefault();
@@ -185,70 +181,86 @@ export const ThemePicker = memo(forwardRef<ThemePickerHandle, ThemePickerProps>(
     }
   }, [move]);
 
-  if (themes.length === 0) {
+  const handleSelect = useCallback((index: number) => {
+    const selected = themesRef.current[index];
+    if (!selected) return;
+    selectedIndexRef.current = index;
+    setSelectedIndex(index);
+    requestPreview(selected.id);
+  }, [requestPreview]);
+
+  const handleActivate = useCallback((item: ListViewItem, index: number) => {
+    const selected = themesRef.current[index] ?? themesRef.current.find((theme) => theme.id === item.id);
+    if (!selected) return;
+    selectedIndexRef.current = index;
+    setSelectedIndex(index);
+    cancelPreview();
+    onCommitRef.current(selected.id);
+  }, [cancelPreview]);
+
+  const renderRow = useCallback((item: ListViewItem, state: ListRowState) => {
+    const label = truncateText(item.label, labelWidth);
+    const trailing = item.current ? "current" : "";
     return (
-      <Box height={height} paddingX={contentPadding}>
-        <Text fg={paletteSubtleText}>{truncateText("No themes match", queryDisplayWidth)}</Text>
+      <Box
+        flexDirection="row"
+        height={1}
+        paddingX={contentPadding}
+        width="100%"
+        data-command-bar-row-selected={nativePaneChrome && state.selected ? "true" : undefined}
+        style={nativePaneChrome ? { borderRadius: 6 } : undefined}
+      >
+        <Box width={labelWidth}>
+          <Text
+            fg={state.selected ? paletteSelectedText : paletteText}
+            attributes={item.current ? TextAttributes.BOLD : undefined}
+          >
+            {label}
+          </Text>
+        </Box>
+        <Box width={trailingWidth}>
+          <Text fg={state.selected ? paletteSelectedText : paletteSubtleText}>
+            {truncateText(trailing, trailingWidth)}
+          </Text>
+        </Box>
       </Box>
     );
-  }
+  }, [
+    contentPadding,
+    labelWidth,
+    nativePaneChrome,
+    paletteSelectedText,
+    paletteSubtleText,
+    paletteText,
+    trailingWidth,
+  ]);
 
   return (
-    <ScrollBox
-      ref={scrollRef}
-      flexDirection="column"
+    <ListView
+      items={items}
+      selectedIndex={selectedIndex}
       height={height}
-      scrollY
-      focusable={false}
-      {...(!nativePaneChrome ? { onMouseScroll: handleScroll } : {})}
-    >
-      {themes.map((theme, index) => {
-        const selected = index === selectedIndex;
-        const hovered = index === hoveredIndex && !selected;
-        const current = theme.id === committedThemeId;
-        const label = truncateText(theme.name, labelWidth);
-        const trailing = current ? "current" : "";
-        return (
-          <Box
-            key={theme.id}
-            flexDirection="row"
-            height={1}
-            paddingX={contentPadding}
-            backgroundColor={selected
-              ? paletteSelectedBg
-              : hovered
-                ? paletteHoverBg
-                : (nativePaneChrome ? panelBg : paletteBg)}
-            onMouseOver={() => setHoveredIndex(index)}
-            onMouseOut={() => setHoveredIndex(null)}
-            onMouseDown={(event: any) => {
-              event.stopPropagation?.();
-              event.preventDefault?.();
-              selectedIndexRef.current = index;
-              setSelectedIndex(index);
-              cancelPreview();
-              onCommitRef.current(theme.id);
-            }}
-            {...(!nativePaneChrome ? { onMouseScroll: handleScroll } : {})}
-            data-command-bar-row-selected={nativePaneChrome && selected ? "true" : undefined}
-            style={nativePaneChrome ? { borderRadius: 6 } : undefined}
-          >
-            <Box width={labelWidth}>
-              <Text
-                fg={selected ? paletteSelectedText : paletteText}
-                attributes={current ? TextAttributes.BOLD : undefined}
-              >
-                {label}
-              </Text>
-            </Box>
-            <Box width={trailingWidth}>
-              <Text fg={selected ? paletteSelectedText : paletteSubtleText}>
-                {truncateText(trailing, trailingWidth)}
-              </Text>
-            </Box>
-          </Box>
-        );
-      })}
-    </ScrollBox>
+      scrollable
+      rowGap={0}
+      rowHeight={1}
+      surface="plain"
+      bgColor={nativePaneChrome ? panelBg : paletteBg}
+      selectedBgColor={paletteSelectedBg}
+      hoverBgColor={paletteHoverBg}
+      emptyMessage={truncateText("No themes match", queryDisplayWidth)}
+      showSelectedDescription={false}
+      onSelect={handleSelect}
+      onActivate={handleActivate}
+      onMouseScroll={!nativePaneChrome ? handleScroll : undefined}
+      renderRow={renderRow}
+      remoteLabel="Theme picker"
+      remoteScope="command-bar"
+      remoteItemKind="theme"
+      remoteItemCategory="Themes"
+      remoteMetadata={{
+        surface: "theme-picker",
+        filter: normalizedFilter,
+      }}
+    />
   );
 }));

package/src/components/command-bar/workflow/field-row.tsx

@@ -15,6 +15,7 @@ import {
   isWorkflowTextField,
   summarizeWorkflowFieldValue,
 } from "../helpers";
+import { useRemoteUiNode } from "../../../remote/semantic-tree";
 import type {
   CommandBarFieldValue,
   CommandBarWorkflowField,
@@ -84,6 +85,34 @@ export function CommandBarWorkflowFieldRow({
       onMoveFieldFocus(1);
     }
   };
+  const focusOrOpenField = () => {
+    onActiveTextareaSync(route);
+    onFieldFocus(field.id);
+    if (!isWorkflowTextField(field) && !useNativeSelect) {
+      onFieldPickerOpen(route, field);
+    }
+  };
+
+  useRemoteUiNode({
+    role: "command-bar-field",
+    label: field.label,
+    disabled: route.pending,
+    actions: {
+      focus: focusOrOpenField,
+      open: !isWorkflowTextField(field) && !useNativeSelect ? focusOrOpenField : undefined,
+      submit: () => void onSubmit(route),
+    },
+    metadata: {
+      scope: "command-bar",
+      surface: "workflow",
+      routeTitle: route.title,
+      fieldId: field.id,
+      fieldType: field.type,
+      active,
+      value: summarizeWorkflowFieldValue(field, value),
+      description: fieldDescription,
+    },
+  });
 
   return (
     <Box
@@ -93,11 +122,7 @@ export function CommandBarWorkflowFieldRow({
       backgroundColor={fieldBg}
       onMouseDown={(event: any) => {
         event.stopPropagation?.();
-        onActiveTextareaSync(route);
-        onFieldFocus(field.id);
-        if (!isWorkflowTextField(field) && !useNativeSelect) {
-          onFieldPickerOpen(route, field);
-        }
+        focusOrOpenField();
       }}
       style={nativePaneChrome ? {
         marginBottom: isLastField ? 8 : 10,

package/src/components/index.ts

@@ -1,6 +1,13 @@
 
 export { PriceSelectorDialog } from "./price-selector-dialog";
 export { StaticChartSurface } from "./chart/static/chart/surface";
+export {
+  buildMetricTreemapNavigationTiles,
+  findMetricTreemapNeighbor,
+  MetricTreemapSurface,
+  type MetricTreemapDirection,
+  type MetricTreemapItem,
+} from "./metric-treemap";
 export { SpeedometerGauge } from "./speedometer-gauge";
 export type { SpeedometerSegment } from "./speedometer-gauge";
 export { TickerListTableView } from "./ticker/list-table-view";

package/src/components/layout/pane/footer/index.tsx

@@ -2,6 +2,7 @@ import { Box, Span, Text, TextAttributes, useUiCapabilities } from "../../../../
 import { useRef } from "react";
 import { colors, blendHex } from "../../../../theme/colors";
 import { getShortcutHintWidth, ShortcutHint } from "../../../ui/shortcut-hint";
+import { useRemoteUiNode } from "../../../../remote/semantic-tree";
 import {
   EMPTY_FOOTER,
   hasPaneFooterContent,
@@ -50,6 +51,15 @@ function stopMouseEvent(event?: { stopPropagation?: () => void; preventDefault?:
 
 function SegmentView({ segment }: { segment: PaneFooterSegment }) {
   const interactive = !!segment.onPress && !segment.disabled;
+  useRemoteUiNode(interactive ? {
+    role: "pane-footer-segment",
+    label: segment.parts.map((part) => part.text).join(" "),
+    disabled: segment.disabled,
+    actions: {
+      press: () => segment.onPress?.(),
+    },
+    metadata: { id: segment.id },
+  } : null);
   const attributes = segment.parts.some((part) => part.bold) || interactive ? TextAttributes.BOLD : 0;
   const triggerMouseDownRef = useRef(false);
   const startSegmentPress = (event?: { stopPropagation?: () => void; preventDefault?: () => void }) => {
@@ -93,6 +103,19 @@ function totalHintsWidth(hints: PaneHint[]): number {
 }
 
 function HintView({ hint, prefixSpace }: { hint: PaneHint; prefixSpace: boolean }) {
+  useRemoteUiNode({
+    role: "pane-hint",
+    label: `${hint.key}${hint.label}`,
+    disabled: hint.disabled,
+    actions: {
+      press: hint.onPress ? () => hint.onPress?.() : undefined,
+    },
+    metadata: {
+      id: hint.id,
+      key: hint.key,
+      label: hint.label,
+    },
+  });
   return (
     <ShortcutHint
       hotkey={hint.key}

package/src/components/layout/shell/index.test.tsx

@@ -1271,6 +1271,7 @@ describe("Shell", () => {
         layouts: [{ name: "Default", layout: cloneLayout(mixedLayout) }],
       }),
       focusedPaneId: "ticker-detail:main",
+      previousFocusedPaneId: "portfolio-list:main",
     };
     const actions: Array<any> = [];
 
@@ -1294,6 +1295,7 @@ describe("Shell", () => {
     expect(updateLayout?.layout.instances.map((instance: { instanceId: string }) => instance.instanceId)).toEqual(["portfolio-list:main"]);
     expect(updateLayout?.layout.floating).toEqual([]);
     expect(updateLayout?.layout.dockRoot).toEqual({ kind: "pane", instanceId: "portfolio-list:main" });
+    expect(updateLayout?.focusedPaneId).toBe("portfolio-list:main");
   });
 
   test("closes the focused floating pane with Cmd+W", async () => {

package/src/components/layout/shell/index.tsx

@@ -95,6 +95,7 @@ export function Shell({
   const config = useAppSelector((state) => state.config);
   const paneState = useAppSelector((state) => state.paneState);
   const focusedPaneId = useAppSelector(selectFocusedPaneId);
+  const previousFocusedPaneId = useAppSelector((state) => state.previousFocusedPaneId);
   const activePanel = useAppSelector((state) => state.activePanel);
   const commandBarOpen = useAppSelector(selectCommandBarOpen);
   const inputCaptured = useAppSelector((state) => state.inputCaptured);
@@ -154,15 +155,18 @@ export function Shell({
   ), [nativePaneChrome]);
   const bounds = useMemo<LayoutBounds>(() => ({ x: 0, y: 0, width, height: contentHeight }), [contentHeight, width]);
 
-  const persistLayout = useCallback((nextLayout: LayoutConfig, options?: { pushHistory?: boolean }) => {
+  const persistLayout = useCallback((nextLayout: LayoutConfig, options?: { pushHistory?: boolean; focusedPaneId?: string | null }) => {
     if (options?.pushHistory !== false) {
       dispatch({ type: "PUSH_LAYOUT_HISTORY" });
     }
-    dispatch({ type: "UPDATE_LAYOUT", layout: nextLayout });
+    const hasFocusTarget = !!options && Object.prototype.hasOwnProperty.call(options, "focusedPaneId");
+    dispatch(hasFocusTarget
+      ? { type: "UPDATE_LAYOUT", layout: nextLayout, focusedPaneId: options.focusedPaneId ?? null }
+      : { type: "UPDATE_LAYOUT", layout: nextLayout });
     scheduleConfigSave(syncConfigActiveLayoutState(
       { ...config, layout: nextLayout },
       paneState,
-      focusedPaneId,
+      hasFocusTarget ? (options.focusedPaneId ?? null) : focusedPaneId,
       activePanel,
     ));
   }, [activePanel, config, dispatch, focusedPaneId, paneState]);
@@ -261,6 +265,7 @@ export function Shell({
     nativePaneChrome,
     paneMap,
     persistLayout,
+    previousFocusedPaneId,
     pluginRegistry,
     rendererHost,
     visibleLayout,

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

@@ -14,6 +14,15 @@ import type { LayoutConfig } from "../../../../types/config";
 import type { RendererHost } from "../../../../ui";
 import { capturePaneScreenshotPngBase64 } from "../../../../utils/dom-screenshot";
 
+function removedFocusRestoreOptions(
+  layout: LayoutConfig,
+  currentFocusedPaneId: string | null,
+  paneId: string | null,
+): { focusedPaneId: string } | undefined {
+  if (currentFocusedPaneId && isPaneInLayout(layout, currentFocusedPaneId)) return undefined;
+  return paneId && isPaneInLayout(layout, paneId) ? { focusedPaneId: paneId } : undefined;
+}
+
 interface UseShellPaneActionsOptions {
   closePaneMenu: () => void;
   contentHeight: number;
@@ -22,7 +31,8 @@ interface UseShellPaneActionsOptions {
   focusPane: (paneId: string) => void;
   nativePaneChrome: boolean;
   paneMap: Map<string, ResolvedPane>;
-  persistLayout: (nextLayout: LayoutConfig, options?: { pushHistory?: boolean }) => void;
+  persistLayout: (nextLayout: LayoutConfig, options?: { pushHistory?: boolean; focusedPaneId?: string | null }) => void;
+  previousFocusedPaneId: string | null;
   pluginRegistry: PluginRegistry;
   rendererHost: RendererHost;
   visibleLayout: LayoutConfig;
@@ -38,6 +48,7 @@ export function useShellPaneActions({
   nativePaneChrome,
   paneMap,
   persistLayout,
+  previousFocusedPaneId,
   pluginRegistry,
   rendererHost,
   visibleLayout,
@@ -70,15 +81,17 @@ export function useShellPaneActions({
 
   const closeFocusedPane = useCallback(() => {
     if (!focusedPaneId || !isPaneInLayout(visibleLayout, focusedPaneId)) return false;
-    persistLayout(removePane(visibleLayout, focusedPaneId));
+    const nextLayout = removePane(visibleLayout, focusedPaneId);
+    persistLayout(nextLayout, removedFocusRestoreOptions(nextLayout, focusedPaneId, previousFocusedPaneId));
     return true;
-  }, [focusedPaneId, persistLayout, visibleLayout]);
+  }, [focusedPaneId, persistLayout, previousFocusedPaneId, visibleLayout]);
 
   const closeAllFloatingPanes = useCallback(() => {
     if (visibleLayout.floating.length === 0) return false;
-    persistLayout(removeFloatingPanes(visibleLayout));
+    const nextLayout = removeFloatingPanes(visibleLayout);
+    persistLayout(nextLayout, removedFocusRestoreOptions(nextLayout, focusedPaneId, previousFocusedPaneId));
     return true;
-  }, [persistLayout, visibleLayout]);
+  }, [focusedPaneId, persistLayout, previousFocusedPaneId, visibleLayout]);
 
   const copyFocusedPaneScreenshot = useCallback(() => {
     if (!focusedPaneId || !nativePaneChrome || !rendererHost.copyPngImage) return false;
@@ -118,8 +131,9 @@ export function useShellPaneActions({
   }, [contentHeight, persistLayout, visibleLayout, width]);
 
   const handleFloatingClose = useCallback((paneId: string) => {
-    persistLayout(removePane(visibleLayout, paneId));
-  }, [persistLayout, visibleLayout]);
+    const nextLayout = removePane(visibleLayout, paneId);
+    persistLayout(nextLayout, removedFocusRestoreOptions(nextLayout, focusedPaneId, previousFocusedPaneId));
+  }, [focusedPaneId, persistLayout, previousFocusedPaneId, visibleLayout]);
 
   return {
     closeAllFloatingPanes,