Skip to content

Add right panel close controls - #4148

Open
caezium wants to merge 5 commits into
pingdotgg:mainfrom
caezium:agent/right-panel-close-button
Open

Add right panel close controls#4148
caezium wants to merge 5 commits into
pingdotgg:mainfrom
caezium:agent/right-panel-close-button

Conversation

@caezium

@caezium caezium commented Jul 19, 2026

Copy link
Copy Markdown
Contributor

What Changed

  • Add a far-right close button that hides the inline right panel without destroying its tabs.
  • Add a configurable rightPanel.closeActiveSurface command, defaulting to Mod+W while the right panel owns focus.
  • Route macOS native close input and embedded Browser shortcuts through the same focus-aware path, while keeping bottom-drawer terminal closing pane-scoped.

Why

The right panel had no explicit hide control, and Cmd+W could close the desktop window instead of the focused panel surface.

Closes #4146.
Closes #4147.

UI Changes

Before

Right panel before the far-right close control

After

Right panel with the far-right close control

Interaction

Watch the real-app interaction demo

The clip starts with Files and Diff open. Cmd+W closes only Diff, the far-right X hides the panel, and the existing toggle restores Files to show that panel state is preserved.

Validation

  • 16 focused test files, 200 tests passed
  • Affected-package typechecks, targeted lint and formatting, and git diff --check passed
  • Real Electron QA covered tab close, final-tab close, panel hide/reopen, embedded Browser routing, custom remaps, terminal scope, and app-window preservation

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes
  • I included a video for animation/interaction changes

Note

Medium Risk
Touches global shortcuts, macOS window-close interception, and persisted keybinding migration; behavior changes when the right panel is open versus legacy terminal-only Mod+W.

Overview
Adds a far-right close control on the inline right panel and wires focus-aware close so Mod+W closes the active right-panel surface (or its terminal) instead of quitting the app when the panel has focus.

Keybindings & migration: New rightPanel.closeActiveSurface (default mod+w when rightPanelFocus); terminal.close is limited to terminalFocus && !rightPanelFocus. Server startup migrates legacy mod+w terminal-close configs and documents the new when context.

Desktop: On macOS, main-window Cmd+W is intercepted and sent to the renderer as close-window-or-focused-region (still closes the window while the main frame is loading). Preview webviews receive configured close shortcuts over IPC so embedded browser input forwards remapped bindings, not a hardcoded Mod+W.

Web: closeFocus tracking, rightPanelFocus scope (including portaled controls), and a shared close-request path in ChatView / sidebar menu handling unify keyboard, menu, and preview forwarding.

Reviewed by Cursor Bugbot for commit 02b9f3f. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Add right panel close controls with focus-aware Cmd+W routing

  • Adds a close button (X) to PanelLayoutControls and routes Cmd+W to close the focused right panel surface, right panel terminal, or drawer terminal based on where focus is tracked.
  • Introduces createCloseFocusTracker in closeFocus.ts to maintain stable focus ownership across native blur events, portals, drag regions, and preview tab switches.
  • Splits the default mod+w keybinding into two: rightPanel.closeActiveSurface when rightPanelFocus is active, and terminal.close only when terminalFocus && !rightPanelFocus; includes a startup migration for existing persisted configs.
  • On macOS, Cmd+W in the desktop app is intercepted via before-input-event and routed to the renderer as CLOSE_WINDOW_OR_FOCUSED_REGION_MENU_ACTION instead of immediately closing the window (unless the main frame is still loading).
  • Preview windows receive configured rightPanelCloseShortcuts via a new IPC channel so the preview manager can forward the correct shortcut instead of always assuming Mod+W.
  • Risk: The terminal.close default keybinding now requires !rightPanelFocus, which is a behavioral change for users whose right panel is open when they press Cmd+W.

Macroscope summarized 02b9f3f.

@coderabbitai

coderabbitai Bot commented Jul 19, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 6d66ce6a-fe4b-498d-9a58-a70b5be0241c

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Jul 19, 2026
@caezium
caezium marked this pull request as ready for review July 19, 2026 14:16
Comment thread apps/web/src/components/ChatView.tsx Outdated
Comment thread apps/web/src/components/ChatView.tsx Outdated
@macroscopeapp

macroscopeapp Bot commented Jul 19, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR introduces a new feature (right panel close controls) with significant new logic including focus tracking, shortcut routing, and behavioral changes to how Cmd+W works. Combined with an unresolved review comment about a potential race condition, this warrants human review.

You can customize Macroscope's approvability policy. Learn more.

Comment thread apps/web/src/lib/rightPanelCloseRequest.ts Outdated
Comment thread apps/web/src/components/ChatView.tsx Outdated
Comment thread apps/web/src/lib/rightPanelFocus.ts Outdated
Comment thread packages/shared/src/keybindings.ts Outdated
Comment thread apps/web/src/components/RightPanelTabs.tsx
Comment thread apps/desktop/src/window/DesktopApplicationMenu.ts Outdated
Comment thread apps/web/src/components/ChatView.tsx Outdated
Comment thread apps/web/src/components/ChatView.tsx Outdated
Comment thread apps/web/src/components/ChatView.tsx Outdated
Comment thread apps/web/src/lib/rightPanelCloseRequest.ts Outdated
Comment thread apps/web/src/lib/terminalFocus.ts Outdated
Comment thread apps/web/src/lib/nativeCloseFocus.ts Outdated
Comment thread apps/web/src/lib/nativeCloseFocus.ts Outdated
@juliusmarminge

Copy link
Copy Markdown
Member

what is the interaction demo doing? looks like you're just toggling visibility which you can already do with Mod+Shift+B ?

@caezium

caezium commented Jul 19, 2026

Copy link
Copy Markdown
Contributor Author

pressing cmd+w to close a single panel, since in the vid there was only one, the whole panel closed, sorry for the bad video, ill record another one

Comment thread apps/web/src/components/ChatView.tsx
Comment thread apps/web/src/lib/rightPanelFocus.ts Outdated
Comment thread apps/web/src/lib/nativeCloseFocus.ts Outdated
Comment thread apps/web/src/components/chat/PanelLayoutControls.tsx
@caezium

caezium commented Jul 19, 2026

Copy link
Copy Markdown
Contributor Author

Updated the PR description with a separate real-app middle-click demo. It starts with Files and Terminal open, then middle-click closes only Files while Terminal, the right panel, and the app window stay open. I also added focused regression coverage for button 1 and clarified what the existing Cmd+W clip is showing.

@github-actions github-actions Bot added size:XL 500-999 changed lines (additions + deletions). and removed size:L 100-499 changed lines (additions + deletions). labels Jul 19, 2026
Comment thread apps/web/src/lib/rightPanelFocus.ts Outdated
@caezium

caezium commented Jul 19, 2026

Copy link
Copy Markdown
Contributor Author

Follow-up review fix in 85e780f: hosted preview focus is now matched by tab ID against the active right-panel preview, so a standalone preview cannot trigger the right-panel close shortcut. The focused tests cover matching and mismatched preview IDs.

Comment thread apps/web/src/components/ChatView.tsx Outdated
@caezium
caezium force-pushed the agent/right-panel-close-button branch from 85e780f to 4935f60 Compare July 19, 2026 20:38
Comment thread apps/web/src/lib/nativeCloseFocus.ts Outdated
juliusmarminge added a commit that referenced this pull request Jul 20, 2026
Keep native close focus scoped to the active hosted preview and preserve pointer ownership across webview blur transitions.

Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarminge force-pushed the agent/right-panel-close-button branch from 4935f60 to 137c501 Compare July 20, 2026 16:33
Comment thread apps/web/src/components/ChatView.tsx Outdated
Comment thread apps/desktop/src/window/DesktopWindow.ts Outdated
Comment thread apps/web/src/components/ChatView.tsx Outdated
Comment thread apps/web/src/components/ChatView.tsx Outdated
Comment thread apps/web/src/lib/nativeCloseFocus.ts Outdated
Comment thread apps/web/src/lib/nativeCloseFocus.ts Outdated
Comment thread apps/web/src/lib/nativeCloseFocus.ts Outdated
@caezium
caezium force-pushed the agent/right-panel-close-button branch from e034689 to 5227956 Compare July 22, 2026 14:21
Comment thread apps/desktop/src/preview/Manager.ts
Comment thread apps/web/src/lib/closeFocus.ts
@caezium
caezium force-pushed the agent/right-panel-close-button branch from 5227956 to 6f86978 Compare July 22, 2026 14:37
Comment thread apps/web/src/components/RightPanelTabs.tsx
Comment thread apps/web/src/components/ChatView.tsx Outdated
Comment thread apps/web/src/components/ChatView.tsx
Comment thread packages/shared/src/keybindings.ts
@github-actions github-actions Bot added size:XXL 1,000+ changed lines (additions + deletions). and removed size:XL 500-999 changed lines (additions + deletions). labels Jul 23, 2026
@caezium
caezium force-pushed the agent/right-panel-close-button branch from 525834d to bfc65e4 Compare July 23, 2026 16:37
Comment thread apps/desktop/src/preview/Manager.ts Outdated
Comment thread apps/web/src/components/ChatView.tsx Outdated

@cursor cursor Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 117cbae. Configure here.

Comment thread apps/desktop/src/preview/Manager.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL 1,000+ changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature]: Close the active right-panel tab with Cmd+W [Feature]: Add an explicit close button to the right panel header

2 participants