Skip to content

fix(settings): keep row content in shared main layout - #28264

Merged
teamleaderleo merged 3 commits into
feat-cmux-nextfrom
lane/sw-settings-row-shapes
Oct 30, 2026
Merged

teamleaderleo merged 3 commits into
feat-cmux-nextfrom
lane/sw-settings-row-shapes

Conversation

@teamleaderleo

@teamleaderleo teamleaderleo commented Oct 30, 2026 •

Copy link
Copy Markdown
Collaborator

Gallery: pages.settings/machines-row-shape, pages.settings/cloud-environments-row-shape

Keep Settings rows structurally consistent by placing environment labels and controls, plus the machine color control, inside the shared .row-main wrapper. Machine VM-host content remains in the row's below slot so it stays a full-width secondary line, while preserving the grid owner's geometry contract in design/grid.md.

Leo, 2026-10-28: “I feel like you guys could be doing more audits of the app. Like there's some amount of, like, satisfying and pretty stuff that can happen that we're not quite taking full advantage of.”

Visual evidence: gallery advisory runs the focused machines-row-shape and cloud-environments-row-shape variants capture the before/after rows at 2x in light and dark.

Before / after

Gallery fixtures pages.settings/machines-row-shape and pages.settings/cloud-environments-row-shape, Chromium, 2x. Before is base 49c648c plus only the fixture commit (gallery run 41101102001); after is head aa8cd3d (gallery run 41096877026).

Before After
Machines, light before machines light after machines light
Machines, dark before machines dark after machines dark
Cloud Environments, light before environments light after environments light
Cloud Environments, dark before environments dark after environments dark

Before, the machine colour swatch and Automatic button fell to their own line under the label, away from the status dot, and the Cloud Environments Build and Delete buttons dropped below the log toggle. After, both sit on the label's line like every other Settings row, and the VM toggle stays a full-width lower row.

Viewed after image: yes
Visual verdict: Yes, both rows now read like the rest of Settings with controls on the label's line and no clipping or overflow in either theme, so Leo would accept them next to ChatGPT/Claude.

Validation: git diff --check passed. Independent review (gpt-6-astra, high): SHIP at aa8cd3d.

Risk: contained to shared Settings row structure; no inset or gap values changed.

Agent session: agent session

@github-actions github-actions Bot added the risk:normal Risk tier (docs/ci/risk-tiers.md) label Oct 30, 2026
@github-actions

github-actions Bot commented Oct 30, 2026 •

Copy link
Copy Markdown
Contributor

cmux status (one comment, edited in place; each line is updated by the job that owns it)

Review aa8cd3d: HQ feed card · gallery before/after runs · checks

App of this head (app.zip, kept 1 day)

gh workflow run reload-build.yml -R manaflow-ai/cmux --ref feat-cmux-next -f tag=pr28264 -f ref=lane/sw-settings-row-shapes -f platform=macos -f backend_mode=local

Gallery before/after for aa8cd3d: the capture produced no images (run).

web and size checks: green

@blacksmith-sh

blacksmith-sh Bot commented Oct 30, 2026 •

Copy link
Copy Markdown

Found 2 test failures on Blacksmith runners:

Failures

Test View Logs
test_every_listed_hook_is_one_glaeda_released_with_the_check (main.SigningHooksInSt
epWithGlaedaTests.test_every_listed_hook_is_one_glaeda_released_with_the_check)/
test_every_listed_hook_is_one_glaeda_released_with_the_check (main.SigningHooksInSt
epWithGlaedaTests.test_every_listed_hook_is_one_glaeda_released_with_the_check)
View Logs
test_the_repository_highlights_validate (main.DigestTests.test_the_repository_highl
ights_validate)/
test_the_repository_highlights_validate (main.DigestTests.test_the_repository_highl
ights_validate)
View Logs

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

@teamleaderleo

Copy link
Copy Markdown
Collaborator Author

