Add subtle Cloud badges to sidebar workspaces

Resources/Localizable.xcstrings

@@ -254544,6 +254544,18 @@
         }
       }
     },
+    "sidebar.cloudWorkspace.label" : {
+      "comment" : "Tooltip and workspace-row accessibility label for a Cloud-bound workspace. The placeholder is the authoritative machine identifier.",
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Cloud workspace on %@"
+          }
+        }
+      }
+    },
     "sidebar.custom.error": {
       "extractionState": "manual",
       "localizations": {

Sources/ContentView.swift

@@ -15941,7 +15941,7 @@ struct TabItemView: View, Equatable {
         let workspaceSnapshot = self.workspaceSnapshot
         let rowBackgroundColor = backgroundColor(for: workspaceSnapshot)
         let rowRailColor = railColor(for: workspaceSnapshot)
-        let accessibilityTitle = accessibilityTitle(for: workspaceSnapshot)
+        let accessibilityTitle = workspaceSnapshot.accessibilityLabel(index: index, workspaceCount: accessibilityWorkspaceCount)
         let closeWorkspaceTooltip = String(localized: "sidebar.closeWorkspace.tooltip", defaultValue: "Close Workspace")
         let protectedWorkspaceTooltip = String(
             localized: "sidebar.pinnedWorkspaceProtected.tooltip",
@@ -16080,6 +16080,8 @@ struct TabItemView: View, Equatable {
                         .layoutPriority(1)
                 }
 
+                SidebarCloudWorkspaceBadgeView(label: workspaceSnapshot.cloudWorkspaceLabel, pointSize: scaledFontSize(10), tint: activeSecondaryColor(0.7))
+
                 if trailingStatusActive || canCloseWorkspace {
                     SidebarWorkspaceTrailingStatusSlot(showsSpinner: spinnerOnTrailing, showsBadge: badgeOnTrailing, unreadCount: unreadCount, side: scaledUnreadBadgeSize, width: scaledCloseButtonWidth, height: scaledCloseButtonHitSize, badgeFont: badgeFont, badgeFillColor: activeUnreadBadgeFillColor, badgeTextColor: activeUnreadBadgeTextColor, spinnerColor: spinnerColor, spinnerTooltip: spinnerTooltip, canCloseWorkspace: canCloseWorkspace, showsCloseButton: showCloseButton, closeButtonTooltip: closeButtonTooltip, closeButtonColor: activeSecondaryColor(0.7), closeButtonFontSize: scaledFontSize(9), closeAction: actions.closeWorkspace)
                 }
@@ -16496,12 +16498,6 @@ struct TabItemView: View, Equatable {
         ) ?? NSColor(hex: hex) ?? .gray
     }
 
-    private func accessibilityTitle(
-        for workspaceSnapshot: SidebarWorkspaceSnapshotBuilder.Snapshot
-    ) -> String {
-        String(localized: "accessibility.workspacePosition", defaultValue: "\(workspaceSnapshot.title), workspace \(index + 1) of \(accessibilityWorkspaceCount)")
-    }
-
     func moveBy(_ delta: Int) {
         actions.moveBy(delta)
     }

Sources/NSImageView+SidebarWorkspaceAccessory.swift

@@ -0,0 +1,33 @@
+import AppKit
+import SwiftUI
+
+extension NSImageView {
+    /// Applies the shared secondary treatment for workspace identity accessories.
+    func configureSidebarWorkspaceAccessory(
+        symbol: String,
+        label: String?,
+        pointSize: CGFloat,
+        tint: NSColor,
+        weight: Font.Weight = .semibold
+    ) {
+        isHidden = label == nil
+        toolTip = label
+        guard label != nil else { return }
+        image = RenderableSystemSymbol.configuredAppKitImage(
+            systemName: symbol, pointSize: pointSize, weight: weight
+        )
+        contentTintColor = tint
+    }
+
+    /// Reserves one fixed accessory slot without changing the row's vertical layout.
+    func layoutSidebarWorkspaceAccessory(
+        maxX: CGFloat, centerY: CGFloat, side: CGFloat, spacing: CGFloat, apply: Bool
+    ) -> CGFloat {
+        guard !isHidden else { return maxX }
+        if apply {
+            frame = NSRect(x: maxX - side, y: centerY - side / 2, width: side, height: side)
+        }
+        return maxX - side - spacing
+    }
+
+}

Sources/Sidebar/AppKitList/Cells/SidebarWorkspaceRowCellView.swift

@@ -33,6 +33,7 @@ final class SidebarWorkspaceRowTableCellView: NSTableCellView {
     private let mediaCameraView = NSImageView()
     private let statusGlyphButton = SidebarRowTaskStatusGlyphButton()
     private let titleView = SidebarRowTextView(lines: 1)
+    private let cloudImageView = NSImageView()
     private let trailingBadge = SidebarRowUnreadBadgeView()
     private var trailingSpinner: GPUSpinnerNSView?
     private let closeButton = SidebarHeaderGlyphButton()
@@ -199,11 +200,7 @@ final class SidebarWorkspaceRowTableCellView: NSTableCellView {
         addSubview(railView)
         addSubview(contentContainer)
 
-        pinImageView.imageScaling = .scaleProportionallyDown
-        contentContainer.addSubview(pinImageView)
-        muteImageView.imageScaling = .scaleProportionallyDown
-        contentContainer.addSubview(muteImageView)
-        for view in [mediaAudioView, mediaMicView, mediaCameraView] {
+        for view in [pinImageView, muteImageView, cloudImageView, mediaAudioView, mediaMicView, mediaCameraView] {
             view.imageScaling = .scaleProportionallyDown
             contentContainer.addSubview(view)
         }
@@ -212,6 +209,8 @@ final class SidebarWorkspaceRowTableCellView: NSTableCellView {
         contentContainer.addSubview(statusGlyphButton)
         contentContainer.addSubview(leadingBadge)
         contentContainer.addSubview(titleView)
+        cloudImageView.setAccessibilityIdentifier("sidebarCloudBadge")
+        cloudImageView.setAccessibilityElement(false)
         contentContainer.addSubview(trailingBadge)
         closeButton.onClick = { [weak self] in self?.actions?.commands.closeWorkspace() }
         contentContainer.addSubview(closeButton)
@@ -413,25 +412,20 @@ final class SidebarWorkspaceRowTableCellView: NSTableCellView {
         }
 
         // Title line
-        pinImageView.isHidden = !snapshot.isPinned
-        if snapshot.isPinned {
-            pinImageView.image = RenderableSystemSymbol.configuredAppKitImage(
-                systemName: "pin.fill", pointSize: model.scaled(9), weight: .semibold
-            )
-            pinImageView.contentTintColor = palette.secondary(0.8)
-            pinImageView.toolTip = String(localized: "sidebar.pinnedWorkspaceProtected.tooltip", defaultValue: "Pinned workspace — protected from Close")
-        }
-        muteImageView.isHidden = !snapshot.isMuted
-        if snapshot.isMuted {
-            muteImageView.image = RenderableSystemSymbol.configuredAppKitImage(
-                systemName: "bell.slash.fill", pointSize: model.scaled(9), weight: .semibold
-            )
-            muteImageView.contentTintColor = palette.secondary(0.8)
-            muteImageView.toolTip = String(
-                localized: "sidebar.mutedWorkspace.tooltip",
-                defaultValue: "Notifications muted for this workspace"
-            )
-        }
+        cloudImageView.configureSidebarWorkspaceAccessory(
+            symbol: "cloud", label: snapshot.cloudWorkspaceLabel,
+            pointSize: model.scaled(10), tint: palette.secondary(0.7), weight: .regular
+        )
+        pinImageView.configureSidebarWorkspaceAccessory(
+            symbol: "pin.fill", label: snapshot.isPinned
+                ? String(localized: "sidebar.pinnedWorkspaceProtected.tooltip", defaultValue: "Pinned workspace — protected from Close") : nil,
+            pointSize: model.scaled(9), tint: palette.secondary(0.8)
+        )
+        muteImageView.configureSidebarWorkspaceAccessory(
+            symbol: "bell.slash.fill", label: snapshot.isMuted
+                ? String(localized: "sidebar.mutedWorkspace.tooltip", defaultValue: "Notifications muted for this workspace") : nil,
+            pointSize: model.scaled(9), tint: palette.secondary(0.8)
+        )
         let media = snapshot.mediaActivity
         mediaAudioView.isHidden = !media.isPlayingAudio
         if media.isPlayingAudio {
@@ -606,9 +600,8 @@ final class SidebarWorkspaceRowTableCellView: NSTableCellView {
         contentContainer.alphaValue = snapshot.taskStatus == .done ? 0.6 : 1
 
         setAccessibilityIdentifier("sidebarWorkspace.\(model.workspaceId.uuidString)")
-        setAccessibilityLabel(String(
-            localized: "accessibility.workspacePosition",
-            defaultValue: "\(snapshot.title), workspace \(model.index + 1) of \(model.accessibilityWorkspaceCount)"
+        setAccessibilityLabel(snapshot.accessibilityLabel(
+            index: model.index, workspaceCount: model.accessibilityWorkspaceCount
         ))
     }
 
@@ -1157,7 +1150,10 @@ final class SidebarWorkspaceRowTableCellView: NSTableCellView {
         let closeHit = max(16, 16 * model.fontScale)
         let closeWidth = max(16, closeHit)
         let trailingSlotActive = !trailingBadge.isHidden || (trailingSpinner?.isHidden == false) || model.canCloseWorkspace
-        let titleMaxX = trailingSlotActive ? (trailing - closeWidth - titleRowSpacing) : trailing
+        let accessoryMaxX = trailingSlotActive ? (trailing - closeWidth - titleRowSpacing) : trailing
+        let titleMaxX = cloudImageView.layoutSidebarWorkspaceAccessory(
+            maxX: accessoryMaxX, centerY: firstLineCenter, side: model.scaled(10) + 4, spacing: titleRowSpacing, apply: apply
+        )
         let titleWidth = max(10, titleMaxX - x)
         let renameField = renameSession?.field
         let titleHeight = renameField.map { ceil($0.intrinsicContentSize.height) }

Sources/Sidebar/SidebarWorkspaceSnapshotRefreshPolicy.swift

@@ -6,6 +6,7 @@ extension SidebarWorkspaceSnapshotBuilder.Snapshot {
         let customDescription: String?
         let isPinned: Bool
         let isMuted: Bool
+        let cloudWorkspaceLabel: String?
         let customColorHex: String?
         let finderDirectoryPath: String?
         let mediaActivity: BrowserMediaActivity
@@ -25,6 +26,7 @@ extension SidebarWorkspaceSnapshotBuilder.Snapshot {
             customDescription: customDescription,
             isPinned: isPinned,
             isMuted: isMuted,
+            cloudWorkspaceLabel: cloudWorkspaceLabel,
             customColorHex: customColorHex,
             finderDirectoryPath: finderDirectoryPath,
             mediaActivity: mediaActivity,
@@ -48,6 +50,7 @@ extension SidebarWorkspaceSnapshotBuilder.Snapshot {
             isPinned: snapshot.isPinned,
             isMuted: snapshot.isMuted,
             customColorHex: snapshot.customColorHex,
+            cloudWorkspaceLabel: snapshot.cloudWorkspaceLabel,
             remoteWorkspaceSidebarText: remoteWorkspaceSidebarText,
             remoteConnectionStatusText: remoteConnectionStatusText,
             remoteStateHelpText: remoteStateHelpText,

Sources/SidebarCloudWorkspaceBadgeView.swift

@@ -0,0 +1,17 @@
+import SwiftUI
+
+/// An immutable, fixed-width Cloud accessory; the row owns its accessibility label.
+struct SidebarCloudWorkspaceBadgeView: View {
+    let label: String?
+    let pointSize: CGFloat
+    let tint: Color
+
+    var body: some View {
+        if let label {
+            CmuxSystemSymbolImage(magnified: "cloud", pointSize: pointSize, weight: .regular, tint: tint)
+                .fixedSize()
+                .safeHelp(label)
+                .accessibilityHidden(true)
+        }
+    }
+}

Sources/SidebarWorkspaceSnapshotBuilder.swift

@@ -39,6 +39,8 @@ struct SidebarWorkspaceSnapshotBuilder {
         /// Whether any workspace-scoped notification mute is active.
         let isMuted: Bool
         let customColorHex: String?
+        /// Stable Cloud identity, independent of connection status and detail visibility.
+        let cloudWorkspaceLabel: String?
         let remoteWorkspaceSidebarText: String?
         let remoteConnectionStatusText: String
         let remoteStateHelpText: String
@@ -70,5 +72,13 @@ struct SidebarWorkspaceSnapshotBuilder {
         let checklistCompletedCount: Int
         let checklistTotalCount: Int
         let checklistFirstUncheckedText: String?
+
+        func accessibilityLabel(index: Int, workspaceCount: Int) -> String {
+            let position = String(
+                localized: "accessibility.workspacePosition",
+                defaultValue: "\(title), workspace \(index + 1) of \(workspaceCount)"
+            )
+            return [position, cloudWorkspaceLabel].compactMap { $0 }.joined(separator: ", ")
+        }
     }
 }

Sources/SidebarWorkspaceSnapshotFactory.swift

@@ -81,6 +81,9 @@ struct SidebarWorkspaceSnapshotFactory {
             isPinned: workspace.isPinned,
             isMuted: workspace.isMuted,
             customColorHex: workspace.customColor,
+            cloudWorkspaceLabel: workspace.cloudVMID.map { machine in
+                String(localized: "sidebar.cloudWorkspace.label", defaultValue: "Cloud workspace on \(machine)")
+            },
             remoteWorkspaceSidebarText: remoteWorkspaceSidebarText,
             remoteConnectionStatusText: remoteConnectionStatusText,
             remoteStateHelpText: remoteStateHelpText,

Sources/WorkspaceSidebarObservation.swift

@@ -166,6 +166,7 @@ private struct SidebarImmediateObservationState: Equatable {
     let isPinned: Bool
     let isMuted: Bool
     let customColor: String?
+    let cloudVMBinding: WorkspaceCloudVMBinding?
     let latestConversationMessage: String?
     let latestSubmittedMessage: String?
     let latestSubmittedAt: Date?
@@ -209,15 +210,15 @@ extension Workspace {
     static let sidebarImmediateObservationCoalesceInterval: DispatchQueue.SchedulerTimeType.Stride = .milliseconds(50)
     func makeSidebarImmediateObservationPublisher() -> AnyPublisher<Void, Never> {
         // Combine exposes up to four-way convenience publishers. Compose the
-        // fifth field explicitly so adding a row-affecting property does not
+        // extra fields explicitly so adding a row-affecting property does not
         // require a non-existent ``CombineLatest5`` specialization.
         let workspaceFields = Publishers.CombineLatest4(
             $customTitle,
             $customDescription,
             $isPinned,
             $customColor
         )
-        .combineLatest($isMuted)
+        .combineLatest($isMuted, $cloudVMBinding)
         let conversationFields = Publishers.CombineLatest3(
             $latestConversationMessage,
             $latestSubmittedMessage,
@@ -241,6 +242,7 @@ extension Workspace {
                     isPinned: workspaceFields.0.2,
                     isMuted: workspaceFields.1,
                     customColor: workspaceFields.0.3,
+                    cloudVMBinding: workspaceFields.2,
                     latestConversationMessage: conversationFields.0,
                     latestSubmittedMessage: conversationFields.1,
                     latestSubmittedAt: conversationFields.2,