fix(cmdk): Use render prop closeModal to properly reset open state

The modal was calling the imported closeModal() from actionCreators/modal
directly, which goes straight to ModalStore.closeModal() and bypasses
GlobalModal's internal closeModal wrapper. That wrapper is the only place
options.onClose is invoked — which is the closeCommandPaletteModal callback
that dispatches {type: 'toggle modal'} to reset state.open.

With state.open stuck at true after an action closed the palette, the next
hotkey press would see open===true and treat it as a close request rather
than an open request, requiring a second press to actually reopen.

Fix by destructuring closeModal from ModalRenderProps and using that
instead of the imported version.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: JonasBa

static/app/components/commandPalette/ui/modal.spec.tsx

@@ -0,0 +1,113 @@
+jest.unmock('lodash/debounce');
+
+jest.mock('@tanstack/react-virtual', () => ({
+  useVirtualizer: ({count}: {count: number}) => {
+    const virtualItems = Array.from({length: count}, (_, index) => ({
+      key: index,
+      index,
+      start: index * 48,
+      size: 48,
+      lane: 0,
+    }));
+    return {
+      getVirtualItems: () => virtualItems,
+      getTotalSize: () => count * 48,
+      measureElement: jest.fn(),
+      measure: jest.fn(),
+    };
+  },
+}));
+
+// Avoid pulling in the full global actions tree (needs org context, feature flags, etc.)
+jest.mock('sentry/components/commandPalette/ui/commandPaletteGlobalActions', () => ({
+  GlobalCommandPaletteActions: () => null,
+}));
+
+import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
+
+import {
+  CMDKAction,
+  CommandPaletteProvider,
+} from 'sentry/components/commandPalette/ui/cmdk';
+import {CommandPaletteSlot} from 'sentry/components/commandPalette/ui/commandPaletteSlot';
+import CommandPaletteModal from 'sentry/components/commandPalette/ui/modal';
+import {
+  makeCloseButton,
+  makeClosableHeader,
+  ModalBody,
+  ModalFooter,
+} from 'sentry/components/globalModal/components';
+
+/**
+ * Returns a minimal but valid ModalRenderProps with a jest.fn() as closeModal.
+ * Header and CloseButton are wired to the same spy so all close paths are tracked.
+ */
+function makeRenderProps(closeModal: jest.Mock) {
+  return {
+    closeModal,
+    Body: ModalBody,
+    Footer: ModalFooter,
+    Header: makeClosableHeader(closeModal),
+    CloseButton: makeCloseButton(closeModal),
+  };
+}
+
+describe('CommandPaletteModal', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('calls the render prop closeModal (not the imported one) when a leaf action is selected', async () => {
+    // This test guards against the regression where modal.tsx called the
+    // imported closeModal() directly. That bypasses GlobalModal's internal
+    // closeModal(), so options.onClose never fires and state.open stays true —
+    // causing the hotkey to need two presses to reopen the palette.
+    const closeModalSpy = jest.fn();
+    const onActionSpy = jest.fn();
+
+    render(
+      <CommandPaletteProvider>
+        <CommandPaletteSlot name="task">
+          <CMDKAction display={{label: 'Leaf Action'}} onAction={onActionSpy} />
+        </CommandPaletteSlot>
+        <CommandPaletteModal {...makeRenderProps(closeModalSpy)} />
+      </CommandPaletteProvider>
+    );
+
+    await userEvent.click(await screen.findByRole('option', {name: 'Leaf Action'}));
+
+    // The action callback must fire …
+    expect(onActionSpy).toHaveBeenCalledTimes(1);
+    // … and the render-prop closeModal (which triggers options.onClose and
+    // resets state.open) must be the one that is called, not an internally
+    // imported closeModal that skips the onClose hook.
+    expect(closeModalSpy).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not call closeModal when an action with children is selected', async () => {
+    // Actions with children push into secondary actions — the modal stays open.
+    const closeModalSpy = jest.fn();
+    const onActionSpy = jest.fn();
+
+    render(
+      <CommandPaletteProvider>
+        <CommandPaletteSlot name="task">
+          <CMDKAction display={{label: 'Outer Group'}}>
+            <CMDKAction display={{label: 'Parent Action'}} onAction={onActionSpy}>
+              <CMDKAction display={{label: 'Child Action'}} onAction={jest.fn()} />
+            </CMDKAction>
+          </CMDKAction>
+        </CommandPaletteSlot>
+        <CommandPaletteModal {...makeRenderProps(closeModalSpy)} />
+      </CommandPaletteProvider>
+    );
+
+    await userEvent.click(await screen.findByRole('option', {name: 'Parent Action'}));
+
+    expect(onActionSpy).toHaveBeenCalledTimes(1);
+    // Modal must remain open so the user can select a secondary action
+    expect(closeModalSpy).not.toHaveBeenCalled();
+    // Secondary action is now visible
+    expect(await screen.findByRole('option', {name: 'Child Action'})).toBeInTheDocument();
+  });
+});

static/app/components/commandPalette/ui/modal.tsx

@@ -2,7 +2,6 @@ import {useCallback} from 'react';
 import {css} from '@emotion/react';
 
 import type {ModalRenderProps} from 'sentry/actionCreators/modal';
-import {closeModal} from 'sentry/actionCreators/modal';
 import type {CMDKActionData} from 'sentry/components/commandPalette/ui/cmdk';
 import type {CollectionTreeNode} from 'sentry/components/commandPalette/ui/collection';
 import {CommandPalette} from 'sentry/components/commandPalette/ui/commandPalette';
@@ -11,7 +10,7 @@ import type {Theme} from 'sentry/utils/theme';
 import {normalizeUrl} from 'sentry/utils/url/normalizeUrl';
 import {useNavigate} from 'sentry/utils/useNavigate';
 
-export default function CommandPaletteModal({Body}: ModalRenderProps) {
+export default function CommandPaletteModal({Body, closeModal}: ModalRenderProps) {
   const navigate = useNavigate();
 
   const handleSelect = useCallback(
@@ -28,7 +27,7 @@ export default function CommandPaletteModal({Body}: ModalRenderProps) {
       }
       closeModal();
     },
-    [navigate]
+    [navigate, closeModal]
   );
 
   return (