[Desktop] macOS Cmd+W intermittently closes the window instead of the active tab (menu role:"close" races with tab.close) #37610

Description

On OpenCode Desktop (macOS), Cmd+W is registered in two places at once:

1. Renderer command tab.close is bound to mod+w (closes the active tab).
2. Native Electron application menu File → "Close Window" uses role: "close", which on macOS always owns Cmd+W and calls win.close().

When the renderer keybind handler receives the event (focus in the app UI with a current tab), the tab closes as expected. When focus is elsewhere, or tab.close is not registered (no current tab), or the native menu accelerator wins the race, the entire window/app closes.

This makes Cmd+W unreliable as "close tab" and can lose session context.

Relevant code paths (Desktop 1.18.3):

// File menu
{ type: "item", label: "Close Window", action: "window.close", role: "close" }

// nativeItem: role short-circuits custom accelerators
if (entry.role) return { role: nativeRole(entry.role) };

// window.close handler
case "window.close":
  win?.close();

Meanwhile the UI registers:

{ id: "tab.close", keybind: "mod+w", onSelect: () => tabsStoreActions.closeTab(...) }
// and also terminal.close on mod+w when focus is in the terminal panel

Related: #34937 (Windows native menu accelerators for Ctrl+W / Ctrl+M). Same class of bug — native menu roles/accelerators conflict with app keybinds — but this report is specifically about macOS Cmd+W = close tab vs close window.

Expected

• Cmd+W always closes the active tab when one exists (browser / VS Code style).
• Closing the window should use a different shortcut (e.g. Cmd+Shift+W) or only happen when there are no tabs left, after an explicit decision.

Suggested fix (any of)

1. Remove role: "close" from File → Close Window and set an explicit accelerator that does not steal Cmd+W (e.g. Cmd+Shift+W), keep action: "window.close".
2. Intercept before-input-event in the main process for Cmd+W and forward to tab.close / only call win.close() when no tabs remain.
3. When the last tab closes, optionally leave an empty window instead of quitting, matching multi-tab desktop apps.

Plugins cannot fix this: the official plugin API runs in the agent process and cannot rewrite Electron Menu.setApplicationMenu or role: "close".

Plugins

None related to keyboard/menu (local agent plugins only).

OpenCode version

Desktop 1.18.3 (ai.opencode.desktop, Notarized Developer ID)

Steps to reproduce

1. Open OpenCode Desktop on macOS with multiple tabs.
2. Focus the main chat/session UI; press Cmd+W → usually closes the tab (good).
3. Repeat after:
   • opening a system/permission dialog,
   • focusing certain inputs/overlays,
   • or when only one tab remains / no current tab,
   • or quickly after launch while UI is still settling.
4. Observe that the same Cmd+W sometimes closes the window (entire client) instead of a tab.

Screenshot and/or share link

N/A (keyboard / menu race). Happy to attach a screen recording if useful.

Operating System

macOS 26.5.2 (Build 25F84), Apple Silicon

Terminal

N/A (Desktop app, not TUI)