Uh oh!
There was an error while loading. Please reload this page.
fix(web): use capture-phase keydown listener so CTRL+J toggles terminal from terminal focus on Windows (#2113) - #2142
Merged
juliusmarminge merged 1 commit intoApr 17, 2026
Conversation
… while terminal has focus Fixespingdotgg#2113
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
2 tasks
Contributor
ApprovabilityVerdict: Approved This is a straightforward bug fix that changes a keydown event listener to use capture phase, ensuring the CTRL+J terminal toggle shortcut works when the terminal itself has focus on Windows. The change is minimal (adding a boolean parameter) with a corresponding test case. You can customize Macroscope's approvability policy. Learn more. |
juliusmarminge
enabled auto-merge (squash)
April 17, 2026 23:03
Uh oh!
There was an error while loading. Please reload this page.
aaditagrawal added a commit
to aaditagrawal/t3code
that referenced
this pull request
Apr 18, 2026
Integrates upstream/main (9df3c64) on top of fork's main (9602c18). Upstream features adopted: - Claude Opus 4.5 and 4.7 built-in models (pingdotgg#2072, pingdotgg#2143) - Node-native TypeScript migration across desktop/server (pingdotgg#2098) - Configurable project grouping with client-settings overrides (pingdotgg#2055, pingdotgg#2099) - Thread status in command palette (pingdotgg#2107) - Responsive composer / plan sidebar on narrow windows (pingdotgg#1198) - Capture-phase CTRL+J keydown for Windows terminal toggle (pingdotgg#2113/pingdotgg#2142) - Bypass xterm for global terminal shortcuts (pingdotgg#1580) - Windows ARM build target (pingdotgg#2080) - Windows PATH hydration + repair (pingdotgg#1729) - Gitignore-aware workspace search (pingdotgg#2078) - Claude process leak fix + stale session monitoring (pingdotgg#2042) - Preserve provider bindings when stopping sessions (pingdotgg#2084) - Clean up invalid pending-approval projections (pingdotgg#2106) — new migration - Extract backend startup readiness coordination - Drop stale text-gen options on reset (pingdotgg#2076) - Extend negative repository identity cache TTL (pingdotgg#2083) - Allow deleting non-empty projects from warning toast (pingdotgg#1264) - Restore defaults only on General settings (pingdotgg#1710) - Release workflow modernization (blacksmith runners, GitHub App token guards, v0.0.20 version bump) Fork features preserved: - All 8 providers (codex, claudeAgent, copilot, cursor, opencode, geminiCli, amp, kilo) with their adapters, services, and tests - Fork's custom OpenCode protocol impl in apps/server/src/opencode/ (kept over upstream's @opencode-ai/sdk-based provider added in pingdotgg#1758 — fork's version is tested and integrated; upstream's parallel files deleted) - Fork's direct-CLI Cursor adapter (kept over upstream's new ACP-based CursorProvider added in pingdotgg#1355 — upstream's parallel files deleted) - Fork's ProviderRegistry aggregates only codex + claudeAgent snapshots; the other 6 providers register via ProviderAdapterRegistry - PROVIDER_CACHE_IDS stays at [codex, claudeAgent] matching what the registry actually caches - Migration IDs preserved (fork 23/24/25/26; upstream's new 025 lands at ID 27 to avoid re-applying on deployed fork DBs) - Fork's generic per-provider settings (enabled/binaryPath/configDir/ customModels) kept over upstream's opencode-specific serverUrl/password - Log directory IPC channels, updateInstallInFlight tracking, icon composer pipeline all preserved - Fork's simplified release.yml (no npm CLI publish, no nightly infra) - composerDraftStore normalizeProviderKind widened to accept all 8 kinds - Dark mode --background set to #0f0f0f Test status: - All 9 package typechecks pass - Lint clean (0 errors) - Tests: 1877 passed, 15 skipped (incl. 4 historically-flaky GitManager cross-repo PR selector tests newly gated with TODO for Node-native-TS follow-up)
This was referenced Apr 18, 2026
tyulyukov pushed a commit
to tyulyukov/marcode
that referenced
this pull request
Apr 22, 2026
…al from terminal focus on Windows (pingdotgg#2113) (pingdotgg#2142) Co-authored-by: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
MuneerAhmed03 pushed a commit
to MuneerAhmed03/t3code
that referenced
this pull request
Apr 26, 2026
…al from terminal focus on Windows (pingdotgg#2113) (pingdotgg#2142) Co-authored-by: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
4 tasks
youpele52 referenced
this pull request
in youpele52/bigbud
Jun 17, 2026
…al from terminal focus on Windows (#2113) (#2142) Co-authored-by: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
NeilTheFisher pushed a commit
to NeilTheFisher/t3code
that referenced
this pull request
Aug 18, 2026
…al from terminal focus on Windows (pingdotgg#2113) (pingdotgg#2142) Co-authored-by: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What Changed
The window keydown listener in
ChatView.tsxnow runs in the capture phase instead of the default bubble phase.Why
On Windows, CTRL+J opens the terminal but pressing it again while the terminal has focus does not close it. Clicking back into chat and pressing CTRL+J closes it fine. macOS CMD+J is unaffected.
PR #1580 added
terminal.attachCustomKeyEventHandlerinsideThreadTerminalDrawer.tsxthat returnsfalsefor terminal shortcuts, with the intent of letting the event bubble up to the global keydown listener inChatView.tsx. On Windows, xterm.js still processes the event before it reaches the bubble-phase listener (ctrlKey combinations that map to control characters like LF get consumed), so the toggle never fires.Flipping the listener to capture phase makes it fire before xterm.js has a chance to touch the event. The handler already calls
event.preventDefault()andevent.stopPropagation()when a terminal command matches, so xterm never sees those events at all. macOS stays unaffected because CMD+J was already working via the same code path.Added a regression test for
isTerminalToggleShortcutwithterminalFocus: trueon Win32.UI Changes
No visual change. Keyboard behavior only: CTRL+J now consistently toggles the terminal regardless of which pane has focus on Windows.
Checklist
Fixes#2113
Note
Medium Risk
Changes global
keydownhandling to run in the capture phase, which can subtly affect shortcut/event propagation ordering across the app, though the change is localized and guarded by command matching.Overview
Ensures the terminal toggle shortcut works consistently on Windows even when focus is inside the terminal by registering the
ChatViewglobalwindowkeydownlistener in the capture phase (and removing it with matching options).Adds a regression test confirming
Ctrl+Jstill matchesterminal.toggleon non-macOS whenterminalFocus: true.Reviewed by Cursor Bugbot for commit 5ffb946. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Fix CTRL+J terminal toggle from terminal focus on Windows by using capture-phase keydown listener
The global
keydownlistener in ChatView.tsx is now registered with{ capture: true }so it intercepts events before they reach the focused terminal element, which was previously consuming the event during the bubble phase. A test is added to confirmisTerminalToggleShortcutmatches Ctrl+J whencontext.terminalFocusis true on non-macOS.Macroscope summarized 5ffb946.