fix(chat): match terminal pane split and close menus

src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx

@@ -146,8 +146,6 @@ export function NativeChatStructuredSession(
     startFailures,
     agentName: agentLabel
   })
-  // Nothing reads an unread history, so its pane stays blank beside the Retry line.
-  const loadingPane = historyPhase === 'unread' ? null : <NativeChatLoadingCue />
   // A lost contact is the host notice's to say; the read adds only a refusal the host sent.
   const readFailure =
     controller.status === 'error' && !(hostOutage && !controller.readRefusal)
@@ -170,6 +168,7 @@ export function NativeChatStructuredSession(
   const fileLinkProps = { onLinkClick, allowFileUriLinks: onLinkClick !== undefined }
   const paneCommands = useStructuredNativeChatPaneCommands({
     tabId: props.tabId,
+    ownerWorktreeId,
     groupId: props.groupId,
     isVisible: props.isVisible,
     rootRef,
@@ -294,7 +293,7 @@ export function NativeChatStructuredSession(
       <NativeChatContextClearFade clearing={controller.contextClear.clearing}>
         {find.isOpen ? <NativeChatFindBar find={find} isVisible={props.isVisible} /> : null}
         {viewState.kind === 'loading' || (viewState.kind === 'error' && !readFailure) ? (
-          loadingPane
+          historyPhase !== 'unread' && <NativeChatLoadingCue />
         ) : viewState.kind === 'error' ? (
           <NativeChatEmptyState
             kind="error"

src/renderer/src/components/native-chat/structured-chat-menu-lifetime.test.tsx

@@ -0,0 +1,117 @@
+// @vitest-environment happy-dom
+import { createRef } from 'react'
+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { afterEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import { TooltipProvider } from '@/components/ui/tooltip'
+import { makeGroup, makeUnifiedTab } from '../worktree-jump-palette-test-fixtures'
+import { useStructuredNativeChatPaneCommands } from './use-structured-native-chat-pane-commands'
+import { emptyNativeChatContextMenuActions } from './use-native-chat-context-menu'
+import { runNativeChatSplitTarget } from './native-chat-layout-actions'
+
+vi.mock('./native-chat-layout-actions', () => ({ runNativeChatSplitTarget: vi.fn(() => true) }))
+vi.mock('./NativeChatSelectionQuote', () => ({ NativeChatSelectionQuote: () => null }))
+const initial = useAppStore.getState()
+let reads = 0
+let renders = 0
+let revision = 0
+afterEach(() => {
+  cleanup()
+  useAppStore.setState(initial, true)
+  vi.clearAllMocks()
+})
+function Host({ index }: { index: number }) {
+  renders++
+  const rootRef = createRef<HTMLDivElement>()
+  const { menu, ...commands } = useStructuredNativeChatPaneCommands({
+    tabId: `chat-${index}`,
+    groupId: 'group-owner',
+    ownerWorktreeId: 'owner',
+    isVisible: index % 3 !== 1,
+    terminalPaneActions: index % 3 === 2 ? emptyNativeChatContextMenuActions : undefined,
+    rootRef,
+    composerRef: createRef(),
+    questionAnswerInputRef: createRef(),
+    sessionId: '4a1f6c2e-8b3d-4e7a-9c15-0d2b6e8f1a37',
+    target: { kind: 'local' }
+  })
+  return (
+    <div ref={rootRef} data-testid={`host-${index}`} {...commands}>
+      {menu}
+    </div>
+  )
+}
+function measure(write: () => void) {
+  for (const tab of Object.values(useAppStore.getState().unifiedTabsByWorktree).flat()) {
+    for (const key of ['id', 'groupId'] as const) {
+      const value = tab[key]
+      Object.defineProperty(tab, key, {
+        configurable: true,
+        enumerable: true,
+        get: () => (reads++, value)
+      })
+    }
+  }
+  reads = 0
+  act(write)
+  return reads
+}
+
+it.each([6, 60])('bounds retained menu work at %i chats', async (size) => {
+  const seed = () => {
+    const tabs = Array.from({ length: size }, (_, index) => ({
+      ...makeUnifiedTab(`chat-${index}`, 'owner', `session-${index}`, 'Chat'),
+      contentType: 'agent-session' as const,
+      agentSessionAgent: 'codex' as const
+    }))
+    const ids = tabs.map((tab) => tab.id)
+    const other = { ...tabs[0], id: 'other', worktreeId: 'other', groupId: 'group-other' }
+    useAppStore.setState({
+      keybindings: initial.keybindings,
+      tabsByWorktree: {},
+      unifiedTabsByWorktree: { owner: tabs, other: [other] },
+      groupsByWorktree: {
+        owner: [makeGroup('owner', ids)],
+        other: [makeGroup('other', ['other'])]
+      }
+    })
+  }
+  const writes = [
+    () => useAppStore.getState().setTabLabel('chat-1', `Title ${++revision}`),
+    () => useAppStore.getState().activateTab('chat-1'),
+    () => useAppStore.getState().setTabLabel('other', `Other ${++revision}`),
+    () => useAppStore.getState().activateTab('other'),
+    () => useAppStore.setState({ activeWorktreeId: 'unrelated' })
+  ]
+  seed()
+  const baseline = writes.map(measure)
+  const idle = () => {
+    act(seed)
+    const before = renders
+    expect(writes.map(measure)).toEqual(baseline)
+    expect(renders).toBe(before)
+  }
+  const hosts = Array.from({ length: size }, (_, index) => <Host key={index} index={index} />)
+  render(hosts, { wrapper: TooltipProvider })
+  idle()
+  fireEvent.contextMenu(screen.getByTestId('host-0'))
+  await screen.findByRole('menu')
+  expect(screen.getAllByRole('menuitem').map((item) => item.textContent)).toEqual([
+    expect.stringContaining('Split Chat Right'),
+    expect.stringContaining('Split Chat Down'),
+    'Copy Orca Session ID'
+  ])
+  const opened = renders
+  const extra = measure(writes[0]) - baseline[0]
+  expect(extra).toBeGreaterThanOrEqual(size - 1)
+  expect(extra).toBeLessThanOrEqual(size * 2)
+  expect(renders).toBe(opened)
+  await new Promise((resolve) => setTimeout(resolve, 110))
+  fireEvent.click(screen.getByRole('menuitem', { name: /Split Chat Right/ }))
+  expect(runNativeChatSplitTarget).toHaveBeenLastCalledWith(
+    { kind: 'workspace-tab', unifiedTabId: 'chat-0', groupId: 'group-owner' },
+    'right'
+  )
+  await waitFor(() => expect(screen.queryByRole('menu')).toBeNull())
+  idle()
+})

src/renderer/src/components/native-chat/use-native-chat-context-menu.test.tsx

@@ -70,10 +70,6 @@ vi.mock('@/lib/image-blob-png', async (importOriginal) => ({
 
 vi.mock('./NativeChatSelectionQuote', () => ({ NativeChatSelectionQuote: () => null }))
 
-vi.mock('@/components/tab-bar/TabWorkspaceLayoutMenuSection', () => ({
-  TabWorkspaceLayoutMenuSection: () => 'Move Tab to Split'
-}))
-
 function childrenText(children: ReactNode): string {
   return React.Children.toArray(children)
     .map((child) => {
@@ -102,7 +98,6 @@ function Harness({
     composerRef: createRef(),
     onSwitchToTerminal,
     showTerminalPaneActions: !structured,
-    workspaceLayout: structured ? { unifiedTabId: 'chat-tab', groupId: 'group-1' } : undefined,
     resolveOrcaSessionId: orcaSessionId === undefined ? undefined : async () => orcaSessionId,
     actions: {
       ...emptyNativeChatContextMenuActions,
@@ -424,14 +419,6 @@ describe('useNativeChatContextMenu', () => {
     ).toBe(false)
   })
 
-  it('reuses workspace layout actions without terminal-only pane commands', () => {
-    const markup = renderToStaticMarkup(<Harness structured />)
-
-    expect(markup).toContain('Move Tab to Split')
-    expect(markup).not.toContain('Split Terminal Right')
-    expect(markup).not.toContain('Fork Agent Session')
-  })
-
   describe('Copy Orca Session ID', () => {
     const orcaSessionId = 'orca_session_id:4a1f6c2e-8b3d-4e7a-9c15-0d2b6e8f1a37'
     const writeClipboardText = vi.fn()

src/renderer/src/components/native-chat/use-native-chat-context-menu.tsx

@@ -7,7 +7,16 @@ import {
   type PointerEventHandler,
   type RefObject
 } from 'react'
-import { Clipboard, Copy, GitFork, Image as ImageIcon, SquareTerminal } from 'lucide-react'
+import {
+  Clipboard,
+  Copy,
+  GitFork,
+  Image as ImageIcon,
+  PanelBottomClose,
+  PanelRightClose,
+  SquareTerminal,
+  X
+} from 'lucide-react'
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -23,15 +32,14 @@ import {
   type NativeChatCopyImage
 } from './native-chat-image-copy'
 import { isMacPlatform, nativeChatToggleShortcutLabel } from './native-chat-shortcut'
-import { TabWorkspaceLayoutMenuSection } from '@/components/tab-bar/TabWorkspaceLayoutMenuSection'
-import { canMoveTabToNewPaneColumn } from '@/components/tab-bar/tab-move-to-pane-column'
+import { useAppStore } from '@/store'
+import { useStructuredChatPaneActions } from './use-structured-chat-pane-actions'
 import { isEditableTarget } from '@/lib/editable-target'
 import { findEditablePrimarySelectionPasteTarget } from '@/lib/primary-selection-paste'
 import { NativeChatCopyOrcaSessionIdMenuItem } from './NativeChatCopyOrcaSessionIdMenuItem'
 import { NativeChatSelectionQuote } from './NativeChatSelectionQuote'
 import { NativeChatPaneMenuItems } from './NativeChatPaneMenuItems'
 import type { NativeChatComposerHandle } from './native-chat-composer-types'
-import type { TabSplitDirection } from '@/store/slices/tabs'
 import { AgentSessionContinuationMenuItem } from '@/components/terminal-pane/AgentSessionContinuationMenuItem'
 import { AgentSessionContextCopyMenuItem } from '@/components/terminal-pane/AgentSessionContextCopyMenuItem'
 import {
@@ -67,11 +75,7 @@ type UseNativeChatContextMenuArgs = {
   actions: NativeChatContextMenuActions
   showTerminalPaneActions?: boolean
   splitShortcutLabels?: { right: string; down: string }
-  workspaceLayout?: {
-    unifiedTabId: string
-    groupId: string
-    shortcutLabels?: Partial<Record<TabSplitDirection, string>>
-  }
+  chatPane?: { tabId: string; worktreeId: string; groupId: string }
   /** A structured chat tab's Orca session ID; a chat in a terminal pane is that terminal's agent. */
   resolveOrcaSessionId?: () => Promise<string | null>
 } & NativeChatContextMenuTargetArgs
@@ -142,7 +146,7 @@ export function useNativeChatContextMenu({
   actions,
   showTerminalPaneActions = true,
   splitShortcutLabels,
-  workspaceLayout,
+  chatPane,
   resolveOrcaSessionId,
   messageListRef,
   fileLinkContext = null,
@@ -173,11 +177,8 @@ export function useNativeChatContextMenu({
     Boolean(target.quoteText ?? target.link ?? target.codeText ?? target.messageText) ||
     (target.rewindItemId !== null && rewind !== undefined)
   const hasSessionItems = onFind !== undefined || showTerminalPaneActions
-  const showWorkspaceLayout =
-    workspaceLayout !== undefined &&
-    canMoveTabToNewPaneColumn(workspaceLayout.unifiedTabId, workspaceLayout.groupId)
   const hasItems =
-    hasEditItems || hasSessionItems || showWorkspaceLayout || resolveOrcaSessionId !== undefined
+    hasEditItems || hasSessionItems || chatPane !== undefined || resolveOrcaSessionId !== undefined
 
   useEffect(() => {
     if (!enabled) {
@@ -317,21 +318,19 @@ export function useNativeChatContextMenu({
               <AgentSessionContextCopyMenuItem onSelect={actions.onCopyAgentSessionContext} />
             </>
           ) : null}
-          {workspaceLayout ? (
-            <TabWorkspaceLayoutMenuSection
-              unifiedTabId={workspaceLayout.unifiedTabId}
-              groupId={workspaceLayout.groupId}
+          {chatPane ? (
+            <StructuredChatPaneMenuItems
+              pane={chatPane}
               leadingSeparator={hasEditItems || hasSessionItems}
-              shortcutLabels={workspaceLayout.shortcutLabels}
+              splitShortcutLabels={splitShortcutLabels}
+              resolveOrcaSessionId={resolveOrcaSessionId}
             />
           ) : null}
           {showTerminalPaneActions ? (
             <NativeChatPaneMenuItems actions={actions} splitShortcutLabels={splitShortcutLabels} />
-          ) : resolveOrcaSessionId ? (
+          ) : !chatPane && resolveOrcaSessionId ? (
             <>
-              {hasEditItems || hasSessionItems || showWorkspaceLayout ? (
-                <DropdownMenuSeparator />
-              ) : null}
+              {hasEditItems || hasSessionItems ? <DropdownMenuSeparator /> : null}
               <NativeChatCopyOrcaSessionIdMenuItem resolveOrcaSessionId={resolveOrcaSessionId} />
             </>
           ) : null}
@@ -341,6 +340,51 @@ export function useNativeChatContextMenu({
   }
 }
 
+function StructuredChatPaneMenuItems({
+  pane,
+  leadingSeparator,
+  splitShortcutLabels,
+  resolveOrcaSessionId
+}: Pick<UseNativeChatContextMenuArgs, 'splitShortcutLabels' | 'resolveOrcaSessionId'> & {
+  pane: NonNullable<UseNativeChatContextMenuArgs['chatPane']>
+  leadingSeparator: boolean
+}) {
+  const actions = useStructuredChatPaneActions(pane.tabId, pane.worktreeId, pane.groupId)
+  const hasSplitPanes = useAppStore(
+    (state) => (state.groupsByWorktree[pane.worktreeId]?.length ?? 0) > 1
+  )
+  return (
+    <>
+      {leadingSeparator ? <DropdownMenuSeparator /> : null}
+      <DropdownMenuItem onSelect={actions.onSplitRight}>
+        <PanelRightClose />
+        {translate('auto.components.cmd.j.quick.actions.splitChatRight', 'Split Chat Right')}
+        <DropdownMenuShortcut>{splitShortcutLabels?.right}</DropdownMenuShortcut>
+      </DropdownMenuItem>
+      <DropdownMenuItem onSelect={actions.onSplitDown}>
+        <PanelBottomClose />
+        {translate('auto.components.cmd.j.quick.actions.splitChatDown', 'Split Chat Down')}
+        <DropdownMenuShortcut>{splitShortcutLabels?.down}</DropdownMenuShortcut>
+      </DropdownMenuItem>
+      {resolveOrcaSessionId ? (
+        <>
+          <DropdownMenuSeparator />
+          <NativeChatCopyOrcaSessionIdMenuItem resolveOrcaSessionId={resolveOrcaSessionId} />
+        </>
+      ) : null}
+      {hasSplitPanes && actions.canClosePane ? (
+        <>
+          <DropdownMenuSeparator />
+          <DropdownMenuItem variant="destructive" onSelect={actions.onClosePane}>
+            <X />
+            {actions.closeLabel}
+          </DropdownMenuItem>
+        </>
+      ) : null}
+    </>
+  )
+}
+
 function keepSelectionThroughMenuPress(event: React.PointerEvent<HTMLElement>): void {
   // Why: left alone, the press that opens the menu collapses the selection before contextmenu fires.
   if (