Conversation
…rride migrator (superset-sh#3460) * feat(desktop/hotkeys): directional pane focus for v1 + Mac alt modifier Restores keyboard pane navigation to v1 workspaces with the same Cmd+Alt+Arrow chords v2 uses, via a standalone spatial neighbor walker over v1's MosaicNode<string> tree (no cross-package coupling to v2). Also lets the recorder accept alt-only chords on Mac and warns when bound alt-only chords could mask typing special characters. * feat(desktop/hotkeys): best-effort migrator for v1 event.key overrides The v1 recorder stored chords from event.key (layout-dependent raw glyphs like "meta+,", "ctrl+shift+@", "meta+alt+ª"), while the new store matches on event.code names. Extends sanitizeOverride with a token rewrite pre-pass covering US-ANSI punctuation, shifted glyphs, and macOS Option dead-keys; gates the Option dead-key table behind a navigator.keyboard-based US-layout probe so non-US Mac users aren't silently rebound to the wrong physical key.
…uperset-sh#3472) Flip Cmd+Alt+Arrow (mac) / Ctrl+Shift+Alt+Arrow (win/linux) back to the pre-superset-sh#3403 behavior: - Cmd+Alt+Left / Right → Previous / Next Tab - Cmd+Alt+Up / Down → Previous / Next Workspace FOCUS_PANE_{LEFT,RIGHT,UP,DOWN} remain registered but are now unbound by default — users who want directional pane focus can rebind them in Settings → Keyboard. PREV_TAB_ALT / NEXT_TAB_ALT (Ctrl+Tab / Ctrl+Shift+Tab) are unchanged. Also move SCROLL_TO_BOTTOM on Windows/Linux from ctrl+shift+alt+down to ctrl+end to avoid the silent collision with NEXT_WORKSPACE that this restoration would otherwise introduce. buildRegisteredAppChords uses a Map keyed by canonical chord, so duplicate chords silently clobber each other in the reverse lookup. mac SCROLL_TO_BOTTOM (meta+shift+down) is unchanged. Registered users who previously overrode any of these IDs keep their overrides — defaults are just fallbacks.
Two blocking issues Codex found on the conflict resolution: 1. apps/desktop/src/renderer/hotkeys/migrate.ts — the fork guard that short-circuited when localStorage already had a hotkey-overrides entry bypassed upstream superset-sh#3460's new sanitizeOverride / detectUSLayout logic. The whole point of the `-v2` marker bump is to re-sanitize existing localStorage overrides that a pre-sanitizer build wrote with corrupt values, so skipping them defeats the migration. Restructure: instead of an early return, parse the existing localStorage overrides, re-run them through sanitizeOverridesMap with the US-layout probe, and write the cleaned map back. Still avoids overwriting with stale tRPC data (the fork's original intent). 2. apps/desktop/src/renderer/routes/_authenticated/_dashboard/workspace/ $workspaceId/page.tsx — the v1 FOCUS_PANE_{LEFT,RIGHT,UP,DOWN} hotkeys were missing `enabled: isActive`. Every other useHotkey in this file already has that guard because KeepAliveWorkspaces keeps inactive WorkspacePage instances mounted; without the guard, a user who rebinds the FOCUS_PANE_* ids would see the hotkey fire in hidden background workspaces as well.
|
Warning Rate limit exceeded
Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 1 minutes and 35 seconds. ⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: ⛔ Files ignored due to path filters (1)
📒 Files selected for processing (9)
✨ 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 |
MocA-Love
added a commit
that referenced
this pull request
Apr 15, 2026
-s ours merge to record that upstream commits a3e34bf through de70163 (13 commits) are semantically already present on origin/main via the PR1-6 cherry-pick series (PRs #176, #177, #178, #179, #180, #182), plus fork-adaptation fixes layered on top. This merge target is de70163 specifically (not upstream/main) so newer upstream commits (9fff075 and later) remain visible in future behind counts. Upstream commits covered by this audit merge: - a3e34bf fix(desktop): restore cmd+click requirement for v1 terminal file links (superset-sh#3457) [PR1/#176] - 57557f8 fix(desktop): gate v2 workspace children on collection readiness (superset-sh#3464) [PR1/#176] - 4ee2e61 fix(desktop): use native clipboard for copy path in v2 sidebar (superset-sh#3462) [PR1/#176] - 87d6e93 feat(desktop): close settings with Escape key (superset-sh#3466) [PR1/#176] - 9c7f5f4 chore(desktop): auto-restart host-service on bundle change in dev (superset-sh#3461) [PR1/#176] - 93140d9 fix(mcp): accept MCP resource URL as valid OAuth audience (superset-sh#3459) [PR2/#177] - be9e000 fix(desktop): drive tray menu off events, fetch real org name (superset-sh#3458) [PR2/#177] - c5f791e feat(v2): unify workspace delete through host-service (superset-sh#3443) [PR3/#178] - 2c24d93 feat(desktop): paginated branch picker with checkout + open actions (superset-sh#3397) [PR4/#179] - 2bf1049 feat(desktop/hotkeys): v1 directional pane focus + best-effort v1 override migrator (superset-sh#3460) [PR5/#180] - 1294a7d feat(desktop/hotkeys): restore Cmd+Alt+Arrow for tab/workspace nav (superset-sh#3472) [PR5/#180] - de70163 feat(desktop): v2 review tab first pass — PR info, checks, comments (superset-sh#3463) [PR6/#182] Intentionally skipped (version bump, fork has independent versioning): - 1e23353 chore(desktop): bump version to 1.5.5 (superset-sh#3473) Fork-adaptation fixes layered on top of the cherry-picks: - PR1: host-service-coordinator alias import fix, settings Escape selector narrowing (role-based + popper wrapper), Escape close uses replace navigation - PR2: dual quit mode preservation (requestQuit "release"/"stop"), trayUpdateToken guard for stale async fetchHostInfo results - PR4: ChangesHeader.normalizeBranchName regex rewrite (lint false positive), worktree add uses fullRef for remote-tracking refs, syncTimedOut reset on pendingId change, GIT_REFS.md barrel example fix - PR5: migrate.ts re-sanitize of existing localStorage overrides (v2 marker bump intent), FOCUS_PANE_* enabled:isActive for KeepAliveWorkspaces, CATEGORY_ORDER merges Navigation (upstream) and Browser (fork) - PR6: normalizeThreadsToComments flattens all thread.comments (not just first), CommentPane overrides <a> (openUrl) and <img> (SafeImage), zero-badge suppression, pr-null comments gate Fork features verified intact (Explore agent audit of combined 36d4de4..35d95f3 range): - BROWSER_RELOAD / BROWSER_HARD_RELOAD hotkeys - dual quit mode menu in tray - v1 terminal cold-restore + retry reconnect (out of range but unaffected) - KeepAliveWorkspaces (FOCUS_PANE_* gated on isActive) - useCommandPalette + addMemoTab in v2 workspace - host-service-coordinator rename alias pattern
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 free
to 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.
概要
12コミット取り込み最後のPR。方針はユーザー明示指示で upstream に合わせる、ただし fork 固有の BROWSER_RELOAD / BROWSER_HARD_RELOAD は温存します。
取り込む upstream コミット
2bf1049a4→5cf73af1c1294a7df6→f7729b4bd方針変更: fork の Cmd+Alt+Arrow 扱い
fork は過去 PR #3 で upstream superset-sh#3403 の Cmd+Alt+Arrow → FOCUS_PANE_* を積極採用し、さらに独自調整 (
ce0fb6134post-cherry-pick fixes for spatial pane navigation) まで入れていました。今回の upstream superset-sh#3472 はこれを default から外し、Cmd+Alt+Arrow は PREV/NEXT_TAB/WORKSPACE に戻す方針転換をしています。fork を upstream の最終判断 (Cmd+Alt+Arrow = tab/workspace nav) に合わせます。FOCUS_PANE_* は registry に残り unbound 扱いなので、pane focus を使いたいユーザーは Settings → Keyboard から任意のキーに再バインドできます。
変更後のキーバインド (上流一致)
meta+alt+leftctrl+shift+alt+leftmeta+alt+rightctrl+shift+alt+rightmeta+alt+upctrl+shift+alt+upmeta+alt+downctrl+shift+alt+downnull(unbound)null(unbound)meta+shift+downctrl+end(wasctrl+shift+alt+down)SCROLL_TO_BOTTOM Windows/Linux を
ctrl+shift+alt+down→ctrl+endに移動したのは、復元された NEXT_WORKSPACE と同じ chord になるのを避けるため (upstream superset-sh#3472)。維持される fork 固有 hotkeys
meta+alt+rctrl+shift+rmeta+shift+alt+rctrl+alt+shift+eどれも上記新 defaults と canonical chord レベルで衝突しません (Codex で検証済み)。
手動 conflict 解決 (3ファイル)
1.
apps/desktop/src/renderer/hotkeys/migrate.tsfork は localStorage に既に
hotkey-overridesがある場合に早期 return して tRPC からの stale 上書きを防いでいましたが、upstream superset-sh#3460 は-v2marker bump でそのレイヤーこそ再サニタイズさせたい層でした。最終解決: 既存
hotkey-overridesがある場合は parse して各 override をsanitizeOverride(新detectUSLayout経由) にかけて re-sanitize して書き戻す。tRPC からの stale 上書きは発生させない fork 意図を維持しつつ、upstream の sanitizer も走るように。2.
apps/desktop/src/renderer/routes/_authenticated/_dashboard/workspace/$workspaceId/page.tsxfork の
extractPaneIdsFromLayoutimport と upstream 新規type FocusDirectionimport を両方取り込み。moveFocusDirectional+useHotkey("FOCUS_PANE_*")4 つを v1 workspace に追加 (upstream superset-sh#3460)。fork 固有の tRPC-based prev/next workspace コメントは温存。3.
apps/desktop/src/renderer/routes/_authenticated/settings/keyboard/page.tsxCATEGORY_ORDERに upstream の"Navigation"と fork の"Browser"を両方含めた (順序: Navigation, Browser, Workspace, Terminal, Layout, Window, Help)。Codex 事前レビュー 2ラウンド
Round 1 (2件指摘, 両方修正):
migrate.tsのexistingRaw早期 return が-v2sanitizer を bypass → 上記「feat(desktop): add Excel/spreadsheet viewer with diff support #1 最終解決」で対応FOCUS_PANE_*4 つにenabled: isActiveが無く、KeepAliveWorkspacesで mounted な非アクティブ workspace でも hotkey fire → 4 つ全てに{ enabled: isActive }を追加Round 2:
Yes。コード上の blocker は解消済み。テスト
bun installbun run lint(biome pass、check-git-ref-strings pass、pre-existing projects.ts simple-git 違反のみ残存)bun run typecheck: /tmp worktree の @types/node 解決問題、CI 側に委ねる-v2) が既存 localStorage を re-sanitize する次のステップ
これで 12 コミットの取り込みが完了します。PR5 マージ後、必要なら最終的な audit merge (
-s ours) で upstream との同期点をマークできます。