[teamleaderleo]

Treat as a leo-named-fix (lanes can't add that label): every change here is a fix to something Leo named.

Takes back #29833: Leo asked to drop the sidebar row's machine glyph ("the tiny cloud icon the repeated cloud cloud cloud"). The row's accessibility label still names the machine.
Takes back #28897: the hover card's separate machine row is gone and the machine is named once in the header, so the machine-colour test now reads the header's name.

Leo, 2026-11-02, on a Cloud workspace's hover card that said Cloud four times (a cloud icon before the title, a "Cloud" row with another cloud icon, "Cloud" under the Terminal tab, and the tiny cloud mark on the sidebar row behind it):

isn't this extremely stupid looking?
the tiny cloud icon the repeated cloud cloud cloud

Leo, 2026-11-02 23:55Z, on the same card's tab rows:

WE SHOULD IMPROVE THIS AREA STILL YOU SHOULD BE ABLE TO CLOSE THESE TABS FROM THE HOVER PREVIEW AND THE HOVER PREVIEW SHOULD NOT MAKE THE SIDEBAR FLICKER IT DOES THAT WHEN I HOVER BACK TO IT SOMETIMES IT'S SOME STUPID THING WHERE I HAVE IT AS MY LAST HOVERED THING THEN I LEAVE IT THEN I GO BACK AND IT RE-RENDERS THE SPINNER VIEW IT'S BAD
PLUS THE PLACEMENT LOOKS LIKE STUFF

What changes

Machine named once

• Hover card header: the machine is named once, as "Cloud" or the remote machine's name, right after the title.
  • It uses the secondary ink, or the machine's appearance.machineColors pick when one is set.
  • Its connection dot sits beside it.
  • The title has no icon on such a card, and there is no separate host row.
  • Local cards show no machine in the header.
• Tab rows: a row names a machine only when the tab runs somewhere other than the header says, such as a remote terminal's own session. "This Mac" no longer appears on every row; the old look survives as the gallery variant namesLocalMachine.
• Sidebar row: the workspace row draws no machine glyph (the trailing mark from cmux NEXT sidebar: machine mark in the trailing column, status-mark size, one neutral colour #29833). Its accessibility label still names the machine.

Close tabs from the hover card

• A hovered tab row shows a ✕ in its trailing slot. The ✕ takes the first click and sends a new SidebarIntent.closeTab, which closes the tab through the same path as the palette's Close Tab.
• The card stays open, and the closed tab leaves it on the next content update.
• A card that can't close tabs shows no ✕.

No flicker on re-hover

• HoverCardMachine remembers the last shown target. Coming back to a row whose card is still fading out shows the same card as a non-sliding show.
• HoverCardPanel.present no longer crossfades a body over itself just because it was dismissing.
• The card and its spinners therefore stay in place instead of being redrawn.
• A row configured again with the same tab keeps its hover state.

Placement

• A working tab's spinner sits right after its title, centred on the title line.
• The meta line drops "Working", since the spinner already says it.
• The meta line truncates with an ellipsis instead of being clipped.
• A lane-style session name such as lane-vm-11/nightly-rollback shows only its last part.
• The card's width follows its content, up to its max.

Gallery and spec

• Gallery cards:
  • "Cloud workspace · machine named once · chosen"
  • "Tab rows · spinner after the title · chosen"
  • "Tab rows · close ✕ on hover · chosen"
  • "Tab rows · only another machine named · chosen"
  • "Tab rows · machine on every line" (the old look, for comparison)
• design/sidebar.md in our notes repo and plans/cmux-next/sidebar-owner.md record the rules.
• On remote cards, this replaces the host row from fix(sidebar): show Cloud and remote host in hover previews #30244 and the per-row machine from cmux NEXT sidebar: hover preview tab rows show where they run, model, command and page paths #31511.

Tests

• WorkspaceHoverHostIdentityTests.aCloudCardNamesItsMachineExactlyOnce
• WorkspaceTabHoverCardTests.aHoveredRowsCloseButtonClosesItsTabAndKeepsTheCard
• WorkspaceHoverCardBehaviorTests.comingBackToTheSameRowShowsTheSameCardWithNoCrossfade (new); comingBackSoon updated
• WorkspaceTabHoverCardRichRowsTests:
  • rowsNeverRepeatTheCardsMachine
  • theThisMacVariantNamesThisMac
  • aRemoteWorkspacesTabNamesOnlyAnotherMachine
  • agentRowsShowModelAndTimeAndLeaveWorkingToTheSpinner
  • aLanePathSessionShowsItsShortName
• SidebarMachineMarkTests.aRowOnAnotherMachineDrawsNoMachineGlyph
• HoverCardMachineColorTests
• Contrast and gallery-count expectations updated

Observed / Not run

• Ran python3 scripts/cmux-next/prepush-gate.py: no new violations.
• Not run locally: the Swift build and these suites, because this machine has no build host. PR CI runs them.
• Not checked by hand: the flicker fix on a Mac.
• No capture: Leo tries the build himself.

Changelog

Changed: A Cloud or remote workspace's hover card names its machine once, beside the title. Its tab rows close with a ✕ on hover and no longer flicker when you hover back. They show a shorter line, with the spinner next to the title. Sidebar rows no longer draw a machine icon.

🤖 Generated with Claude Code

Agent session: agent session

[github-actions]

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

Review 22e4c97: 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=pr32688 -f ref=lane/hover-card-cloud-once -f platform=macos -f backend_mode=local

Default changes

This pull request changes 7 defaults at 22e4c970077f (what everyone gets without configuring anything):

• tunable-source.CmuxNextSidebar/Logic/SidebarEdits.swift:apply: "36fcd38afd375ee95558948be9c063c4e28add43fb73fe2c529ea05ad4292d87" -> "b9f4c5ec79cf5d2dc077100bb0fb9596794af65532d45f8e6d24d8cf349f854b"
• tunable-source.CmuxNextSidebar/Logic/WorkspaceTabHoverCardLine.swift:machineText: "c70e00f5766a3385c96bce887c9192074a91c76d04faf680a82dd82967d22159" -> "493d34d0ff32980103882e417ced96ad051a1ae21c07cc9266ab665b9d551672"
• tunable-source.CmuxNextSidebar/Logic/WorkspaceTabHoverCardLine.swift:separator: (none) -> "b180e96df5690ba6c1c1f624611d9e4f187c5a174f66e36103fc235698e5c4c2"
• tunable-source.CmuxNextSidebar/Logic/WorkspaceTabHoverCardLine.swift:shortSessionName: (none) -> "6bef7e45e8a4fe026ccd03ecb4bd9b6fab2cd6533125e2267b35aedbb5f1b2ad"
• tunable-source.CmuxNextSidebar/Logic/WorkspaceTabHoverCardLine.swift:text: "91b27239de496e446e92fc91a83c2d4b056d03c31af589b64c6ad6851a635006" -> "b49c65dfb36ab98a6077e5b780114ebe12789ea301361762c512d3f911553ebf"
• tunable-source.CmuxNextSidebar/Logic/WorkspaceTabHoverCardLine.swift:title: "41c994452a7728da07ddb26075453372c0fde975626755d36ef17277fcb01cbd" -> "90a26013fd06fbee6c3a521b255b9819644e8c3baa6b6910b3cf2fe52d4ff55c"
• tunable-source.CmuxNextSidebar/Views/WorkspaceHoverCardGallery.swift:cloudCard: (none) -> "6f629bc06248974db6c24c27edfd4d3bf47b8d1110f2465f87d5a0f21d9dacb8"

Signed off on this commit by review (subagent claude-opus-5-5 medium).

Merge receipt: merged as 901d7e6450f1 with these defaults changed, signed off by review (subagent claude-opus-5-5 medium).

Regenerate the snapshot with python3 scripts/ci/defaults_guard.py snapshot.

Shipped in:

• cmux NEXT nightly 1.0.0-nightly.4156043994601 (35245964aa)
• cmux NEXT nightly 1.0.0-nightly.4156284504201 (8ce390075e)
• cmux NEXT nightly 1.0.0-nightly.4156407433601 (79b76ff1ed)
• cmux NEXT nightly 1.0.0-nightly.4156482801501 (585171513e)
• cmux NEXT nightly 1.0.0-nightly.4156640893901 (06ca249ff1)

[teamleaderleo]

Review (subagent claude-opus-5-5 medium): SHIP at 02ffacf

Visual verdict: no images; the header, tab-row and row changes match Leo's ask by code reading.
Checked: no references remain to the removed host row, row machine mark or machineMarkImage anywhere in the package's Sources and Tests. The header uses only public APIs with the right access (HoverCardAccessoryView, MachineColor.pickedColor, performWithTheme, an @objc appearance override). The title row's gravity and its wrap width are correct, and every test expectation was traced against the code (lines, the tab-row machine rule, the gallery count). The base merge resolves the row's view lists correctly; base's Chief avatar removal and this PR's mark removal are both kept. The defaults guard's two changes (machineText, the gallery's cloudCard) are this PR's intended behaviour.
Follow-ups: none

[blacksmith-sh]

Found 1 test failure on Blacksmith runners:

Failure

Test	View Logs
test_big_red (main.FleetRuleLints.test_big_red)/ test_big_red (main.FleetRuleLints.test_big_red)	View Logs

^{Need help on this PR? Tag @codesmith-bot with what you need.}

[teamleaderleo]

Review (subagent claude-opus-5-5 medium): SHIP at 22e4c97

The first pass at 51fa9e9 found a duplicated test and spinners that would freeze once occlusion tracking was off. Both are fixed: the duplicate is gone and occlusion tracking is back to base. The flicker fix now rests on the no-crossfade return and lastShownID. The ✕ takes the first click, and the close handler is cleared when the card deactivates.

Follow-ups:

• After a ✕ closes a tab, the row that moves under the pointer shows its ✕ only after the pointer leaves and comes back.
• A row can keep a stale hover fill if the card hid without the pointer leaving the row.
• In the one-line style, the space the detail line is fitted to doesn't subtract the spinner's room.
• Confirm on a DEV build that the re-hover spinner no longer redraws.

[teamleaderleo]

Review (codex gpt-6.1-sol high, sweep, via the review router; full diff from merge base ed4e6a8 to this head): BLOCK at 51fa9e9

No P1/P2 findings.