Restore iOS workspace group row actions

Packages/Shared/CMUXMobileCore/Sources/CMUXMobileCore/MobileStateSyncRecords.swift

@@ -203,6 +203,8 @@ public struct GroupSyncRecord: MobileSyncRecord {
     public let isCollapsed: Bool
     /// Whether the group is pinned on the Mac.
     public let isPinned: Bool
+    /// SF Symbol rendered by the corresponding group row on the Mac.
+    public let iconSymbol: String?
     /// The anchor workspace that owns this group.
     public let anchorWorkspaceID: String
     /// Position in the Mac's presented section order.
@@ -219,13 +221,15 @@ public struct GroupSyncRecord: MobileSyncRecord {
         name: String,
         isCollapsed: Bool,
         isPinned: Bool,
+        iconSymbol: String? = nil,
         anchorWorkspaceID: String,
         sortIndex: Int
     ) {
         self.id = id
         self.name = name
         self.isCollapsed = isCollapsed
         self.isPinned = isPinned
+        self.iconSymbol = iconSymbol
         self.anchorWorkspaceID = anchorWorkspaceID
         self.sortIndex = sortIndex
     }
@@ -235,6 +239,7 @@ public struct GroupSyncRecord: MobileSyncRecord {
         case name
         case isCollapsed = "is_collapsed"
         case isPinned = "is_pinned"
+        case iconSymbol = "icon_symbol"
         case anchorWorkspaceID = "anchor_workspace_id"
         case sortIndex = "sort_index"
     }

Packages/Shared/CMUXMobileCore/Tests/CMUXMobileCoreTests/MobileStateSyncFrameCodingTests.swift

@@ -80,6 +80,35 @@ struct MobileStateSyncFrameCodingTests {
         #expect(!decoded.customDescriptionIsTruncated)
     }
 
+    @Test func groupRecordCarriesIconAndDecodesOlderFrames() throws {
+        let group = GroupSyncRecord(
+            id: "group-1",
+            name: "Release",
+            isCollapsed: false,
+            isPinned: true,
+            iconSymbol: "shippingbox.fill",
+            anchorWorkspaceID: "workspace-1",
+            sortIndex: 0
+        )
+        let object = try MobileSyncFrameCoder().jsonObject(from: group)
+        #expect(object["icon_symbol"] as? String == "shippingbox.fill")
+
+        let decodedOlder = try MobileSyncFrameCoder().decode(
+            GroupSyncRecord.self,
+            fromJSONString: """
+            {
+              "id": "group-older",
+              "name": "Older Mac",
+              "is_collapsed": false,
+              "is_pinned": false,
+              "anchor_workspace_id": "workspace-older",
+              "sort_index": 0
+            }
+            """
+        )
+        #expect(decodedOlder.iconSymbol == nil)
+    }
+
     @Test func deltaEventRoundTripsThroughJSONObject() throws {
         let event = MobileSyncDeltaEvent(
             epoch: "e1",

Packages/iOS/CmuxMobileRPC/Sources/CmuxMobileRPC/MobileSyncWorkspaceListResponse.swift

@@ -105,7 +105,7 @@ public struct MobileSyncWorkspaceListResponse: Decodable, Sendable {
     }
 
     /// A workspace group section in the list response. Mirrors the iOS-facing
-    /// subset the Mac emits (no v2 handle refs, color, or icon). Members are
+    /// subset the Mac emits (no v2 handle refs or color). Members are
     /// listed in the Mac's spatial (`tabs`) order. Absent on Macs old enough not
     /// to emit groups.
     public struct Group: Decodable, Sendable {
@@ -117,6 +117,8 @@ public struct MobileSyncWorkspaceListResponse: Decodable, Sendable {
         public let isCollapsed: Bool
         /// Whether the group is pinned on the Mac.
         public let isPinned: Bool
+        /// SF Symbol rendered by the corresponding group row on the Mac.
+        public let iconSymbol: String?
         /// The anchor workspace that owns this group. It is represented by the
         /// group header and never rendered as a separate row.
         public let anchorWorkspaceID: String
@@ -130,6 +132,7 @@ public struct MobileSyncWorkspaceListResponse: Decodable, Sendable {
             case name
             case isCollapsed = "is_collapsed"
             case isPinned = "is_pinned"
+            case iconSymbol = "icon_symbol"
             case anchorWorkspaceID = "anchor_workspace_id"
         }
 
@@ -139,12 +142,14 @@ public struct MobileSyncWorkspaceListResponse: Decodable, Sendable {
             name: String,
             isCollapsed: Bool,
             isPinned: Bool,
+            iconSymbol: String? = nil,
             anchorWorkspaceID: String
         ) {
             self.id = id
             self.name = name
             self.isCollapsed = isCollapsed
             self.isPinned = isPinned
+            self.iconSymbol = iconSymbol
             self.anchorWorkspaceID = anchorWorkspaceID
         }
     }
@@ -243,4 +248,3 @@ extension MobileSyncWorkspaceListResponse {
         self.createdTerminalID = createdTerminalID
     }
 }
-

Packages/iOS/CmuxMobileRPC/Sources/CmuxMobileRPC/MobileWorkspacePreview+RemoteMapping.swift

@@ -35,6 +35,7 @@ extension MobileWorkspaceGroupPreview {
             name: remote.name,
             isCollapsed: remote.isCollapsed,
             isPinned: remote.isPinned,
+            iconSymbol: remote.iconSymbol,
             anchorWorkspaceID: MobileWorkspacePreview.ID(rawValue: remote.anchorWorkspaceID)
         )
     }

Packages/iOS/CmuxMobileRPC/Tests/CmuxMobileRPCTests/MobileCoreRPCClientTests.swift

@@ -270,6 +270,51 @@ import Testing
         #expect(mapped.customColorHex == nil)
     }
 
+    @Test func workspaceListResponseCarriesWorkspaceGroupIcon() throws {
+        let json = Data("""
+        {
+          "workspaces": [],
+          "groups": [
+            {
+              "id": "group-1",
+              "name": "Release",
+              "is_collapsed": false,
+              "is_pinned": true,
+              "icon_symbol": "shippingbox.fill",
+              "anchor_workspace_id": "workspace-1"
+            }
+          ]
+        }
+        """.utf8)
+
+        let response = try MobileSyncWorkspaceListResponse.decode(json)
+        let remoteGroup = try #require(response.groups.first)
+        #expect(remoteGroup.iconSymbol == "shippingbox.fill")
+
+        let mappedGroup = MobileWorkspaceGroupPreview(remote: remoteGroup)
+        #expect(mappedGroup.iconSymbol == "shippingbox.fill")
+    }
+
+    @Test func workspaceListResponseDefaultsMissingWorkspaceGroupIconToNil() throws {
+        let json = Data("""
+        {
+          "workspaces": [],
+          "groups": [
+            {
+              "id": "group-older",
+              "name": "Older Mac",
+              "is_collapsed": false,
+              "is_pinned": false,
+              "anchor_workspace_id": "workspace-older"
+            }
+          ]
+        }
+        """.utf8)
+
+        let response = try MobileSyncWorkspaceListResponse.decode(json)
+        #expect(response.groups.first?.iconSymbol == nil)
+    }
+
     /// The Mac emits an optional per-workspace `preview` + `preview_at` (latest
     /// notification text + epoch seconds) for the iMessage-style row preview.
     /// Both must decode when present and stay `nil` when an older Mac omits them.

Packages/iOS/CmuxMobileShell/Sources/CmuxMobileShell/MobileShellComposite+Capabilities.swift

@@ -38,9 +38,15 @@ extension MobileShellComposite {
     /// Whether the Mac supports workspace group mutation requests.
     public var supportsWorkspaceGroupActions: Bool { supportedHostCapabilities.contains(Self.workspaceGroupActionsCapability) && allowsMacScopedWorkspaceMutations }
     /// Whether the Mac supports creating a workspace directly inside a group.
-    public var supportsWorkspaceCreateInGroup: Bool { supportedHostCapabilities.contains(Self.workspaceCreateInGroupCapability) && allowsMacScopedWorkspaceMutations }
+    public var supportsWorkspaceCreateInGroup: Bool {
+        supportedHostCapabilities.contains(Self.workspaceCreateInGroupCapability)
+            && hasMacScopedWorkspaceMutationTicketScope
+    }
     /// Whether the Mac supports creating workspace groups from iOS.
-    public var supportsWorkspaceGroupCreate: Bool { supportedHostCapabilities.contains(Self.workspaceGroupCreateCapability) && allowsMacScopedWorkspaceMutations }
+    public var supportsWorkspaceGroupCreate: Bool {
+        supportedHostCapabilities.contains(Self.workspaceGroupCreateCapability)
+            && hasMacScopedWorkspaceMutationTicketScope
+    }
     /// Whether the Mac supports dogfood feedback submission.
     public var supportsDogfoodFeedback: Bool { supportedHostCapabilities.contains(Self.dogfoodFeedbackCapability) }
     /// Whether the Mac supports chat artifact stat/fetch/thumbnail/list RPCs.

Packages/iOS/CmuxMobileShell/Sources/CmuxMobileShell/MobileShellComposite+StateSync.swift

@@ -374,6 +374,7 @@ extension MobileShellComposite {
                 name: record.name,
                 isCollapsed: record.isCollapsed,
                 isPinned: record.isPinned,
+                iconSymbol: record.iconSymbol,
                 anchorWorkspaceID: record.anchorWorkspaceID
             )
         }

Packages/iOS/CmuxMobileShell/Sources/CmuxMobileShell/MobileShellComposite+WorkspaceMutationCapabilities.swift

@@ -3,6 +3,19 @@ internal import CmuxMobileRPC
 internal import Foundation
 
 extension MobileShellComposite {
+    /// Whether the active ticket was issued with Mac-wide mutation scope.
+    ///
+    /// Menu discovery depends on stable scope, not the ticket's short-lived
+    /// expiry. The mutation methods still call
+    /// ``allowsMacScopedWorkspaceMutations`` immediately before sending, so an
+    /// expired credential fails closed without silently removing supported
+    /// actions from an already-visible workspace list.
+    var hasMacScopedWorkspaceMutationTicketScope: Bool {
+        let ticket = activeTicket ?? remoteClient?.attachTicket
+        return MobileShellWorkspaceMutationTicketPolicy(now: runtime?.now() ?? Date())
+            .hasMacScopedWorkspaceMutationScope(ticket)
+    }
+
     var allowsMacScopedWorkspaceMutations: Bool {
         allowsMacScopedWorkspaceMutations(targetClient: nil)
     }

Packages/iOS/CmuxMobileShell/Sources/CmuxMobileShell/MobileShellWorkspaceMutationTicketPolicy.swift

@@ -5,12 +5,20 @@ internal import Foundation
 struct MobileShellWorkspaceMutationTicketPolicy {
     let now: Date
 
+    func hasMacScopedWorkspaceMutationScope(_ ticket: CmxAttachTicket?) -> Bool {
+        guard let ticket,
+              ticket.authToken?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false else {
+            return false
+        }
+        return ticket.workspaceID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+    }
+
     func allowsMacScopedWorkspaceMutations(_ ticket: CmxAttachTicket?) -> Bool {
         guard let ticket,
-              ticket.authToken?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false,
+              hasMacScopedWorkspaceMutationScope(ticket),
               !ticket.isExpired(at: now) else {
             return false
         }
-        return ticket.workspaceID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+        return true
     }
 }

Packages/iOS/CmuxMobileShell/Tests/CmuxMobileShellTests/MobileShellWorkspaceCapabilityTests.swift

@@ -139,6 +139,26 @@ import Testing
         #expect(await router.count(of: "workspace.group.create") == 0)
     }
 
+    @Test func expiredMacWideTicketKeepsAdvertisedCreateActionsDiscoverable() async throws {
+        let connected = try await connectedStore(
+            capabilities: [
+                "events.v1",
+                "terminal.render_grid.v1",
+                "terminal.replay.v1",
+                "workspace.create_in_group.v1",
+                "workspace.group_create.v1",
+            ],
+            ticketWorkspaceID: "",
+            ticketTerminalID: nil,
+            ticketLifetime: 1
+        )
+
+        connected.clock.advance(by: 2)
+
+        #expect(connected.store.supportsWorkspaceCreateInGroup)
+        #expect(connected.store.supportsWorkspaceGroupCreate)
+    }
+
     private func connectedStore(
         capabilities: [String],
         ticketWorkspaceID: String = "live-workspace",

Packages/iOS/CmuxMobileShellModel/Sources/CmuxMobileShellModel/MobileWorkspaceGroupPreview.swift

@@ -35,6 +35,8 @@ public struct MobileWorkspaceGroupPreview: Identifiable, Equatable, Sendable {
     public var isCollapsed: Bool
     /// Whether the group is pinned on the Mac.
     public var isPinned: Bool
+    /// SF Symbol rendered by the corresponding group row on the Mac.
+    public var iconSymbol: String?
     /// The anchor workspace that owns this group. It is represented by the group
     /// header and never rendered as a separate row.
     public var anchorWorkspaceID: MobileWorkspacePreview.ID
@@ -45,18 +47,21 @@ public struct MobileWorkspaceGroupPreview: Identifiable, Equatable, Sendable {
     ///   - name: The group's user-facing name.
     ///   - isCollapsed: Whether the group is collapsed. Defaults to `false`.
     ///   - isPinned: Whether the group is pinned. Defaults to `false`.
+    ///   - iconSymbol: The Mac row's SF Symbol name, when customized.
     ///   - anchorWorkspaceID: The anchor workspace that owns the group.
     public init(
         id: ID,
         name: String,
         isCollapsed: Bool = false,
         isPinned: Bool = false,
+        iconSymbol: String? = nil,
         anchorWorkspaceID: MobileWorkspacePreview.ID
     ) {
         self.id = id
         self.name = name
         self.isCollapsed = isCollapsed
         self.isPinned = isPinned
+        self.iconSymbol = iconSymbol
         self.anchorWorkspaceID = anchorWorkspaceID
     }
 }

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/WorkspaceGroupDestructiveRequestState.swift

@@ -0,0 +1,31 @@
+import CmuxMobileShellModel
+import Observation
+
+@Observable
+final class WorkspaceGroupDestructiveRequestState {
+    struct Request {
+        let groupID: MobileWorkspaceGroupPreview.ID
+        let action: WorkspaceGroupHeaderPendingDestructiveAction
+    }
+
+    private var pending: Request?
+
+    var groupID: MobileWorkspaceGroupPreview.ID? { pending?.groupID }
+    var action: WorkspaceGroupHeaderPendingDestructiveAction? { pending?.action }
+
+    func enqueue(
+        groupID: MobileWorkspaceGroupPreview.ID,
+        action: WorkspaceGroupHeaderPendingDestructiveAction
+    ) {
+        pending = Request(groupID: groupID, action: action)
+    }
+
+    func consume() -> Request? {
+        defer { pending = nil }
+        return pending
+    }
+
+    func clear() {
+        pending = nil
+    }
+}

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/WorkspaceGroupHeaderRow.swift

@@ -28,6 +28,7 @@ struct WorkspaceGroupHeaderRow: View, Equatable {
     private var isAnchorSelected: Bool { value.isAnchorSelected }
 
     @State private var isRenaming = false
+    @State private var renameDraft = ""
     @State private var pendingDestructiveAction: WorkspaceGroupHeaderPendingDestructiveAction?
 
     /// The leading disclosure chevron. Its own hit target, so tapping it only
@@ -68,7 +69,7 @@ struct WorkspaceGroupHeaderRow: View, Equatable {
     /// the desktop header whose body focuses the anchor.
     private var nameLabel: some View {
         HStack(spacing: 6) {
-            Image(systemName: "folder.fill")
+            Image(systemName: group.iconSymbol ?? "folder.fill")
                 .font(.system(size: 13, weight: .semibold))
                 .foregroundStyle(.secondary)
                 .accessibilityHidden(true)
@@ -133,11 +134,12 @@ struct WorkspaceGroupHeaderRow: View, Equatable {
                 : Color.clear
         )
         .clipShape(RoundedRectangle(cornerRadius: 6, style: .continuous))
-        .contextMenu { contextMenu }
-        .sheet(isPresented: $isRenaming) {
-            WorkspaceGroupRenameSheet(currentName: group.name) { newName in
-                actions.renameGroup?(group.id, newName)
-            }
+        .workspaceGroupRowContextMenu { contextMenu }
+        .workspaceGroupRenameDialog(
+            isPresented: $isRenaming,
+            text: $renameDraft
+        ) { newName in
+            actions.renameGroup?(group.id, newName)
         }
         .confirmationDialog(
             destructiveDialogTitle,
@@ -196,6 +198,7 @@ struct WorkspaceGroupHeaderRow: View, Equatable {
                 }
                 if value.canRenameGroup {
                     Button {
+                        renameDraft = group.name
                         isRenaming = true
                     } label: {
                         Label(L10n.string("mobile.workspaceGroup.rename.action", defaultValue: "Rename Group"), systemImage: "pencil")
@@ -285,3 +288,21 @@ struct WorkspaceGroupHeaderRow: View, Equatable {
         )
     }
 }
+
+private extension View {
+    /// The iOS workspace list is backed by `UITableView`, whose delegate owns
+    /// the complete group-plus-anchor context menu. Attaching a second SwiftUI
+    /// menu to the hosted row intercepts the long press and hides the anchor's
+    /// workspace actions. The non-iOS list has no UIKit delegate, so it keeps
+    /// this row-local menu.
+    @ViewBuilder
+    func workspaceGroupRowContextMenu<MenuContent: View>(
+        @ViewBuilder content: () -> MenuContent
+    ) -> some View {
+        #if os(iOS)
+        self
+        #else
+        contextMenu(menuItems: content)
+        #endif
+    }
+}