Review (codex gpt-6-astra high, next-review): BLOCK at 40a1bd5

  • P1 — cmux-next-ios/CmuxMobileKit/Tests/CmuxMobileLiveTests/PushRegistrationTests.swift:27: The new tests cannot pass against this implementation. Restoring original while changed is pending hits key == sent and skips registration. Releasing the pending write leaves [original, changed], not the asserted [original, changed, original]. The failure-response test has the same deterministic failure. Include the reconciliation implementation or remove these unrelated changes.
  • P2 — webviews/src/pages/settings/components/HostSections.tsx:61: Moving below inside the horizontal .row-main places MachineVmHost beside the machine name and color controls. Its “Dedicated agent machine” label, help, and switch lose their separate full-width line and compete for horizontal space. Keep below outside this wrapper.

@cursor

cursor Bot commented Oct 30, 2026

Copy link
Copy Markdown

Bugbot needs on-demand usage enabled

Bugbot uses usage-based billing for this team and requires on-demand usage to be enabled.

A team admin can enable on-demand usage in the Cursor dashboard.

@teamleaderleo

Copy link
Copy Markdown
Collaborator Author

Review (codex gpt-6-astra high, next-review): BLOCK at 232bf01

  • Blocking — cmux-next-ios/CmuxMobileKit/Tests/CmuxMobileLiveTests/PushRegistrationTests.swift:27: The new tests require reconciliation that sync() does not implement. After accepting original, restoring it while changed is pending returns early because key == sent. Releasing the pending write leaves server preferences as changed, with only two writes, so assertions here and at lines 68–69 deterministically fail. Include the corresponding reconciliation fix or remove these unrelated tests.

@teamleaderleo
teamleaderleo force-pushed the lane/sw-settings-row-shapes branch from 232bf01 to abb0d96 Compare October 30, 2026 16:54
@cursor

cursor Bot commented Oct 30, 2026

Copy link
Copy Markdown

Bugbot needs on-demand usage enabled

Bugbot uses usage-based billing for this team and requires on-demand usage to be enabled.

A team admin can enable on-demand usage in the Cursor dashboard.

@teamleaderleo
teamleaderleo force-pushed the lane/sw-settings-row-shapes branch from abb0d96 to aa8cd3d Compare October 30, 2026 17:12
teamleaderleo added a commit that referenced this pull request Oct 30, 2026
teamleaderleo added a commit that referenced this pull request Oct 30, 2026
teamleaderleo added a commit that referenced this pull request Oct 30, 2026
teamleaderleo added a commit that referenced this pull request Oct 30, 2026
teamleaderleo added a commit that referenced this pull request Oct 30, 2026
teamleaderleo added a commit that referenced this pull request Oct 30, 2026
teamleaderleo added a commit that referenced this pull request Oct 30, 2026
teamleaderleo added a commit that referenced this pull request Oct 30, 2026
@teamleaderleo

Copy link
Copy Markdown
Collaborator Author

Review (codex gpt-6-astra high, next-review): SHIP at aa8cd3d

No blocking findings.

@cmux-bot cmux-bot Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

cmux-bot approves aa8cd3d: an independent review passed this exact head (next-review receipt by teamleaderleo). A push needs a new review; a later BLOCK at this head dismisses this approval.

@teamleaderleo
teamleaderleo merged commit bdc44fa into feat-cmux-next Oct 30, 2026
200 of 207 checks passed
@teamleaderleo
teamleaderleo deleted the lane/sw-settings-row-shapes branch October 30, 2026 18:58
@github-actions

github-actions Bot commented Oct 30, 2026 •

Copy link
Copy Markdown
Contributor

This branch was previously deployed

1 inactive deployment
ci-routing-agent — aa8cd3db Deployed Oct 30, 2026 by teamleaderleo via cmux-tui tree preflight #84286
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk:normal Risk tier (docs/ci/risk-tiers.md)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant