Skip to content

Expose Settings in the sidebar Help menu - #13211

Merged
teamleaderleo merged 3 commits into
mainfrom
feat/sidebar-settings-upstream
Sep 22, 2026
Merged

teamleaderleo merged 3 commits into
mainfrom
feat/sidebar-settings-upstream

Conversation

@teamleaderleo

@teamleaderleo teamleaderleo commented Sep 20, 2026 •

Copy link
Copy Markdown
Collaborator

Reviewer summary

Adds Settings to the sidebar Help menu so it is reachable from the same place as the other support and discovery links.

Checks

The sidebar Help popover now exposes the existing native Settings window directly. Settings sits with Keyboard Shortcuts and Import Browser Data near the top of the menu, ahead of feedback and external resources, and shows the user’s configured Settings shortcut.

Selecting Settings dismisses the popover and routes through the same presenter used by the app menu and Command-comma. No new Settings surface or onboarding flow is introduced.

Testing

  • Built and launched the exact fork HEAD locally with the tagged cmux workflow and the fork’s pinned GhosttyKit.
  • Dogfooded Help → Settings, popover dismissal, close/return to the same terminal, Help-menu reopen, and Command-comma reuse without a duplicate window.
  • Focused XCUITest passed locally on the implementation commit: 1 test, 0 failures.
  • The shortcut assertion requires an observable close/reopen transition. The two-commit reviewed result has since been replayed onto the latest upstream main; fresh current-head CI is still required.
  • Localization audit passed; the Settings label already exists in the supported catalogs.

Scope

This PR is intentionally limited to the Help-menu entry, ordering, shortcut hint, and behavior coverage.

Summary by CodeRabbit

  • New Features

    • Added a Settings option to the Sidebar Help menu.
    • Settings can be opened using the standard keyboard shortcut.
    • Reopening Settings reuses the existing window instead of creating duplicates.
  • Improvements

    • Reordered Help menu options, including Send Feedback and Import Browser Data.
    • The Help menu now dismisses when Settings opens.

Replaces #12981 (same commits, head branch moved into the org so it gets the build cache and can be kept current with main).

🤖 Generated with Claude Code


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.


Summary by cubic

Adds a Settings entry to the sidebar Help menu so users can open the existing Settings window from the same popover as the other support links.

  • Selecting Settings dismisses the popover and opens the same window used by the app menu and Cmd+,, so repeated opens reuse it.
  • Settings appears above Keyboard Shortcuts and Import Browser Data with its configured shortcut hint; Send Feedback moves below them.
  • Added import CmuxFoundation to several source files to unblock native compile admission.

Written for commit 5c2098a. Summary will update on new commits.

Review in cubic

@coderabbitai

coderabbitai Bot commented Sep 20, 2026 •

Copy link
Copy Markdown

Warning

Review limit reached

Next included review available in 20 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used all 10 included reviews currently available.

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Learn how review limits work.

Review configuration:

⚙️ Run configuration

Configuration used: Repository: manaflow-ai/cmux/.coderabbit.yaml

Review profile: ASSERTIVE

Plan: Advanced

Run ID: 4d7101aa-05f9-4f52-a567-2fa9a4249c7b

📥 Commits

Reviewing files that changed from the base of the PR and between 6e93cb6 and 5c2098a.

📒 Files selected for processing (3)
  • Sources/ContentView.swift
  • Sources/Workspace+AgentResumeOwnership.swift
  • cmuxUITests/SidebarHelpMenuUITests.swift

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

Copy link
Copy Markdown
Contributor

All contributors have signed the CLA ✍️ ✅
Posted by the CLA Assistant Lite bot.

@greptile-apps

greptile-apps Bot commented Sep 20, 2026 •

Copy link
Copy Markdown
Contributor

RetriggerConfidence Score: 5/5

The PR appears safe to merge with no actionable correctness, security, or repository-rule issues.

Summary

Adds a localized Settings entry to the sidebar Help menu and routes it through the existing native Settings presenter.

  • Displays the configured Settings keyboard shortcut.
  • Reorders Help menu actions so Settings, Keyboard Shortcuts, and browser-data import appear together.
  • Adds UI coverage for popover dismissal, reopening Settings, and avoiding duplicate Settings windows.

Reviews (5) · Last reviewed commit: "fix: import CmuxFoundation process ident..."

@cursor

cursor Bot commented Sep 20, 2026

Copy link
Copy Markdown

Bugbot is paused — on-demand spend limit reached

Bugbot uses usage-based billing for this team and has hit its on-demand spend limit.

A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue.

@teamleaderleo teamleaderleo added the full-ci EXPENSIVE: full macOS tests/builds; overrides selective PR routing. Not needed for normal checks. label Sep 20, 2026
@teamleaderleo

Copy link
Copy Markdown
Collaborator Author

The exact failing compiler logs reported missing AgentPIDProcessIdentity imports inherited from the baseline. Applied upstream #13236 in 95f1163875a2d63ef8296165994d628759629939, then integrated upstream main 024562cb7f53be3cb56658efe93b44cbd7354e1b cleanly. Current head is 2b70fcfa11c832d9277dc009d4948f88500800dc. There were no current inline review findings. Full-ci is enabled; complete CI workflow 35526810022 was rerun to recompute scope after the label. Native validation remains pending; no local native pass is claimed.

@teamleaderleo

Copy link
Copy Markdown
Collaborator Author

Full-suite evidence at2b70fcfa11c832d9277dc009d4948f88500800dc: app+test compile admission and package gates passed; runtime shards1/4/6 currently fail. Example run35526810022 jobs106124368848,106124368804,106124368910. These are real test failures across shared CLI, Cloud, persistence, browser and focus suites, not compilation-only evidence. One source-verified baseline defect: CLIVMLayoutEnvTests supplies --workspace and --name together although the production parser explicitly rejects that combination. Shared baseline repair is coordinated centrally rather than changing unrelated assertions here. The PR is not ready to merge while required runtime gates remain red.

@teamleaderleo
teamleaderleo force-pushed the feat/sidebar-settings-upstream branch from 2b70fcf to 5c2098a Compare September 21, 2026 08:07
@cursor

cursor Bot commented Sep 21, 2026

Copy link
Copy Markdown

Bugbot is paused — on-demand spend limit reached

Bugbot uses usage-based billing for this team and has hit its on-demand spend limit.

A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue.

@teamleaderleo
teamleaderleo enabled auto-merge (squash) September 21, 2026 08:31
@teamleaderleo teamleaderleo removed the full-ci EXPENSIVE: full macOS tests/builds; overrides selective PR routing. Not needed for normal checks. label Sep 22, 2026
@teamleaderleo
teamleaderleo merged commit 360555d into main Sep 22, 2026
67 of 76 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant